From ac11d4eb30c0070e4865e887ce0b73afda9ad06a Mon Sep 17 00:00:00 2001 From: thsrite Date: Wed, 13 Sep 2023 11:58:30 +0800 Subject: [PATCH] Revert "fix dd7803c9" This reverts commit 08560fc7c3ada16dc64d0d6c1407b856152381c5. --- app/db/systemconfig_oper.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/db/systemconfig_oper.py b/app/db/systemconfig_oper.py index 79e4a463..2ccb1e81 100644 --- a/app/db/systemconfig_oper.py +++ b/app/db/systemconfig_oper.py @@ -2,8 +2,8 @@ import json from typing import Any, Union from app.db import DbOper, SessionFactory -from app.db.models.plugin import PluginData from app.db.models.systemconfig import SystemConfig +from app.db.plugindata_oper import PluginDataOper from app.schemas.types import SystemConfigKey from app.utils.object import ObjectUtils from app.utils.singleton import Singleton @@ -19,7 +19,8 @@ class SystemConfigOper(DbOper, metaclass=Singleton): """ self._db = SessionFactory() self._syscomconfig = SystemConfig() - self._plugindata = PluginData() + # 插件数据 + self.plugindata = PluginDataOper(self._db) super().__init__(self._db) for item in self._syscomconfig.list(self._db): if ObjectUtils.is_obj(item.value): @@ -69,7 +70,7 @@ class SystemConfigOper(DbOper, metaclass=Singleton): # 删除系统配置 self._syscomconfig.delete_by_key(db=self._db, key=f"plugin.{key}") # 删除插件数据 - self._plugindata.del_plugin_data_by_plugin_id(db=self._db, plugin_id=key) + self.plugindata.del_data(plugin_id=key) def __del__(self): if self._db: