diff --git a/app/db/__init__.py b/app/db/__init__.py index e9807d33..cf7eda25 100644 --- a/app/db/__init__.py +++ b/app/db/__init__.py @@ -236,7 +236,6 @@ class DbOper: """ 数据库操作基类 """ - _db: Session = None def __init__(self, db: Session = None): self._db = db diff --git a/app/db/models/__init__.py b/app/db/models/__init__.py index 09ecf69f..933fcb49 100644 --- a/app/db/models/__init__.py +++ b/app/db/models/__init__.py @@ -9,3 +9,4 @@ from .transferhistory import TransferHistory from .user import User from .userconfig import UserConfig from .workflow import Workflow +from .userrequest import UserRequest diff --git a/app/db/systemconfig_oper.py b/app/db/systemconfig_oper.py index 5d070a0e..6a6541df 100644 --- a/app/db/systemconfig_oper.py +++ b/app/db/systemconfig_oper.py @@ -8,14 +8,15 @@ from app.utils.singleton import Singleton class SystemConfigOper(DbOper, metaclass=Singleton): - # 配置对象 - __SYSTEMCONF: dict = {} - + """ + 系统配置管理 + """ def __init__(self): """ 加载配置到内存 """ super().__init__() + self.__SYSTEMCONF = {} for item in SystemConfig.list(self._db): self.__SYSTEMCONF[item.key] = item.value diff --git a/app/db/userconfig_oper.py b/app/db/userconfig_oper.py index b263f71c..4b4d4b15 100644 --- a/app/db/userconfig_oper.py +++ b/app/db/userconfig_oper.py @@ -7,14 +7,15 @@ from app.utils.singleton import Singleton class UserConfigOper(DbOper, metaclass=Singleton): - # 配置缓存 - __USERCONF: Dict[str, Dict[str, Any]] = {} - + """ + 用户配置管理 + """ def __init__(self): """ 加载配置到内存 """ super().__init__() + self.__USERCONF = {} for item in UserConfig.list(self._db): self.__set_config_cache(username=item.username, key=item.key, value=item.value)