refactor: 重构系统配置和用户模型相关代码

feat: 添加中间件系统配置获取功能
fix: 修复用户模型和CRUD基础类的问题
docs: 更新README和界面文本
style: 清理无用代码和注释
This commit is contained in:
zhangtao
2025-10-08 01:32:14 +08:00
parent 319a332ad3
commit e669722706
17 changed files with 232 additions and 189 deletions
+4 -6
View File
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from pydantic import BaseModel
from typing import TypeVar, Sequence, Generic, Dict, Any, List, Optional, Type
from typing import TypeVar, Sequence, Generic, Dict, Any, List, Optional, Type, Union
from sqlalchemy.sql.elements import ColumnElement
from sqlalchemy.orm import selectinload
from sqlalchemy.engine import Result
@@ -58,7 +58,7 @@ class CRUDBase(Generic[ModelType, CreateSchemaType, UpdateSchemaType]):
if hasattr(self.model, "creator_id"):
sql = sql.options(selectinload(self.model.creator))
# sql = await self.__filter_permissions(sql)
sql = await self.__filter_permissions(sql)
result: Result = await self.db.execute(sql)
obj = result.scalars().first()
@@ -173,7 +173,7 @@ class CRUDBase(Generic[ModelType, CreateSchemaType, UpdateSchemaType]):
except Exception as e:
raise CustomException(msg=f"分页查询失败: {str(e)}")
async def create(self, data: CreateSchemaType) -> ModelType:
async def create(self, data: Union[CreateSchemaType, Dict]) -> ModelType:
"""
创建新对象
@@ -194,8 +194,6 @@ class CRUDBase(Generic[ModelType, CreateSchemaType, UpdateSchemaType]):
if hasattr(self.model, "creator_id") and self.current_user:
# 设置创建人ID
obj.creator_id = self.current_user.id
# 设置创建人对象
obj.creator = self.current_user
self.db.add(obj)
await self.db.flush()
@@ -204,7 +202,7 @@ class CRUDBase(Generic[ModelType, CreateSchemaType, UpdateSchemaType]):
except Exception as e:
raise CustomException(msg=f"创建失败: {str(e)}")
async def update(self, id: int, data: UpdateSchemaType) -> ModelType:
async def update(self, id: int, data: Union[UpdateSchemaType, Dict]) -> ModelType:
"""
更新对象