Merge branch '1014TaoTao:v2.0.0' into v2.0.0

backend/app/api/v1/models/system/dict_model.py

@@ -18,7 +18,7 @@ class DictTypeModel(ModelBase):
     id = Column(Integer, primary_key=True, autoincrement=True, comment='字典主键')
     dict_name = Column(String(100), nullable=True, unique=True, default='', comment='字典名称')
     dict_type = Column(String(100), nullable=True, unique=True, default='', comment='字典类型')
-    status = Column(Boolean, nullable=True, default='0', comment='状态（0正常 1停用）')
+    status = Column(Boolean, nullable=True, default='1', comment='状态（1正常 0停用）')
     
     # 审计字段
     description = Column(Text, nullable=True, comment="备注说明")
@@ -56,7 +56,7 @@ class DictDataModel(ModelBase):
     css_class = Column(String(100), nullable=True, default=None, comment='样式属性（其他样式扩展）')
     list_class = Column(String(100), nullable=True, default=None, comment='表格回显样式')
     is_default = Column(Boolean, nullable=True, default='N', comment='是否默认（Y是 N否）')
-    status = Column(Boolean, nullable=True, default='0', comment='状态（0正常 1停用）')
+    status = Column(Boolean, nullable=True, default='1', comment='状态（1正常 0停用）')
     
     # 审计字段
     description = Column(Text, nullable=True, comment="备注说明")

backend/app/api/v1/params/system/dict_param.py

@@ -14,7 +14,7 @@ class DictTypeQueryParams:
             self,
             dict_name: Optional[str] = Query(None, description="字典名称"),
             dict_type: Optional[str] = Query(None, description="字典类型"),
-            status: Optional[bool] = Query(None, description="状态（0正常 1停用）"),
+            status: Optional[bool] = Query(None, description="状态（1正常 0停用）"),
             creator: Optional[int] = Query(None, description="创建人"),
             start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2023-01-01 00:00:00"),
             end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2023-12-31 23:59:59"),
@@ -43,7 +43,7 @@ class DictDataQueryParams:
             self,
             dict_label: Optional[str] = Query(None, description="字典标签"),
             dict_type: Optional[str] = Query(None, description="字典类型"),
-            status: Optional[bool] = Query(None, description="状态（0正常 1停用）"),
+            status: Optional[bool] = Query(None, description="状态（1正常 0停用）"),
             creator: Optional[int] = Query(None, description="创建人"),
             start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2023-01-01 00:00:00"),
             end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2023-12-31 23:59:59"),

backend/app/api/v1/schemas/monitor/cache_schema.py

@@ -17,7 +17,7 @@ class CacheInfoSchema(BaseModel):
     """缓存对象信息模型"""
     model_config = ConfigDict(from_attributes=True)
 
-    cache_key: str = Field(default='', description='缓存键名')
+    cache_key: str = Field(..., description='缓存键名')
-    cache_name: str = Field(default='', description='缓存名称')
+    cache_name: str = Field(..., description='缓存名称')
     cache_value: Any = Field(default=None, description='缓存值')
     remark: Optional[str] = Field(default=None, description='备注说明')

backend/app/api/v1/schemas/monitor/job_schema.py

@@ -2,9 +2,6 @@
 
 from pydantic import BaseModel, ConfigDict, Field
 from typing import Optional
-from datetime import datetime
-
-from app.core.validator import DateTimeStr
 from app.core.base_schema import BaseSchema
 
 
@@ -12,16 +9,15 @@ class JobCreateSchema(BaseModel):
     """
     定时任务调度表对应pydantic模型
     """
-
+    name: Optional[str] = Field(..., max_length=64, description='任务名称')
-    name: Optional[str] = Field(default=None, max_length=64, description='任务名称')
     func: str = Field(..., description='任务函数')
     trigger: str = Field(..., description='触发器:控制此作业计划的 trigger 对象')
     args: Optional[str] = Field(default=None, description='位置参数')
     kwargs: Optional[str] = Field(default=None, description='关键字参数')
-    coalesce: Optional[bool] = Field(default=False, description='是否合并运行:是否在多个运行时间到期时仅运行作业一次')
+    coalesce: Optional[bool] = Field(..., description='是否合并运行:是否在多个运行时间到期时仅运行作业一次')
     max_instances: Optional[int] = Field(default=1, ge=1, description='最大实例数:允许的最大并发执行实例数')
-    jobstore: Optional[str] = Field(default='default', max_length=64, description='任务存储')
+    jobstore: Optional[str] = Field(..., max_length=64, description='任务存储')
-    executor: Optional[str] = Field(default='default', max_length=64, description='任务执行器:将运行此作业的执行程序的名称')
+    executor: Optional[str] = Field(..., max_length=64, description='任务执行器:将运行此作业的执行程序的名称')
     trigger_args: Optional[str] = Field(default=None, description='触发器参数')
     start_date: Optional[str] = Field(default=None, description='开始时间')
     end_date: Optional[str] = Field(default=None, description='结束时间')
@@ -29,14 +25,13 @@ class JobCreateSchema(BaseModel):
     status: Optional[bool] = Field(default=False, description='任务状态:启动,停止')
     message: Optional[str] = Field(default=None, max_length=500, description='日志信息')
 
+
 class JobUpdateSchema(JobCreateSchema):
     """定时任务更新模型"""
-    ...
     id: int = Field(..., gt=0, description="ID")
     
 
 class JobOutSchema(JobCreateSchema, BaseSchema):
     """定时任务响应模型"""
     model_config = ConfigDict(from_attributes=True)
-    ...
     

backend/app/api/v1/schemas/monitor/online_schema.py

@@ -13,10 +13,10 @@ class OnlineOutSchema(BaseModel):
 
     model_config = ConfigDict(from_attributes=True)
 
-    name: Optional[str] = Field(default=None, description='用户名称')
+    name: str = Field(..., description='用户名称')
-    session_id: Optional[str] = Field(default=None, description='会话编号')
+    session_id: str = Field(..., description='会话编号')
-    user_id: Optional[int] = Field(default=None, description='用户ID')
+    user_id: int = Field(..., description='用户ID')
-    user_name: Optional[str] = Field(default=None, description='用户名')
+    user_name: str = Field(..., description='用户名')
     ipaddr: Optional[str] = Field(default=None, description='登陆IP地址')
     login_location: Optional[str] = Field(default=None, description='登录所属地')
     os: Optional[str] = Field(default=None, description='操作系统')

backend/app/api/v1/schemas/system/auth_schema.py

@@ -2,7 +2,7 @@
 
 from typing import Optional, Union
 from datetime import datetime
-from pydantic import ConfigDict, Field, BaseModel, model_validator
+from pydantic import ConfigDict, Field, BaseModel, field_validator
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
@@ -15,7 +15,7 @@ class AuthSchema(BaseModel):
 
     user: Optional[UserOutSchema] = Field(default=None, description='用户信息')
     check_data_scope: bool = Field(default=True, description='是否检查数据权限')
-    db: AsyncSession | Session = Field(default=None, description='数据库会话')
+    db: AsyncSession | Session | None = Field(default=None, description='数据库会话')
 
 
 class JWTPayloadSchema(BaseModel):
@@ -24,11 +24,12 @@ class JWTPayloadSchema(BaseModel):
     is_refresh: bool = Field(default=False, description='是否刷新token')
     exp: Union[datetime, int] = Field(..., description='过期时间')
 
-    @model_validator(mode='after')
+    @field_validator('sub')
-    def validate_fields(cls, data):
+    @classmethod
-        if not data.sub or len(data.sub.strip()) == 0:
+    def validate_sub(cls, value: str):
+        if not value or len(value.strip()) == 0:
             raise ValueError("会话编号不能为空")
-        return data
+        return value
 
 
 class JWTOutSchema(BaseModel):

backend/app/api/v1/schemas/system/config_schema.py

@@ -17,23 +17,23 @@ class ConfigCreateSchema(BaseModel):
 
 class ConfigUpdateSchema(ConfigCreateSchema):
     """配置更新模型"""
-    id: int = Field(description="主键ID")
+    id: int = Field(..., description="主键ID")
 
 
 class ConfigOutSchema(ConfigCreateSchema, BaseSchema):
     """配置响应模型"""
     model_config = ConfigDict(from_attributes=True)
-    id: int = Field(description="主键ID")
+    id: int = Field(..., description="主键ID")
 
 
-class UpdataSystemConfigSchema(BaseSchema):
+class UpdataSystemConfigSchema(BaseModel):
     """更新系统配置"""
     sys_web_title: str = Field(description="网站标题") 
-    sys_web_description:  str = Field(description="网站描述")
+    sys_web_description: str = Field(description="网站描述")
     sys_web_favicon: str = Field(description="网站图标")
     sys_web_logo: str = Field(description="网站logo")
-    sys_login_background:  str = Field(description="登录背景")
+    sys_login_background: str = Field(description="登录背景")
-    sys_web_copyright:  str = Field(description="版权信息")
+    sys_web_copyright: str = Field(description="版权信息")
     sys_keep_record: str = Field(description="备案号")
     sys_help_doc: str = Field(description="帮助文档")
     sys_web_privacy: str = Field(description="隐私条款")

backend/app/api/v1/schemas/system/dept_schema.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from typing import Any, Optional
-from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator, validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from app.core.base_schema import BaseSchema
-from app.core.validator import DateTimeStr
+
-from app.core.logger import logger
 
 class DeptCreateSchema(BaseModel):
     """部门创建模型"""
@@ -15,20 +14,22 @@ class DeptCreateSchema(BaseModel):
     parent_id: Optional[int] = Field(default=None, ge=0, description="父部门ID")
     description: Optional[str] = Field(default=None, max_length=500, description="备注说明")
 
-    @model_validator(mode='after')
+    @field_validator('name')
-    def validate_fields(self):
+    @classmethod
-        if not self.name or len(self.name.strip()) == 0:
+    def validate_name(cls, value: str):
+        if not value or len(value.strip()) == 0:
             raise ValueError("部门名称不能为空")
-        self.name = self.name.replace(" ", "")
+        value = value.replace(" ", "")
-        return self
+        return value
 
 
 class DeptUpdateSchema(DeptCreateSchema):
     """部门更新模型"""
-    id: int = Field(..., gt=0, description="部门ID")
+    id: int = Field(..., ge=1, description="部门ID")
 
 
 class DeptOutSchema(DeptCreateSchema, BaseSchema):
     """部门响应模型"""
     model_config = ConfigDict(from_attributes=True)
+    
     parent_name: Optional[str] = Field(default=None, max_length=40, description="父部门名称")

backend/app/api/v1/schemas/system/dict_schema.py

@@ -1,6 +1,6 @@
-from pydantic import BaseModel, ConfigDict, Field
+import re
-from pydantic_validation_decorator import NotBlank, Pattern, Size
+from pydantic import BaseModel, ConfigDict, Field, field_validator
-from typing import Literal, Optional
+from typing import Optional
 
 from app.core.base_schema import BaseSchema
 
@@ -10,29 +10,25 @@ class DictTypeCreateSchema(BaseModel):
     字典类型表对应pydantic模型
     """
 
-    dict_name: Optional[str] = Field(default=None, description='字典名称')
+    dict_name: str = Field(..., min_length=1, max_length=100, description='字典名称')
-    dict_type: Optional[str] = Field(default=None, description='字典类型')
+    dict_type: str = Field(..., min_length=1, max_length=100, description='字典类型')
-    status: Optional[bool] = Field(default=None, description='状态（0正常 1停用）')
+    status: Optional[bool] = Field(default=None, description='状态（1正常 0停用）')
     description: Optional[str] = Field(None, max_length=255, description="描述")
 
-    @NotBlank(field_name='dict_name', message='字典名称不能为空')
+    @field_validator('dict_name')
-    @Size(field_name='dict_name', min_length=0, max_length=100, message='字典类型名称长度不能超过100个字符')
+    def validate_dict_name(cls, value: str):
-    def get_dict_name(self):
+        if not value or value.strip() == '':
-        return self.dict_name
+            raise ValueError('字典名称不能为空')
+        return value
 
-    @NotBlank(field_name='dict_type', message='字典类型不能为空')
+    @field_validator('dict_type')
-    @Size(field_name='dict_type', min_length=0, max_length=100, message='字典类型类型长度不能超过100个字符')
+    def validate_dict_type(cls, value: str):
-    @Pattern(
+        if not value or value.strip() == '':
-        field_name='dict_type',
+            raise ValueError('字典类型不能为空')
-        regexp='^[a-z][a-z0-9_]*$',
+        regexp = r'^[a-z][a-z0-9_]*$'
-        message='字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）',
+        if not re.match(regexp, value):
-    )
+            raise ValueError('字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）')
-    def get_dict_type(self):
+        return value
-        return self.dict_type
-
-    def validate_fields(self):
-        self.get_dict_name()
-        self.get_dict_type()
 
 
 class DictTypeUpdateSchema(DictTypeCreateSchema):
@@ -45,46 +41,37 @@ class DictTypeOutSchema(DictTypeCreateSchema, BaseSchema):
     model_config = ConfigDict(from_attributes=True)
 
 
-
 class DictDataCreateSchema(BaseModel):
     """
     字典数据表对应pydantic模型
     """
-
+    dict_sort: int = Field(..., gt=0, description='字典排序')
-    dict_sort: Optional[int] = Field(default=None, description='字典排序')
+    dict_label: str = Field(..., max_length=100, description='字典标签')
-    dict_label: Optional[str] = Field(default=None, description='字典标签')
+    dict_value: str = Field(..., max_length=100, description='字典键值')
-    dict_value: Optional[str] = Field(default=None, description='字典键值')
+    dict_type: str = Field(..., max_length=100, description='字典类型')
-    dict_type: Optional[str] = Field(default=None, description='字典类型')
+    css_class: Optional[str] = Field(default=None, max_length=100, description='样式属性（其他样式扩展）')
-    css_class: Optional[str] = Field(default=None, description='样式属性（其他样式扩展）')
     list_class: Optional[str] = Field(default=None, description='表格回显样式')
     is_default: Optional[bool] = Field(default=None, description='是否默认（Y是 N否）')
-    status: Optional[bool] = Field(default=None, description='状态（0正常 1停用）')
+    status: Optional[bool] = Field(default=None, description='状态（1正常 0停用）')
     description: Optional[str] = Field(default=None, max_length=255, description="描述")
 
-    @NotBlank(field_name='dict_label', message='字典标签不能为空')
+    @field_validator('dict_label')
-    @Size(field_name='dict_label', min_length=0, max_length=100, message='字典标签长度不能超过100个字符')
+    def validate_dict_label(cls, value: str):
-    def get_dict_label(self):
+        if not value or value.strip() == '':
-        return self.dict_label
+            raise ValueError('字典标签不能为空')
+        return value
 
-    @NotBlank(field_name='dict_value', message='字典键值不能为空')
+    @field_validator('dict_value')
-    @Size(field_name='dict_value', min_length=0, max_length=100, message='字典键值长度不能超过100个字符')
+    def validate_dict_value(cls, value: str):
-    def get_dict_value(self):
+        if not value or value.strip() == '':
-        return self.dict_value
+            raise ValueError('字典键值不能为空')
+        return value
 
-    @NotBlank(field_name='dict_type', message='字典类型不能为空')
+    @field_validator('dict_type')
-    @Size(field_name='dict_type', min_length=0, max_length=100, message='字典类型长度不能超过100个字符')
+    def validate_dict_type(cls, value: str):
-    def get_dict_type(self):
+        if not value or value.strip() == '':
-        return self.dict_type
+            raise ValueError('字典类型不能为空')
-
+        return value
-    @Size(field_name='css_class', min_length=0, max_length=100, message='样式属性长度不能超过100个字符')
-    def get_css_class(self):
-        return self.css_class
-
-    def validate_fields(self):
-        self.get_dict_label()
-        self.get_dict_value()
-        self.get_dict_type()
-        self.get_css_class()
 
 
 class DictDataUpdateSchema(DictDataCreateSchema):

backend/app/api/v1/schemas/system/menu_schema.py

@@ -10,9 +10,9 @@ from app.core.base_schema import BaseSchema
 class MenuCreateSchema(BaseModel):
     """菜单创建模型"""
     name: str = Field(..., max_length=50, description="菜单名称")
-    type: int = Field(..., ge=1, le=4, description="菜单类型(1:目录 2:菜单 3:按钮 4:外链)")
+    type: Optional[int] = Field(default=None, ge=1, le=4, description="菜单类型(1:目录 2:菜单 3:按钮 4:外链)")
     icon: Optional[str] = Field(default=None, max_length=100, description="菜单图标")
-    order: int = Field(default=1, ge=0, description="显示顺序")
+    order: int = Field(..., ge=1, description="显示顺序")
     permission: Optional[str] = Field(default=None, max_length=100, description="权限标识")
     route_name: Optional[str] = Field(default=None, max_length=100, description="路由名称")
     route_path: Optional[str] = Field(default=None, max_length=200, description="路由地址")
@@ -25,22 +25,22 @@ class MenuCreateSchema(BaseModel):
     title: Optional[str] = Field(default=None, max_length=50, description="菜单标题")
     params: Optional[list[dict[str, str]]] = Field(default=None, description="路由参数，格式为[{key: string, value: string}]")
     affix: bool = Field(default=False, description="是否固定标签页(True:是 False:否)")
-    parent_id: Optional[int] = Field(default=None, ge=0, description="父菜单ID")
+    parent_id: Optional[int] = Field(default=None, ge=1, description="父菜单ID")
     description: Optional[str] = Field(default=None, max_length=500, description="备注说明")
 
-    @classmethod
     @model_validator(mode='after')
-    def validate_fields(cls, data):
+    def validate_fields(self):
-        return menu_request_validator(data)
+        return menu_request_validator(self)
 
 
 class MenuUpdateSchema(MenuCreateSchema):
     """菜单更新模型"""
-    id: int = Field(..., gt=0, description="菜单ID")
+    id: int = Field(..., ge=1, description="菜单ID")
     parent_name: Optional[str] = Field(default=None, max_length=50, description="父菜单名称")
 
 
 class MenuOutSchema(MenuCreateSchema, BaseSchema):
     """菜单响应模型"""
     model_config = ConfigDict(from_attributes=True)
+    
     parent_name: Optional[str] = Field(default=None, max_length=50, description="父菜单名称")

backend/app/api/v1/schemas/system/notice_schema.py

@@ -11,13 +11,13 @@ class NoticeCreateSchema(BaseModel):
     notice_title: str = Field(..., max_length=50, description='公告标题')
     notice_type: str = Field(..., description='公告类型（1通知 2公告）')
     notice_content: str = Field(..., description='公告内容')
-    status: bool = Field(True, description="是否启用(True:启用 False:禁用)")
+    status: bool = Field(default=True, description="是否启用(True:启用 False:禁用)")
-    description: Optional[str] = Field(None, max_length=255, description="公告描述")
+    description: Optional[str] = Field(default=None, max_length=255, description="公告描述")
 
 
 class NoticeUpdateSchema(NoticeCreateSchema):
     """公告通知更新模型"""
-    id: int = Field(..., gt=0, description="公告通知ID")
+    id: int = Field(..., ge=1, description="公告通知ID")    
 
 
 class NoticeOutSchema(NoticeCreateSchema, BaseSchema):

backend/app/api/v1/schemas/system/position_schema.py

@@ -11,12 +11,12 @@ class PositionCreateSchema(BaseModel):
     name: str = Field(..., max_length=40, description="岗位名称")
     order: Optional[int] = Field(default=1, ge=1, description='显示排序')
     status: bool = Field(default=True, description="是否启用(True:启用 False:禁用)")
-    description: Optional[str] = Field(None, description="备注说明")
+    description: Optional[str] = Field(default=None, description="备注说明")
 
 
 class PositionUpdateSchema(PositionCreateSchema):
     """岗位更新模型"""
-    id: int = Field(..., gt=0, description="岗位ID")
+    id: int = Field(..., ge=1, description="岗位ID")
 
 
 class PositionOutSchema(PositionCreateSchema, BaseSchema):
@@ -27,6 +27,6 @@ class PositionOutSchema(PositionCreateSchema, BaseSchema):
 class PositionOptionsOut(PositionCreateSchema):
     model_config = ConfigDict(from_attributes=True)
 
-    id: int = Field(description="主键ID")
+    id: int = Field(..., description="主键ID")
-    created_at: DateTimeStr = Field(description="创建时间")
+    created_at: DateTimeStr = Field(..., description="创建时间")
-    updated_at: DateTimeStr = Field(description="更新时间")
+    updated_at: DateTimeStr = Field(..., description="更新时间")

backend/app/api/v1/schemas/system/role_schema.py

@@ -11,7 +11,7 @@ from app.core.validator import DateTimeStr
 
 class RoleCreateSchema(BaseModel):
     """角色创建模型"""
-    name: str = Field(default=None, max_length=15, description="角色名称")
+    name: str = Field(..., max_length=15, description="角色名称")
     order: Optional[int] = Field(default=1, ge=1, description='显示排序')
     data_scope: Optional[int] = Field(default=1, ge=1, le=5, description='数据权限范围')
     status: bool = Field(default=True, description="是否启用")
@@ -25,16 +25,15 @@ class RolePermissionSettingSchema(BaseModel):
     menu_ids: List[int] = Field(default_factory=list, description='菜单ID列表')
     dept_ids: List[int] = Field(default_factory=list, description='部门ID列表')
     
-    @classmethod
     @model_validator(mode='after')
-    def validate_fields(cls, data):
+    def validate_fields(self):
         """验证权限配置字段"""
-        return role_permission_request_validator(data)
+        return role_permission_request_validator(self)
 
 
 class RoleUpdateSchema(RoleCreateSchema):
     """角色更新模型"""
-    id: int = Field(..., gt=0, description="角色ID")
+    id: int = Field(..., ge=1, description="角色ID")
 
 
 class RoleOutSchema(RoleCreateSchema, BaseSchema):
@@ -48,8 +47,8 @@ class RoleOutSchema(RoleCreateSchema, BaseSchema):
 class RoleOptionsOut(RoleCreateSchema):
     model_config = ConfigDict(from_attributes=True)
 
-    id: int = Field(description="主键ID")
+    id: int = Field(..., description="主键ID")
-    created_at: DateTimeStr = Field(description="创建时间")
+    created_at: DateTimeStr = Field(..., description="创建时间")
-    updated_at: DateTimeStr = Field(description="更新时间")
+    updated_at: DateTimeStr = Field(..., description="更新时间")
     menus: List[MenuOutSchema] = Field(default_factory=list, description='角色菜单列表')
     depts: List[DeptOutSchema] = Field(default_factory=list, description='角色部门列表')

backend/app/api/v1/schemas/system/user_schema.py

@@ -12,59 +12,63 @@ from app.core.base_schema import BaseSchema
 
 class CurrentUserUpdateSchema(BaseModel):
     """基础用户信息"""
-    name: str = Field(default=None, max_length=15, description="名称")
+    name: str = Field(..., max_length=15, description="名称")
     mobile: Optional[str] = Field(default=None, description="手机号")
     email: Optional[EmailStr] = Field(default=None, description="邮箱")
     gender: Optional[str] = Field(default=None, description="性别")
     avatar: Optional[str] = Field(default=None, description="头像")
 
-    @classmethod
     @field_validator("mobile")
+    @classmethod
     def validate_mobile(cls, value: Optional[str]):
         return mobile_validator(value)
 
 
 class UserRegisterSchema(BaseModel):
     """注册"""
-    name: str = Field(default=None, max_length=15, description="名称")
+    name: str = Field(..., max_length=15, description="名称")
     mobile: Optional[str] = Field(default=None, description="手机号")
-    username: str = Field(default=None, max_length=15, description="账号")
+    username: str = Field(..., max_length=15, description="账号")
-    password: str = Field(default=None, max_length=128, description="密码哈希值")
+    password: str = Field(..., max_length=128, description="密码哈希值")
     role_ids: Optional[List[int]] = Field(default=[2], description='角色ID')
     creator_id: Optional[int] = Field(default=1, description='创建人ID')
     description: Optional[str] = Field(default=f'注册用户{username}', max_length=250, description="备注")
 
+    @field_validator("mobile")
+    @classmethod
+    def validate_mobile(cls, value: Optional[str]):
+        return mobile_validator(value)
 
 class UserForgetPasswordSchema(BaseModel):
     """忘记密码"""
-    username: str = Field(default=None, max_length=15, description="用户名")
+    username: str = Field(..., max_length=15, description="用户名")
     mobile: Optional[str] = Field(default=None, description="手机号")
-    new_password: str = Field(default=None, max_length=128, description="新密码")
+    new_password: str = Field(..., max_length=128, description="新密码")
     
-    @classmethod
     @field_validator("mobile")
+    @classmethod
     def validate_mobile(cls, value: Optional[str]):
         return mobile_validator(value)
 
 
 class UserChangePasswordSchema(BaseModel):
     """修改密码"""
-    old_password: str = Field(default=None, max_length=128, description="旧密码")
+    old_password: str = Field(..., max_length=128, description="旧密码")
-    new_password: str = Field(default=None, max_length=128, description="新密码")
+    new_password: str = Field(..., max_length=128, description="新密码")
 
 
 class ResetPasswordSchema(BaseModel):
     """修改密码"""
     id: int = Field(..., description="主键ID")
-    password: str = Field(default=None, min_length=6, max_length=128, description="新密码")
+    password: str = Field(..., min_length=6, max_length=128, description="新密码")
 
 
 class UserCreateSchema(CurrentUserUpdateSchema):
     """新增"""
     model_config = ConfigDict(from_attributes=True)
     
-    username: str = Field(default=None, max_length=15, description="用户名")
+    username: str = Field(..., max_length=15, description="用户名")
-    password: Optional[str] = Field(default=None, max_length=128, description="密码哈希值")
+    password: str = Field(..., max_length=128, description="密码哈希值")
     status: bool = Field(default=True, description="是否可用")
     is_superuser: bool = Field(default=False, description="是否超管")
     description: Optional[str] = Field(None, max_length=255, description="备注")
@@ -76,14 +80,17 @@ class UserCreateSchema(CurrentUserUpdateSchema):
 
 class UserUpdateSchema(UserCreateSchema):
     """更新"""
-    model_config = ConfigDict(from_attributes=True, exclude={"password"})
+    model_config = ConfigDict(from_attributes=True)
+
     id: int = Field(..., description="主键ID")
+    password: Optional[str] = Field(default=None, max_length=128, description="密码哈希值")
 
 
 class UserOutSchema(UserCreateSchema, BaseSchema):
     """响应"""
     model_config = ConfigDict(arbitrary_types_allowed=True, from_attributes=True)
     
+    password: str = Field(exclude=True)  # password 不返回
     last_login: Optional[DateTimeStr] = Field(default=None, description="最后登录时间")
     dept_name: Optional[str] = Field(default=None, description='部门名称')
     dept: Optional[DeptOutSchema] = Field(default=None, description='部门')

backend/app/core/validator.py

@@ -99,7 +99,7 @@ def menu_request_validator(data):
     :return: 验证后的请求数据
     :raises: CustomException 请求数据无效时抛出
     """
-    menu_types = {1: "目录", 2: "功能", 3: "权限"}
+    menu_types = {1: "目录", 2: "功能", 3: "权限", 4: "外链"}
 
     if data.type not in menu_types:
         raise CustomException(code=RET.BAD_REQUEST.code, msg=f"菜单类型必须为: {','.join(map(str, menu_types.keys()))}")

backend/sql/fastapi_vue_admin.sql

@@ -166,7 +166,7 @@ CREATE TABLE `system_dict_data` (
   `css_class` varchar(100) DEFAULT NULL COMMENT '样式属性（其他样式扩展）',
   `list_class` varchar(100) DEFAULT NULL COMMENT '表格回显样式',
   `is_default` tinyint(1) DEFAULT NULL COMMENT '是否默认（Y是 N否）',
-  `status` tinyint(1) DEFAULT NULL COMMENT '状态（0正常 1停用）',
+  `status` tinyint(1) DEFAULT NULL COMMENT '状态（1正常 0停用）',
   `description` text COMMENT '备注说明',
   `created_at` datetime DEFAULT NULL COMMENT '创建时间',
   `updated_at` datetime DEFAULT NULL COMMENT '更新时间',
@@ -224,7 +224,7 @@ CREATE TABLE `system_dict_type` (
   `id` int NOT NULL AUTO_INCREMENT COMMENT '字典主键',
   `dict_name` varchar(100) DEFAULT NULL COMMENT '字典名称',
   `dict_type` varchar(100) DEFAULT NULL COMMENT '字典类型',
-  `status` tinyint(1) DEFAULT NULL COMMENT '状态（0正常 1停用）',
+  `status` tinyint(1) DEFAULT NULL COMMENT '状态（1正常 0停用）',
   `description` text COMMENT '备注说明',
   `created_at` datetime DEFAULT NULL COMMENT '创建时间',
   `updated_at` datetime DEFAULT NULL COMMENT '更新时间',