优化部分代码实现

models/migration.py

@@ -1,5 +1,6 @@
 from .setting import Setting
 from pkg.conf.appmeta import BackendVersion
+from .response import ThemeModel
 from pkg.password.pwd import Password
 from pkg.log import log
 
@@ -71,7 +72,7 @@ Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; verti
     Setting(name="hot_share_num", value="10", type="share"),
     Setting(name="gravatar_server", value="https://www.gravatar.com/", type="avatar"),
     Setting(name="defaultTheme", value="#3f51b5", type="basic"),
-    Setting(name="themes", value={"#3f51b5":{"palette":{"primary":{"main":"#3f51b5"},"secondary":{"main":"#f50057"}}},"#2196f3":{"palette":{"primary":{"main":"#2196f3"},"secondary":{"main":"#FFC107"}}},"#673AB7":{"palette":{"primary":{"main":"#673AB7"},"secondary":{"main":"#2196F3"}}},"#E91E63":{"palette":{"primary":{"main":"#E91E63"},"secondary":{"main":"#42A5F5","contrastText":"#fff"}}},"#FF5722":{"palette":{"primary":{"main":"#FF5722"},"secondary":{"main":"#3F51B5"}}},"#FFC107":{"palette":{"primary":{"main":"#FFC107"},"secondary":{"main":"#26C6DA"}}},"#8BC34A":{"palette":{"primary":{"main":"#8BC34A","contrastText":"#fff"},"secondary":{"main":"#FF8A65","contrastText":"#fff"}}},"#009688":{"palette":{"primary":{"main":"#009688"},"secondary":{"main":"#4DD0E1","contrastText":"#fff"}}},"#607D8B":{"palette":{"primary":{"main":"#607D8B"},"secondary":{"main":"#F06292"}}},"#795548":{"palette":{"primary":{"main":"#795548"},"secondary":{"main":"#4CAF50","contrastText":"#fff"}}}}, type="basic"),
+    Setting(name="themes", value=ThemeModel().model_dump(), type="basic"),
     Setting(name="aria2_token", value="", type="aria2"),
     Setting(name="aria2_rpcurl", value="", type="aria2"),
     Setting(name="aria2_temp_path", value="", type="aria2"),

models/response.py

@@ -4,18 +4,41 @@ from datetime import datetime, timezone
 from uuid import uuid4
 
 class ResponseModel(BaseModel):
+    '''
+    默认响应模型
+    '''
     code: int = Field(default=0, description="系统内部状态码, 0表示成功，其他表示失败", lt=60000, gt=0)
     data: Union[dict, list, str, int, float, None] = Field(None, description="响应数据")
     msg: Optional[str] = Field(default=None, description="响应消息，可以是错误消息或信息提示")
     instance_id: str = Field(default_factory=lambda: str(uuid4()), description="实例ID，用于标识请求的唯一性")
+    
+class ThemeModel(BaseModel):
+    '''
+    主题模型
+    '''
+    primary: str = Field(default="#3f51b5", description="Primary color")
+    secondary: str = Field(default="#f50057", description="Secondary color")
+    accent: str = Field(default="#9c27b0", description="Accent color")
+    dark: str = Field(default="#1d1d1d", description="Dark color")
+    dark_page: str = Field(default="#121212", description="Dark page color")
+    positive: str = Field(default="#21ba45", description="Positive color")
+    negative: str = Field(default="#c10015", description="Negative color")
+    info: str = Field(default="#31ccec", description="Info color")
+    warning: str = Field(default="#f2c037", description="Warning color")
 
 class TokenModel(BaseModel):
+    '''
+    访问令牌模型
+    '''
     access_expires: datetime = Field(default=None, description="访问令牌的过期时间")
     access_token: str = Field(default=None, description="访问令牌")
     refresh_expires: datetime = Field(default=None, description="刷新令牌的过期时间")
     refresh_token: str = Field(default=None, description="刷新令牌")
 
 class groupModel(BaseModel):
+    '''
+    用户组模型
+    '''
     id: int = Field(default=None, description="用户组ID")
     name: str = Field(default=None, description="用户组名称")
     allowShare: bool = Field(default=False, description="是否允许分享")
@@ -32,19 +55,25 @@ class groupModel(BaseModel):
     advanceDelete: bool = Field(default=False, description="是否允许高级删除")
 
 class userModel(BaseModel):
+    '''
+    用户模型
+    '''
     id: int = Field(default=None, description="用户ID")
     username: str = Field(default=None, description="用户名")
     nickname: str = Field(default=None, description="用户昵称")
     status: int = Field(default=0, description="用户状态")
     avatar: Literal['default', 'gravatar', 'file'] = Field(default='default', description="头像类型")
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc), description="用户创建时间")
-    preferred_theme: str = Field(default="#607D8B", description="用户首选主题")
+    preferred_theme: ThemeModel = Field(default_factory=ThemeModel, description="用户首选主题")
     score: int = Field(default=0, description="用户积分")
     anonymous: bool = Field(default=False, description="是否为匿名用户")
     group: groupModel = Field(default_factory=None, description="用户所属用户组")
     tags: list = Field(default_factory=list, description="用户标签列表")
     
 class SiteConfigModel(ResponseModel):
+    '''
+    站点配置模型
+    '''
     title: str = Field(default="DiskNext", description="网站标题")
     themes: dict = Field(default_factory=dict, description="网站主题配置")
     default_theme: str = Field(default="default", description="默认主题RGB色号")
@@ -56,13 +85,19 @@ class SiteConfigModel(ResponseModel):
     captcha_key: Optional[str] = Field(default=None, description="验证码密钥")
 
 class AuthnModel(BaseModel):
+    '''
+    WebAuthn模型
+    '''
     id: str = Field(default=None, description="ID")
     fingerprint: str = Field(default=None, description="指纹")
 
 class UserSettingModel(BaseModel):
+    '''
+    用户设置模型
+    '''
     authn: Optional[AuthnModel] = Field(default=None, description="认证信息")
     group_expires: Optional[datetime] = Field(default=None, description="用户组过期时间")
-    prefer_theme: str = Field(default="#607D8B", description="用户首选主题")
+    prefer_theme: str = Field(default="#5898d4", description="用户首选主题")
     qq: str | bool = Field(default=False, description="QQ号")
     themes: dict = Field(default_factory=dict, description="用户主题配置")
     two_factor: bool = Field(default=False, description="是否启用两步验证")