diff --git a/gsuid_core/global_val.py b/gsuid_core/global_val.py index e3d7c00..dc94300 100644 --- a/gsuid_core/global_val.py +++ b/gsuid_core/global_val.py @@ -100,8 +100,10 @@ async def get_global_analysis( # 七天内的用户 user_7_list = [user for users in user_list[:7] for user in users] + user_1_7_list = [user for users in user_list[1:8] for user in users] # 七天内的群组 group_7_list = [group for groups in group_list[:7] for group in groups] + group_1_7_list = [group for groups in group_list[1:8] for group in groups] # 昨日到三十日之前的用户 user_after_list = [user for users in user_list[1:] for user in users] @@ -143,8 +145,8 @@ async def get_global_analysis( # user_num = len(user_data) # group_num = len(group_data) - day7_user_num = len(user_7_list) - day7_group_num = len(group_7_list) + day7_user_num = len(user_1_7_list) + day7_group_num = len(group_1_7_list) data = { 'DAU': '{0:.2f}'.format(day7_user_num / 7) if day7_user_num else 0, diff --git a/gsuid_core/sv.py b/gsuid_core/sv.py index cb82ae4..10a3135 100644 --- a/gsuid_core/sv.py +++ b/gsuid_core/sv.py @@ -123,12 +123,15 @@ class Plugins: self.force_prefix = force_prefix self.disable_force_prefix = disable_force_prefix - def set(self, **kwargs): + def set(self, is_lazy: bool = True, **kwargs): plugin_config = config_plugins[self.name] for var in kwargs: setattr(self, var, kwargs[var]) plugin_config[var] = kwargs[var] - core_config.set_config('plugins', config_plugins) + if is_lazy: + core_config.lazy_set_config('plugins', config_plugins) + else: + core_config.set_config('plugins', config_plugins) class SV: @@ -296,14 +299,17 @@ class SV: self.pm = 6 self.enabled = False - def set(self, **kwargs): + def set(self, is_lazy: bool = True, **kwargs): plugin_sv_config = config_plugins[self.self_plugin_name]['sv'] if self.name not in plugin_sv_config: plugin_sv_config[self.name] = {} for var in kwargs: setattr(self, var, kwargs[var]) plugin_sv_config[self.name][var] = kwargs[var] - core_config.lazy_set_config('plugins', config_plugins) + if is_lazy: + core_config.lazy_set_config('plugins', config_plugins) + else: + core_config.set_config('plugins', config_plugins) def enable(self): self.set(enabled=True) diff --git a/gsuid_core/utils/database/startup.py b/gsuid_core/utils/database/startup.py index 17beaab..c176bc8 100644 --- a/gsuid_core/utils/database/startup.py +++ b/gsuid_core/utils/database/startup.py @@ -1,16 +1,13 @@ from shutil import move -from sqlalchemy import MetaData from sqlalchemy.sql import text -from sqlalchemy.schema import DropTable -from sqlalchemy.exc import NoSuchTableError from gsuid_core.logger import logger from gsuid_core.server import on_core_start from gsuid_core.data_store import get_res_path from gsuid_core.global_val import global_val_path -from .base_models import DB_PATH, db_url, engine, async_maker +from .base_models import DB_PATH, db_url, async_maker exec_list = [] @@ -30,8 +27,9 @@ async def move_database(): logger.warning('删除历史统计记录...') -# @on_core_start +@on_core_start async def trans_adapter(): + ''' async with engine.begin() as conn: metadata = MetaData() try: @@ -69,6 +67,7 @@ async def trans_adapter(): logger.info('[迁移WebConsole数据表] 操作完成..') else: logger.info('[迁移WebConsole数据表] 无需操作...') + ''' async with async_maker() as session: for _t in exec_list: diff --git a/gsuid_core/web_app.py b/gsuid_core/web_app.py index edd3480..7de71c3 100644 --- a/gsuid_core/web_app.py +++ b/gsuid_core/web_app.py @@ -160,7 +160,7 @@ def _set_SV(request: Request, data: Dict, name: str): data['black_list'] = [] if data['white_list'] == ['']: data['white_list'] = [] - sv.set(**data) + sv.set(False, **data) @app.post('/genshinuid/setPlugins/{name}') @@ -180,7 +180,7 @@ def _set_Plugins(request: Request, data: Dict, name: str): data['black_list'] = [] if data['white_list'] == ['']: data['white_list'] = [] - plugin.set(**data) + plugin.set(False, **data) @app.post('/genshinuid/setGsConfig/{config_name}')