From 21e5cb0a03c38c9b85320a53d5830222b7de7d50 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 14 May 2025 09:16:12 +0800
Subject: [PATCH] v2.4.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复了订阅文件信息显示问题
- 修复了默认通知模板格式中季号的显示问题
- 修复了原始语言图片刮削的问题
- 修复了馒头新版标签无法识别的问题
- 优化了联邦插件API的注册
---
 app/startup/command_initializer.py   |  6 ++++--
 app/startup/lifecycle.py             | 14 +++++++-------
 app/startup/modules_initializer.py   |  2 +-
 app/startup/monitor_initializer.py   |  2 +-
 app/startup/scheduler_initializer.py |  5 ++++-
 version.py                           |  4 ++--
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/startup/command_initializer.py b/app/startup/command_initializer.py
index aec83643..013660e1 100644
--- a/app/startup/command_initializer.py
+++ b/app/startup/command_initializer.py
@@ -1,4 +1,4 @@
-from command import Command
+from app.command import Command
 
 
 def init_command():
@@ -7,14 +7,16 @@ def init_command():
     """
     Command()
 
+
 def stop_command():
     """
     停止命令
     """
     pass
 
+
 def restart_command():
     """
     重启命令
     """
-    Command().init_commands()
\ No newline at end of file
+    Command().init_commands()
diff --git a/app/startup/lifecycle.py b/app/startup/lifecycle.py
index 49a0ad4f..6fd8978d 100644
--- a/app/startup/lifecycle.py
+++ b/app/startup/lifecycle.py
@@ -3,14 +3,14 @@ from contextlib import asynccontextmanager
 
 from fastapi import FastAPI
 
-from core.config import global_vars
-from app.startup.workflow_initializer import init_workflow, stop_workflow
+from app.core.config import global_vars
+from app.startup.command_initializer import init_command, stop_command, restart_command
 from app.startup.modules_initializer import init_modules, stop_modules
+from app.startup.monitor_initializer import stop_monitor, init_monitor
 from app.startup.plugins_initializer import init_plugins, stop_plugins, sync_plugins
 from app.startup.routers_initializer import init_routers
-from app.startup.command_initializer import init_command, stop_command, restart_command
-from app.startup.monitor_initializer import stop_monitor, init_monitor
-from app.startup.scheduler_initializer import stop_scheduler, init_scheduler, restart_scheduler, init_plugin_scheduler
+from app.startup.scheduler_initializer import stop_scheduler, init_scheduler, init_plugin_scheduler
+from app.startup.workflow_initializer import init_workflow, stop_workflow
 
 
 async def init_plugin_system():
@@ -62,13 +62,13 @@ async def lifespan(app: FastAPI):
             print(str(e))
         # 停止插件
         stop_plugins()
+        # 停止工作流
+        stop_workflow()
         # 停止命令
         stop_command()
         # 停止监控器
         stop_monitor()
         # 停止定时器
         stop_scheduler()
-        # 停止工作流
-        stop_workflow()
         # 停止模块
         stop_modules()
diff --git a/app/startup/modules_initializer.py b/app/startup/modules_initializer.py
index 04368bf2..9c459e8d 100644
--- a/app/startup/modules_initializer.py
+++ b/app/startup/modules_initializer.py
@@ -5,7 +5,7 @@ from app.core.config import settings
 from app.core.module import ModuleManager
 from app.log import logger
 from app.utils.system import SystemUtils
-from command import CommandChain
+from app.command import CommandChain
 
 # SitesHelper涉及资源包拉取，提前引入并容错提示
 try:
diff --git a/app/startup/monitor_initializer.py b/app/startup/monitor_initializer.py
index 85c679a5..b3aa3ddd 100644
--- a/app/startup/monitor_initializer.py
+++ b/app/startup/monitor_initializer.py
@@ -1,4 +1,4 @@
-from monitor import Monitor
+from app.monitor import Monitor
 
 
 def init_monitor():
diff --git a/app/startup/scheduler_initializer.py b/app/startup/scheduler_initializer.py
index 951b17db..49f77145 100644
--- a/app/startup/scheduler_initializer.py
+++ b/app/startup/scheduler_initializer.py
@@ -1,4 +1,4 @@
-from scheduler import Scheduler
+from app.scheduler import Scheduler
 
 
 def init_scheduler():
@@ -7,18 +7,21 @@ def init_scheduler():
     """
     Scheduler()
 
+
 def stop_scheduler():
     """
     停止定时器
     """
     Scheduler().stop()
 
+
 def restart_scheduler():
     """
     重启定时器
     """
     Scheduler().init()
 
+
 def init_plugin_scheduler():
     """
     初始化插件定时器
diff --git a/version.py b/version.py
index 1a011ccf..337973cc 100644
--- a/version.py
+++ b/version.py
@@ -1,2 +1,2 @@
-APP_VERSION = 'v2.4.6'
-FRONTEND_VERSION = 'v2.4.6'
+APP_VERSION = 'v2.4.7'
+FRONTEND_VERSION = 'v2.4.7'