mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-25 21:57:48 +00:00
zhangtao
6a5f8cf0dd
这是一次综合性的项目迭代，包含以下核心变更：
1. **目录与模块重构**
- 调整工作流节点类型模块目录结构，迁移节点类型相关代码
- 重命名platform模块为system模块，更新插件配置信息
- 重构代码生成模块导入路径
2. **数据库与CRUD优化**
- 统一所有CRUD类构造函数，新增数据库会话参数
- 修复权限过滤器数据库会话使用问题
- 更新模板生成器的CRUD代码模板
3. **认证与安全改进**
- 重构JWT密钥配置，移除默认密钥强制要求环境变量
- 重命名密码工具类，统一密码加密校验逻辑
- 优化OAuth认证流程，修复匿名认证使用问题
4. **前端与静态资源**
- 重构前端挂载逻辑，增加目录存在性校验
- 使用标准StaticFiles替换自定义前端挂载实现
5. **工具类与依赖更新**
- 修复导入工具的表名重复检测逻辑
- 优化限流回调代码，移除冗余依赖
- 更新用户、租户等模块的响应模型字段
6. **数据与配置修正**
- 修复系统版本数据字段命名不统一问题
- 简化枚举类校验逻辑，移除冗余注释
- 修复测试用例中的密码工具类导入错误
294 lines
12 KiB
Python
294 lines
12 KiB
Python
from urllib.parse import urlparse
|
||
|
||
from pydantic import (
|
||
BaseModel,
|
||
ConfigDict,
|
||
EmailStr,
|
||
Field,
|
||
field_validator,
|
||
model_validator,
|
||
)
|
||
|
||
from app.api.v1.module_platform.menu.schema import MenuOutSchema
|
||
from app.api.v1.module_system.role.schema import RoleOutSchema
|
||
from app.common.enums import QueueEnum
|
||
from app.core.base_schema import BaseQueryParam, BaseSchema, CommonSchema, CoreUserSchema, TenantByQueryParam, TenantBySchema, UserByQueryParam, UserBySchema
|
||
from app.core.validator import email_validator, mobile_validator
|
||
|
||
|
||
class CurrentUserUpdateSchema(BaseModel):
|
||
"""基础用户信息"""
|
||
|
||
name: str | None = Field(default=None, max_length=32, description="名称")
|
||
mobile: str | None = Field(default=None, max_length=11, description="手机号")
|
||
email: EmailStr | None = Field(default=None, description="邮箱")
|
||
gender: str | None = Field(default=None, max_length=1, description="性别(0:男 1:女 2:未知)")
|
||
avatar: str | None = Field(default=None, max_length=255, description="头像")
|
||
|
||
@field_validator("mobile")
|
||
@classmethod
|
||
def validate_mobile(cls, value: str | None):
|
||
"""校验手机号格式"""
|
||
return mobile_validator(value)
|
||
|
||
@field_validator("email")
|
||
@classmethod
|
||
def validate_email(cls, value: str | None):
|
||
"""校验邮箱格式"""
|
||
if not value:
|
||
return value
|
||
return email_validator(value)
|
||
|
||
@field_validator("gender")
|
||
@classmethod
|
||
def validate_gender(cls, value: str | None):
|
||
"""校验性别：仅支持 0(男)、1(女)、2(未知)"""
|
||
if value and value not in {"0", "1", "2"}:
|
||
raise ValueError("性别仅支持 0(男)、1(女)、2(未知)")
|
||
return value
|
||
|
||
@field_validator("avatar")
|
||
@classmethod
|
||
def validate_avatar(cls, value: str | None):
|
||
"""校验头像地址为合法的 HTTP/HTTPS URL"""
|
||
if not value:
|
||
return value
|
||
parsed = urlparse(value)
|
||
if parsed.scheme in ("http", "https") and parsed.netloc:
|
||
return value
|
||
raise ValueError("头像地址需为有效的 HTTP/HTTPS URL")
|
||
|
||
@model_validator(mode="after")
|
||
def check_model(self):
|
||
"""校验基础用户信息长度约束"""
|
||
if self.name and len(self.name) > 32:
|
||
raise ValueError("名称长度不能超过 32 个字符")
|
||
return self
|
||
|
||
|
||
class UserForgetPasswordSchema(BaseModel):
|
||
"""忘记密码"""
|
||
|
||
tenant_name: str = Field(..., min_length=1, max_length=32, description="租户名称")
|
||
username: str = Field(..., min_length=3, max_length=32, description="用户名")
|
||
new_password: str = Field(..., min_length=6, max_length=128, description="新密码")
|
||
mobile: str | None = Field(default=None, max_length=11, description="手机号")
|
||
|
||
@field_validator("username")
|
||
@classmethod
|
||
def validate_username(cls, value: str):
|
||
"""校验账号：字母开头，3-32 位"""
|
||
v = value.strip()
|
||
if not v:
|
||
raise ValueError("账号不能为空")
|
||
import re
|
||
|
||
if not re.match(r"^[A-Za-z][A-Za-z0-9_.-]{2,31}$", v):
|
||
raise ValueError("账号需以字母开头，3-32 位，仅允许字母、数字、_ . -")
|
||
return v
|
||
|
||
@field_validator("new_password")
|
||
@classmethod
|
||
def validate_new_password(cls, value: str):
|
||
"""校验密码：6-128 位"""
|
||
if len(value) < 6:
|
||
raise ValueError("密码长度不能少于 6 位")
|
||
if len(value) > 128:
|
||
raise ValueError("密码长度不能超过 128 位")
|
||
return value
|
||
|
||
@field_validator("mobile")
|
||
@classmethod
|
||
def validate_mobile(cls, value: str | None):
|
||
"""校验手机号格式"""
|
||
return mobile_validator(value)
|
||
|
||
|
||
class UserChangePasswordSchema(BaseModel):
|
||
"""修改密码"""
|
||
|
||
old_password: str = Field(..., min_length=6, max_length=128, description="旧密码")
|
||
new_password: str = Field(..., min_length=6, max_length=128, description="新密码")
|
||
|
||
@field_validator("new_password")
|
||
@classmethod
|
||
def validate_new_password(cls, value: str):
|
||
"""校验新密码：6-128 位"""
|
||
if len(value) < 6:
|
||
raise ValueError("新密码长度不能少于 6 位")
|
||
if len(value) > 128:
|
||
raise ValueError("新密码长度不能超过 128 位")
|
||
return value
|
||
|
||
|
||
class ResetPasswordSchema(BaseModel):
|
||
"""重置密码"""
|
||
|
||
id: int = Field(default=0, description="主键ID（已弃用，由路径参数传入）")
|
||
password: str = Field(..., min_length=6, max_length=128, description="新密码")
|
||
|
||
@field_validator("password")
|
||
@classmethod
|
||
def validate_password(cls, value: str):
|
||
"""校验新密码：6-128 位"""
|
||
if len(value) < 6:
|
||
raise ValueError("新密码长度不能少于 6 位")
|
||
if len(value) > 128:
|
||
raise ValueError("新密码长度不能超过 128 位")
|
||
return value
|
||
|
||
|
||
class UserCreateSchema(CurrentUserUpdateSchema):
|
||
"""新增用户
|
||
"""
|
||
|
||
username: str | None = Field(default=None, max_length=32, description="用户名")
|
||
password: str | None = Field(default=None, min_length=6, max_length=128, description="密码")
|
||
status: int = Field(default=0, ge=0, le=1, description="状态(0:启动 1:停用)")
|
||
description: str | None = Field(default=None, max_length=255, description="备注")
|
||
is_superuser: bool | None = Field(default=False, description="是否超管")
|
||
dept_id: int | None = Field(default=None, description="部门ID")
|
||
tenant_id: int | None = Field(default=None, description="租户ID，仅平台管理员创建时可指定")
|
||
role_ids: list[int] | None = Field(default=[], description="角色ID列表")
|
||
position_ids: list[int] | None = Field(default=[], description="岗位ID列表")
|
||
|
||
@field_validator("status")
|
||
@classmethod
|
||
def validate_status(cls, value: int):
|
||
"""校验状态：仅支持 0(正常)、1(禁用)"""
|
||
if value not in {0, 1}:
|
||
raise ValueError("状态仅支持 0(正常) 或 1(禁用)")
|
||
return value
|
||
|
||
@field_validator("username")
|
||
@classmethod
|
||
def validate_username(cls, value: str | None):
|
||
"""校验账号：字母开头，2-32 位"""
|
||
if not value:
|
||
return value
|
||
v = value.strip()
|
||
import re
|
||
|
||
if not re.match(r"^[A-Za-z][A-Za-z0-9_.-]{1,31}$", v):
|
||
raise ValueError("账号需以字母开头，2-32 位，仅允许字母、数字、_ . -")
|
||
return v
|
||
|
||
@field_validator("password")
|
||
@classmethod
|
||
def validate_password(cls, value: str | None):
|
||
"""校验密码：6-128 位"""
|
||
if value and len(value) < 6:
|
||
raise ValueError("密码长度不能少于 6 位")
|
||
if value and len(value) > 128:
|
||
raise ValueError("密码长度不能超过 128 位")
|
||
return value
|
||
|
||
|
||
class UserUpdateSchema(CurrentUserUpdateSchema):
|
||
"""更新"""
|
||
|
||
model_config = ConfigDict(from_attributes=True)
|
||
|
||
username: str | None = Field(default=None, max_length=32, description="用户名")
|
||
password: str | None = Field(default=None, min_length=6, max_length=128, description="密码")
|
||
status: int | None = Field(default=None, ge=0, le=1, description="状态(0:启动 1:停用)")
|
||
description: str | None = Field(default=None, max_length=255, description="备注")
|
||
dept_id: int | None = Field(default=None, description="部门ID")
|
||
role_ids: list[int] | None = Field(default=[], description="角色ID列表")
|
||
position_ids: list[int] | None = Field(default=[], description="岗位ID列表")
|
||
|
||
@field_validator("status")
|
||
@classmethod
|
||
def validate_status(cls, value: int | None):
|
||
"""校验状态：仅支持 0(正常)、1(禁用)"""
|
||
if value is not None and value not in {0, 1}:
|
||
raise ValueError("状态仅支持 0(正常) 或 1(禁用)")
|
||
return value
|
||
|
||
@field_validator("username")
|
||
@classmethod
|
||
def validate_username(cls, value: str | None):
|
||
"""校验账号：字母开头，2-32 位"""
|
||
if not value:
|
||
return value
|
||
v = value.strip()
|
||
import re
|
||
|
||
if not re.match(r"^[A-Za-z][A-Za-z0-9_.-]{1,31}$", v):
|
||
raise ValueError("账号需以字母开头，2-32 位，仅允许字母、数字、_ . -")
|
||
return v
|
||
|
||
|
||
class UserOutSchema(CoreUserSchema, BaseSchema, UserBySchema, TenantBySchema):
|
||
"""响应"""
|
||
|
||
model_config = ConfigDict(arbitrary_types_allowed=True, from_attributes=True)
|
||
|
||
id: int = Field(default=0, description="主键ID")
|
||
tenant_id: int = Field(default=0, description="租户ID")
|
||
username: str | None = Field(default=None, max_length=32, description="用户名")
|
||
name: str | None = Field(default=None, max_length=32, description="名称")
|
||
mobile: str | None = Field(default=None, max_length=11, description="手机号")
|
||
email: EmailStr | None = Field(default=None, description="邮箱")
|
||
gender: str | None = Field(default=None, max_length=1, description="性别(0:男 1:女 2:未知)")
|
||
avatar: str | None = Field(default=None, max_length=255, description="头像")
|
||
status: int | None = Field(default=0, ge=0, le=1, description="状态(0:启动 1:停用)")
|
||
description: str | None = Field(default=None, max_length=255, description="备注")
|
||
dept_id: int | None = Field(default=None, description="部门ID")
|
||
role_ids: list[int] | None = Field(default=[], description="角色ID列表")
|
||
position_ids: list[int] | None = Field(default=[], description="岗位ID列表")
|
||
gitee_login: str | None = Field(default=None, max_length=32, description="Gitee登录")
|
||
github_login: str | None = Field(default=None, max_length=32, description="Github登录")
|
||
wx_login: str | None = Field(default=None, max_length=32, description="微信登录")
|
||
qq_login: str | None = Field(default=None, max_length=32, description="QQ登录")
|
||
dept_name: str | None = Field(default=None, description="部门名称")
|
||
dept: CommonSchema | None = Field(default=None, description="部门")
|
||
positions: list[CommonSchema] | None = Field(default=[], description="岗位")
|
||
roles: list[RoleOutSchema] | None = Field(default=[], description="角色")
|
||
menus: list[MenuOutSchema] | None = Field(default=[], description="菜单")
|
||
is_impersonate: bool = Field(default=False, description="是否为平台管理员代签入")
|
||
is_superuser: bool = Field(default=False, description="是否超管")
|
||
tenant: CommonSchema | None = Field(default=None, description="租户")
|
||
|
||
|
||
class UserQueryParam(BaseQueryParam, UserByQueryParam, TenantByQueryParam):
|
||
"""用户管理查询参数（继承标准 Mixin）
|
||
|
||
支持：
|
||
- 时间范围（BaseQueryParam）
|
||
- 创建人/更新人筛选（UserByQueryParam）
|
||
- 租户筛选（TenantByQueryParam）
|
||
- 业务字段：用户名、名称、手机号、邮箱、部门、状态
|
||
"""
|
||
|
||
username: str | tuple[str, str] | None = Field(None, description="用户名")
|
||
name: str | tuple[str, str] | None = Field(None, description="名称")
|
||
mobile: str | tuple[str, str] | None = Field(None, description="手机号", pattern=r"^1[3-9]\d{9}$")
|
||
email: str | tuple[str, str] | None = Field(
|
||
None,
|
||
description="邮箱",
|
||
pattern=r"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$",
|
||
)
|
||
dept_id: int | tuple[str, int] | None = Field(None, description="部门ID")
|
||
status: int | tuple[str, int] | None = Field(None, description="是否可用")
|
||
|
||
@model_validator(mode="after")
|
||
def validate_query_params(self) -> "UserQueryParam":
|
||
if isinstance(self.username, str):
|
||
self.username = (QueueEnum.like.value, self.username)
|
||
if isinstance(self.name, str):
|
||
self.name = (QueueEnum.like.value, self.name)
|
||
if isinstance(self.mobile, str):
|
||
self.mobile = (QueueEnum.like.value, self.mobile)
|
||
if isinstance(self.email, str):
|
||
self.email = (QueueEnum.like.value, self.email)
|
||
if isinstance(self.dept_id, int):
|
||
self.dept_id = (QueueEnum.eq.value, self.dept_id)
|
||
if isinstance(self.status, int):
|
||
self.status = (QueueEnum.eq.value, self.status)
|
||
return self
|
||
|
||
|
||
UserBySchema.model_rebuild()
|
||
TenantBySchema.model_rebuild()
|