mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-23 13:13:09 +00:00
zhangtao
6a5f8cf0dd
这是一次综合性的项目迭代，包含以下核心变更：
1. **目录与模块重构**
- 调整工作流节点类型模块目录结构，迁移节点类型相关代码
- 重命名platform模块为system模块，更新插件配置信息
- 重构代码生成模块导入路径
2. **数据库与CRUD优化**
- 统一所有CRUD类构造函数，新增数据库会话参数
- 修复权限过滤器数据库会话使用问题
- 更新模板生成器的CRUD代码模板
3. **认证与安全改进**
- 重构JWT密钥配置，移除默认密钥强制要求环境变量
- 重命名密码工具类，统一密码加密校验逻辑
- 优化OAuth认证流程，修复匿名认证使用问题
4. **前端与静态资源**
- 重构前端挂载逻辑，增加目录存在性校验
- 使用标准StaticFiles替换自定义前端挂载实现
5. **工具类与依赖更新**
- 修复导入工具的表名重复检测逻辑
- 优化限流回调代码，移除冗余依赖
- 更新用户、租户等模块的响应模型字段
6. **数据与配置修正**
- 修复系统版本数据字段命名不统一问题
- 简化枚举类校验逻辑，移除冗余注释
- 修复测试用例中的密码工具类导入错误
126 lines
4.5 KiB
Python
126 lines
4.5 KiB
Python
from typing import Any
|
||
|
||
from pydantic import BaseModel, ConfigDict, EmailStr, Field
|
||
|
||
from app.core.base_schema import AuthSchema, CoreUserSchema, JWTOutSchema
|
||
|
||
__all__ = [
|
||
"AuthSchema",
|
||
"CoreUserSchema",
|
||
"CaptchaOutSchema",
|
||
"TenantOptionSchema",
|
||
"SelectTenantSchema",
|
||
"SelectTenantOutSchema",
|
||
"LoginWithTenantsSchema",
|
||
"TenantRegisterSchema",
|
||
"TenantRegisterOutSchema",
|
||
"EnterPlatformOutSchema",
|
||
"TenantLookupOutSchema",
|
||
"ImpersonateSchema",
|
||
"ImpersonateOutSchema",
|
||
]
|
||
|
||
class CaptchaOutSchema(BaseModel):
|
||
"""验证码响应模型"""
|
||
|
||
model_config = ConfigDict(from_attributes=True)
|
||
|
||
enable: bool = Field(default=True, description="是否启用验证码")
|
||
key: str = Field(..., min_length=1, description="验证码唯一标识")
|
||
img_base: str = Field(..., min_length=1, description="Base64编码的验证码图片")
|
||
|
||
|
||
class TenantOptionSchema(BaseModel):
|
||
"""租户选项（用于登录后选择租户）"""
|
||
|
||
model_config = ConfigDict(from_attributes=True)
|
||
|
||
id: int = Field(..., description="租户ID")
|
||
name: str = Field(..., description="租户名称")
|
||
code: str = Field(..., description="租户编码")
|
||
|
||
|
||
class SelectTenantSchema(BaseModel):
|
||
"""选择租户请求"""
|
||
|
||
tenant_id: int = Field(..., gt=0, description="租户ID")
|
||
|
||
|
||
class SelectTenantOutSchema(BaseModel):
|
||
"""选择租户响应"""
|
||
|
||
model_config = ConfigDict(from_attributes=True)
|
||
|
||
access_token: str = Field(..., description="访问token（含租户上下文）")
|
||
token_type: str = Field(default="Bearer", description="token类型（RFC 6750）")
|
||
expires_in: int = Field(..., gt=0, description="过期时间(秒)")
|
||
|
||
|
||
class LoginWithTenantsSchema(JWTOutSchema):
|
||
"""登录响应（含租户列表）"""
|
||
|
||
tenants: list[TenantOptionSchema] = Field(default_factory=list, description="可选租户列表")
|
||
user_info: dict[str, Any] = Field(default_factory=dict, description="用户信息")
|
||
|
||
|
||
class TenantRegisterSchema(BaseModel):
|
||
"""租户自助注册请求"""
|
||
|
||
username: str = Field(..., min_length=3, max_length=32, description="登录账号")
|
||
password: str = Field(..., min_length=6, max_length=128, description="登录密码")
|
||
email: EmailStr = Field(..., max_length=128, description="邮箱（用于接收通知）")
|
||
tenant_name: str | None = Field(default=None, max_length=100, description="企业/团队名称（可选，默认：{用户名}的租户）")
|
||
|
||
|
||
class TenantRegisterOutSchema(BaseModel):
|
||
"""租户自助注册响应"""
|
||
|
||
user_id: int = Field(..., description="用户ID")
|
||
username: str = Field(..., description="账号")
|
||
tenant_id: int = Field(..., description="租户ID")
|
||
tenant_name: str = Field(..., description="租户名称")
|
||
tenant_code: str = Field(..., description="租户编码")
|
||
package: str | None = Field(default=None, description="开通套餐")
|
||
trial_end: str = Field(..., description="试用到期日")
|
||
message: str = Field(default="注册成功", description="提示信息")
|
||
|
||
|
||
class EnterPlatformOutSchema(BaseModel):
|
||
"""进入平台管理模式响应"""
|
||
|
||
model_config = ConfigDict(from_attributes=True)
|
||
|
||
access_token: str = Field(..., description="访问token（平台上下文）")
|
||
token_type: str = Field(default="Bearer", description="token类型（RFC 6750）")
|
||
expires_in: int = Field(..., gt=0, description="过期时间(秒)")
|
||
|
||
|
||
class TenantLookupOutSchema(BaseModel):
|
||
"""通过编码查询租户响应"""
|
||
|
||
id: int = Field(..., description="租户ID")
|
||
name: str = Field(..., description="租户名称")
|
||
code: str = Field(..., description="租户编码")
|
||
logo_url: str | None = Field(default=None, description="Logo URL")
|
||
login_bg: str | None = Field(default=None, description="登录背景地址")
|
||
version: str | None = Field(default=None, description="版本号")
|
||
|
||
|
||
class ImpersonateSchema(BaseModel):
|
||
"""平台管理员代签入请求"""
|
||
|
||
tenant_id: int = Field(..., gt=0, description="目标租户ID")
|
||
|
||
|
||
class ImpersonateOutSchema(BaseModel):
|
||
"""平台管理员代签入响应"""
|
||
|
||
model_config = ConfigDict(from_attributes=True)
|
||
|
||
access_token: str = Field(..., description="访问token（租户上下文）")
|
||
refresh_token: str = Field(..., description="刷新token")
|
||
token_type: str = Field(default="Bearer", description="token类型")
|
||
expires_in: int = Field(..., gt=0, description="过期时间(秒)")
|
||
tenant_id: int = Field(..., description="目标租户ID")
|
||
tenant_name: str = Field(..., description="目标租户名称")
|