diff --git a/zhenxun/builtin_plugins/__init__.py b/zhenxun/builtin_plugins/__init__.py index 028e7558..f2688905 100644 --- a/zhenxun/builtin_plugins/__init__.py +++ b/zhenxun/builtin_plugins/__init__.py @@ -71,7 +71,7 @@ from public.bag_users t1 """ -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def _(): await ResourceManager.init_resources() """签到与用户的数据迁移""" diff --git a/zhenxun/builtin_plugins/admin/welcome_message/data_source.py b/zhenxun/builtin_plugins/admin/welcome_message/data_source.py index 0714e4b4..c8e486ed 100644 --- a/zhenxun/builtin_plugins/admin/welcome_message/data_source.py +++ b/zhenxun/builtin_plugins/admin/welcome_message/data_source.py @@ -92,7 +92,7 @@ def migrate(path: Path): json.dump(new_data, f, ensure_ascii=False, indent=4) -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) def _(): """数据迁移 diff --git a/zhenxun/builtin_plugins/init/init_plugin.py b/zhenxun/builtin_plugins/init/init_plugin.py index bc3eda99..5bf50409 100644 --- a/zhenxun/builtin_plugins/init/init_plugin.py +++ b/zhenxun/builtin_plugins/init/init_plugin.py @@ -96,7 +96,7 @@ async def _handle_setting( ) -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def _(): """ 初始化插件数据配置 diff --git a/zhenxun/builtin_plugins/init/init_task.py b/zhenxun/builtin_plugins/init/init_task.py index 8857e665..b9bab56d 100644 --- a/zhenxun/builtin_plugins/init/init_task.py +++ b/zhenxun/builtin_plugins/init/init_task.py @@ -133,7 +133,7 @@ async def create_schedule(task: Task): logger.error(f"动态创建定时任务 {task.name}({task.module}) 失败", e=e) -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def _(): """ 初始化插件数据配置 diff --git a/zhenxun/builtin_plugins/scripts.py b/zhenxun/builtin_plugins/scripts.py index 9cc2949e..0270c342 100644 --- a/zhenxun/builtin_plugins/scripts.py +++ b/zhenxun/builtin_plugins/scripts.py @@ -15,7 +15,7 @@ from zhenxun.utils.manager.priority_manager import PriorityLifecycle driver: Driver = nonebot.get_driver() -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def update_city(): """ 部分插件需要中国省份城市 @@ -62,7 +62,7 @@ async def _(): await update_city() -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def _(): """开启/禁用插件格式修改""" _, is_create = await GroupConsole.get_or_create(group_id=133133133) diff --git a/zhenxun/builtin_plugins/sign_in/utils.py b/zhenxun/builtin_plugins/sign_in/utils.py index 3bd20c99..910b90d8 100644 --- a/zhenxun/builtin_plugins/sign_in/utils.py +++ b/zhenxun/builtin_plugins/sign_in/utils.py @@ -55,7 +55,7 @@ LG_MESSAGE = [ ] -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def init_image(): SIGN_RESOURCE_PATH.mkdir(parents=True, exist_ok=True) SIGN_TODAY_CARD_PATH.mkdir(exist_ok=True, parents=True) diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py index 1853b8bd..87011c93 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py @@ -32,7 +32,7 @@ driver: Driver = nonebot.get_driver() CONNECT_TIME = 0 -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def _(): global CONNECT_TIME CONNECT_TIME = int(time.time()) diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py b/zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py index b01c3f8c..91fbc5c0 100644 --- a/zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py @@ -22,7 +22,7 @@ router = APIRouter(prefix="/database") driver: Driver = nonebot.get_driver() -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def _(): for plugin in nonebot.get_loaded_plugins(): module = plugin.name diff --git a/zhenxun/services/plugin_init.py b/zhenxun/services/plugin_init.py index 1e573f6e..a622a9e8 100644 --- a/zhenxun/services/plugin_init.py +++ b/zhenxun/services/plugin_init.py @@ -101,6 +101,6 @@ class PluginInitManager: logger.error(f"执行: {module_path}:remove 失败", e=e) -@PriorityLifecycle.on_startup() +@PriorityLifecycle.on_startup(priority=5) async def _(): await PluginInitManager.install_all() diff --git a/zhenxun/utils/manager/priority_manager.py b/zhenxun/utils/manager/priority_manager.py index d42148e0..1c59635c 100644 --- a/zhenxun/utils/manager/priority_manager.py +++ b/zhenxun/utils/manager/priority_manager.py @@ -15,7 +15,7 @@ class PriorityLifecycle: _data: ClassVar[dict[PriorityLifecycleType, dict[int, list[Callable]]]] = {} @classmethod - def add(cls, hook_type: PriorityLifecycleType, func: Callable, priority: int = 5): + def add(cls, hook_type: PriorityLifecycleType, func: Callable, priority: int): if hook_type not in cls._data: cls._data[hook_type] = {} if priority not in cls._data[hook_type]: @@ -23,7 +23,7 @@ class PriorityLifecycle: cls._data[hook_type][priority].append(func) @classmethod - def on_startup(cls, *, priority: int = 5): + def on_startup(cls, *, priority: int): def wrapper(func): cls.add(PriorityLifecycleType.STARTUP, func, priority) return func @@ -31,7 +31,7 @@ class PriorityLifecycle: return wrapper @classmethod - def on_shutdown(cls, *, priority: int = 5): + def on_shutdown(cls, *, priority: int): def wrapper(func): cls.add(PriorityLifecycleType.SHUTDOWN, func, priority) return func