This commit is contained in:
thsrite
2023-09-13 09:29:52 +08:00
parent 4659e7367f
commit 08560fc7c3

View File

@ -2,8 +2,8 @@ import json
from typing import Any, Union from typing import Any, Union
from app.db import DbOper, SessionFactory from app.db import DbOper, SessionFactory
from app.db.models.plugin import PluginData
from app.db.models.systemconfig import SystemConfig from app.db.models.systemconfig import SystemConfig
from app.db.plugindata_oper import PluginDataOper
from app.schemas.types import SystemConfigKey from app.schemas.types import SystemConfigKey
from app.utils.object import ObjectUtils from app.utils.object import ObjectUtils
from app.utils.singleton import Singleton from app.utils.singleton import Singleton
@ -19,8 +19,7 @@ class SystemConfigOper(DbOper, metaclass=Singleton):
""" """
self._db = SessionFactory() self._db = SessionFactory()
self._syscomconfig = SystemConfig() self._syscomconfig = SystemConfig()
# 插件数据 self._plugindata = PluginData()
self.plugindata = PluginDataOper(self._db)
super().__init__(self._db) super().__init__(self._db)
for item in self._syscomconfig.list(self._db): for item in self._syscomconfig.list(self._db):
if ObjectUtils.is_obj(item.value): if ObjectUtils.is_obj(item.value):
@ -70,7 +69,7 @@ class SystemConfigOper(DbOper, metaclass=Singleton):
# 删除系统配置 # 删除系统配置
self._syscomconfig.delete_by_key(db=self._db, key=f"plugin.{key}") self._syscomconfig.delete_by_key(db=self._db, key=f"plugin.{key}")
# 删除插件数据 # 删除插件数据
self.plugindata.del_data(plugin_id=key) self._plugindata.del_plugin_data_by_plugin_id(db=self._db, plugin_id=key)
def __del__(self): def __del__(self):
if self._db: if self._db: