Merge branch 'main' into main

README.md

@@ -112,7 +112,7 @@ AccessToken: PUBLIC_ZHENXUN_TEST
 |      [插件库](https://github.com/zhenxun-org/zhenxun_bot_plugins)      |   插件   |    [zhenxun-org](https://github.com/zhenxun-org)    |                 原 plugins 文件夹插件                 |
 | [插件索引库](https://github.com/zhenxun-org/zhenxun_bot_plugins_index) |   插件   |    [zhenxun-org](https://github.com/zhenxun-org)    |                    扩展插件索引库                     |
 |    [一键安装](https://github.com/soloxiaoye2022/zhenxun_bot-deploy)    |   安装   | [soloxiaoye2022](https://github.com/soloxiaoye2022) |                        第三方                         |
-|         [WebUi](https://github.com/HibiKier/zhenxun_bot_webui)         |   管理   |       [hibikier](https://github.com/HibiKier)       | 基于真寻 WebApi 的 webui 实现 [预览](#-webui界面展示) |
+|          [WebUi](https://github.com/zhenxun-org/zhenxun_bot)           |   管理   |       [hibikier](https://github.com/HibiKier)       | 基于真寻 WebApi 的 webui 实现 [预览](#-webui界面展示) |
 |  [安卓 app(WebUi)](https://github.com/YuS1aN/zhenxun_bot_android_ui)   |   安装   |         [YuS1aN](https://github.com/YuS1aN)         |                        第三方                         |
 
 </div>
@@ -126,6 +126,28 @@ AccessToken: PUBLIC_ZHENXUN_TEST
 - 提供了 cd，阻塞，每日次数等限制，仅仅通过简单的属性就可以生成一个限制，例如：`PluginCdBlock` 等
 - **更多详细请通过 [传送门](https://zhenxun-org.github.io/zhenxun_bot/) 查看文档！**
 
+## 🐣 小白整合
+
+如果你系统是 **Windows** 且不想下载 Python  
+可以使用整合包（Python3.10+zhenxun+webui）
+
+文档地址：[整合包文档](https://hibikier.github.io/zhenxun_bot/beginner/)
+
+<details>
+<summary>下载地址</summary>
+
+- **百度云：**  
+  https://pan.baidu.com/s/1ph4yzx1vdNbkxm9VBKDdgQ?pwd=971j
+
+- **天翼云：**  
+  https://cloud.189.cn/web/share?code=jq67r2i2E7Fb  
+  访问码：8wxm
+
+- **Google Drive：**  
+  https://drive.google.com/file/d/1cc3Dqjk0x5hWGLNeMkrFwWl8BvsK6KfD/view?usp=drive_link
+
+</details>
+
 ## 🛠️ 简单部署
 
 ```bash
@@ -272,12 +294,12 @@ DB_URL 是基于 Tortoise ORM 的数据库连接字符串，用于指定项目
 ## ❔ 需要帮助？
 
 > [!TIP]
-> 发起 [issue](https://github.com/HibiKier/zhenxun_bot/issues/new/choose) 前，我们希望你能够阅读过或者了解 [提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
+> 发起 [issue](https://github.com/zhenxun-org/zhenxun_bot/issues/new/choose) 前，我们希望你能够阅读过或者了解 [提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
 >
 > - 善用[搜索引擎](https://www.google.com/)
 > - 查阅 issue 中是否有类似问题，如果没有请按照模板发起 issue
 
-欢迎前往 [issue](https://github.com/HibiKier/zhenxun_bot/issues/new/choose) 中提出你遇到的问题，或者加入我们的 [用户群](https://qm.qq.com/q/mRNtLSl6uc) 或 [技术群](https://qm.qq.com/q/YYYt5rkMYc)与我们联系
+欢迎前往 [issue](https://github.com/zhenxun-org/zhenxun_bot/issues/new/choose) 中提出你遇到的问题，或者加入我们的 [用户群](https://qm.qq.com/q/mRNtLSl6uc) 或 [技术群](https://qm.qq.com/q/YYYt5rkMYc)与我们联系
 
 ## 🛠️ 进度追踪
 
@@ -287,6 +309,8 @@ Project [zhenxun_bot](https://github.com/users/HibiKier/projects/2)
 
 首席设计师：[酥酥/coldly-ss](https://github.com/coldly-ss)
 
+LOGO 设计：[FrostN0v0](https://github.com/FrostN0v0)
+
 ## 🙏 感谢
 
 [botuniverse / onebot](https://github.com/botuniverse/onebot) ：超棒的机器人协议  
@@ -326,34 +350,68 @@ Project [zhenxun_bot](https://github.com/users/HibiKier/projects/2)
   <img src="https://contrib.rocks/image?repo=HibiKier/zhenxun_bot&max=1000" alt="contributors"/>
 </a>
 
-## 📸 WebUI 界面展示
+## 📸 WebUI 界面展示（仅展示默认主题下的 pc 端）
 
 <div style="display: flex; flex-wrap: wrap; justify-content: space-between;">
-  <div style="width: 48%; margin-bottom: 10px;">
-    <img src="./docs_image/webui00.png" alt="webui00" style="width: 100%; height: auto;">
-  </div>
-  <div style="width: 48%; margin-bottom: 10px;">
-    <img src="./docs_image/webui01.png" alt="webui01" style="width: 100%; height: auto;">
-  </div>
 
-  <div style="width: 48%; margin-bottom: 10px;">
-    <img src="./docs_image/webui02.png" alt="webui02" style="width: 100%; height: auto;">
-  </div>
-  <div style="width: 48%; margin-bottom: 10px;">
-    <img src="./docs_image/webui03.png" alt="webui03" style="width: 100%; height: auto;">
-  </div>
+#### 登录界面
 
-  <div style="width: 48%; margin-bottom: 10px;">
-    <img src="./docs_image/webui04.png" alt="webui04" style="width: 100%; height: auto;">
-  </div>
-  <div style="width: 48%; margin-bottom: 10px;">
-    <img src="./docs_image/webui05.png" alt="webui05" style="width: 100%; height: auto;">
-  </div>
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-login.jpg)
+
+#### API 设置
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-api.jpg)
+
+#### 仪表盘
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-dashboard.jpg)
+
+#### 仪表盘（展开）
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-dashboard1.jpg)
+
+#### 控制台
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-command.jpg)
+
+#### 插件列表
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-plugin.jpg)
+
+#### 插件列表（配置项）
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-plugin1.jpg)
+
+#### 插件商店
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-store.jpg)
+
+#### 好友/群组管理
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-manage.jpg)
+
+#### 请求管理
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-manage1.jpg)
+
+#### 数据库管理
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-database.jpg)
+
+### 文件管理
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-system.jpg)
+
+### 文件管理（文本查看）
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-system1.jpg)
+
+### 文件管理（图片查看）
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-system2.jpg)
+
+### 关于
+
+![x](https://github.com/zhenxun-org/zhenxun_bot/blob/main/docs_image/pc-about.jpg)
 
-  <div style="width: 48%; margin-bottom: 10px;">
-    <img src="./docs_image/webui06.png" alt="webui06" style="width: 100%; height: auto;">
-  </div>
-  <div style="width: 48%; margin-bottom: 10px;">
-    <img src="./docs_image/webui07.png" alt="webui07" style="width: 100%; height: auto;">
-  </div>
 </div>

bot.py

@@ -14,9 +14,9 @@ driver.register_adapter(OneBotV11Adapter)
 # driver.register_adapter(DoDoAdapter)
 # driver.register_adapter(DiscordAdapter)
 
-from zhenxun.services.db_context import disconnect, init
+from zhenxun.services.db_context import disconnect
 
-driver.on_startup(init)
+# driver.on_startup(init)
 driver.on_shutdown(disconnect)
 
 # nonebot.load_builtin_plugins("echo")

zhenxun/builtin_plugins/__init__.py

@@ -16,6 +16,7 @@ from zhenxun.models.sign_user import SignUser
 from zhenxun.models.user_console import UserConsole
 from zhenxun.services.log import logger
 from zhenxun.utils.decorator.shop import shop_register
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 from zhenxun.utils.manager.resource_manager import ResourceManager
 from zhenxun.utils.platform import PlatformUtils
 
@@ -70,7 +71,7 @@ from public.bag_users t1
 """
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=5)
 async def _():
     await ResourceManager.init_resources()
     """签到与用户的数据迁移"""

zhenxun/builtin_plugins/admin/welcome_message/data_source.py

@@ -14,6 +14,7 @@ from zhenxun.services.log import logger
 from zhenxun.utils._build_image import BuildImage
 from zhenxun.utils._image_template import ImageTemplate
 from zhenxun.utils.http_utils import AsyncHttpx
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 from zhenxun.utils.platform import PlatformUtils
 
 BASE_PATH = DATA_PATH / "welcome_message"
@@ -91,7 +92,7 @@ def migrate(path: Path):
         json.dump(new_data, f, ensure_ascii=False, indent=4)
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=5)
 def _():
     """数据迁移
 

zhenxun/builtin_plugins/help/__init__.py

@@ -37,8 +37,8 @@ __plugin_meta__ = PluginMetadata(
         configs=[
             RegisterConfig(
                 key="type",
-                value="normal",
-                help="帮助图片样式 ['normal', 'HTML', 'zhenxun']",
+                value="zhenxun",
+                help="帮助图片样式 [normal, HTML, zhenxun]",
                 default_value="zhenxun",
             )
         ],

zhenxun/builtin_plugins/hooks/__init__.py

@@ -49,4 +49,14 @@ Config.add_plugin_config(
     type=bool,
 )
 
+Config.add_plugin_config(
+    "hook",
+    "RECORD_BOT_SENT_MESSAGES",
+    True,
+    help="记录bot消息发送",
+    default_value=True,
+    type=bool,
+)
+
+
 nonebot.load_plugins(str(Path(__file__).parent.resolve()))

zhenxun/builtin_plugins/hooks/call_hook.py

@@ -1,23 +1,85 @@
 from typing import Any
 
-from nonebot.adapters import Bot
+from nonebot.adapters import Bot, Message
 
+from zhenxun.configs.config import Config
+from zhenxun.models.bot_message_store import BotMessageStore
 from zhenxun.services.log import logger
+from zhenxun.utils.enum import BotSentType
 from zhenxun.utils.manager.message_manager import MessageManager
+from zhenxun.utils.platform import PlatformUtils
+
+
+def replace_message(message: Message) -> str:
+    """将消息中的at、image、record、face替换为字符串
+
+    参数:
+        message: Message
+
+    返回:
+        str: 文本消息
+    """
+    result = ""
+    for msg in message:
+        if isinstance(msg, str):
+            result += msg
+        elif msg.type == "at":
+            result += f"@{msg.data['qq']}"
+        elif msg.type == "image":
+            result += "[image]"
+        elif msg.type == "record":
+            result += "[record]"
+        elif msg.type == "face":
+            result += f"[face:{msg.data['id']}]"
+        elif msg.type == "reply":
+            result += ""
+        else:
+            result += str(msg)
+    return result
 
 
 @Bot.on_called_api
 async def handle_api_result(
     bot: Bot, exception: Exception | None, api: str, data: dict[str, Any], result: Any
 ):
-    if not exception and api == "send_msg":
-        try:
-            if (uid := data.get("user_id")) and (msg_id := result.get("message_id")):
-                MessageManager.add(str(uid), str(msg_id))
-                logger.debug(
-                    f"收集消息id，user_id: {uid}, msg_id: {msg_id}", "msg_hook"
-                )
-        except Exception as e:
-            logger.warning(
-                f"收集消息id发生错误...data: {data}, result: {result}", "msg_hook", e=e
+    if exception or api != "send_msg":
+        return
+    user_id = data.get("user_id")
+    group_id = data.get("group_id")
+    message_id = result.get("message_id")
+    message: Message = data.get("message", "")
+    message_type = data.get("message_type")
+    try:
+        # 记录消息id
+        if user_id and message_id:
+            MessageManager.add(str(user_id), str(message_id))
+            logger.debug(
+                f"收集消息id，user_id: {user_id}, msg_id: {message_id}", "msg_hook"
             )
+    except Exception as e:
+        logger.warning(
+            f"收集消息id发生错误...data: {data}, result: {result}", "msg_hook", e=e
+        )
+    if not Config.get_config("hook", "RECORD_BOT_SENT_MESSAGES"):
+        return
+    try:
+        await BotMessageStore.create(
+            bot_id=bot.self_id,
+            user_id=user_id,
+            group_id=group_id,
+            sent_type=BotSentType.GROUP
+            if message_type == "group"
+            else BotSentType.PRIVATE,
+            text=replace_message(message),
+            plain_text=message.extract_plain_text()
+            if isinstance(message, Message)
+            else replace_message(message),
+            platform=PlatformUtils.get_platform(bot),
+        )
+        logger.debug(f"消息发送记录，message: {message}")
+    except Exception as e:
+        logger.warning(
+            f"消息发送记录发生错误...data: {data}, result: {result}",
+            "msg_hook",
+            e=e,
+        )

zhenxun/builtin_plugins/init/init_config.py

@@ -11,6 +11,7 @@ from zhenxun.configs.config import Config
 from zhenxun.configs.path_config import DATA_PATH
 from zhenxun.configs.utils import RegisterConfig
 from zhenxun.services.log import logger
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 
 _yaml = YAML(pure=True)
 _yaml.allow_unicode = True
@@ -102,7 +103,7 @@ def _generate_simple_config(exists_module: list[str]):
         temp_file.unlink()
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=0)
 def _():
     """
     初始化插件数据配置
@@ -125,3 +126,4 @@ def _():
         with plugins2config_file.open("w", encoding="utf8") as wf:
             _yaml.dump(_data, wf)
     _generate_simple_config(exists_module)
+    Config.reload()

zhenxun/builtin_plugins/init/init_plugin.py

@@ -20,6 +20,7 @@ from zhenxun.utils.enum import (
     PluginLimitType,
     PluginType,
 )
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 
 from .manager import manager
 
@@ -95,7 +96,7 @@ async def _handle_setting(
         )
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=5)
 async def _():
     """
     初始化插件数据配置

zhenxun/builtin_plugins/init/init_task.py

@@ -10,6 +10,7 @@ from zhenxun.models.group_console import GroupConsole
 from zhenxun.models.task_info import TaskInfo
 from zhenxun.services.log import logger
 from zhenxun.utils.common_utils import CommonUtils
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 
 driver: Driver = nonebot.get_driver()
 
@@ -132,7 +133,7 @@ async def create_schedule(task: Task):
         logger.error(f"动态创建定时任务 {task.name}({task.module}) 失败", e=e)
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=5)
 async def _():
     """
     初始化插件数据配置

zhenxun/builtin_plugins/plugin_store/data_source.py

@@ -18,6 +18,12 @@ from zhenxun.utils.utils import is_number
 
 from .config import BASE_PATH, DEFAULT_GITHUB_URL, EXTRA_GITHUB_URL
 
+BAT_FILE = Path() / "win启动.bat"
+
+WIN_COMMAND = ["./Python310/python.exe", "-m", "pip", "install", "-r"]
+
+DEFAULT_COMMAND = ["poetry", "run", "pip", "install", "-r"]
+
 
 def row_style(column: str, text: str) -> RowStyle:
     """被动技能文本风格
@@ -50,8 +56,10 @@ def install_requirement(plugin_path: Path):
         return
 
     try:
+        command = WIN_COMMAND if BAT_FILE.exists() else DEFAULT_COMMAND
+        command.append(str(existing_requirements))
         result = subprocess.run(
-            ["poetry", "run", "pip", "install", "-r", str(existing_requirements)],
+            command,
             check=True,
             capture_output=True,
             text=True,

zhenxun/builtin_plugins/scripts.py

@@ -1,12 +1,8 @@
-import nonebot
-from nonebot.drivers import Driver
-
 from zhenxun.models.group_console import GroupConsole
-
-driver: Driver = nonebot.get_driver()
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=5)
 async def _():
     """开启/禁用插件格式修改"""
     _, is_create = await GroupConsole.get_or_create(group_id=133133133)

zhenxun/builtin_plugins/shop/__init__.py

@@ -5,7 +5,9 @@ from nonebot_plugin_alconna import (
     AlconnaQuery,
     Args,
     Arparma,
+    At,
     Match,
+    MultiVar,
     Option,
     Query,
     Subcommand,
@@ -47,6 +49,7 @@ __plugin_meta__ = PluginMetadata(
         plugin_type=PluginType.NORMAL,
         menu_type="商店",
         commands=[
+            Command(command="商店"),
             Command(command="我的金币"),
             Command(command="我的道具"),
             Command(command="购买道具"),
@@ -75,13 +78,21 @@ _matcher = on_alconna(
         Subcommand("my-cost", help_text="我的金币"),
         Subcommand("my-props", help_text="我的道具"),
         Subcommand("buy", Args["name?", str]["num?", int], help_text="购买道具"),
-        Subcommand("use", Args["name?", str]["num?", int], help_text="使用道具"),
         Subcommand("gold-list", Args["num?", int], help_text="金币排行"),
     ),
     priority=5,
     block=True,
 )
 
+_use_matcher = on_alconna(
+    Alconna(
+        "使用道具",
+        Args["name?", str]["num?", int]["at_users?", MultiVar(At)],
+    ),
+    priority=5,
+    block=True,
+)
+
 _matcher.shortcut(
     "我的金币",
     command="商店",
@@ -103,13 +114,6 @@ _matcher.shortcut(
     prefix=True,
 )
 
-_matcher.shortcut(
-    "使用道具(?P<name>.*?)",
-    command="商店",
-    arguments=["use", "{name}"],
-    prefix=True,
-)
-
 _matcher.shortcut(
     "金币排行",
     command="商店",
@@ -173,7 +177,7 @@ async def _(
     await MessageUtils.build_message(result).send(reply_to=True)
 
 
-@_matcher.assign("use")
+@_use_matcher.handle()
 async def _(
     bot: Bot,
     event: Event,
@@ -182,6 +186,7 @@ async def _(
     arparma: Arparma,
     name: Match[str],
     num: Query[int] = AlconnaQuery("num", 1),
+    at_users: Query[list[At]] = AlconnaQuery("at_users", []),
 ):
     if not name.available:
         await MessageUtils.build_message(
@@ -189,7 +194,7 @@ async def _(
         ).finish(reply_to=True)
     try:
         result = await ShopManage.use(
-            bot, event, session, message, name.result, num.result, ""
+            bot, event, session, message, name.result, num.result, "", at_users.result
         )
         logger.info(
             f"使用道具 {name.result}, 数量: {num.result}",

zhenxun/builtin_plugins/shop/_data_source.py

@@ -8,7 +8,7 @@ from typing import Any, Literal
 
 from nonebot.adapters import Bot, Event
 from nonebot.compat import model_dump
-from nonebot_plugin_alconna import UniMessage, UniMsg
+from nonebot_plugin_alconna import At, UniMessage, UniMsg
 from nonebot_plugin_uninfo import Uninfo
 from pydantic import BaseModel, Field, create_model
 from tortoise.expressions import Q
@@ -48,6 +48,10 @@ class Goods(BaseModel):
     """model"""
     session: Uninfo | None = None
     """Uninfo"""
+    at_user: str | None = None
+    """At对象"""
+    at_users: list[str] = []
+    """At对象列表"""
 
 
 class ShopParam(BaseModel):
@@ -73,6 +77,10 @@ class ShopParam(BaseModel):
     """Uninfo"""
     message: UniMsg
     """UniMessage"""
+    at_user: str | None = None
+    """At对象"""
+    at_users: list[str] = []
+    """At对象列表"""
     extra_data: dict[str, Any] = Field(default_factory=dict)
     """额外数据"""
 
@@ -156,6 +164,7 @@ class ShopManage:
         goods: Goods,
         num: int,
         text: str,
+        at_users: list[str] = [],
     ) -> tuple[ShopParam, dict[str, Any]]:
         """构造参数
 
@@ -165,6 +174,7 @@ class ShopManage:
             goods_name: 商品名称
             num: 数量
             text: 其他信息
+            at_users: at用户
         """
         group_id = None
         if session.group:
@@ -172,6 +182,7 @@ class ShopManage:
                 session.group.parent.id if session.group.parent else session.group.id
             )
         _kwargs = goods.params
+        at_user = at_users[0] if at_users else None
         model = goods.model(
             **{
                 "goods_name": goods.name,
@@ -183,6 +194,8 @@ class ShopManage:
                 "text": text,
                 "session": session,
                 "message": message,
+                "at_user": at_user,
+                "at_users": at_users,
             }
         )
         return model, {
@@ -194,6 +207,8 @@ class ShopManage:
             "num": num,
             "text": text,
             "goods_name": goods.name,
+            "at_user": at_user,
+            "at_users": at_users,
         }
 
     @classmethod
@@ -223,6 +238,7 @@ class ShopManage:
             **param.extra_data,
             "session": session,
             "message": message,
+            "shop_param": ShopParam,
         }
         for key in list(param_json.keys()):
             if key not in args:
@@ -308,6 +324,7 @@ class ShopManage:
         goods_name: str,
         num: int,
         text: str,
+        at_users: list[At] = [],
     ) -> str | UniMessage | None:
         """使用道具
 
@@ -319,6 +336,7 @@ class ShopManage:
             goods_name: 商品名称
             num: 使用数量
             text: 其他信息
+            at_users: at用户
 
         返回:
             str | MessageFactory | None: 使用完成后返回信息
@@ -339,8 +357,9 @@ class ShopManage:
         goods = cls.uuid2goods.get(goods_info.uuid)
         if not goods or not goods.func:
             return f"{goods_info.goods_name} 未注册使用函数, 无法使用..."
+        at_user_ids = [at.target for at in at_users]
         param, kwargs = cls.__build_params(
-            bot, event, session, message, goods, num, text
+            bot, event, session, message, goods, num, text, at_user_ids
         )
         if num > param.max_num_limit:
             return f"{goods_info.goods_name} 单次使用最大数量为{param.max_num_limit}..."
@@ -480,10 +499,13 @@ class ShopManage:
         if not user.props:
             return None
 
-        user.props = {uuid: count for uuid, count in user.props.items() if count > 0}
-
         goods_list = await GoodsInfo.filter(uuid__in=user.props.keys()).all()
         goods_by_uuid = {item.uuid: item for item in goods_list}
+        user.props = {
+            uuid: count
+            for uuid, count in user.props.items()
+            if count > 0 and goods_by_uuid.get(uuid)
+        }
 
         table_rows = []
         for i, prop_uuid in enumerate(user.props):

zhenxun/builtin_plugins/sign_in/__init__.py

@@ -10,7 +10,6 @@ from nonebot_plugin_alconna import (
     store_true,
 )
 from nonebot_plugin_apscheduler import scheduler
-from nonebot_plugin_uninfo import Uninfo
 
 from zhenxun.configs.utils import (
     Command,
@@ -23,7 +22,7 @@ from zhenxun.utils.depends import UserName
 from zhenxun.utils.message import MessageUtils
 
 from ._data_source import SignManage
-from .goods_register import driver  # noqa: F401
+from .goods_register import Uninfo
 from .utils import clear_sign_data_pic
 
 __plugin_meta__ = PluginMetadata(

zhenxun/builtin_plugins/sign_in/goods_register.py

@@ -1,7 +1,6 @@
 from decimal import Decimal
 
 import nonebot
-from nonebot.drivers import Driver
 from nonebot_plugin_uninfo import Uninfo
 
 from zhenxun.models.sign_user import SignUser
@@ -9,14 +8,7 @@ from zhenxun.models.user_console import UserConsole
 from zhenxun.utils.decorator.shop import shop_register
 from zhenxun.utils.platform import PlatformUtils
 
-driver: Driver = nonebot.get_driver()
-
-
-# @driver.on_startup
-# async def _():
-#     """
-#     导入内置的三个商品
-#     """
+driver = nonebot.get_driver()
 
 
 @shop_register(

zhenxun/builtin_plugins/sign_in/utils.py

@@ -16,6 +16,7 @@ from zhenxun.models.sign_log import SignLog
 from zhenxun.models.sign_user import SignUser
 from zhenxun.utils.http_utils import AsyncHttpx
 from zhenxun.utils.image_utils import BuildImage
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 from zhenxun.utils.platform import PlatformUtils
 
 from .config import (
@@ -54,7 +55,7 @@ LG_MESSAGE = [
 ]
 
 
-@driver.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)

zhenxun/builtin_plugins/web_ui/__init__.py

@@ -10,7 +10,9 @@ from zhenxun.configs.config import Config as gConfig
 from zhenxun.configs.utils import PluginExtraData, RegisterConfig
 from zhenxun.services.log import logger, logger_
 from zhenxun.utils.enum import PluginType
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 
+from .api.configure import router as configure_router
 from .api.logs import router as ws_log_routes
 from .api.logs.log_manager import LOG_STORAGE
 from .api.menu import router as menu_router
@@ -81,6 +83,7 @@ BaseApiRouter.include_router(database_router)
 BaseApiRouter.include_router(plugin_router)
 BaseApiRouter.include_router(system_router)
 BaseApiRouter.include_router(menu_router)
+BaseApiRouter.include_router(configure_router)
 
 WsApiRouter = APIRouter(prefix="/zhenxun/socket")
 
@@ -89,7 +92,7 @@ WsApiRouter.include_router(status_routes)
 WsApiRouter.include_router(chat_routes)
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=0)
 async def _():
     try:
         # 存储任务引用的列表，防止任务被垃圾回收

zhenxun/builtin_plugins/web_ui/api/configure/__init__.py

@@ -0,0 +1,133 @@
+import asyncio
+import os
+from pathlib import Path
+import re
+import subprocess
+import sys
+import time
+
+from fastapi import APIRouter
+from fastapi.responses import JSONResponse
+import nonebot
+
+from zhenxun.configs.config import BotConfig, Config
+
+from ...base_model import Result
+from .data_source import test_db_connection
+from .model import Setting
+
+router = APIRouter(prefix="/configure")
+
+driver = nonebot.get_driver()
+
+port = driver.config.port
+
+BAT_FILE = Path() / "win启动.bat"
+
+FILE_NAME = ".configure_restart"
+
+
+@router.post(
+    "/set_configure",
+    response_model=Result,
+    response_class=JSONResponse,
+    description="设置基础配置",
+)
+async def _(setting: Setting) -> Result:
+    global port
+    password = Config.get_config("web-ui", "password")
+    if password or BotConfig.db_url:
+        return Result.fail("配置已存在，请先删除DB_URL内容和前端密码再进行设置。")
+    env_file = Path() / ".env.dev"
+    if not env_file.exists():
+        return Result.fail("配置文件.env.dev不存在。")
+    env_text = env_file.read_text(encoding="utf-8")
+    if setting.db_url:
+        if setting.db_url.startswith("sqlite"):
+            base_dir = Path().resolve()
+            # 清理和验证数据库路径
+            db_path_str = setting.db_url.split(":")[-1].strip()
+            # 移除任何可能的路径遍历尝试
+            db_path_str = re.sub(r"[\\/]\.\.[\\/]", "", db_path_str)
+            # 规范化路径
+            db_path = Path(db_path_str).resolve()
+            parent_path = db_path.parent
+
+            # 验证路径是否在项目根目录内
+            try:
+                if not parent_path.absolute().is_relative_to(base_dir):
+                    return Result.fail("数据库路径不在项目根目录内。")
+            except ValueError:
+                return Result.fail("无效的数据库路径。")
+
+            # 创建目录
+            try:
+                parent_path.mkdir(parents=True, exist_ok=True)
+            except Exception as e:
+                return Result.fail(f"创建数据库目录失败: {e!s}")
+
+        env_text = env_text.replace('DB_URL = ""', f'DB_URL = "{setting.db_url}"')
+    if setting.superusers:
+        superusers = ", ".join([f'"{s}"' for s in setting.superusers])
+        env_text = re.sub(r"SUPERUSERS=\[.*?\]", f"SUPERUSERS=[{superusers}]", env_text)
+    if setting.host:
+        env_text = env_text.replace("HOST = 127.0.0.1", f"HOST = {setting.host}")
+    if setting.port:
+        env_text = env_text.replace("PORT = 8080", f"PORT = {setting.port}")
+        port = setting.port
+    if setting.username:
+        Config.set_config("web-ui", "username", setting.username)
+    Config.set_config("web-ui", "password", setting.password, True)
+    env_file.write_text(env_text, encoding="utf-8")
+    if BAT_FILE.exists():
+        for file in os.listdir(Path()):
+            if file.startswith(FILE_NAME):
+                Path(file).unlink()
+        flag_file = Path() / f"{FILE_NAME}_{int(time.time())}"
+        flag_file.touch()
+    return Result.ok(BAT_FILE.exists(), info="设置成功，请重启真寻以完成配置！")
+
+
+@router.get(
+    "/test_db",
+    response_model=Result,
+    response_class=JSONResponse,
+    description="设置基础配置",
+)
+async def _(db_url: str) -> Result:
+    result = await test_db_connection(db_url)
+    if isinstance(result, str):
+        return Result.fail(result)
+    return Result.ok(info="数据库连接成功!")
+
+
+async def run_restart_command(bat_path: Path, port: int):
+    """在后台执行重启命令"""
+    await asyncio.sleep(1)  # 确保 FastAPI 已返回响应
+    subprocess.Popen([bat_path, str(port)], shell=True)  # noqa: ASYNC220
+    sys.exit(0)  # 退出当前进程
+
+
+@router.post(
+    "/restart",
+    response_model=Result,
+    response_class=JSONResponse,
+    description="重启",
+)
+async def _() -> Result:
+    if not BAT_FILE.exists():
+        return Result.fail("自动重启仅支持意见整合包，请尝试手动重启")
+    flag_file = next(
+        (Path() / file for file in os.listdir(Path()) if file.startswith(FILE_NAME)),
+        None,
+    )
+    if not flag_file or not flag_file.exists():
+        return Result.fail("重启标志文件不存在...")
+    set_time = flag_file.name.split("_")[-1]
+    if time.time() - float(set_time) > 10 * 60:
+        return Result.fail("重启标志文件已过期，请重新设置配置。")
+    flag_file.unlink()
+    try:
+        return Result.ok(info="执行重启命令成功")
+    finally:
+        asyncio.create_task(run_restart_command(BAT_FILE, port))  # noqa: RUF006

zhenxun/builtin_plugins/web_ui/api/configure/data_source.py

@@ -0,0 +1,18 @@
+from tortoise import Tortoise
+
+
+async def test_db_connection(db_url: str) -> bool | str:
+    try:
+        # 初始化 Tortoise ORM
+        await Tortoise.init(
+            db_url=db_url,
+            modules={"models": ["__main__"]},  # 这里不需要实际模型
+        )
+        # 测试连接
+        await Tortoise.get_connection("default").execute_query("SELECT 1")
+        return True
+    except Exception as e:
+        return str(e)
+    finally:
+        # 关闭连接
+        await Tortoise.close_connections()

zhenxun/builtin_plugins/web_ui/api/configure/model.py

@@ -0,0 +1,16 @@
+from pydantic import BaseModel
+
+
+class Setting(BaseModel):
+    superusers: list[str]
+    """超级用户列表"""
+    db_url: str
+    """数据库地址"""
+    host: str
+    """主机地址"""
+    port: int
+    """端口"""
+    username: str
+    """前端用户名"""
+    password: str
+    """前端密码"""

zhenxun/builtin_plugins/web_ui/api/menu/data_source.py

@@ -5,54 +5,63 @@ from zhenxun.services.log import logger
 
 from .model import MenuData, MenuItem
 
+default_menus = [
+    MenuItem(
+        name="仪表盘",
+        module="dashboard",
+        router="/dashboard",
+        icon="dashboard",
+        default=True,
+    ),
+    MenuItem(
+        name="真寻控制台",
+        module="command",
+        router="/command",
+        icon="command",
+    ),
+    MenuItem(name="插件列表", module="plugin", router="/plugin", icon="plugin"),
+    MenuItem(name="插件商店", module="store", router="/store", icon="store"),
+    MenuItem(name="好友/群组", module="manage", router="/manage", icon="user"),
+    MenuItem(
+        name="数据库管理",
+        module="database",
+        router="/database",
+        icon="database",
+    ),
+    MenuItem(name="系统信息", module="system", router="/system", icon="system"),
+    MenuItem(name="关于我们", module="about", router="/about", icon="about"),
+]
 
-class MenuManage:
+
+class MenuManager:
     def __init__(self) -> None:
         self.file = DATA_PATH / "web_ui" / "menu.json"
         self.menu = []
         if self.file.exists():
             try:
+                temp_menu = []
                 self.menu = json.load(self.file.open(encoding="utf8"))
+                self_menu_name = [menu["name"] for menu in self.menu]
+                for module in [m.module for m in default_menus]:
+                    if module in self_menu_name:
+                        temp_menu.append(
+                            MenuItem(
+                                **next(m for m in self.menu if m["module"] == module)
+                            )
+                        )
+                    else:
+                        temp_menu.append(self.__get_menu_model(module))
+                self.menu = temp_menu
             except Exception as e:
                 logger.warning("菜单文件损坏，已重新生成...", "WebUi", e=e)
         if not self.menu:
-            self.menu = [
-                MenuItem(
-                    name="仪表盘",
-                    module="dashboard",
-                    router="/dashboard",
-                    icon="dashboard",
-                    default=True,
-                ),
-                MenuItem(
-                    name="真寻控制台",
-                    module="command",
-                    router="/command",
-                    icon="command",
-                ),
-                MenuItem(
-                    name="插件列表", module="plugin", router="/plugin", icon="plugin"
-                ),
-                MenuItem(
-                    name="插件商店", module="store", router="/store", icon="store"
-                ),
-                MenuItem(
-                    name="好友/群组", module="manage", router="/manage", icon="user"
-                ),
-                MenuItem(
-                    name="数据库管理",
-                    module="database",
-                    router="/database",
-                    icon="database",
-                ),
-                MenuItem(
-                    name="文件管理", module="system", router="/system", icon="system"
-                ),
-                MenuItem(
-                    name="关于我们", module="about", router="/about", icon="about"
-                ),
-            ]
-            self.save()
+            self.menu = default_menus
+        self.save()
+
+    def __get_menu_model(self, module: str):
+        return default_menus[
+            next(i for i, m in enumerate(default_menus) if m.module == module)
+        ]
 
     def get_menus(self):
         return MenuData(menus=self.menu)
@@ -64,4 +73,4 @@ class MenuManage:
             json.dump(temp, f, ensure_ascii=False, indent=4)
 
 
-menu_manage = MenuManage()
+menu_manage = MenuManager()

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py

@@ -13,6 +13,7 @@ from zhenxun.models.bot_connect_log import BotConnectLog
 from zhenxun.models.chat_history import ChatHistory
 from zhenxun.models.statistics import Statistics
 from zhenxun.services.log import logger
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 from zhenxun.utils.platform import PlatformUtils
 
 from ....base_model import BaseResultModel, QueryModel
@@ -31,7 +32,7 @@ driver: Driver = nonebot.get_driver()
 CONNECT_TIME = 0
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=5)
 async def _():
     global CONNECT_TIME
     CONNECT_TIME = int(time.time())

zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py

@@ -8,6 +8,7 @@ from zhenxun.configs.config import BotConfig
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.task_info import TaskInfo
 from zhenxun.services.log import logger
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 
 from ....base_model import BaseResultModel, QueryModel, Result
 from ....utils import authentication
@@ -21,7 +22,7 @@ router = APIRouter(prefix="/database")
 driver: Driver = nonebot.get_driver()
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=5)
 async def _():
     for plugin in nonebot.get_loaded_plugins():
         module = plugin.name

zhenxun/builtin_plugins/web_ui/api/tabs/system/__init__.py

@@ -9,7 +9,7 @@ from fastapi.responses import JSONResponse
 from zhenxun.utils._build_image import BuildImage
 
 from ....base_model import Result, SystemFolderSize
-from ....utils import authentication, get_system_disk
+from ....utils import authentication, get_system_disk, validate_path
 from .model import AddFile, DeleteFile, DirFile, RenameFile, SaveFile
 
 router = APIRouter(prefix="/system")
@@ -25,22 +25,29 @@ IMAGE_TYPE = ["jpg", "jpeg", "png", "gif", "bmp", "webp", "svg"]
     description="获取文件列表",
 )
 async def _(path: str | None = None) -> Result[list[DirFile]]:
-    base_path = Path(path) if path else Path()
-    data_list = []
-    for file in os.listdir(base_path):
-        file_path = base_path / file
-        is_image = any(file.endswith(f".{t}") for t in IMAGE_TYPE)
-        data_list.append(
-            DirFile(
-                is_file=not file_path.is_dir(),
-                is_image=is_image,
-                name=file,
-                parent=path,
-                size=None if file_path.is_dir() else file_path.stat().st_size,
-                mtime=file_path.stat().st_mtime,
+    try:
+        base_path, error = validate_path(path)
+        if error:
+            return Result.fail(error)
+        if not base_path:
+            return Result.fail("无效的路径")
+        data_list = []
+        for file in os.listdir(base_path):
+            file_path = base_path / file
+            is_image = any(file.endswith(f".{t}") for t in IMAGE_TYPE)
+            data_list.append(
+                DirFile(
+                    is_file=not file_path.is_dir(),
+                    is_image=is_image,
+                    name=file,
+                    parent=path,
+                    size=None if file_path.is_dir() else file_path.stat().st_size,
+                    mtime=file_path.stat().st_mtime,
+                )
             )
-        )
-    return Result.ok(data_list)
+        return Result.ok(data_list)
+    except Exception as e:
+        return Result.fail(f"获取文件列表失败: {e!s}")
 
 
 @router.get(
@@ -62,8 +69,12 @@ async def _(full_path: str | None = None) -> Result[list[SystemFolderSize]]:
     description="删除文件",
 )
 async def _(param: DeleteFile) -> Result:
-    path = Path(param.full_path)
-    if not path or not path.exists():
+    path, error = validate_path(param.full_path)
+    if error:
+        return Result.fail(error)
+    if not path:
+        return Result.fail("无效的路径")
+    if not path.exists():
         return Result.warning_("文件不存在...")
     try:
         path.unlink()
@@ -80,8 +91,12 @@ async def _(param: DeleteFile) -> Result:
     description="删除文件夹",
 )
 async def _(param: DeleteFile) -> Result:
-    path = Path(param.full_path)
-    if not path or not path.exists() or path.is_file():
+    path, error = validate_path(param.full_path)
+    if error:
+        return Result.fail(error)
+    if not path:
+        return Result.fail("无效的路径")
+    if not path.exists() or path.is_file():
         return Result.warning_("文件夹不存在...")
     try:
         shutil.rmtree(path.absolute())
@@ -98,10 +113,14 @@ async def _(param: DeleteFile) -> Result:
     description="重命名文件",
 )
 async def _(param: RenameFile) -> Result:
-    path = (
-        (Path(param.parent) / param.old_name) if param.parent else Path(param.old_name)
-    )
-    if not path or not path.exists():
+    parent_path, error = validate_path(param.parent)
+    if error:
+        return Result.fail(error)
+    if not parent_path:
+        return Result.fail("无效的路径")
+
+    path = (parent_path / param.old_name) if param.parent else Path(param.old_name)
+    if not path.exists():
         return Result.warning_("文件不存在...")
     try:
         path.rename(path.parent / param.name)
@@ -118,10 +137,14 @@ async def _(param: RenameFile) -> Result:
     description="重命名文件夹",
 )
 async def _(param: RenameFile) -> Result:
-    path = (
-        (Path(param.parent) / param.old_name) if param.parent else Path(param.old_name)
-    )
-    if not path or not path.exists() or path.is_file():
+    parent_path, error = validate_path(param.parent)
+    if error:
+        return Result.fail(error)
+    if not parent_path:
+        return Result.fail("无效的路径")
+
+    path = (parent_path / param.old_name) if param.parent else Path(param.old_name)
+    if not path.exists() or path.is_file():
         return Result.warning_("文件夹不存在...")
     try:
         new_path = path.parent / param.name
@@ -139,7 +162,13 @@ async def _(param: RenameFile) -> Result:
     description="新建文件",
 )
 async def _(param: AddFile) -> Result:
-    path = (Path(param.parent) / param.name) if param.parent else Path(param.name)
+    parent_path, error = validate_path(param.parent)
+    if error:
+        return Result.fail(error)
+    if not parent_path:
+        return Result.fail("无效的路径")
+
+    path = (parent_path / param.name) if param.parent else Path(param.name)
     if path.exists():
         return Result.warning_("文件已存在...")
     try:
@@ -157,7 +186,13 @@ async def _(param: AddFile) -> Result:
     description="新建文件夹",
 )
 async def _(param: AddFile) -> Result:
-    path = (Path(param.parent) / param.name) if param.parent else Path(param.name)
+    parent_path, error = validate_path(param.parent)
+    if error:
+        return Result.fail(error)
+    if not parent_path:
+        return Result.fail("无效的路径")
+
+    path = (parent_path / param.name) if param.parent else Path(param.name)
     if path.exists():
         return Result.warning_("文件夹已存在...")
     try:
@@ -175,7 +210,11 @@ async def _(param: AddFile) -> Result:
     description="读取文件",
 )
 async def _(full_path: str) -> Result:
-    path = Path(full_path)
+    path, error = validate_path(full_path)
+    if error:
+        return Result.fail(error)
+    if not path:
+        return Result.fail("无效的路径")
     if not path.exists():
         return Result.warning_("文件不存在...")
     try:
@@ -193,9 +232,13 @@ async def _(full_path: str) -> Result:
     description="读取文件",
 )
 async def _(param: SaveFile) -> Result[str]:
-    path = Path(param.full_path)
+    path, error = validate_path(param.full_path)
+    if error:
+        return Result.fail(error)
+    if not path:
+        return Result.fail("无效的路径")
     try:
-        async with aiofiles.open(path, "w", encoding="utf-8") as f:
+        async with aiofiles.open(str(path), "w", encoding="utf-8") as f:
             await f.write(param.content)
         return Result.ok("更新成功!")
     except Exception as e:
@@ -210,7 +253,11 @@ async def _(param: SaveFile) -> Result[str]:
     description="读取图片base64",
 )
 async def _(full_path: str) -> Result[str]:
-    path = Path(full_path)
+    path, error = validate_path(full_path)
+    if error:
+        return Result.fail(error)
+    if not path:
+        return Result.fail("无效的路径")
     if not path.exists():
         return Result.warning_("文件不存在...")
     try:

zhenxun/builtin_plugins/web_ui/config.py

@@ -1,6 +1,12 @@
+import sys
+
 from fastapi.middleware.cors import CORSMiddleware
 import nonebot
-from strenum import StrEnum
+
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+else:
+    from strenum import StrEnum
 
 from zhenxun.configs.path_config import DATA_PATH, TEMP_PATH
 

zhenxun/builtin_plugins/web_ui/public/data_source.py

@@ -18,6 +18,7 @@ async def update_webui_assets():
     download_url = await GithubUtils.parse_github_url(
         WEBUI_DIST_GITHUB_URL
     ).get_archive_download_urls()
+    logger.info("开始下载 webui_assets 资源...", COMMAND_NAME)
     if await AsyncHttpx.download_file(
         download_url, webui_assets_path, follow_redirects=True
     ):

zhenxun/builtin_plugins/web_ui/utils.py

@@ -2,6 +2,7 @@ import contextlib
 from datetime import datetime, timedelta, timezone
 import os
 from pathlib import Path
+import re
 
 from fastapi import Depends, HTTPException
 from fastapi.security import OAuth2PasswordBearer
@@ -28,6 +29,45 @@ if token_file.exists():
         token_data = json.load(open(token_file, encoding="utf8"))
 
 
+def validate_path(path_str: str | None) -> tuple[Path | None, str | None]:
+    """验证路径是否安全
+
+    参数:
+        path_str: 用户输入的路径
+
+    返回:
+        tuple[Path | None, str | None]: (验证后的路径, 错误信息)
+    """
+    try:
+        if not path_str:
+            return Path().resolve(), None
+
+        # 1. 移除任何可能的路径遍历尝试
+        path_str = re.sub(r"[\\/]\.\.[\\/]", "", path_str)
+
+        # 2. 规范化路径并转换为绝对路径
+        path = Path(path_str).resolve()
+
+        # 3. 获取项目根目录
+        root_dir = Path().resolve()
+
+        # 4. 验证路径是否在项目根目录内
+        try:
+            if not path.is_relative_to(root_dir):
+                return None, "访问路径超出允许范围"
+        except ValueError:
+            return None, "无效的路径格式"
+
+        # 5. 验证路径是否包含任何危险字符
+        if any(c in str(path) for c in ["..", "~", "*", "?", ">", "<", "|", '"']):
+            return None, "路径包含非法字符"
+
+        # 6. 验证路径长度是否合理
+        return (None, "路径长度超出限制") if len(str(path)) > 4096 else (path, None)
+    except Exception as e:
+        return None, f"路径验证失败: {e!s}"
+
+
 GROUP_HELP_PATH = DATA_PATH / "group_help"
 SIMPLE_HELP_IMAGE = IMAGE_PATH / "SIMPLE_HELP.png"
 SIMPLE_DETAIL_HELP_IMAGE = IMAGE_PATH / "SIMPLE_DETAIL_HELP.png"

zhenxun/models/bot_message_store.py

@@ -0,0 +1,29 @@
+from tortoise import fields
+
+from zhenxun.services.db_context import Model
+from zhenxun.utils.enum import BotSentType
+
+
+class BotMessageStore(Model):
+    id = fields.IntField(pk=True, generated=True, auto_increment=True)
+    """自增id"""
+    bot_id = fields.CharField(255, null=True)
+    """bot id"""
+    user_id = fields.CharField(255, null=True)
+    """目标id"""
+    group_id = fields.CharField(255, null=True)
+    """群组id"""
+    sent_type = fields.CharEnumField(BotSentType)
+    """类型"""
+    text = fields.TextField(null=True)
+    """文本内容"""
+    plain_text = fields.TextField(null=True)
+    """纯文本"""
+    platform = fields.CharField(255, null=True)
+    """平台"""
+    create_time = fields.DatetimeField(auto_now_add=True)
+    """创建时间"""
+
+    class Meta:  # pyright: ignore [reportIncompatibleVariableOverride]
+        table = "bot_message_store"
+        table_description = "Bot发送消息列表"

zhenxun/services/db_context.py

@@ -1,9 +1,12 @@
+import nonebot
 from nonebot.utils import is_coroutine_callable
 from tortoise import Tortoise
 from tortoise.connection import connections
 from tortoise.models import Model as Model_
 
 from zhenxun.configs.config import BotConfig
+from zhenxun.utils.exception import HookPriorityException
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 
 from .log import logger
 
@@ -11,6 +14,9 @@ SCRIPT_METHOD = []
 MODELS: list[str] = []
 
 
+driver = nonebot.get_driver()
+
+
 class Model(Model_):
     """
     自动添加模块
@@ -26,7 +32,7 @@ class Model(Model_):
             SCRIPT_METHOD.append((cls.__module__, func))
 
 
-class DbUrlIsNode(Exception):
+class DbUrlIsNode(HookPriorityException):
     """
     数据库链接地址为空
     """
@@ -42,9 +48,19 @@ class DbConnectError(Exception):
     pass
 
 
+@PriorityLifecycle.on_startup(priority=1)
 async def init():
     if not BotConfig.db_url:
-        raise DbUrlIsNode("数据库配置为空，请在.env.dev中配置DB_URL...")
+        # raise DbUrlIsNode("数据库配置为空，请在.env.dev中配置DB_URL...")
+        error = f"""
+**********************************************************************
+🌟 **************************** 配置为空 ************************* 🌟
+🚀 请打开 WebUi 进行基础配置 🚀
+🌐 配置地址：http://{driver.config.host}:{driver.config.port}/#/configure 🌐
+***********************************************************************
+***********************************************************************
+        """
+        raise DbUrlIsNode("\n" + error.strip())
     try:
         await Tortoise.init(
             db_url=BotConfig.db_url,

zhenxun/services/plugin_init.py

@@ -6,6 +6,7 @@ from nonebot.utils import is_coroutine_callable
 from pydantic import BaseModel
 
 from zhenxun.services.log import logger
+from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 
 driver = nonebot.get_driver()
 
@@ -100,6 +101,6 @@ class PluginInitManager:
                     logger.error(f"执行: {module_path}:remove 失败", e=e)
 
 
-@driver.on_startup
+@PriorityLifecycle.on_startup(priority=5)
 async def _():
     await PluginInitManager.install_all()

zhenxun/utils/_build_mat.py

@@ -1,12 +1,17 @@
 from io import BytesIO
 from pathlib import Path
 import random
+import sys
 
 from pydantic import BaseModel, Field
-from strenum import StrEnum
 
 from ._build_image import BuildImage
 
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+else:
+    from strenum import StrEnum
+
 
 class MatType(StrEnum):
     LINE = "LINE"

zhenxun/utils/enum.py

@@ -1,4 +1,21 @@
-from strenum import StrEnum
+import sys
+
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+else:
+    from strenum import StrEnum
+
+
+class PriorityLifecycleType(StrEnum):
+    STARTUP = "STARTUP"
+    """启动"""
+    SHUTDOWN = "SHUTDOWN"
+    """关闭"""
+
+
+class BotSentType(StrEnum):
+    GROUP = "GROUP"
+    PRIVATE = "PRIVATE"
 
 
 class BankHandleType(StrEnum):

zhenxun/utils/exception.py

@@ -1,3 +1,15 @@
+class HookPriorityException(BaseException):
+    """
+    钩子优先级异常
+    """
+
+    def __init__(self, info: str = "") -> None:
+        self.info = info
+
+    def __str__(self) -> str:
+        return self.info
+
+
 class NotFoundError(Exception):
     """
     未发现

zhenxun/utils/github_utils/models.py

@@ -1,13 +1,18 @@
 import contextlib
+import sys
 from typing import Protocol
 
 from aiocache import cached
 from nonebot.compat import model_dump
 from pydantic import BaseModel, Field
-from strenum import StrEnum
 
 from zhenxun.utils.http_utils import AsyncHttpx
 
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+else:
+    from strenum import StrEnum
+
 from .const import (
     CACHED_API_TTL,
     GIT_API_COMMIT_FORMAT,

zhenxun/utils/http_utils.py

@@ -1,219 +1,205 @@
 import asyncio
-from asyncio.exceptions import TimeoutError
-from collections.abc import AsyncGenerator
+from collections.abc import AsyncGenerator, Sequence
 from contextlib import asynccontextmanager
 from pathlib import Path
 import time
-from typing import Any, ClassVar, Literal
+from typing import Any, ClassVar, Literal, cast
 
 import aiofiles
-from anyio import EndOfStream
 import httpx
-from httpx import ConnectTimeout, HTTPStatusError, Response
+from httpx import AsyncHTTPTransport, HTTPStatusError, Response
 from nonebot_plugin_alconna import UniMessage
 from nonebot_plugin_htmlrender import get_browser
+from packaging.version import parse as parse_version
 from playwright.async_api import Page
-from retrying import retry
-import rich
+from rich.progress import (
+    BarColumn,
+    DownloadColumn,
+    Progress,
+    TextColumn,
+    TransferSpeedColumn,
+)
 
 from zhenxun.configs.config import BotConfig
 from zhenxun.services.log import logger
 from zhenxun.utils.message import MessageUtils
 from zhenxun.utils.user_agent import get_user_agent
 
-# from .browser import get_browser
+
+def get_async_client(
+    proxies: dict[str, str] | None = None, verify: bool = False, **kwargs
+) -> httpx.AsyncClient:
+    check_httpx_version = parse_version(httpx.__version__) >= parse_version("0.28.0")
+    transport = kwargs.pop("transport", None) or AsyncHTTPTransport(verify=verify)
+
+    if not check_httpx_version:
+        return httpx.AsyncClient(proxies=proxies, transport=transport, **kwargs)  # type: ignore
+    proxy_str = None
+    if proxies:
+        proxy_str = proxies.get("http://") or proxies.get("https://")
+        if not proxy_str:
+            logger.warning(f"代理字典 {proxies} 中未能提取出有效的URL，代理已被忽略。")
+    return httpx.AsyncClient(proxy=proxy_str, transport=transport, **kwargs)  # type: ignore
 
 
 class AsyncHttpx:
-    proxy: ClassVar[dict[str, str | None]] = {
-        "http://": BotConfig.system_proxy,
-        "https://": BotConfig.system_proxy,
-    }
+    default_proxy: ClassVar[dict[str, str] | None] = (
+        {
+            "http://": BotConfig.system_proxy,
+            "https://": BotConfig.system_proxy,
+        }
+        if BotConfig.system_proxy
+        else None
+    )
+
+    @classmethod
+    @asynccontextmanager
+    async def _create_client(
+        cls,
+        *,
+        use_proxy: bool = True,
+        proxy: dict[str, str] | None = None,
+        headers: dict[str, str] | None = None,
+        verify: bool = False,
+        **kwargs,
+    ) -> AsyncGenerator[httpx.AsyncClient, None]:
+        """创建一个私有的、配置好的 httpx.AsyncClient 上下文管理器。
+
+        说明:
+            此方法用于内部统一创建客户端，处理代理和请求头逻辑，减少代码重复。
+
+        参数:
+            use_proxy: 是否使用在类中定义的默认代理。
+            proxy: 手动指定的代理，会覆盖默认代理。
+            headers: 需要合并到客户端的自定义请求头。
+            verify: 是否验证 SSL 证书。
+            **kwargs: 其他所有传递给 httpx.AsyncClient 的参数。
+
+        返回:
+            AsyncGenerator[httpx.AsyncClient, None]: 生成器。
+        """
+        proxies_to_use = proxy or (cls.default_proxy if use_proxy else None)
+
+        final_headers = get_user_agent()
+        if headers:
+            final_headers.update(headers)
+
+        async with get_async_client(
+            proxies=proxies_to_use, verify=verify, headers=final_headers, **kwargs
+        ) as client:
+            yield client
 
     @classmethod
-    @retry(stop_max_attempt_number=3)
     async def get(
         cls,
         url: str | list[str],
         *,
-        params: dict[str, Any] | None = None,
-        headers: dict[str, str] | None = None,
-        cookies: dict[str, str] | None = None,
-        verify: bool = True,
-        use_proxy: bool = True,
-        proxy: dict[str, str] | None = None,
-        timeout: int = 30,  # noqa: ASYNC109
         check_status_code: int | None = None,
         **kwargs,
-    ) -> Response:
-        """Get
+    ) -> Response:  # sourcery skip: use-assigned-variable
+        """发送 GET 请求，并返回第一个成功的响应。
+
+        说明:
+            本方法是 httpx.get 的高级包装，增加了多链接尝试、自动重试和统一的代理管理。
+            如果提供 URL 列表，它将依次尝试直到成功为止。
 
         参数:
-            url: url
-            params: params
-            headers: 请求头
-            cookies: cookies
-            verify: verify
-            use_proxy: 使用默认代理
-            proxy: 指定代理
-            timeout: 超时时间
-            check_status_code: 检查状态码
+            url: 单个请求 URL 或一个 URL 列表。
+            check_status_code: (可选) 若提供，将检查响应状态码是否匹配，否则抛出异常。
+            **kwargs: 其他所有传递给 httpx.get 的参数
+                    (如 `params`, `headers`, `timeout`等)。
+
+        返回:
+            Response: Response
         """
         urls = [url] if isinstance(url, str) else url
-        return await cls._get_first_successful(
-            urls,
-            params=params,
-            headers=headers,
-            cookies=cookies,
-            verify=verify,
-            use_proxy=use_proxy,
-            proxy=proxy,
-            timeout=timeout,
-            check_status_code=check_status_code,
-            **kwargs,
-        )
-
-    @classmethod
-    async def _get_first_successful(
-        cls,
-        urls: list[str],
-        check_status_code: int | None = None,
-        **kwargs,
-    ) -> Response:
         last_exception = None
-        for url in urls:
+        for current_url in urls:
             try:
-                logger.info(f"开始获取 {url}..")
-                response = await cls._get_single(url, **kwargs)
+                logger.info(f"开始获取 {current_url}..")
+                async with cls._create_client(**kwargs) as client:
+                    # 从 kwargs 中提取仅 client.get 支持的参数
+                    get_kwargs = {
+                        k: v
+                        for k, v in kwargs.items()
+                        if k not in ["use_proxy", "proxy", "verify", "headers"]
+                    }
+                    response = await client.get(current_url, **get_kwargs)
+
                 if check_status_code and response.status_code != check_status_code:
-                    status_code = response.status_code
-                    raise Exception(f"状态码错误:{status_code}!={check_status_code}")
+                    raise HTTPStatusError(
+                        f"状态码错误: {response.status_code}!={check_status_code}",
+                        request=response.request,
+                        response=response,
+                    )
                 return response
             except Exception as e:
                 last_exception = e
-                if url != urls[-1]:
-                    logger.warning(f"获取 {url} 失败, 尝试下一个")
-        raise last_exception or Exception("All URLs failed")
+                if current_url != urls[-1]:
+                    logger.warning(f"获取 {current_url} 失败, 尝试下一个", e=e)
+
+        raise last_exception or Exception("所有URL都获取失败")
 
     @classmethod
-    async def _get_single(
-        cls,
-        url: str,
-        *,
-        params: dict[str, Any] | None = None,
-        headers: dict[str, str] | None = None,
-        cookies: dict[str, str] | None = None,
-        verify: bool = True,
-        use_proxy: bool = True,
-        proxy: dict[str, str] | None = None,
-        timeout: int = 30,  # noqa: ASYNC109
-        **kwargs,
-    ) -> Response:
-        if not headers:
-            headers = get_user_agent()
-        _proxy = proxy or (cls.proxy if use_proxy else None)
-        async with httpx.AsyncClient(proxies=_proxy, verify=verify) as client:  # type: ignore
-            return await client.get(
-                url,
-                params=params,
-                headers=headers,
-                cookies=cookies,
-                timeout=timeout,
-                **kwargs,
-            )
+    async def head(cls, url: str, **kwargs) -> Response:
+        """发送 HEAD 请求。
 
-    @classmethod
-    async def head(
-        cls,
-        url: str,
-        *,
-        params: dict[str, Any] | None = None,
-        headers: dict[str, str] | None = None,
-        cookies: dict[str, str] | None = None,
-        verify: bool = True,
-        use_proxy: bool = True,
-        proxy: dict[str, str] | None = None,
-        timeout: int = 30,  # noqa: ASYNC109
-        **kwargs,
-    ) -> Response:
-        """Get
-
-        参数:
-            url: url
-            params: params
-            headers: 请求头
-            cookies: cookies
-            verify: verify
-            use_proxy: 使用默认代理
-            proxy: 指定代理
-            timeout: 超时时间
-        """
-        if not headers:
-            headers = get_user_agent()
-        _proxy = proxy or (cls.proxy if use_proxy else None)
-        async with httpx.AsyncClient(proxies=_proxy, verify=verify) as client:  # type: ignore
-            return await client.head(
-                url,
-                params=params,
-                headers=headers,
-                cookies=cookies,
-                timeout=timeout,
-                **kwargs,
-            )
-
-    @classmethod
-    async def post(
-        cls,
-        url: str,
-        *,
-        data: dict[str, Any] | None = None,
-        content: Any = None,
-        files: Any = None,
-        verify: bool = True,
-        use_proxy: bool = True,
-        proxy: dict[str, str] | None = None,
-        json: dict[str, Any] | None = None,
-        params: dict[str, str] | None = None,
-        headers: dict[str, str] | None = None,
-        cookies: dict[str, str] | None = None,
-        timeout: int = 30,  # noqa: ASYNC109
-        **kwargs,
-    ) -> Response:
-        """
         说明:
-            Post
+            本方法是对 httpx.head 的封装，通常用于检查资源的元信息（如大小、类型）。
+
         参数:
-            url: url
-            data: data
-            content: content
-            files: files
-            use_proxy: 是否默认代理
-            proxy: 指定代理
-            json: json
-            params: params
-            headers: 请求头
-            cookies: cookies
-            timeout: 超时时间
+            url: 请求的 URL。
+            **kwargs: 其他所有传递给 httpx.head 的参数
+                        (如 `headers`, `timeout`, `allow_redirects`)。
+
+        返回:
+            Response: Response
         """
-        if not headers:
-            headers = get_user_agent()
-        _proxy = proxy or (cls.proxy if use_proxy else None)
-        async with httpx.AsyncClient(proxies=_proxy, verify=verify) as client:  # type: ignore
-            return await client.post(
-                url,
-                content=content,
-                data=data,
-                files=files,
-                json=json,
-                params=params,
-                headers=headers,
-                cookies=cookies,
-                timeout=timeout,
-                **kwargs,
-            )
+        async with cls._create_client(**kwargs) as client:
+            head_kwargs = {
+                k: v
+                for k, v in kwargs.items()
+                if k not in ["use_proxy", "proxy", "verify"]
+            }
+            return await client.head(url, **head_kwargs)
+
+    @classmethod
+    async def post(cls, url: str, **kwargs) -> Response:
+        """发送 POST 请求。
+
+        说明:
+            本方法是对 httpx.post 的封装，提供了统一的代理和客户端管理。
+
+        参数:
+            url: 请求的 URL。
+            **kwargs: 其他所有传递给 httpx.post 的参数
+                        (如 `data`, `json`, `content` 等)。
+
+        返回:
+            Response: Response。
+        """
+        async with cls._create_client(**kwargs) as client:
+            post_kwargs = {
+                k: v
+                for k, v in kwargs.items()
+                if k not in ["use_proxy", "proxy", "verify"]
+            }
+            return await client.post(url, **post_kwargs)
 
     @classmethod
     async def get_content(cls, url: str, **kwargs) -> bytes:
+        """获取指定 URL 的二进制内容。
+
+        说明:
+            这是一个便捷方法，等同于调用 get() 后再访问 .content 属性。
+
+        参数:
+            url: 请求的 URL。
+            **kwargs: 所有传递给 get() 方法的参数。
+
+        返回:
+            bytes: 响应内容的二进制字节流 (bytes)。
+        """
         res = await cls.get(url, **kwargs)
         return res.content
 
@@ -223,195 +209,143 @@ class AsyncHttpx:
         url: str | list[str],
         path: str | Path,
         *,
-        params: dict[str, str] | None = None,
-        verify: bool = True,
-        use_proxy: bool = True,
-        proxy: dict[str, str] | None = None,
-        headers: dict[str, str] | None = None,
-        cookies: dict[str, str] | None = None,
-        timeout: int = 30,  # noqa: ASYNC109
         stream: bool = False,
-        follow_redirects: bool = True,
         **kwargs,
     ) -> bool:
-        """下载文件
+        """下载文件到指定路径。
+
+        说明:
+            支持多链接尝试和流式下载（带进度条）。
 
         参数:
-            url: url
-            path: 存储路径
-            params: params
-            verify: verify
-            use_proxy: 使用代理
-            proxy: 指定代理
-            headers: 请求头
-            cookies: cookies
-            timeout: 超时时间
-            stream: 是否使用流式下载（流式写入+进度条，适用于下载大文件）
+            url: 单个文件 URL 或一个备用 URL 列表。
+            path: 文件保存的本地路径。
+            stream: (可选) 是否使用流式下载，适用于大文件，默认为 False。
+            **kwargs: 其他所有传递给 get() 方法或 httpx.stream() 的参数。
+
+        返回:
+            bool: 是否下载成功。
         """
-        if isinstance(path, str):
-            path = Path(path)
+        path = Path(path)
         path.parent.mkdir(parents=True, exist_ok=True)
-        try:
-            for _ in range(3):
-                if not isinstance(url, list):
-                    url = [url]
-                for u in url:
-                    try:
-                        if not stream:
-                            response = await cls.get(
-                                u,
-                                params=params,
-                                headers=headers,
-                                cookies=cookies,
-                                use_proxy=use_proxy,
-                                proxy=proxy,
-                                timeout=timeout,
-                                follow_redirects=follow_redirects,
-                                **kwargs,
-                            )
+
+        urls = [url] if isinstance(url, str) else url
+
+        for current_url in urls:
+            try:
+                if not stream:
+                    response = await cls.get(current_url, **kwargs)
+                    response.raise_for_status()
+                    async with aiofiles.open(path, "wb") as f:
+                        await f.write(response.content)
+                else:
+                    async with cls._create_client(**kwargs) as client:
+                        stream_kwargs = {
+                            k: v
+                            for k, v in kwargs.items()
+                            if k not in ["use_proxy", "proxy", "verify"]
+                        }
+                        async with client.stream(
+                            "GET", current_url, **stream_kwargs
+                        ) as response:
                             response.raise_for_status()
-                            content = response.content
-                            async with aiofiles.open(path, "wb") as wf:
-                                await wf.write(content)
-                                logger.info(f"下载 {u} 成功.. Path：{path.absolute()}")
-                        else:
-                            if not headers:
-                                headers = get_user_agent()
-                            _proxy = proxy or (cls.proxy if use_proxy else None)
-                            async with httpx.AsyncClient(
-                                proxies=_proxy,  # type: ignore
-                                verify=verify,
-                            ) as client:
-                                async with client.stream(
-                                    "GET",
-                                    u,
-                                    params=params,
-                                    headers=headers,
-                                    cookies=cookies,
-                                    timeout=timeout,
-                                    follow_redirects=True,
-                                    **kwargs,
-                                ) as response:
-                                    response.raise_for_status()
-                                    logger.info(
-                                        f"开始下载 {path.name}.. "
-                                        f"Url: {u}.. "
-                                        f"Path: {path.absolute()}"
-                                    )
-                                    async with aiofiles.open(path, "wb") as wf:
-                                        total = int(
-                                            response.headers.get("Content-Length", 0)
-                                        )
-                                        with rich.progress.Progress(  # type: ignore
-                                            rich.progress.TextColumn(path.name),  # type: ignore
-                                            "[progress.percentage]{task.percentage:>3.0f}%",  # type: ignore
-                                            rich.progress.BarColumn(bar_width=None),  # type: ignore
-                                            rich.progress.DownloadColumn(),  # type: ignore
-                                            rich.progress.TransferSpeedColumn(),  # type: ignore
-                                        ) as progress:
-                                            download_task = progress.add_task(
-                                                "Download",
-                                                total=total or None,
-                                            )
-                                            async for chunk in response.aiter_bytes():
-                                                await wf.write(chunk)
-                                                await wf.flush()
-                                                progress.update(
-                                                    download_task,
-                                                    completed=response.num_bytes_downloaded,
-                                                )
-                                        logger.info(
-                                            f"下载 {u} 成功.. Path：{path.absolute()}"
-                                        )
-                        return True
-                    except (TimeoutError, ConnectTimeout, HTTPStatusError):
-                        logger.warning(f"下载 {u} 失败.. 尝试下一个地址..")
-                    except EndOfStream as e:
-                        logger.warning(
-                            f"下载 {url} EndOfStream 异常 Path：{path.absolute()}", e=e
-                        )
-                        if path.exists():
-                            return True
-            logger.error(f"下载 {url} 下载超时.. Path：{path.absolute()}")
-        except Exception as e:
-            logger.error(f"下载 {url} 错误 Path：{path.absolute()}", e=e)
+                            total = int(response.headers.get("Content-Length", 0))
+
+                            with Progress(
+                                TextColumn(path.name),
+                                "[progress.percentage]{task.percentage:>3.0f}%",
+                                BarColumn(bar_width=None),
+                                DownloadColumn(),
+                                TransferSpeedColumn(),
+                            ) as progress:
+                                task_id = progress.add_task("Download", total=total)
+                                async with aiofiles.open(path, "wb") as f:
+                                    async for chunk in response.aiter_bytes():
+                                        await f.write(chunk)
+                                        progress.update(task_id, advance=len(chunk))
+
+                logger.info(f"下载 {current_url} 成功 -> {path.absolute()}")
+                return True
+
+            except Exception as e:
+                logger.warning(f"下载 {current_url} 失败，尝试下一个。错误: {e}")
+
+        logger.error(f"所有URL {urls} 下载均失败 -> {path.absolute()}")
         return False
 
     @classmethod
     async def gather_download_file(
         cls,
-        url_list: list[str] | list[list[str]],
-        path_list: list[str | Path],
+        url_list: Sequence[list[str] | str],
+        path_list: Sequence[str | Path],
         *,
-        limit_async_number: int | None = None,
-        params: dict[str, str] | None = None,
-        use_proxy: bool = True,
-        proxy: dict[str, str] | None = None,
-        headers: dict[str, str] | None = None,
-        cookies: dict[str, str] | None = None,
-        timeout: int = 30,  # noqa: ASYNC109
+        limit_async_number: int = 5,
         **kwargs,
     ) -> list[bool]:
-        """分组同时下载文件
+        """并发下载多个文件，支持为每个文件提供备用镜像链接。
+
+        说明:
+            使用 asyncio.Semaphore 来控制并发请求的数量。
+            对于 url_list 中的每个元素，如果它是一个列表，则会依次尝试直到下载成功。
 
         参数:
-            url_list: url列表
-            path_list: 存储路径列表
-            limit_async_number: 限制同时请求数量
-            params: params
-            use_proxy: 使用代理
-            proxy: 指定代理
-            headers: 请求头
-            cookies: cookies
-            timeout: 超时时间
+            url_list: 包含所有文件下载任务的列表。每个元素可以是：
+                      - 一个字符串 (str): 代表该任务的唯一URL。
+                      - 一个字符串列表 (list[str]): 代表该任务的多个备用/镜像URL。
+            path_list: 与 url_list 对应的文件保存路径列表。
+            limit_async_number: (可选) 最大并发下载数，默认为 5。
+            **kwargs: 其他所有传递给 download_file() 方法的参数。
+
+        返回:
+            list[bool]: 对应每个下载任务是否成功。
         """
-        if n := len(url_list) != len(path_list):
-            raise UrlPathNumberNotEqual(
-                f"Url数量与Path数量不对等，Url：{len(url_list)}，Path：{len(path_list)}"
-            )
-        if limit_async_number and n > limit_async_number:
-            m = float(n) / limit_async_number
-            x = 0
-            j = limit_async_number
-            _split_url_list = []
-            _split_path_list = []
-            for _ in range(int(m)):
-                _split_url_list.append(url_list[x:j])
-                _split_path_list.append(path_list[x:j])
-                x += limit_async_number
-                j += limit_async_number
-            if int(m) < m:
-                _split_url_list.append(url_list[j:])
-                _split_path_list.append(path_list[j:])
-        else:
-            _split_url_list = [url_list]
-            _split_path_list = [path_list]
-        tasks = []
-        result_ = []
-        for x, y in zip(_split_url_list, _split_path_list):
-            tasks.extend(
-                asyncio.create_task(
-                    cls.download_file(
-                        url,
-                        path,
-                        params=params,
-                        headers=headers,
-                        cookies=cookies,
-                        use_proxy=use_proxy,
-                        timeout=timeout,
-                        proxy=proxy,
-                        **kwargs,
-                    )
+        if len(url_list) != len(path_list):
+            raise ValueError("URL 列表和路径列表的长度必须相等")
+
+        semaphore = asyncio.Semaphore(limit_async_number)
+
+        async def _download_with_semaphore(
+            urls_for_one_path: str | list[str], path: str | Path
+        ):
+            async with semaphore:
+                return await cls.download_file(urls_for_one_path, path, **kwargs)
+
+        tasks = [
+            _download_with_semaphore(url_group, path)
+            for url_group, path in zip(url_list, path_list)
+        ]
+
+        results = await asyncio.gather(*tasks, return_exceptions=True)
+
+        final_results = []
+        for i, result in enumerate(results):
+            if isinstance(result, Exception):
+                url_info = (
+                    url_list[i]
+                    if isinstance(url_list[i], str)
+                    else ", ".join(url_list[i])
                 )
-                for url, path in zip(x, y)
-            )
-            _x = await asyncio.gather(*tasks)
-            result_ = result_ + list(_x)
-            tasks.clear()
-        return result_
+                logger.error(f"并发下载任务 ({url_info}) 时发生错误", e=result)
+                final_results.append(False)
+            else:
+                # download_file 返回的是 bool，可以直接附加
+                final_results.append(cast(bool, result))
+
+        return final_results
 
     @classmethod
     async def get_fastest_mirror(cls, url_list: list[str]) -> list[str]:
+        """测试并返回最快的镜像地址。
+
+        说明:
+            通过并发发送 HEAD 请求来测试每个 URL 的响应时间和可用性，并按响应速度排序。
+
+        参数:
+            url_list: 需要测试的镜像 URL 列表。
+
+        返回:
+            list[str]: 按从快到慢的顺序包含了所有可用的 URL。
+        """
         assert url_list
 
         async def head_mirror(client: type[AsyncHttpx], url: str) -> dict[str, Any]:
@@ -480,7 +414,7 @@ class AsyncPlaywright:
         wait_until: (
             Literal["domcontentloaded", "load", "networkidle"] | None
         ) = "networkidle",
-        timeout: float | None = None,  # noqa: ASYNC109
+        timeout: float | None = None,
         type_: Literal["jpeg", "png"] | None = None,
         user_agent: str | None = None,
         cookies: list[dict[str, Any]] | dict[str, Any] | None = None,
@@ -524,9 +458,5 @@ class AsyncPlaywright:
         return None
 
 
-class UrlPathNumberNotEqual(Exception):
-    pass
-
-
 class BrowserIsNone(Exception):
     pass

zhenxun/utils/manager/message_manager.py

@@ -22,6 +22,4 @@ class MessageManager:
 
     @classmethod
     def get(cls, uid: str) -> list[str]:
-        if uid in cls.data:
-            return cls.data[uid]
-        return []
+        return cls.data[uid] if uid in cls.data else []

zhenxun/utils/manager/priority_manager.py

@@ -0,0 +1,57 @@
+from collections.abc import Callable
+from typing import ClassVar
+
+import nonebot
+from nonebot.utils import is_coroutine_callable
+
+from zhenxun.services.log import logger
+from zhenxun.utils.enum import PriorityLifecycleType
+from zhenxun.utils.exception import HookPriorityException
+
+driver = nonebot.get_driver()
+
+
+class PriorityLifecycle:
+    _data: ClassVar[dict[PriorityLifecycleType, dict[int, list[Callable]]]] = {}
+
+    @classmethod
+    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]:
+            cls._data[hook_type][priority] = []
+        cls._data[hook_type][priority].append(func)
+
+    @classmethod
+    def on_startup(cls, *, priority: int):
+        def wrapper(func):
+            cls.add(PriorityLifecycleType.STARTUP, func, priority)
+            return func
+
+        return wrapper
+
+    @classmethod
+    def on_shutdown(cls, *, priority: int):
+        def wrapper(func):
+            cls.add(PriorityLifecycleType.SHUTDOWN, func, priority)
+            return func
+
+        return wrapper
+
+
+@driver.on_startup
+async def _():
+    priority_data = PriorityLifecycle._data.get(PriorityLifecycleType.STARTUP)
+    if not priority_data:
+        return
+    priority_list = sorted(priority_data.keys())
+    priority = 0
+    try:
+        for priority in priority_list:
+            for func in priority_data[priority]:
+                if is_coroutine_callable(func):
+                    await func()
+                else:
+                    func()
+    except HookPriorityException as e:
+        logger.error(f"打断优先级 [{priority}] on_startup 方法. {type(e)}: {e}")

zhenxun/utils/platform.py

@@ -1,7 +1,7 @@
 import asyncio
 from collections.abc import Awaitable, Callable
 import random
-from typing import Literal
+from typing import cast
 
 import httpx
 import nonebot
@@ -486,15 +486,134 @@ class PlatformUtils:
         return target
 
 
+class BroadcastEngine:
+    def __init__(
+        self,
+        message: str | UniMessage,
+        bot: Bot | list[Bot] | None = None,
+        bot_id: str | set[str] | None = None,
+        ignore_group: list[str] | None = None,
+        check_func: Callable[[Bot, str], Awaitable] | None = None,
+        log_cmd: str | None = None,
+        platform: str | None = None,
+    ):
+        """广播引擎
+
+        参数:
+        message: 广播消息内容
+        bot: 指定bot对象.
+        bot_id: 指定bot id.
+        ignore_group: 忽略群聊列表.
+        check_func: 发送前对群聊检测方法，判断是否发送.
+        log_cmd: 日志标记.
+        platform: 指定平台.
+
+        异常:
+            ValueError: 没有可用的Bot对象
+        """
+        if ignore_group is None:
+            ignore_group = []
+        self.message = MessageUtils.build_message(message)
+        self.ignore_group = ignore_group
+        self.check_func = check_func
+        self.log_cmd = log_cmd
+        self.platform = platform
+        self.bot_list = []
+        self.count = 0
+        if bot:
+            self.bot_list = [bot] if isinstance(bot, Bot) else bot
+        if isinstance(bot_id, str):
+            bot_id = set(bot_id)
+        if bot_id:
+            for i in bot_id:
+                try:
+                    self.bot_list.append(nonebot.get_bot(i))
+                except KeyError:
+                    logger.warning(f"Bot:{i} 对象未连接或不存在")
+        if not self.bot_list:
+            raise ValueError("当前没有可用的Bot对象...", log_cmd)
+
+    async def call_check(self, bot: Bot, group_id: str) -> bool:
+        """运行发送检测函数
+
+        参数:
+            bot: Bot
+            group_id: 群组id
+
+        返回:
+            bool: 是否发送
+        """
+        if not self.check_func:
+            return True
+        if is_coroutine_callable(self.check_func):
+            is_run = await self.check_func(bot, group_id)
+        else:
+            is_run = self.check_func(bot, group_id)
+        return cast(bool, is_run)
+
+    async def __send_message(self, bot: Bot, group: GroupConsole):
+        """群组发送消息
+
+        参数:
+            bot: Bot
+            group: GroupConsole
+        """
+        key = f"{group.group_id}:{group.channel_id}"
+        if not await self.call_check(bot, group.group_id):
+            logger.debug(
+                "广播方法检测运行方法为 False, 已跳过该群组...",
+                self.log_cmd,
+                group_id=group.group_id,
+            )
+            return
+        if target := PlatformUtils.get_target(
+            group_id=group.group_id,
+            channel_id=group.channel_id,
+        ):
+            self.ignore_group.append(key)
+            await MessageUtils.build_message(self.message).send(target, bot)
+            logger.debug("广播消息发送成功...", self.log_cmd, target=key)
+        else:
+            logger.warning("广播消息获取Target失败...", self.log_cmd, target=key)
+
+    async def broadcast(self) -> int:
+        """广播消息
+
+        返回:
+            int: 成功发送次数
+        """
+        for bot in self.bot_list:
+            if self.platform and self.platform != PlatformUtils.get_platform(bot):
+                continue
+            group_list, _ = await PlatformUtils.get_group_list(bot)
+            if not group_list:
+                continue
+            for group in group_list:
+                if (
+                    group.group_id in self.ignore_group
+                    or group.channel_id in self.ignore_group
+                ):
+                    continue
+                try:
+                    await self.__send_message(bot, group)
+                    await asyncio.sleep(random.randint(1, 3))
+                    self.count += 1
+                except Exception as e:
+                    logger.warning(
+                        "广播消息发送失败", self.log_cmd, target=group.group_id, e=e
+                    )
+        return self.count
+
+
 async def broadcast_group(
     message: str | UniMessage,
     bot: Bot | list[Bot] | None = None,
     bot_id: str | set[str] | None = None,
-    ignore_group: set[int] | None = None,
+    ignore_group: list[str] = [],
     check_func: Callable[[Bot, str], Awaitable] | None = None,
     log_cmd: str | None = None,
-    platform: Literal["qq", "dodo", "kaiheila"] | None = None,
-):
+    platform: str | None = None,
+) -> int:
     """获取所有Bot或指定Bot对象广播群聊
 
     参数:
@@ -505,81 +624,18 @@ async def broadcast_group(
         check_func: 发送前对群聊检测方法，判断是否发送.
         log_cmd: 日志标记.
         platform: 指定平台
+
+    返回:
+        int: 成功发送次数
     """
-    if platform and platform not in ["qq", "dodo", "kaiheila"]:
-        raise ValueError("指定平台不支持")
-    if not message:
-        raise ValueError("群聊广播消息不能为空")
-    bot_dict = nonebot.get_bots()
-    bot_list: list[Bot] = []
-    if bot:
-        if isinstance(bot, list):
-            bot_list = bot
-        else:
-            bot_list.append(bot)
-    elif bot_id:
-        _bot_id_list = bot_id
-        if isinstance(bot_id, str):
-            _bot_id_list = [bot_id]
-        for id_ in _bot_id_list:
-            if bot_id in bot_dict:
-                bot_list.append(bot_dict[bot_id])
-            else:
-                logger.warning(f"Bot:{id_} 对象未连接或不存在")
-    else:
-        bot_list = list(bot_dict.values())
-    _used_group = []
-    for _bot in bot_list:
-        try:
-            if platform and platform != PlatformUtils.get_platform(_bot):
-                continue
-            group_list, _ = await PlatformUtils.get_group_list(_bot)
-            if group_list:
-                for group in group_list:
-                    key = f"{group.group_id}:{group.channel_id}"
-                    try:
-                        if (
-                            ignore_group
-                            and (
-                                group.group_id in ignore_group
-                                or group.channel_id in ignore_group
-                            )
-                        ) or key in _used_group:
-                            logger.debug(
-                                "广播方法群组重复, 已跳过...",
-                                log_cmd,
-                                group_id=group.group_id,
-                            )
-                            continue
-                        is_run = False
-                        if check_func:
-                            if is_coroutine_callable(check_func):
-                                is_run = await check_func(_bot, group.group_id)
-                            else:
-                                is_run = check_func(_bot, group.group_id)
-                        if not is_run:
-                            logger.debug(
-                                "广播方法检测运行方法为 False, 已跳过...",
-                                log_cmd,
-                                group_id=group.group_id,
-                            )
-                            continue
-                        target = PlatformUtils.get_target(
-                            user_id=None,
-                            group_id=group.group_id,
-                            channel_id=group.channel_id,
-                        )
-                        if target:
-                            _used_group.append(key)
-                            message_list = message
-                            await MessageUtils.build_message(message_list).send(
-                                target, _bot
-                            )
-                            logger.debug("发送成功", log_cmd, target=key)
-                            await asyncio.sleep(random.randint(1, 3))
-                        else:
-                            logger.warning("target为空", log_cmd, target=key)
-                    except Exception as e:
-                        logger.error("发送失败", log_cmd, target=key, e=e)
-        except Exception as e:
-            logger.error(f"Bot: {_bot.self_id} 获取群聊列表失败", command=log_cmd, e=e)
+    if not message.strip():
+        raise ValueError("群聊广播消息不能为空...")
+    return await BroadcastEngine(
+        message=message,
+        bot=bot,
+        bot_id=bot_id,
+        ignore_group=ignore_group,
+        check_func=check_func,
+        log_cmd=log_cmd,
+        platform=platform,
+    ).broadcast()