test(auto_update): 修改更新检测消息格式 (#2003)

- 移除了不必要的版本号后缀（如 "-e6f17c4"）
- 统一了版本更新消息的格式，删除了冗余信息

.env.example

@@ -10,9 +10,6 @@ SESSION_EXPIRE_TIMEOUT=00:00:30
 
 ALCONNA_USE_COMMAND_START=True
 
-# ws连接密钥,若bot能被公网访问则建议打开该注释并设置该配置项
-# ONEBOT_ACCESS_TOKEN=""
-
 # 全局图片统一使用bytes发送，当真寻与协议端不在同一服务器上时为True
 IMAGE_TO_BYTES = True
 
@@ -32,7 +29,6 @@ DB_URL = ""
 
 # NONE: 不使用缓存, MEMORY: 使用内存缓存, REDIS: 使用Redis缓存
 CACHE_MODE = NONE
-
 # REDIS配置，使用REDIS替换Cache内存缓存
 # REDIS地址
 # REDIS_HOST = "127.0.0.1"
@@ -90,4 +86,4 @@ PORT = 8080
 # '
 
 # application_commands的{"*": ["*"]}代表将全部应用命令注册为全局应用命令
-# {"admin": ["123", "456"]}则代表将admin命令注册为id是123、456服务器的局部命令，其余命令不注册
+# {"admin": ["123", "456"]}则代表将admin命令注册为id是123、456服务器的局部命令，其余命令不注册

.github/workflows/codeql.yml

@@ -45,9 +45,12 @@ jobs:
         include:
           - language: python
             build-mode: none
+          - language: javascript-typescript
+            build-mode: none
         # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
         # Use `c-cpp` to analyze code written in C, C++ or both
         # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
         # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
         # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
         # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how

.gitignore

@@ -32,7 +32,6 @@ MANIFEST
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
-!resources.spec
 
 # Installer logs
 pip-log.txt

README.md

@@ -131,20 +131,20 @@ AccessToken: PUBLIC_ZHENXUN_TEST
 如果你系统是 **Windows** 且不想下载 Python  
 可以使用整合包（Python3.10+zhenxun+webui）
 
-文档地址：[整合包文档](https://zhenxun-org.github.io/zhenxun_bot/beginner)
+文档地址：[整合包文档](https://hibikier.github.io/zhenxun_bot/beginner/)
 
 <details>
 <summary>下载地址</summary>
 
 - **百度云：**  
-  https://pan.baidu.com/s/1MKGOoIgQW1qom_KT3rNhlg?pwd=t7iz
+  https://pan.baidu.com/s/1ph4yzx1vdNbkxm9VBKDdgQ?pwd=971j
 
-- **夸克网盘：**  
-  https://pan.quark.cn/s/b4dc6cb8fb08  
-  访问码：Yi46
+- **天翼云：**  
+  https://cloud.189.cn/web/share?code=jq67r2i2E7Fb  
+  访问码：8wxm
 
 - **Google Drive：**  
-  https://drive.google.com/drive/folders/1dcTWhPZhSt9WqLehyjF6Gj0CXQCS4OWh?usp=drive_link
+  https://drive.google.com/file/d/1cc3Dqjk0x5hWGLNeMkrFwWl8BvsK6KfD/view?usp=drive_link
 
 </details>
 

envs/pydantic-v1/pyproject.toml

@@ -14,21 +14,21 @@ priority = "primary"
 [tool.poetry.dependencies]
 python = "^3.10"
 playwright = "^1.41.1"
-nonebot-adapter-onebot = ">=2.3.1"
+nonebot-adapter-onebot = "^2.3.1"
 nonebot-plugin-apscheduler = "^0.5"
-tortoise-orm = "^0.20.0"
+tortoise-orm = { extras = ["asyncpg"], version = "^0.20.0" }
 cattrs = "^23.2.3"
 ruamel-yaml = "^0.18.5"
 strenum = "^0.4.15"
-nonebot-plugin-session = "^0.3.2"
-ujson = ">=5.9.0"
-nb-cli = ">=1.3.0"
-nonebot2 = { extras = ["fastapi"], version = ">=2.3.3" }
+nonebot-plugin-session = "^0.2.3"
+ujson = "^5.9.0"
+nb-cli = "^1.3.0"
+nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
 pillow = "^10.0.0"
 retrying = "^1.3.4"
 aiofiles = "^23.2.1"
 nonebot-plugin-htmlrender = ">=0.6.0,<1.0.0"
-pypinyin = ">=0.51.0"
+pypinyin = "^0.51.0"
 beautifulsoup4 = "^4.12.3"
 lxml = "^5.1.0"
 psutil = "^5.9.8"
@@ -36,20 +36,16 @@ feedparser = "^6.0.11"
 imagehash = "^4.3.1"
 cn2an = "^0.5.22"
 dateparser = "^1.2.0"
+bilireq = "0.2.3post0"
 python-jose = { extras = ["cryptography"], version = "^3.3.0" }
 python-multipart = "^0.0.9"
-aiocache = {extras = ["redis"], version = "^0.12.3"}
+aiocache = "^0.12.2"
 py-cpuinfo = "^9.0.0"
-nonebot-plugin-alconna = ">=0.56.0"
+nonebot-plugin-alconna = "^0.54.0"
 tenacity = "^9.0.0"
-nonebot-plugin-uninfo = ">=0.7.3"
-nonebot-plugin-waiter = "^0.8.1"
-multidict = ">=6.0.0,!=6.3.2"
-pydantic = ">=1.0.0, <2.0.0"
-redis = { version = ">=5", optional = true }
-asyncpg = { version = ">=0.20.0", optional = true }
+nonebot-plugin-uninfo = ">0.4.1"
+pydantic = "1.10.18"
 alibabacloud-devops20210625 = "^5.0.2"
-json_repair = "^0.54.0"
 
 [tool.poetry.group.dev.dependencies]
 nonebug = "^0.4"
@@ -61,6 +57,7 @@ respx = "^0.21.1"
 ruff = "^0.8.0"
 pre-commit = "^4.0.0"
 
+
 [tool.nonebot]
 plugins = [
     "nonebot_plugin_apscheduler",

envs/pydantic-v2/pyproject.toml

@@ -14,21 +14,21 @@ priority = "primary"
 [tool.poetry.dependencies]
 python = "^3.10"
 playwright = "^1.41.1"
-nonebot-adapter-onebot = ">=2.3.1"
+nonebot-adapter-onebot = "^2.3.1"
 nonebot-plugin-apscheduler = "^0.5"
-tortoise-orm = "^0.20.0"
+tortoise-orm = { extras = ["asyncpg"], version = "^0.20.0" }
 cattrs = "^23.2.3"
 ruamel-yaml = "^0.18.5"
 strenum = "^0.4.15"
-nonebot-plugin-session = "^0.3.2"
-ujson = ">=5.9.0"
-nb-cli = ">=1.3.0"
-nonebot2 = { extras = ["fastapi"], version = ">=2.3.3" }
+nonebot-plugin-session = "^0.2.3"
+ujson = "^5.9.0"
+nb-cli = "^1.3.0"
+nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
 pillow = "^10.0.0"
 retrying = "^1.3.4"
 aiofiles = "^23.2.1"
 nonebot-plugin-htmlrender = ">=0.6.0,<1.0.0"
-pypinyin = ">=0.51.0"
+pypinyin = "^0.51.0"
 beautifulsoup4 = "^4.12.3"
 lxml = "^5.1.0"
 psutil = "^5.9.8"
@@ -36,20 +36,16 @@ feedparser = "^6.0.11"
 imagehash = "^4.3.1"
 cn2an = "^0.5.22"
 dateparser = "^1.2.0"
+bilireq = "0.2.3post0"
 python-jose = { extras = ["cryptography"], version = "^3.3.0" }
 python-multipart = "^0.0.9"
-aiocache = {extras = ["redis"], version = "^0.12.3"}
+aiocache = "^0.12.2"
 py-cpuinfo = "^9.0.0"
-nonebot-plugin-alconna = ">=0.56.0"
+nonebot-plugin-alconna = "^0.54.0"
 tenacity = "^9.0.0"
-nonebot-plugin-uninfo = ">=0.7.3"
-nonebot-plugin-waiter = "^0.8.1"
-multidict = ">=6.0.0,!=6.3.2"
-pydantic = ">=2.0.0, <3.0.0"
-redis = { version = ">=5", optional = true }
-asyncpg = { version = ">=0.20.0", optional = true }
+nonebot-plugin-uninfo = ">0.4.1"
+pydantic = "2.10.6"
 alibabacloud-devops20210625 = "^5.0.2"
-json_repair = "^0.54.0"
 
 [tool.poetry.group.dev.dependencies]
 nonebug = "^0.4"

pyproject.toml

@@ -14,21 +14,21 @@ priority = "primary"
 [tool.poetry.dependencies]
 python = "^3.10"
 playwright = "^1.41.1"
-nonebot-adapter-onebot = ">=2.3.1"
+nonebot-adapter-onebot = "^2.3.1"
 nonebot-plugin-apscheduler = "^0.5"
 tortoise-orm = "^0.20.0"
 cattrs = "^23.2.3"
 ruamel-yaml = "^0.18.5"
 strenum = "^0.4.15"
-nonebot-plugin-session = "^0.3.2"
-ujson = ">=5.9.0"
-nb-cli = ">=1.3.0"
-nonebot2 = { extras = ["fastapi"], version = ">=2.3.3" }
+nonebot-plugin-session = "^0.2.3"
+ujson = "^5.9.0"
+nb-cli = "^1.3.0"
+nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
 pillow = "^10.0.0"
 retrying = "^1.3.4"
 aiofiles = "^23.2.1"
 nonebot-plugin-htmlrender = ">=0.6.0,<1.0.0"
-pypinyin = ">=0.51.0"
+pypinyin = "^0.51.0"
 beautifulsoup4 = "^4.12.3"
 lxml = "^5.1.0"
 psutil = "^5.9.8"
@@ -36,16 +36,16 @@ feedparser = "^6.0.11"
 imagehash = "^4.3.1"
 cn2an = "^0.5.22"
 dateparser = "^1.2.0"
+bilireq = "0.2.3post0"
 python-jose = { extras = ["cryptography"], version = "^3.3.0" }
 python-multipart = "^0.0.9"
 aiocache = {extras = ["redis"], version = "^0.12.3"}
 py-cpuinfo = "^9.0.0"
-nonebot-plugin-alconna = ">=0.56.0"
+nonebot-plugin-alconna = "^0.54.0"
 tenacity = "^9.0.0"
-nonebot-plugin-uninfo = ">=0.7.3"
+nonebot-plugin-uninfo = ">0.4.1"
 nonebot-plugin-waiter = "^0.8.1"
 multidict = ">=6.0.0,!=6.3.2"
-json_repair = "^0.54.0"
 
 redis = { version = ">=5", optional = true }
 asyncpg = { version = ">=0.20.0", optional = true }
@@ -145,4 +145,4 @@ asyncio_default_fixture_loop_scope = "session"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"

requirements.txt

@@ -1,36 +1,131 @@
-playwright>=1.41.1,<2.0.0
-nonebot-adapter-onebot>=2.3.1
-nonebot-plugin-apscheduler>=0.5,<0.6
-tortoise-orm>=0.20.0,<0.21.0
-cattrs>=23.2.3,<24.0.0
-ruamel.yaml>=0.18.5,<0.19.0
-strenum>=0.4.15,<0.5.0
-nonebot-plugin-session>=0.3.2,<0.4.0
-ujson>=5.9.0
-nb-cli>=1.3.0
-nonebot2[fastapi]>=2.3.3
-Pillow>=10.0.0,<11.0.0
-retrying>=1.3.4,<2.0.0
-aiofiles>=23.2.1,<24.0.0
-nonebot-plugin-htmlrender>=0.6.0,<1.0.0
-pypinyin>=0.51.0
-beautifulsoup4>=4.12.3,<5.0.0
-lxml>=5.1.0,<6.0.0
-psutil>=5.9.8,<6.0.0
-feedparser>=6.0.11,<7.0.0
-ImageHash>=4.3.1,<5.0.0
-cn2an>=0.5.22,<0.6.0
-dateparser>=1.2.0,<2.0.0
-python-jose[cryptography]>=3.3.0,<4.0.0
-python-multipart>=0.0.9,<0.1.0
-aiocache[redis]>=0.12.3,<0.13.0
-py-cpuinfo>=9.0.0,<10.0.0
-nonebot-plugin-alconna>=0.56.0
-tenacity>=9.0.0,<10.0.0
-nonebot-plugin-uninfo>=0.7.3
-nonebot-plugin-waiter>=0.8.1,<0.9.0
-multidict>=6.0.0,<7.0.0,!=6.3.2
-alibabacloud-devops20210625>=5.0.2,<6.0.0
-json_repair>=0.54.0,<0.55.0
-redis>=5
-asyncpg>=0.20.0
+aiocache==0.12.3 ; python_version >= "3.10" and python_version < "4.0"
+aiofiles==23.2.1 ; python_version >= "3.10" and python_version < "4.0"
+aiosqlite==0.17.0 ; python_version >= "3.10" and python_version < "4.0"
+annotated-types==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
+alibabacloud-devops20210625==5.0.2 ; python_version >= "3.10" and python_version < "4.0"
+anyio==4.8.0 ; python_version >= "3.10" and python_version < "4.0"
+apscheduler==3.11.0 ; python_version >= "3.10" and python_version < "4.0"
+arclet-alconna-tools==0.7.10 ; python_version >= "3.10" and python_version < "4.0"
+arclet-alconna==1.8.35 ; python_version >= "3.10" and python_version < "4.0"
+arrow==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
+async-timeout==5.0.1 ; python_version == "3.10"
+asyncpg==0.30.0 ; python_version >= "3.10" and python_version < "4.0"
+attrs==25.1.0 ; python_version >= "3.10" and python_version < "4.0"
+beautifulsoup4==4.13.3 ; python_version >= "3.10" and python_version < "4.0"
+bilireq==0.2.3.post0 ; python_version >= "3.10" and python_version < "4.0"
+binaryornot==0.4.4 ; python_version >= "3.10" and python_version < "4.0"
+cashews==7.4.0 ; python_version >= "3.10" and python_version < "4.0"
+cattrs==23.2.3 ; python_version >= "3.10" and python_version < "4.0"
+certifi==2025.1.31 ; python_version >= "3.10" and python_version < "4.0"
+cffi==1.17.1 ; python_version >= "3.10" and python_version < "4.0" and platform_python_implementation != "PyPy"
+chardet==5.2.0 ; python_version >= "3.10" and python_version < "4.0"
+charset-normalizer==3.4.1 ; python_version >= "3.10" and python_version < "4.0"
+click==8.1.8 ; python_version >= "3.10" and python_version < "4.0"
+cn2an==0.5.23 ; python_version >= "3.10" and python_version < "4.0"
+colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and (platform_system == "Windows" or sys_platform == "win32")
+cookiecutter==2.6.0 ; python_version >= "3.10" and python_version < "4.0"
+cryptography==44.0.1 ; python_version >= "3.10" and python_version < "4.0"
+dateparser==1.2.1 ; python_version >= "3.10" and python_version < "4.0"
+distlib==0.3.9 ; python_version >= "3.10" and python_version < "4.0"
+ecdsa==0.19.0 ; python_version >= "3.10" and python_version < "4.0"
+exceptiongroup==1.2.2 ; python_version >= "3.10" and python_version < "4.0"
+fastapi==0.115.8 ; python_version >= "3.10" and python_version < "4.0"
+feedparser==6.0.11 ; python_version >= "3.10" and python_version < "4.0"
+filelock==3.17.0 ; python_version >= "3.10" and python_version < "4.0"
+greenlet==3.1.1 ; python_version >= "3.10" and python_version < "4.0"
+grpcio==1.70.0 ; python_version >= "3.10" and python_version < "4.0"
+h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0"
+httpcore==0.16.3 ; python_version >= "3.10" and python_version < "4.0"
+httptools==0.6.4 ; python_version >= "3.10" and python_version < "4.0"
+httpx==0.23.3 ; python_version >= "3.10" and python_version < "4.0"
+idna==3.10 ; python_version >= "3.10" and python_version < "4.0"
+imagehash==4.3.2 ; python_version >= "3.10" and python_version < "4.0"
+importlib-metadata==8.6.1 ; python_version >= "3.10" and python_version < "4.0"
+iso8601==1.1.0 ; python_version >= "3.10" and python_version < "4.0"
+jinja2==3.1.5 ; python_version >= "3.10" and python_version < "4.0"
+loguru==0.7.3 ; python_version >= "3.10" and python_version < "4.0"
+lxml==5.3.1 ; python_version >= "3.10" and python_version < "4.0"
+markdown-it-py==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
+markdown==3.7 ; python_version >= "3.10" and python_version < "4.0"
+markupsafe==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
+mdurl==0.1.2 ; python_version >= "3.10" and python_version < "4.0"
+msgpack==1.1.0 ; python_version >= "3.10" and python_version < "4.0"
+multidict==6.1.0 ; python_version >= "3.10" and python_version < "4.0"
+nb-cli==1.4.2 ; python_version >= "3.10" and python_version < "4.0"
+nepattern==0.7.7 ; python_version >= "3.10" and python_version < "4.0"
+nonebot-adapter-onebot==2.4.6 ; python_version >= "3.10" and python_version < "4.0"
+nonebot-plugin-alconna==0.54.2 ; python_version >= "3.10" and python_version < "4.0"
+nonebot-plugin-apscheduler==0.5.0 ; python_version >= "3.10" and python_version < "4.0"
+nonebot-plugin-htmlrender==0.6.0 ; python_version >= "3.10" and python_version < "4.0"
+nonebot-plugin-session==0.2.3 ; python_version >= "3.10" and python_version < "4.0"
+nonebot-plugin-uninfo==0.6.8 ; python_version >= "3.10" and python_version < "4.0"
+nonebot-plugin-waiter==0.8.1 ; python_version >= "3.10" and python_version < "4.0"
+nonebot2==2.4.1 ; python_version >= "3.10" and python_version < "4.0"
+nonebot2[fastapi]==2.4.1 ; python_version >= "3.10" and python_version < "4.0"
+noneprompt==0.1.9 ; python_version >= "3.10" and python_version < "4.0"
+numpy==2.2.2 ; python_version >= "3.10" and python_version < "4.0"
+pillow==10.4.0 ; python_version >= "3.10" and python_version < "4.0"
+platformdirs==4.3.6 ; python_version >= "3.10" and python_version < "4.0"
+playwright==1.50.0 ; python_version >= "3.10" and python_version < "4.0"
+proces==0.1.7 ; python_version >= "3.10" and python_version < "4.0"
+prompt-toolkit==3.0.50 ; python_version >= "3.10" and python_version < "4.0"
+propcache==0.2.1 ; python_version >= "3.10" and python_version < "4.0"
+protobuf==4.25.6 ; python_version >= "3.10" and python_version < "4.0"
+psutil==5.9.8 ; python_version >= "3.10" and python_version < "4.0"
+py-cpuinfo==9.0.0 ; python_version >= "3.10" and python_version < "4.0"
+pyasn1==0.6.1 ; python_version >= "3.10" and python_version < "4.0"
+pycparser==2.22 ; python_version >= "3.10" and python_version < "4.0" and platform_python_implementation != "PyPy"
+pydantic-core==2.27.2 ; python_version >= "3.10" and python_version < "4.0"
+pydantic==2.10.6 ; python_version >= "3.10" and python_version < "4.0"
+pyee==12.1.1 ; python_version >= "3.10" and python_version < "4.0"
+pyfiglet==1.0.2 ; python_version >= "3.10" and python_version < "4.0"
+pygments==2.19.1 ; python_version >= "3.10" and python_version < "4.0"
+pygtrie==2.5.0 ; python_version >= "3.10" and python_version < "4.0"
+pymdown-extensions==10.14.3 ; python_version >= "3.10" and python_version < "4.0"
+pypika-tortoise==0.1.6 ; python_version >= "3.10" and python_version < "4.0"
+pypinyin==0.51.0 ; python_version >= "3.10" and python_version < "4"
+python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0"
+python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "4.0"
+python-jose[cryptography]==3.3.0 ; python_version >= "3.10" and python_version < "4.0"
+python-markdown-math==0.8 ; python_version >= "3.10" and python_version < "4.0"
+python-multipart==0.0.9 ; python_version >= "3.10" and python_version < "4.0"
+python-slugify==8.0.4 ; python_version >= "3.10" and python_version < "4.0"
+pytz==2025.1 ; python_version >= "3.10" and python_version < "4.0"
+pywavelets==1.8.0 ; python_version >= "3.10" and python_version < "4.0"
+pyyaml==6.0.2 ; python_version >= "3.10" and python_version < "4.0"
+regex==2024.11.6 ; python_version >= "3.10" and python_version < "4.0"
+requests==2.32.3 ; python_version >= "3.10" and python_version < "4.0"
+retrying==1.3.4 ; python_version >= "3.10" and python_version < "4.0"
+rfc3986[idna2008]==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
+rich==13.9.4 ; python_version >= "3.10" and python_version < "4.0"
+rsa==4.9 ; python_version >= "3.10" and python_version < "4"
+ruamel-yaml-clib==0.2.12 ; platform_python_implementation == "CPython" and python_version < "3.13" and python_version >= "3.10"
+ruamel-yaml==0.18.10 ; python_version >= "3.10" and python_version < "4.0"
+scipy==1.15.1 ; python_version >= "3.10" and python_version < "4.0"
+sgmllib3k==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
+six==1.17.0 ; python_version >= "3.10" and python_version < "4.0"
+sniffio==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
+soupsieve==2.6 ; python_version >= "3.10" and python_version < "4.0"
+starlette==0.45.3 ; python_version >= "3.10" and python_version < "4.0"
+strenum==0.4.15 ; python_version >= "3.10" and python_version < "4.0"
+tarina==0.6.8 ; python_version >= "3.10" and python_version < "4.0"
+tenacity==9.0.0 ; python_version >= "3.10" and python_version < "4.0"
+text-unidecode==1.3 ; python_version >= "3.10" and python_version < "4.0"
+tomli==2.2.1 ; python_version == "3.10"
+tomlkit==0.13.2 ; python_version >= "3.10" and python_version < "4.0"
+tortoise-orm[asyncpg]==0.20.0 ; python_version >= "3.10" and python_version < "4.0"
+types-python-dateutil==2.9.0.20241206 ; python_version >= "3.10" and python_version < "4.0"
+typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
+tzdata==2025.1 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows"
+tzlocal==5.2 ; python_version >= "3.10" and python_version < "4.0"
+ujson==5.10.0 ; python_version >= "3.10" and python_version < "4.0"
+urllib3==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
+uvicorn[standard]==0.34.0 ; python_version >= "3.10" and python_version < "4.0"
+uvloop==0.21.0 ; sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy" and python_version >= "3.10" and python_version < "4.0"
+virtualenv==20.29.2 ; python_version >= "3.10" and python_version < "4.0"
+watchfiles==0.24.0 ; python_version >= "3.10" and python_version < "4.0"
+wcwidth==0.2.13 ; python_version >= "3.10" and python_version < "4.0"
+websockets==14.2 ; python_version >= "3.10" and python_version < "4.0"
+win32-setctime==1.2.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
+yarl==1.18.3 ; python_version >= "3.10" and python_version < "4.0"
+zipp==3.21.0 ; python_version >= "3.10" and python_version < "4.0"

resources.spec

@@ -1 +0,0 @@
-require_resources_version: ">=1.0.0"

tests/builtin_plugins/auto_update/test_check_update.py

@@ -9,7 +9,6 @@ import zipfile
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
 from respx import MockRouter
 
@@ -32,32 +31,60 @@ def init_mocked_api(mocked_api: MockRouter) -> None:
         name="release_latest",
     ).respond(json=get_response_json("release_latest.json"))
 
+    mocked_api.head(
+        url="https://raw.githubusercontent.com/",
+        name="head_raw",
+    ).respond(text="")
+    mocked_api.head(
+        url="https://github.com/",
+        name="head_github",
+    ).respond(text="")
+    mocked_api.head(
+        url="https://codeload.github.com/",
+        name="head_codeload",
+    ).respond(text="")
+
+    mocked_api.get(
+        url="https://raw.githubusercontent.com/HibiKier/zhenxun_bot/dev/__version__",
+        name="dev_branch_version",
+    ).respond(text="__version__: v0.2.2-e6f17c4")
+    mocked_api.get(
+        url="https://raw.githubusercontent.com/HibiKier/zhenxun_bot/main/__version__",
+        name="main_branch_version",
+    ).respond(text="__version__: v0.2.2-e6f17c4")
+    mocked_api.get(
+        url="https://api.github.com/repos/HibiKier/zhenxun_bot/tarball/v0.2.2",
+        name="release_download_url",
+    ).respond(
+        status_code=302,
+        headers={
+            "Location": "https://codeload.github.com/HibiKier/zhenxun_bot/legacy.tar.gz/refs/tags/v0.2.2"
+        },
+    )
+
     tar_buffer = io.BytesIO()
     zip_bytes = io.BytesIO()
 
-    from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
+    from zhenxun.builtin_plugins.auto_update.config import (
+        PYPROJECT_FILE_STRING,
+        PYPROJECT_LOCK_FILE_STRING,
+        REPLACE_FOLDERS,
+        REQ_TXT_FILE_STRING,
+    )
 
     # 指定要添加到压缩文件中的文件路径列表
     file_paths: list[str] = [
-        ZhenxunRepoManager.config.PYPROJECT_FILE_STRING,
-        ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE_STRING,
-        ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING,
+        PYPROJECT_FILE_STRING,
+        PYPROJECT_LOCK_FILE_STRING,
+        REQ_TXT_FILE_STRING,
     ]
 
     # 打开一个tarfile对象，写入到上面创建的BytesIO对象中
     with tarfile.open(mode="w:gz", fileobj=tar_buffer) as tar:
-        add_files_and_folders_to_tar(
-            tar,
-            file_paths,
-            folders=ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS,
-        )
+        add_files_and_folders_to_tar(tar, file_paths, folders=REPLACE_FOLDERS)
 
     with zipfile.ZipFile(zip_bytes, mode="w", compression=zipfile.ZIP_DEFLATED) as zipf:
-        add_files_and_folders_to_zip(
-            zipf,
-            file_paths,
-            folders=ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS,
-        )
+        add_files_and_folders_to_zip(zipf, file_paths, folders=REPLACE_FOLDERS)
 
     mocked_api.get(
         url="https://codeload.github.com/HibiKier/zhenxun_bot/legacy.tar.gz/refs/tags/v0.2.2",
@@ -65,6 +92,12 @@ def init_mocked_api(mocked_api: MockRouter) -> None:
     ).respond(
         content=tar_buffer.getvalue(),
     )
+    mocked_api.get(
+        url="https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/dev.zip",
+        name="dev_download_url",
+    ).respond(
+        content=zip_bytes.getvalue(),
+    )
     mocked_api.get(
         url="https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/main.zip",
         name="main_download_url",
@@ -166,52 +199,54 @@ def add_directory_to_tar(tarinfo, tar):
 
 
 def init_mocker_path(mocker: MockerFixture, tmp_path: Path):
-    from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
+    from zhenxun.builtin_plugins.auto_update.config import (
+        PYPROJECT_FILE_STRING,
+        PYPROJECT_LOCK_FILE_STRING,
+        REQ_TXT_FILE_STRING,
+        VERSION_FILE_STRING,
+    )
 
     mocker.patch(
         "zhenxun.utils.manager.virtual_env_package_manager.VirtualEnvPackageManager.install_requirement",
         return_value=None,
     )
     mock_tmp_path = mocker.patch(
-        "zhenxun.configs.path_config.TEMP_PATH",
+        "zhenxun.builtin_plugins.auto_update._data_source.TMP_PATH",
         new=tmp_path / "auto_update",
     )
     mock_base_path = mocker.patch(
-        "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_CODE_PATH",
+        "zhenxun.builtin_plugins.auto_update._data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
     )
     mock_backup_path = mocker.patch(
-        "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_BACKUP_PATH",
+        "zhenxun.builtin_plugins.auto_update._data_source.BACKUP_PATH",
         new=tmp_path / "backup",
     )
     mock_download_gz_file = mocker.patch(
-        "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_DOWNLOAD_FILE",
+        "zhenxun.builtin_plugins.auto_update._data_source.DOWNLOAD_GZ_FILE",
         new=mock_tmp_path / "download_latest_file.tar.gz",
     )
     mock_download_zip_file = mocker.patch(
-        "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_UNZIP_PATH",
+        "zhenxun.builtin_plugins.auto_update._data_source.DOWNLOAD_ZIP_FILE",
         new=mock_tmp_path / "download_latest_file.zip",
     )
     mock_pyproject_file = mocker.patch(
-        "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.PYPROJECT_FILE",
-        new=tmp_path / ZhenxunRepoManager.config.PYPROJECT_FILE_STRING,
+        "zhenxun.builtin_plugins.auto_update._data_source.PYPROJECT_FILE",
+        new=tmp_path / PYPROJECT_FILE_STRING,
     )
     mock_pyproject_lock_file = mocker.patch(
-        "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE",
-        new=tmp_path / ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE_STRING,
+        "zhenxun.builtin_plugins.auto_update._data_source.PYPROJECT_LOCK_FILE",
+        new=tmp_path / PYPROJECT_LOCK_FILE_STRING,
     )
     mock_req_txt_file = mocker.patch(
-        "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.REQUIREMENTS_FILE",
-        new=tmp_path / ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING,
+        "zhenxun.builtin_plugins.auto_update._data_source.REQ_TXT_FILE",
+        new=tmp_path / REQ_TXT_FILE_STRING,
     )
     mock_version_file = mocker.patch(
-        "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_VERSION_FILE",
-        new=tmp_path / ZhenxunRepoManager.config.ZHENXUN_BOT_VERSION_FILE_STRING,
+        "zhenxun.builtin_plugins.auto_update._data_source.VERSION_FILE",
+        new=tmp_path / VERSION_FILE_STRING,
     )
     open(mock_version_file, "w").write("__version__: v0.2.2")
-    open(ZhenxunRepoManager.config.ZHENXUN_BOT_VERSION_FILE, "w").write(
-        "__version__: v0.2.2"
-    )
     return (
         mock_tmp_path,
         mock_base_path,
@@ -225,7 +260,6 @@ def init_mocker_path(mocker: MockerFixture, tmp_path: Path):
     )
 
 
-@pytest.mark.xfail
 async def test_check_update_release(
     app: App,
     mocker: MockerFixture,
@@ -237,7 +271,12 @@ async def test_check_update_release(
     测试检查更新（release）
     """
     from zhenxun.builtin_plugins.auto_update import _matcher
-    from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
+    from zhenxun.builtin_plugins.auto_update.config import (
+        PYPROJECT_FILE_STRING,
+        PYPROJECT_LOCK_FILE_STRING,
+        REPLACE_FOLDERS,
+        REQ_TXT_FILE_STRING,
+    )
 
     init_mocked_api(mocked_api=mocked_api)
 
@@ -256,7 +295,7 @@ async def test_check_update_release(
     # 确保目录下有一个子目录，以便 os.listdir() 能返回一个目录名
     mock_tmp_path.mkdir(parents=True, exist_ok=True)
 
-    for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
+    for folder in REPLACE_FOLDERS:
         (mock_base_path / folder).mkdir(parents=True, exist_ok=True)
 
     mock_pyproject_file.write_bytes(b"")
@@ -266,7 +305,7 @@ async def test_check_update_release(
     async with app.test_matcher(_matcher) as ctx:
         bot = create_bot(ctx)
         bot = cast(Bot, bot)
-        raw_message = "检查更新 release -z"
+        raw_message = "检查更新 release"
         event = _v11_group_message_event(
             raw_message,
             self_id=BotId.QQ_BOT,
@@ -285,14 +324,14 @@ async def test_check_update_release(
         ctx.should_call_api(
             "send_msg",
             _v11_private_message_send(
-                message="检测真寻已更新，当前版本：v0.2.2\n开始更新...",
+                message="检测真寻已更新，版本更新：v0.2.2\n开始更新...",
                 user_id=UserId.SUPERUSER,
             ),
         )
         ctx.should_call_send(
             event=event,
             message=Message(
-                "版本更新完成！\n版本: v0.2.2 -> v0.2.2\n请重新启动真寻以完成更新!"
+                "版本更新完成\n版本: v0.2.2 -> v0.2.2\n请重新启动真寻以完成更新!"
             ),
             result=None,
             bot=bot,
@@ -301,13 +340,9 @@ async def test_check_update_release(
     assert mocked_api["release_latest"].called
     assert mocked_api["release_download_url_redirect"].called
 
-    assert (mock_backup_path / ZhenxunRepoManager.config.PYPROJECT_FILE_STRING).exists()
-    assert (
-        mock_backup_path / ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE_STRING
-    ).exists()
-    assert (
-        mock_backup_path / ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING
-    ).exists()
+    assert (mock_backup_path / PYPROJECT_FILE_STRING).exists()
+    assert (mock_backup_path / PYPROJECT_LOCK_FILE_STRING).exists()
+    assert (mock_backup_path / REQ_TXT_FILE_STRING).exists()
 
     assert not mock_download_gz_file.exists()
     assert not mock_download_zip_file.exists()
@@ -316,13 +351,12 @@ async def test_check_update_release(
     assert mock_pyproject_lock_file.read_bytes() == b"new"
     assert mock_req_txt_file.read_bytes() == b"new"
 
-    for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
+    for folder in REPLACE_FOLDERS:
         assert not (mock_base_path / folder).exists()
-    for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
+    for folder in REPLACE_FOLDERS:
         assert (mock_backup_path / folder).exists()
 
 
-@pytest.mark.xfail
 async def test_check_update_main(
     app: App,
     mocker: MockerFixture,
@@ -334,9 +368,12 @@ async def test_check_update_main(
     测试检查更新（正式环境）
     """
     from zhenxun.builtin_plugins.auto_update import _matcher
-    from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
-
-    ZhenxunRepoManager.zhenxun_zip_update = mocker.Mock(return_value="v0.2.2-e6f17c4")
+    from zhenxun.builtin_plugins.auto_update.config import (
+        PYPROJECT_FILE_STRING,
+        PYPROJECT_LOCK_FILE_STRING,
+        REPLACE_FOLDERS,
+        REQ_TXT_FILE_STRING,
+    )
 
     init_mocked_api(mocked_api=mocked_api)
 
@@ -354,7 +391,7 @@ async def test_check_update_main(
 
     # 确保目录下有一个子目录，以便 os.listdir() 能返回一个目录名
     mock_tmp_path.mkdir(parents=True, exist_ok=True)
-    for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
+    for folder in REPLACE_FOLDERS:
         (mock_base_path / folder).mkdir(parents=True, exist_ok=True)
 
     mock_pyproject_file.write_bytes(b"")
@@ -364,7 +401,7 @@ async def test_check_update_main(
     async with app.test_matcher(_matcher) as ctx:
         bot = create_bot(ctx)
         bot = cast(Bot, bot)
-        raw_message = "检查更新 main -r -z"
+        raw_message = "检查更新 main -r"
         event = _v11_group_message_event(
             raw_message,
             self_id=BotId.QQ_BOT,
@@ -383,30 +420,26 @@ async def test_check_update_main(
         ctx.should_call_api(
             "send_msg",
             _v11_private_message_send(
-                message="检测真寻已更新，当前版本：v0.2.2\n开始更新...",
+                message="检测真寻已更新，版本更新：v0.2.2\n开始更新...",
                 user_id=UserId.SUPERUSER,
             ),
         )
         ctx.should_call_send(
             event=event,
             message=Message(
-                "版本更新完成！\n"
+                "版本更新完成\n"
                 "版本: v0.2.2 -> v0.2.2-e6f17c4\n"
                 "请重新启动真寻以完成更新!\n"
-                "真寻资源更新完成!"
+                "资源文件更新成功！"
             ),
             result=None,
             bot=bot,
         )
         ctx.should_finished(_matcher)
     assert mocked_api["main_download_url"].called
-    assert (mock_backup_path / ZhenxunRepoManager.config.PYPROJECT_FILE_STRING).exists()
-    assert (
-        mock_backup_path / ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE_STRING
-    ).exists()
-    assert (
-        mock_backup_path / ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING
-    ).exists()
+    assert (mock_backup_path / PYPROJECT_FILE_STRING).exists()
+    assert (mock_backup_path / PYPROJECT_LOCK_FILE_STRING).exists()
+    assert (mock_backup_path / REQ_TXT_FILE_STRING).exists()
 
     assert not mock_download_gz_file.exists()
     assert not mock_download_zip_file.exists()
@@ -415,7 +448,7 @@ async def test_check_update_main(
     assert mock_pyproject_lock_file.read_bytes() == b"new"
     assert mock_req_txt_file.read_bytes() == b"new"
 
-    for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
+    for folder in REPLACE_FOLDERS:
         assert (mock_base_path / folder).exists()
-    for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
+    for folder in REPLACE_FOLDERS:
         assert (mock_backup_path / folder).exists()

tests/builtin_plugins/check/test_check.py

@@ -4,11 +4,12 @@ from pathlib import Path
 import platform
 from typing import cast
 
+import nonebot
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
+from respx import MockRouter
 
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
@@ -65,11 +66,9 @@ def init_mocker(mocker: MockerFixture, tmp_path: Path):
     mock_platform = mocker.patch("zhenxun.builtin_plugins.check.data_source.platform")
     mock_platform.uname.return_value = platform_uname
 
-    mock_render_service = mocker.patch(
-        "zhenxun.builtin_plugins.check.renderer_service.render"
-    )
-    mock_render_service_return = mocker.AsyncMock()
-    mock_render_service.return_value = mock_render_service_return
+    mock_template_to_pic = mocker.patch("zhenxun.builtin_plugins.check.template_to_pic")
+    mock_template_to_pic_return = mocker.AsyncMock()
+    mock_template_to_pic.return_value = mock_template_to_pic_return
 
     mock_build_message = mocker.patch(
         "zhenxun.builtin_plugins.check.MessageUtils.build_message"
@@ -77,21 +76,26 @@ def init_mocker(mocker: MockerFixture, tmp_path: Path):
     mock_build_message_return = mocker.AsyncMock()
     mock_build_message.return_value = mock_build_message_return
 
+    mock_template_path_new = tmp_path / "resources" / "template"
+    mocker.patch(
+        "zhenxun.builtin_plugins.check.TEMPLATE_PATH", new=mock_template_path_new
+    )
     return (
         mock_psutil,
         mock_cpuinfo,
         mock_platform,
-        mock_render_service,
-        mock_render_service_return,
+        mock_template_to_pic,
+        mock_template_to_pic_return,
         mock_build_message,
         mock_build_message_return,
+        mock_template_path_new,
     )
 
 
-@pytest.mark.xfail
 async def test_check(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -99,15 +103,18 @@ async def test_check(
     测试自检
     """
     from zhenxun.builtin_plugins.check import _self_check_matcher
+    from zhenxun.builtin_plugins.check.data_source import __get_version
+    from zhenxun.configs.config import BotConfig
 
     (
         mock_psutil,
         mock_cpuinfo,
         mock_platform,
-        mock_render_service,
-        mock_render_service_return,
+        mock_template_to_pic,
+        mock_template_to_pic_return,
         mock_build_message,
         mock_build_message_return,
+        mock_template_path_new,
     ) = init_mocker(mocker, tmp_path)
     async with app.test_matcher(_self_check_matcher) as ctx:
         bot = create_bot(ctx)
@@ -124,15 +131,49 @@ async def test_check(
         ctx.receive_event(bot=bot, event=event)
         ctx.should_ignore_rule(_self_check_matcher)
 
-    mock_render_service.assert_awaited_once()
-    mock_build_message.assert_called_once_with(mock_render_service_return)
+    data = {
+        "cpu_info": f"{mock_psutil.cpu_percent.return_value}% "
+        + f"- {mock_psutil.cpu_freq.return_value.current}Ghz "
+        + f"[{mock_psutil.cpu_count.return_value} core]",
+        "cpu_process": mock_psutil.cpu_percent.return_value,
+        "ram_info": f"{round(mock_psutil.virtual_memory.return_value.used / (1024 ** 3), 1)}"  # noqa: E501
+        + f" / {round(mock_psutil.virtual_memory.return_value.total / (1024 ** 3), 1)}"
+        + " GB",
+        "ram_process": mock_psutil.virtual_memory.return_value.percent,
+        "swap_info": f"{round(mock_psutil.swap_memory.return_value.used / (1024 ** 3), 1)}"  # noqa: E501
+        + f" / {round(mock_psutil.swap_memory.return_value.total / (1024 ** 3), 1)} GB",
+        "swap_process": mock_psutil.swap_memory.return_value.percent,
+        "disk_info": f"{round(mock_psutil.disk_usage.return_value.used / (1024 ** 3), 1)}"  # noqa: E501
+        + f" / {round(mock_psutil.disk_usage.return_value.total / (1024 ** 3), 1)} GB",
+        "disk_process": mock_psutil.disk_usage.return_value.percent,
+        "brand_raw": cpuinfo_get_cpu_info["brand_raw"],
+        "baidu": "red",
+        "google": "red",
+        "system": f"{platform_uname.system} " f"{platform_uname.release}",
+        "version": __get_version(),
+        "plugin_count": len(nonebot.get_loaded_plugins()),
+        "nickname": BotConfig.self_nickname,
+    }
+
+    mock_template_to_pic.assert_awaited_once_with(
+        template_path=str((mock_template_path_new / "check").absolute()),
+        template_name="main.html",
+        templates={"data": data},
+        pages={
+            "viewport": {"width": 195, "height": 750},
+            "base_url": f"file://{mock_template_path_new.absolute()}",
+        },
+        wait=2,
+    )
+    mock_template_to_pic.assert_awaited_once()
+    mock_build_message.assert_called_once_with(mock_template_to_pic_return)
     mock_build_message_return.send.assert_awaited_once()
 
 
-@pytest.mark.xfail
 async def test_check_arm(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -140,6 +181,8 @@ async def test_check_arm(
     测试自检（arm）
     """
     from zhenxun.builtin_plugins.check import _self_check_matcher
+    from zhenxun.builtin_plugins.check.data_source import __get_version
+    from zhenxun.configs.config import BotConfig
 
     platform_uname_arm = platform.uname_result(
         system="Linux",
@@ -160,10 +203,11 @@ async def test_check_arm(
         mock_psutil,
         mock_cpuinfo,
         mock_platform,
-        mock_render_service,
-        mock_render_service_return,
+        mock_template_to_pic,
+        mock_template_to_pic_return,
         mock_build_message,
         mock_build_message_return,
+        mock_template_path_new,
     ) = init_mocker(mocker, tmp_path)
 
     mock_platform.uname.return_value = platform_uname_arm
@@ -184,6 +228,35 @@ async def test_check_arm(
         )
         ctx.receive_event(bot=bot, event=event)
         ctx.should_ignore_rule(_self_check_matcher)
+    mock_template_to_pic.assert_awaited_once_with(
+        template_path=str((mock_template_path_new / "check").absolute()),
+        template_name="main.html",
+        templates={
+            "data": {
+                "cpu_info": "1.0% - 0.0Ghz [1 core]",
+                "cpu_process": 1.0,
+                "ram_info": "1.0 / 1.0 GB",
+                "ram_process": 100.0,
+                "swap_info": "1.0 / 1.0 GB",
+                "swap_process": 100.0,
+                "disk_info": "1.0 / 1.0 GB",
+                "disk_process": 100.0,
+                "brand_raw": "",
+                "baidu": "red",
+                "google": "red",
+                "system": f"{platform_uname_arm.system} "
+                f"{platform_uname_arm.release}",
+                "version": __get_version(),
+                "plugin_count": len(nonebot.get_loaded_plugins()),
+                "nickname": BotConfig.self_nickname,
+            }
+        },
+        pages={
+            "viewport": {"width": 195, "height": 750},
+            "base_url": f"file://{mock_template_path_new.absolute()}",
+        },
+        wait=2,
+    )
     mock_subprocess_check_output.assert_has_calls(
         [
             mocker.call(["lscpu"], env=mock_environ_copy_return),
@@ -197,6 +270,6 @@ async def test_check_arm(
             mocker.call().decode().split().__getitem__().__float__(),
         ]  # type: ignore
     )
-    mock_render_service.assert_awaited_once()
-    mock_build_message.assert_called_once_with(mock_render_service_return)
+    mock_template_to_pic.assert_awaited_once()
+    mock_build_message.assert_called_once_with(mock_template_to_pic_return)
     mock_build_message_return.send.assert_awaited_once()

tests/builtin_plugins/plugin_store/test_add_plugin.py

@@ -8,17 +8,21 @@ from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
 import pytest
 from pytest_mock import MockerFixture
+from respx import MockRouter
 
+from tests.builtin_plugins.plugin_store.utils import init_mocked_api
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
-test_path = Path(__file__).parent.parent.parent
 
-
-@pytest.mark.xfail
+@pytest.mark.parametrize("package_api", ["gh"])
+@pytest.mark.parametrize("is_commit", [True, False])
 async def test_add_plugin_basic(
+    package_api: str,
+    is_commit: bool,
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -27,11 +31,19 @@ async def test_add_plugin_basic(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mock_base_path = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
     )
 
+    mocked_api["zhenxun_bot_plugins_metadata"].respond(404)
+    if not is_commit:
+        mocked_api["zhenxun_bot_plugins_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit_proxy"].respond(404)
+
     plugin_id = "search_image"
 
     async with app.test_matcher(_matcher) as ctx:
@@ -59,13 +71,25 @@ async def test_add_plugin_basic(
             result=None,
             bot=bot,
         )
+    if is_commit:
+        assert mocked_api["search_image_plugin_file_init_commit"].called
+        assert mocked_api["basic_plugins"].called
+        assert mocked_api["extra_plugins"].called
+    else:
+        assert mocked_api["search_image_plugin_file_init"].called
+        assert mocked_api["basic_plugins_no_commit"].called
+        assert mocked_api["extra_plugins_no_commit"].called
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
-@pytest.mark.xfail
+@pytest.mark.parametrize("package_api", ["gh"])
+@pytest.mark.parametrize("is_commit", [True, False])
 async def test_add_plugin_basic_commit_version(
+    package_api: str,
+    is_commit: bool,
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -74,11 +98,18 @@ async def test_add_plugin_basic_commit_version(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mock_base_path = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
     )
 
+    mocked_api["zhenxun_bot_plugins_metadata_commit"].respond(404)
+    if not is_commit:
+        mocked_api["zhenxun_bot_plugins_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit_proxy"].respond(404)
     plugin_id = "bilibili_sub"
 
     async with app.test_matcher(_matcher) as ctx:
@@ -106,13 +137,28 @@ async def test_add_plugin_basic_commit_version(
             result=None,
             bot=bot,
         )
+    if package_api == "jsd":
+        assert mocked_api["zhenxun_bot_plugins_metadata_commit"].called
+    if package_api == "gh":
+        assert mocked_api["zhenxun_bot_plugins_tree_commit"].called
+    if is_commit:
+        assert mocked_api["basic_plugins"].called
+        assert mocked_api["extra_plugins"].called
+    else:
+        assert mocked_api["basic_plugins_no_commit"].called
+        assert mocked_api["extra_plugins_no_commit"].called
+    assert mocked_api["bilibili_sub_plugin_file_init"].called
     assert (mock_base_path / "plugins" / "bilibili_sub" / "__init__.py").is_file()
 
 
-@pytest.mark.xfail
+@pytest.mark.parametrize("package_api", ["gh"])
+@pytest.mark.parametrize("is_commit", [True, False])
 async def test_add_plugin_basic_is_not_dir(
+    package_api: str,
+    is_commit: bool,
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -121,11 +167,20 @@ async def test_add_plugin_basic_is_not_dir(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mock_base_path = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
     )
 
+    mocked_api["zhenxun_bot_plugins_metadata"].respond(404)
+
+    if not is_commit:
+        mocked_api["zhenxun_bot_plugins_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit_proxy"].respond(404)
+
     plugin_id = "jitang"
 
     async with app.test_matcher(_matcher) as ctx:
@@ -153,13 +208,25 @@ async def test_add_plugin_basic_is_not_dir(
             result=None,
             bot=bot,
         )
-    assert (mock_base_path / "plugins" / "jitang.py").is_file()
+    if is_commit:
+        assert mocked_api["jitang_plugin_file_commit"].called
+        assert mocked_api["basic_plugins"].called
+        assert mocked_api["extra_plugins"].called
+    else:
+        assert mocked_api["jitang_plugin_file"].called
+        assert mocked_api["basic_plugins_no_commit"].called
+        assert mocked_api["extra_plugins_no_commit"].called
+    assert (mock_base_path / "plugins" / "alapi" / "jitang.py").is_file()
 
 
-@pytest.mark.xfail
+@pytest.mark.parametrize("package_api", ["gh"])
+@pytest.mark.parametrize("is_commit", [True, False])
 async def test_add_plugin_extra(
+    package_api: str,
+    is_commit: bool,
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -168,11 +235,22 @@ async def test_add_plugin_extra(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mock_base_path = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
     )
 
+    mocked_api["zhenxun_github_sub_metadata"].respond(404)
+
+    if not is_commit:
+        mocked_api["zhenxun_github_sub_commit"].respond(404)
+        mocked_api["zhenxun_github_sub_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit_proxy"].respond(404)
+
     plugin_id = "github_sub"
 
     async with app.test_matcher(_matcher) as ctx:
@@ -200,19 +278,30 @@ async def test_add_plugin_extra(
             result=None,
             bot=bot,
         )
+    if is_commit:
+        assert mocked_api["github_sub_plugin_file_init_commit"].called
+        assert mocked_api["basic_plugins"].called
+        assert mocked_api["extra_plugins"].called
+    else:
+        assert mocked_api["github_sub_plugin_file_init"].called
+        assert mocked_api["basic_plugins_no_commit"].called
+        assert mocked_api["extra_plugins_no_commit"].called
     assert (mock_base_path / "plugins" / "github_sub" / "__init__.py").is_file()
 
 
-@pytest.mark.xfail
 async def test_plugin_not_exist_add(
     app: App,
+    mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
+    tmp_path: Path,
 ) -> None:
     """
     测试插件不存在，添加插件
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     plugin_id = -1
 
     async with app.test_matcher(_matcher) as ctx:
@@ -242,17 +331,19 @@ async def test_plugin_not_exist_add(
         )
 
 
-@pytest.mark.xfail
 async def test_add_plugin_exist(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
+    tmp_path: Path,
 ) -> None:
     """
     测试插件已经存在，添加插件
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.StoreManager.get_loaded_plugins",
         return_value=[("search_image", "0.1")],

tests/builtin_plugins/plugin_store/test_remove_plugin.py

@@ -8,17 +8,18 @@ from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
+from respx import MockRouter
 
+from tests.builtin_plugins.plugin_store.utils import get_content_bytes, init_mocked_api
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
 
-@pytest.mark.xfail
 async def test_remove_plugin(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -27,6 +28,7 @@ async def test_remove_plugin(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mock_base_path = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
@@ -36,7 +38,7 @@ async def test_remove_plugin(
     plugin_path.mkdir(parents=True, exist_ok=True)
 
     with open(plugin_path / "__init__.py", "wb") as f:
-        f.write(b"A_nmi")
+        f.write(get_content_bytes("search_image.py"))
 
     plugin_id = 1
 
@@ -59,19 +61,24 @@ async def test_remove_plugin(
             result=None,
             bot=bot,
         )
+    assert mocked_api["basic_plugins"].called
+    assert mocked_api["extra_plugins"].called
     assert not (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
-@pytest.mark.xfail
 async def test_plugin_not_exist_remove(
     app: App,
+    mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
+    tmp_path: Path,
 ) -> None:
     """
     测试插件不存在，移除插件
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     plugin_id = -1
 
     async with app.test_matcher(_matcher) as ctx:
@@ -95,10 +102,10 @@ async def test_plugin_not_exist_remove(
         )
 
 
-@pytest.mark.xfail
 async def test_remove_plugin_not_install(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -107,6 +114,7 @@ async def test_remove_plugin_not_install(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     _ = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",

tests/builtin_plugins/plugin_store/test_search_plugin.py

@@ -1,27 +1,33 @@
 from collections.abc import Callable
+from pathlib import Path
 from typing import cast
 
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
+from respx import MockRouter
 
+from tests.builtin_plugins.plugin_store.utils import init_mocked_api
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
 
-@pytest.mark.xfail
 async def test_search_plugin_name(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
+    tmp_path: Path,
 ) -> None:
     """
     测试搜索插件
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
+    from zhenxun.builtin_plugins.plugin_store.data_source import row_style
+
+    init_mocked_api(mocked_api=mocked_api)
 
     mock_table_page = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.ImageTemplate.table_page"
@@ -50,20 +56,44 @@ async def test_search_plugin_name(
             to_me=True,
         )
         ctx.receive_event(bot=bot, event=event)
+    mock_table_page.assert_awaited_once_with(
+        "商店插件列表",
+        "通过添加/移除插件 ID 来管理插件",
+        ["-", "ID", "名称", "简介", "作者", "版本", "类型"],
+        [
+            [
+                "",
+                4,
+                "github订阅",
+                "订阅github用户或仓库",
+                "xuanerwa",
+                "0.7",
+                "普通插件",
+            ]
+        ],
+        text_style=row_style,
+    )
     mock_build_message.assert_called_once_with(mock_table_page_return)
     mock_build_message_return.send.assert_awaited_once()
 
+    assert mocked_api["basic_plugins"].called
+    assert mocked_api["extra_plugins"].called
+
 
-@pytest.mark.xfail
 async def test_search_plugin_author(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
+    tmp_path: Path,
 ) -> None:
     """
     测试搜索插件，作者
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
+    from zhenxun.builtin_plugins.plugin_store.data_source import row_style
+
+    init_mocked_api(mocked_api=mocked_api)
 
     mock_table_page = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.ImageTemplate.table_page"
@@ -92,20 +122,43 @@ async def test_search_plugin_author(
             to_me=True,
         )
         ctx.receive_event(bot=bot, event=event)
+    mock_table_page.assert_awaited_once_with(
+        "商店插件列表",
+        "通过添加/移除插件 ID 来管理插件",
+        ["-", "ID", "名称", "简介", "作者", "版本", "类型"],
+        [
+            [
+                "",
+                4,
+                "github订阅",
+                "订阅github用户或仓库",
+                "xuanerwa",
+                "0.7",
+                "普通插件",
+            ]
+        ],
+        text_style=row_style,
+    )
     mock_build_message.assert_called_once_with(mock_table_page_return)
     mock_build_message_return.send.assert_awaited_once()
 
+    assert mocked_api["basic_plugins"].called
+    assert mocked_api["extra_plugins"].called
+
 
-@pytest.mark.xfail
 async def test_plugin_not_exist_search(
     app: App,
+    mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
+    tmp_path: Path,
 ) -> None:
     """
     测试插件不存在，搜索插件
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     plugin_name = "not_exist_plugin_name"
 
     async with app.test_matcher(_matcher) as ctx:

tests/builtin_plugins/plugin_store/test_update_all_plugin.py

@@ -6,17 +6,18 @@ from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
+from respx import MockRouter
 
+from tests.builtin_plugins.plugin_store.utils import init_mocked_api
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
 
-@pytest.mark.xfail
 async def test_update_all_plugin_basic_need_update(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -25,6 +26,7 @@ async def test_update_all_plugin_basic_need_update(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mock_base_path = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
@@ -61,13 +63,16 @@ async def test_update_all_plugin_basic_need_update(
             result=None,
             bot=bot,
         )
+    assert mocked_api["basic_plugins"].called
+    assert mocked_api["extra_plugins"].called
+    assert mocked_api["search_image_plugin_file_init_commit"].called
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
-@pytest.mark.xfail
 async def test_update_all_plugin_basic_is_new(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -76,13 +81,14 @@ async def test_update_all_plugin_basic_is_new(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
     )
     mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.StoreManager.get_loaded_plugins",
-        return_value=[("search_image", "0.2")],
+        return_value=[("search_image", "0.1")],
     )
 
     async with app.test_matcher(_matcher) as ctx:
@@ -110,3 +116,5 @@ async def test_update_all_plugin_basic_is_new(
             result=None,
             bot=bot,
         )
+    assert mocked_api["basic_plugins"].called
+    assert mocked_api["extra_plugins"].called

tests/builtin_plugins/plugin_store/test_update_plugin.py

@@ -6,17 +6,18 @@ from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
+from respx import MockRouter
 
+from tests.builtin_plugins.plugin_store.utils import init_mocked_api
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
 
-@pytest.mark.xfail
 async def test_update_plugin_basic_need_update(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -25,6 +26,7 @@ async def test_update_plugin_basic_need_update(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mock_base_path = mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
@@ -61,13 +63,16 @@ async def test_update_plugin_basic_need_update(
             result=None,
             bot=bot,
         )
+    assert mocked_api["basic_plugins"].called
+    assert mocked_api["extra_plugins"].called
+    assert mocked_api["search_image_plugin_file_init_commit"].called
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
-@pytest.mark.xfail
 async def test_update_plugin_basic_is_new(
     app: App,
     mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
     tmp_path: Path,
 ) -> None:
@@ -76,13 +81,14 @@ async def test_update_plugin_basic_is_new(
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.BASE_PATH",
         new=tmp_path / "zhenxun",
     )
     mocker.patch(
         "zhenxun.builtin_plugins.plugin_store.data_source.StoreManager.get_loaded_plugins",
-        return_value=[("search_image", "0.2")],
+        return_value=[("search_image", "0.1")],
     )
 
     plugin_id = 1
@@ -112,18 +118,23 @@ async def test_update_plugin_basic_is_new(
             result=None,
             bot=bot,
         )
+    assert mocked_api["basic_plugins"].called
+    assert mocked_api["extra_plugins"].called
 
 
-@pytest.mark.xfail
 async def test_plugin_not_exist_update(
     app: App,
+    mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
+    tmp_path: Path,
 ) -> None:
     """
     测试插件不存在，更新插件
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     plugin_id = -1
 
     async with app.test_matcher(_matcher) as ctx:
@@ -153,16 +164,19 @@ async def test_plugin_not_exist_update(
         )
 
 
-@pytest.mark.xfail
 async def test_update_plugin_not_install(
     app: App,
+    mocker: MockerFixture,
+    mocked_api: MockRouter,
     create_bot: Callable,
+    tmp_path: Path,
 ) -> None:
     """
     测试插件不存在，更新插件
     """
     from zhenxun.builtin_plugins.plugin_store import _matcher
 
+    init_mocked_api(mocked_api=mocked_api)
     plugin_id = 1
 
     async with app.test_matcher(_matcher) as ctx:

tests/builtin_plugins/plugin_store/utils.py

@@ -0,0 +1,147 @@
+# ruff: noqa: ASYNC230
+
+from pathlib import Path
+
+from respx import MockRouter
+
+from tests.utils import get_content_bytes as _get_content_bytes
+from tests.utils import get_response_json as _get_response_json
+
+
+def get_response_json(file: str) -> dict:
+    return _get_response_json(Path() / "plugin_store", file=file)
+
+
+def get_content_bytes(file: str) -> bytes:
+    return _get_content_bytes(Path() / "plugin_store", file)
+
+
+def init_mocked_api(mocked_api: MockRouter) -> None:
+    # metadata
+    mocked_api.get(
+        "https://data.jsdelivr.com/v1/packages/gh/zhenxun-org/zhenxun_bot_plugins@main",
+        name="zhenxun_bot_plugins_metadata",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_metadata.json"))
+    mocked_api.get(
+        "https://data.jsdelivr.com/v1/packages/gh/xuanerwa/zhenxun_github_sub@main",
+        name="zhenxun_github_sub_metadata",
+    ).respond(json=get_response_json("zhenxun_github_sub_metadata.json"))
+    mocked_api.get(
+        "https://data.jsdelivr.com/v1/packages/gh/zhenxun-org/zhenxun_bot_plugins@b101fbc",
+        name="zhenxun_bot_plugins_metadata_commit",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_metadata.json"))
+    mocked_api.get(
+        "https://data.jsdelivr.com/v1/packages/gh/xuanerwa/zhenxun_github_sub@f524632f78d27f9893beebdf709e0e7885cd08f1",
+        name="zhenxun_github_sub_metadata_commit",
+    ).respond(json=get_response_json("zhenxun_github_sub_metadata.json"))
+
+    # tree
+    mocked_api.get(
+        "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/git/trees/main?recursive=1",
+        name="zhenxun_bot_plugins_tree",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_tree.json"))
+    mocked_api.get(
+        "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/trees/main?recursive=1",
+        name="zhenxun_github_sub_tree",
+    ).respond(json=get_response_json("zhenxun_github_sub_tree.json"))
+    mocked_api.get(
+        "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/git/trees/b101fbc?recursive=1",
+        name="zhenxun_bot_plugins_tree_commit",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_tree.json"))
+    mocked_api.get(
+        "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/trees/f524632f78d27f9893beebdf709e0e7885cd08f1?recursive=1",
+        name="zhenxun_github_sub_tree_commit",
+    ).respond(json=get_response_json("zhenxun_github_sub_tree.json"))
+
+    mocked_api.head(
+        "https://raw.githubusercontent.com/",
+        name="head_raw",
+    ).respond(200, text="")
+
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins.json",
+        name="basic_plugins",
+    ).respond(json=get_response_json("basic_plugins.json"))
+    mocked_api.get(
+        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins@b101fbc/plugins.json",
+        name="basic_plugins_jsdelivr",
+    ).respond(200, json=get_response_json("basic_plugins.json"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/main/plugins.json",
+        name="basic_plugins_no_commit",
+    ).respond(json=get_response_json("basic_plugins.json"))
+    mocked_api.get(
+        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins@main/plugins.json",
+        name="basic_plugins_jsdelivr_no_commit",
+    ).respond(200, json=get_response_json("basic_plugins.json"))
+
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins_index/2ed61284873c526802752b12a3fd3b5e1a59d948/plugins.json",
+        name="extra_plugins",
+    ).respond(200, json=get_response_json("extra_plugins.json"))
+    mocked_api.get(
+        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins_index@2ed61284873c526802752b12a3fd3b5e1a59d948/plugins.json",
+        name="extra_plugins_jsdelivr",
+    ).respond(200, json=get_response_json("extra_plugins.json"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins_index/index/plugins.json",
+        name="extra_plugins_no_commit",
+    ).respond(200, json=get_response_json("extra_plugins.json"))
+    mocked_api.get(
+        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins_index@index/plugins.json",
+        name="extra_plugins_jsdelivr_no_commit",
+    ).respond(200, json=get_response_json("extra_plugins.json"))
+
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/main/plugins/search_image/__init__.py",
+        name="search_image_plugin_file_init",
+    ).respond(content=get_content_bytes("search_image.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins/search_image/__init__.py",
+        name="search_image_plugin_file_init_commit",
+    ).respond(content=get_content_bytes("search_image.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/main/plugins/alapi/jitang.py",
+        name="jitang_plugin_file",
+    ).respond(content=get_content_bytes("jitang.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins/alapi/jitang.py",
+        name="jitang_plugin_file_commit",
+    ).respond(content=get_content_bytes("jitang.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/xuanerwa/zhenxun_github_sub/main/github_sub/__init__.py",
+        name="github_sub_plugin_file_init",
+    ).respond(content=get_content_bytes("github_sub.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/xuanerwa/zhenxun_github_sub/f524632f78d27f9893beebdf709e0e7885cd08f1/github_sub/__init__.py",
+        name="github_sub_plugin_file_init_commit",
+    ).respond(content=get_content_bytes("github_sub.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins/bilibili_sub/__init__.py",
+        name="bilibili_sub_plugin_file_init",
+    ).respond(content=get_content_bytes("bilibili_sub.py"))
+
+    mocked_api.get(
+        "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/commits/main",
+        name="zhenxun_bot_plugins_commit",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_commit.json"))
+    mocked_api.get(
+        "https://git-api.zhenxun.org/repos/zhenxun-org/zhenxun_bot_plugins/commits/main",
+        name="zhenxun_bot_plugins_commit_proxy",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_commit.json"))
+    mocked_api.get(
+        "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins_index/commits/index",
+        name="zhenxun_bot_plugins_index_commit",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_index_commit.json"))
+    mocked_api.get(
+        "https://git-api.zhenxun.org/repos/zhenxun-org/zhenxun_bot_plugins_index/commits/index",
+        name="zhenxun_bot_plugins_index_commit_proxy",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_index_commit.json"))
+    mocked_api.get(
+        "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/commits/main",
+        name="zhenxun_github_sub_commit",
+    ).respond(json=get_response_json("zhenxun_github_sub_commit.json"))
+    mocked_api.get(
+        "https://git-api.zhenxun.org/repos/xuanerwa/zhenxun_github_sub/commits/main",
+        name="zhenxun_github_sub_commit_proxy",
+    ).respond(json=get_response_json("zhenxun_github_sub_commit.json"))

tests/content/plugin_store/bilibili_sub.py

@@ -0,0 +1,37 @@
+from nonebot.plugin import PluginMetadata
+
+from zhenxun.configs.utils import PluginExtraData
+
+__plugin_meta__ = PluginMetadata(
+    name="B站订阅",
+    description="非常便利的B站订阅通知",
+    usage="""
+        usage：
+            B站直播，番剧，UP动态开播等提醒
+            主播订阅相当于 直播间订阅 + UP订阅
+            指令：
+                添加订阅 ['主播'/'UP'/'番剧'] [id/链接/番名]
+                删除订阅 ['主播'/'UP'/'id'] [id]
+                查看订阅
+            示例：
+                添加订阅主播 2345344 <-(直播房间id)
+                添加订阅UP 2355543 <-(个人主页id)
+                添加订阅番剧 史莱姆 <-(支持模糊搜索)
+                添加订阅番剧 125344 <-(番剧id)
+                删除订阅id 2324344 <-(任意id，通过查看订阅获取)
+        """.strip(),
+    extra=PluginExtraData(
+        author="HibiKier",
+        version="0.3-b101fbc",
+        superuser_help="""
+    登录b站获取cookie防止风控：
+            bil_check/检测b站
+            bil_login/登录b站
+            bil_logout/退出b站 uid
+            示例:
+                登录b站
+                检测b站
+                bil_logout 12345<-(退出登录的b站uid，通过检测b站获取)
+        """,
+    ).to_dict(),
+)

tests/content/plugin_store/github_sub.py

@@ -0,0 +1,24 @@
+from nonebot.plugin import PluginMetadata
+
+from zhenxun.configs.utils import PluginExtraData
+
+__plugin_meta__ = PluginMetadata(
+    name="github订阅",
+    description="订阅github用户或仓库",
+    usage="""
+    usage：
+        github新Comment，PR，Issue等提醒
+    指令：
+        添加github ['用户'/'仓库'] [用户名/{owner/repo}]
+        删除github [用户名/{owner/repo}]
+        查看github
+        示例：添加github订阅 用户 HibiKier
+        示例：添加gb订阅 仓库 HibiKier/zhenxun_bot
+        示例：添加github 用户 HibiKier
+        示例：删除gb订阅 HibiKier
+    """.strip(),
+    extra=PluginExtraData(
+        author="xuanerwa",
+        version="0.7",
+    ).to_dict(),
+)

tests/content/plugin_store/jitang.py

@@ -0,0 +1,17 @@
+from nonebot.plugin import PluginMetadata
+
+from zhenxun.configs.utils import PluginExtraData
+
+__plugin_meta__ = PluginMetadata(
+    name="鸡汤",
+    description="喏，亲手为你煮的鸡汤",
+    usage="""
+    不喝点什么感觉有点不舒服
+    指令：
+        鸡汤
+    """.strip(),
+    extra=PluginExtraData(
+        author="HibiKier",
+        version="0.1",
+    ).to_dict(),
+)

tests/content/plugin_store/search_image.py

@@ -0,0 +1,18 @@
+from nonebot.plugin import PluginMetadata
+
+from zhenxun.configs.utils import PluginExtraData
+
+__plugin_meta__ = PluginMetadata(
+    name="识图",
+    description="以图搜图，看破本源",
+    usage="""
+    识别图片 [二次元图片]
+    指令：
+        识图 [图片]
+    """.strip(),
+    extra=PluginExtraData(
+        author="HibiKier",
+        version="0.1",
+        menu_type="一些工具",
+    ).to_dict(),
+)

tests/response/plugin_store/basic_plugins.json

@@ -0,0 +1,46 @@
+[
+  {
+    "name": "鸡汤",
+    "module": "jitang",
+    "module_path": "plugins.alapi.jitang",
+    "description": "喏，亲手为你煮的鸡汤",
+    "usage": "不喝点什么感觉有点不舒服\n    指令：\n        鸡汤",
+    "author": "HibiKier",
+    "version": "0.1",
+    "plugin_type": "NORMAL",
+    "is_dir": false
+  },
+  {
+    "name": "识图",
+    "module": "search_image",
+    "module_path": "plugins.search_image",
+    "description": "以图搜图，看破本源",
+    "usage": "识别图片 [二次元图片]\n    指令：\n        识图 [图片]",
+    "author": "HibiKier",
+    "version": "0.1",
+    "plugin_type": "NORMAL",
+    "is_dir": true
+  },
+  {
+    "name": "网易云热评",
+    "module": "comments_163",
+    "module_path": "plugins.alapi.comments_163",
+    "description": "生了个人，我很抱歉",
+    "usage": "到点了，还是防不了下塔\n    指令：\n        网易云热评/到点了/12点了",
+    "author": "HibiKier",
+    "version": "0.1",
+    "plugin_type": "NORMAL",
+    "is_dir": false
+  },
+  {
+    "name": "B站订阅",
+    "module": "bilibili_sub",
+    "module_path": "plugins.bilibili_sub",
+    "description": "非常便利的B站订阅通知",
+    "usage": "B站直播，番剧，UP动态开播等提醒",
+    "author": "HibiKier",
+    "version": "0.3-b101fbc",
+    "plugin_type": "NORMAL",
+    "is_dir": true
+  }
+]

tests/response/plugin_store/extra_plugins.json

@@ -0,0 +1,26 @@
+[
+  {
+    "name": "github订阅",
+    "module": "github_sub",
+    "module_path": "github_sub",
+    "description": "订阅github用户或仓库",
+    "usage": "usage：\n        github新Comment，PR，Issue等提醒\n    指令：\n        添加github ['用户'/'仓库'] [用户名/{owner/repo}]\n        删除github [用户名/{owner/repo}]\n        查看github\n        示例：添加github订阅 用户 HibiKier\n        示例：添加gb订阅 仓库 HibiKier/zhenxun_bot\n        示例：添加github 用户 HibiKier\n        示例：删除gb订阅 HibiKier",
+    "author": "xuanerwa",
+    "version": "0.7",
+    "plugin_type": "NORMAL",
+    "is_dir": true,
+    "github_url": "https://github.com/xuanerwa/zhenxun_github_sub"
+  },
+  {
+    "name": "Minecraft查服",
+    "module": "mc_check",
+    "module_path": "mc_check",
+    "description": "Minecraft服务器状态查询，支持IPv6",
+    "usage": "Minecraft服务器状态查询，支持IPv6\n用法：\n\t查服 [ip]:[端口] / 查服 [ip]\n\t设置语言 zh-cn\n\t当前语言\n\t语言列表\neg:\t\nmcheck ip:port / mcheck ip\n\tset_lang en\n\tlang_now\n\tlang_list",
+    "author": "molanp",
+    "version": "1.13",
+    "plugin_type": "NORMAL",
+    "is_dir": true,
+    "github_url": "https://github.com/molanp/zhenxun_check_Minecraft"
+  }
+]

tests/response/plugin_store/zhenxun_bot_plugins_commit.json

@@ -0,0 +1,101 @@
+{
+  "sha": "b101fbc",
+  "node_id": "C_kwDOMndPGNoAKGIxMDFmYmNlODg4NjA4ZTJiYmU1YjVmZDI3OWUxNDY1MTY4ODEyYzc",
+  "commit": {
+    "author": {
+      "name": "xuaner",
+      "email": "xuaner_wa@qq.com",
+      "date": "2024-09-20T12:08:27Z"
+    },
+    "committer": {
+      "name": "xuaner",
+      "email": "xuaner_wa@qq.com",
+      "date": "2024-09-20T12:08:27Z"
+    },
+    "message": "🐛修复B站订阅bug",
+    "tree": {
+      "sha": "0566306219a434f7122798647498faef692c1879",
+      "url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/git/trees/0566306219a434f7122798647498faef692c1879"
+    },
+    "url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/git/commits/b101fbce888608e2bbe5b5fd279e1465168812c7",
+    "comment_count": 0,
+    "verification": {
+      "verified": false,
+      "reason": "unsigned",
+      "signature": null,
+      "payload": null,
+      "verified_at": null
+    }
+  },
+  "url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/commits/b101fbce888608e2bbe5b5fd279e1465168812c7",
+  "html_url": "https://github.com/zhenxun-org/zhenxun_bot_plugins/commit/b101fbce888608e2bbe5b5fd279e1465168812c7",
+  "comments_url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/commits/b101fbce888608e2bbe5b5fd279e1465168812c7/comments",
+  "author": {
+    "login": "xuanerwa",
+    "id": 58063798,
+    "node_id": "MDQ6VXNlcjU4MDYzNzk4",
+    "avatar_url": "https://avatars.githubusercontent.com/u/58063798?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/xuanerwa",
+    "html_url": "https://github.com/xuanerwa",
+    "followers_url": "https://api.github.com/users/xuanerwa/followers",
+    "following_url": "https://api.github.com/users/xuanerwa/following{/other_user}",
+    "gists_url": "https://api.github.com/users/xuanerwa/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/xuanerwa/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/xuanerwa/subscriptions",
+    "organizations_url": "https://api.github.com/users/xuanerwa/orgs",
+    "repos_url": "https://api.github.com/users/xuanerwa/repos",
+    "events_url": "https://api.github.com/users/xuanerwa/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/xuanerwa/received_events",
+    "type": "User",
+    "user_view_type": "public",
+    "site_admin": false
+  },
+  "committer": {
+    "login": "xuanerwa",
+    "id": 58063798,
+    "node_id": "MDQ6VXNlcjU4MDYzNzk4",
+    "avatar_url": "https://avatars.githubusercontent.com/u/58063798?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/xuanerwa",
+    "html_url": "https://github.com/xuanerwa",
+    "followers_url": "https://api.github.com/users/xuanerwa/followers",
+    "following_url": "https://api.github.com/users/xuanerwa/following{/other_user}",
+    "gists_url": "https://api.github.com/users/xuanerwa/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/xuanerwa/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/xuanerwa/subscriptions",
+    "organizations_url": "https://api.github.com/users/xuanerwa/orgs",
+    "repos_url": "https://api.github.com/users/xuanerwa/repos",
+    "events_url": "https://api.github.com/users/xuanerwa/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/xuanerwa/received_events",
+    "type": "User",
+    "user_view_type": "public",
+    "site_admin": false
+  },
+  "parents": [
+    {
+      "sha": "a545dfa0c4e149595f7ddd50dc34c55513738fb9",
+      "url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/commits/a545dfa0c4e149595f7ddd50dc34c55513738fb9",
+      "html_url": "https://github.com/zhenxun-org/zhenxun_bot_plugins/commit/a545dfa0c4e149595f7ddd50dc34c55513738fb9"
+    }
+  ],
+  "stats": {
+    "total": 4,
+    "additions": 2,
+    "deletions": 2
+  },
+  "files": [
+    {
+      "sha": "0fbc9695db04c56174e3bff933f670d8d2df2abc",
+      "filename": "plugins/bilibili_sub/data_source.py",
+      "status": "modified",
+      "additions": 2,
+      "deletions": 2,
+      "changes": 4,
+      "blob_url": "https://github.com/zhenxun-org/zhenxun_bot_plugins/blob/b101fbce888608e2bbe5b5fd279e1465168812c7/plugins%2Fbilibili_sub%2Fdata_source.py",
+      "raw_url": "https://github.com/zhenxun-org/zhenxun_bot_plugins/raw/b101fbce888608e2bbe5b5fd279e1465168812c7/plugins%2Fbilibili_sub%2Fdata_source.py",
+      "contents_url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/contents/plugins%2Fbilibili_sub%2Fdata_source.py?ref=b101fbce888608e2bbe5b5fd279e1465168812c7",
+      "patch": "@@ -271,14 +271,14 @@ async def _get_live_status(id_: int) -> list:\n     sub = await BilibiliSub.get_or_none(sub_id=id_)\n     msg_list = []\n     if sub.live_status != live_status:\n+        await BilibiliSub.sub_handle(id_, live_status=live_status)\n         image = None\n         try:\n             image_bytes = await fetch_image_bytes(cover)\n             image = BuildImage(background = image_bytes)\n         except Exception as e:\n                 logger.error(f\"图片构造失败，错误信息：{e}\")\n     if sub.live_status in [0, 2] and live_status == 1 and image:\n-        await BilibiliSub.sub_handle(id_, live_status=live_status)\n         msg_list = [\n             image,\n             \"\\n\",\n@@ -322,7 +322,7 @@ async def _get_up_status(id_: int) -> list:\n         video = video_info[\"list\"][\"vlist\"][0]\n         latest_video_created = video[\"created\"]\n     msg_list = []\n-    if dynamic_img:\n+    if dynamic_img and _user.dynamic_upload_time < dynamic_upload_time:\n         await BilibiliSub.sub_handle(id_, dynamic_upload_time=dynamic_upload_time)\n         msg_list = [f\"{uname} 发布了动态！📢\\n\", dynamic_img, f\"\\n查看详情：{link}\"]\n     if ("
+    }
+  ]
+}

tests/response/plugin_store/zhenxun_bot_plugins_index_commit.json

@@ -0,0 +1,101 @@
+{
+    "sha": "2ed61284873c526802752b12a3fd3b5e1a59d948",
+    "node_id": "C_kwDOGK5Du9oAKDJlZDYxMjg0ODczYzUyNjgwMjc1MmIxMmEzZmQzYjVlMWE1OWQ5NDg",
+    "commit": {
+      "author": {
+        "name": "zhenxunflow[bot]",
+        "email": "179375394+zhenxunflow[bot]@users.noreply.github.com",
+        "date": "2025-01-26T09:04:55Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2025-01-26T09:04:55Z"
+      },
+      "message": ":beers: publish plugin AI全家桶 (#235) (#236)\n\nCo-authored-by: molanp <molanp@users.noreply.github.com>",
+      "tree": {
+        "sha": "64ea463e084b6ab0def0322c6ad53799054ec9b3",
+        "url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins_index/git/trees/64ea463e084b6ab0def0322c6ad53799054ec9b3"
+      },
+      "url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins_index/git/commits/2ed61284873c526802752b12a3fd3b5e1a59d948",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsFcBAABCAAQBQJnlfq3CRC1aQ7uu5UhlAAA+n0QADPVjQQIHFlNcTEgdq3LGQ1X\nm8+H5N07E5JD+83LdyU9/YOvqY/WURwFsQ0T4+23icUWEOD4LB5qZIdVJBYHseto\nbJNmYd1kZxpvsONoiK/2Uk6JoeVnEQIR+dTbB0wBlbL0lRt1WtTXHpLQbFXuXn3q\nJh4SdSj283UZ6D2sBADblPZ7DqaTmLlpgwrTPx0OH5wIhcuORkzOl6x0DabcVAYu\nu5zHSKM9c7g+jEmrqRuVy+ZlZMDPN4S3gDNzEhoTn4tn+KNzSIja4n7ZMRD+1a5X\nMIP3aXcVBqCyuYc6DU76IvjlaL/MjnlPwfOtx1zu+pNxZKNaSpojtqopp3blfk0E\n8s8lD9utDgUaUrdPWgpiMDjj+oNMye91CGomNDfv0fNGUlBGT6r48qaq1z8BwAAR\nzgDsF13kDuKTTkT/6T8CdgCpJtwvxMptUr2XFRtn4xwf/gJdqrbEc4fHTOSHqxzh\ncDfXuP+Sorla4oJ0duygTsulpr/zguX8RJWJml35VjERw54ARAVvhZn19G9qQVJo\n2QIp+xtyTjkM3yTeN4UDXFt4lDuxz3+l1MBduj+CHn+WTgxyJUpX2TA1GVfni9xT\npOMOtzuDQfDIxTNB6hFjSWATb1/E5ys1lfK09n+dRhmvC/Be+b5M4WlyX3cqy/za\ns0XxuZ+CHzLfHaPxFUem\n=VYpl\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 64ea463e084b6ab0def0322c6ad53799054ec9b3\nparent 5df26081d40e3000a7beedb73954d4df397c93fa\nauthor zhenxunflow[bot] <179375394+zhenxunflow[bot]@users.noreply.github.com> 1737882295 +0800\ncommitter GitHub <noreply@github.com> 1737882295 +0800\n\n:beers: publish plugin AI全家桶 (#235) (#236)\n\nCo-authored-by: molanp <molanp@users.noreply.github.com>",
+        "verified_at": "2025-01-26T09:04:58Z"
+      }
+    },
+    "url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins_index/commits/2ed61284873c526802752b12a3fd3b5e1a59d948",
+    "html_url": "https://github.com/zhenxun-org/zhenxun_bot_plugins_index/commit/2ed61284873c526802752b12a3fd3b5e1a59d948",
+    "comments_url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins_index/commits/2ed61284873c526802752b12a3fd3b5e1a59d948/comments",
+    "author": {
+      "login": "zhenxunflow[bot]",
+      "id": 179375394,
+      "node_id": "BOT_kgDOCrENIg",
+      "avatar_url": "https://avatars.githubusercontent.com/in/978723?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/zhenxunflow%5Bbot%5D",
+      "html_url": "https://github.com/apps/zhenxunflow",
+      "followers_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/zhenxunflow%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "5df26081d40e3000a7beedb73954d4df397c93fa",
+        "url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins_index/commits/5df26081d40e3000a7beedb73954d4df397c93fa",
+        "html_url": "https://github.com/zhenxun-org/zhenxun_bot_plugins_index/commit/5df26081d40e3000a7beedb73954d4df397c93fa"
+      }
+    ],
+    "stats": {
+      "total": 11,
+      "additions": 11,
+      "deletions": 0
+    },
+    "files": [
+      {
+        "sha": "3d98392c25d38f5d375b830aed6e2298e47e5601",
+        "filename": "plugins.json",
+        "status": "modified",
+        "additions": 11,
+        "deletions": 0,
+        "changes": 11,
+        "blob_url": "https://github.com/zhenxun-org/zhenxun_bot_plugins_index/blob/2ed61284873c526802752b12a3fd3b5e1a59d948/plugins.json",
+        "raw_url": "https://github.com/zhenxun-org/zhenxun_bot_plugins_index/raw/2ed61284873c526802752b12a3fd3b5e1a59d948/plugins.json",
+        "contents_url": "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins_index/contents/plugins.json?ref=2ed61284873c526802752b12a3fd3b5e1a59d948",
+        "patch": "@@ -53,5 +53,16 @@\n     \"plugin_type\": \"NORMAL\",\n     \"is_dir\": true,\n     \"github_url\": \"https://github.com/PackageInstaller/zhenxun_plugin_draw_painting/tree/master\"\n+  },\n+  \"AI全家桶\": {\n+    \"module\": \"zhipu_toolkit\",\n+    \"module_path\": \"zhipu_toolkit\",\n+    \"description\": \"AI全家桶，一次安装，到处使用，省时省力省心\",\n+    \"usage\": \"AI全家桶，一次安装，到处使用，省时省力省心\\n    usage:\\n        生成图片 <prompt>\\n        生成视频 <prompt>\\n        清理我的会话:   用于清理你与AI的聊天记录\\n    或者与机器人聊天，\\n    例如；\\n        @Bot抱抱\\n        小真寻老婆\",\n+    \"author\": \"molanp\",\n+    \"version\": \"0.1\",\n+    \"plugin_type\": \"NORMAL\",\n+    \"is_dir\": true,\n+    \"github_url\": \"https://github.com/molanp/zhenxun_plugin_zhipu_toolkit\"\n   }\n }"
+      }
+    ]
+  }

tests/response/plugin_store/zhenxun_bot_plugins_metadata.json

@@ -0,0 +1,83 @@
+{
+  "type": "gh",
+  "name": "zhenxun-org/zhenxun_bot_plugins",
+  "version": "main",
+  "default": null,
+  "files": [
+    {
+      "type": "directory",
+      "name": "plugins",
+      "files": [
+        {
+          "type": "directory",
+          "name": "search_image",
+          "files": [
+            {
+              "type": "file",
+              "name": "__init__.py",
+              "hash": "a4Yp9HPoBzMwvnQDT495u0yYqTQWofkOyHxEi1FdVb0=",
+              "size": 3010
+            }
+          ]
+        },
+        {
+          "type": "directory",
+          "name": "alapi",
+          "files": [
+            {
+              "type": "file",
+              "name": "__init__.py",
+              "hash": "ndDxtO0pAq3ZTb4RdqW7FTDgOGC/RjS1dnwdaQfT0uQ=",
+              "size": 284
+            },
+            {
+              "type": "file",
+              "name": "_data_source.py",
+              "hash": "KOLqtj4TQWWQco5bA4tWFc7A0z1ruMyDk1RiKeqJHRA=",
+              "size": 919
+            },
+            {
+              "type": "file",
+              "name": "comments_163.py",
+              "hash": "Q5pZsj1Pj+EJMdKYcPtLqejcXAWUQIoXVQG49PZPaSI=",
+              "size": 1593
+            },
+            {
+              "type": "file",
+              "name": "cover.py",
+              "hash": "QSjtcy0oVrjaRiAWZKmUJlp0L4DQqEcdYNmExNo9mgc=",
+              "size": 1438
+            },
+            {
+              "type": "file",
+              "name": "jitang.py",
+              "hash": "xh43Osxt0xogTH448gUMC+/DaSGmCFme8DWUqC25IbU=",
+              "size": 1411
+            },
+            {
+              "type": "file",
+              "name": "poetry.py",
+              "hash": "Aj2unoNQboj3/0LhIrYU+dCa5jvMdpjMYXYUayhjuz4=",
+              "size": 1530
+            }
+          ]
+        },
+        {
+          "type": "directory",
+          "name": "bilibili_sub",
+          "files": [
+            {
+              "type": "file",
+              "name": "__init__.py",
+              "hash": "407DCgNFcZnuEK+d716j8EWrFQc4Nlxa35V3yemy3WQ=",
+              "size": 14293
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "links": {
+    "stats": "https://data.jsdelivr.com/v1/stats/packages/gh/zhenxun-org/zhenxun_bot_plugins@main"
+  }
+}

tests/response/plugin_store/zhenxun_github_sub_commit.json

@@ -0,0 +1,101 @@
+{
+    "sha": "f524632f78d27f9893beebdf709e0e7885cd08f1",
+    "node_id": "C_kwDOJAjBPdoAKGY1MjQ2MzJmNzhkMjdmOTg5M2JlZWJkZjcwOWUwZTc4ODVjZDA4ZjE",
+    "commit": {
+      "author": {
+        "name": "xuaner",
+        "email": "xuaner_wa@qq.com",
+        "date": "2024-11-18T18:17:15Z"
+      },
+      "committer": {
+        "name": "xuaner",
+        "email": "xuaner_wa@qq.com",
+        "date": "2024-11-18T18:17:15Z"
+      },
+      "message": "fix bug",
+      "tree": {
+        "sha": "b6b1b4f06cc869b9f38d7b51bdca3a2c575255e4",
+        "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/trees/b6b1b4f06cc869b9f38d7b51bdca3a2c575255e4"
+      },
+      "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/commits/f524632f78d27f9893beebdf709e0e7885cd08f1",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null,
+        "verified_at": null
+      }
+    },
+    "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/commits/f524632f78d27f9893beebdf709e0e7885cd08f1",
+    "html_url": "https://github.com/xuanerwa/zhenxun_github_sub/commit/f524632f78d27f9893beebdf709e0e7885cd08f1",
+    "comments_url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/commits/f524632f78d27f9893beebdf709e0e7885cd08f1/comments",
+    "author": {
+      "login": "xuanerwa",
+      "id": 58063798,
+      "node_id": "MDQ6VXNlcjU4MDYzNzk4",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58063798?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/xuanerwa",
+      "html_url": "https://github.com/xuanerwa",
+      "followers_url": "https://api.github.com/users/xuanerwa/followers",
+      "following_url": "https://api.github.com/users/xuanerwa/following{/other_user}",
+      "gists_url": "https://api.github.com/users/xuanerwa/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/xuanerwa/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/xuanerwa/subscriptions",
+      "organizations_url": "https://api.github.com/users/xuanerwa/orgs",
+      "repos_url": "https://api.github.com/users/xuanerwa/repos",
+      "events_url": "https://api.github.com/users/xuanerwa/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/xuanerwa/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "xuanerwa",
+      "id": 58063798,
+      "node_id": "MDQ6VXNlcjU4MDYzNzk4",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58063798?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/xuanerwa",
+      "html_url": "https://github.com/xuanerwa",
+      "followers_url": "https://api.github.com/users/xuanerwa/followers",
+      "following_url": "https://api.github.com/users/xuanerwa/following{/other_user}",
+      "gists_url": "https://api.github.com/users/xuanerwa/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/xuanerwa/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/xuanerwa/subscriptions",
+      "organizations_url": "https://api.github.com/users/xuanerwa/orgs",
+      "repos_url": "https://api.github.com/users/xuanerwa/repos",
+      "events_url": "https://api.github.com/users/xuanerwa/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/xuanerwa/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "91e5e2c792e79193830441d555769aa54acd2d15",
+        "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/commits/91e5e2c792e79193830441d555769aa54acd2d15",
+        "html_url": "https://github.com/xuanerwa/zhenxun_github_sub/commit/91e5e2c792e79193830441d555769aa54acd2d15"
+      }
+    ],
+    "stats": {
+      "total": 2,
+      "additions": 1,
+      "deletions": 1
+    },
+    "files": [
+      {
+        "sha": "764a5f7b81554c4c10d29486ea5d9105e505cec3",
+        "filename": "github_sub/__init__.py",
+        "status": "modified",
+        "additions": 1,
+        "deletions": 1,
+        "changes": 2,
+        "blob_url": "https://github.com/xuanerwa/zhenxun_github_sub/blob/f524632f78d27f9893beebdf709e0e7885cd08f1/github_sub%2F__init__.py",
+        "raw_url": "https://github.com/xuanerwa/zhenxun_github_sub/raw/f524632f78d27f9893beebdf709e0e7885cd08f1/github_sub%2F__init__.py",
+        "contents_url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/contents/github_sub%2F__init__.py?ref=f524632f78d27f9893beebdf709e0e7885cd08f1",
+        "patch": "@@ -168,7 +168,7 @@ async def _(session: EventSession):\n # 推送\n @scheduler.scheduled_job(\n     \"interval\",\n-    seconds=base_config.get(\"CHECK_API_TIME\") if base_config.get(\"CHECK_TIME\") else 30,\n+    seconds=base_config.get(\"CHECK_API_TIME\") if base_config.get(\"CHECK_API_TIME\") else 30,\n )\n async def _():\n     bots = nonebot.get_bots()"
+      }
+    ]
+  }

tests/response/plugin_store/zhenxun_github_sub_metadata.json

@@ -0,0 +1,23 @@
+{
+  "type": "gh",
+  "name": "xuanerwa/zhenxun_github_sub",
+  "version": "main",
+  "default": null,
+  "files": [
+    {
+      "type": "directory",
+      "name": "github_sub",
+      "files": [
+        {
+          "type": "file",
+          "name": "__init__.py",
+          "hash": "z1C5BBK0+atbDghbyRlF2xIDwk0HQdHM1yXQZkF7/t8=",
+          "size": 7551
+        }
+      ]
+    }
+  ],
+  "links": {
+    "stats": "https://data.jsdelivr.com/v1/stats/packages/gh/xuanerwa/zhenxun_github_sub@main"
+  }
+}

tests/response/plugin_store/zhenxun_github_sub_tree.json

@@ -0,0 +1,38 @@
+{
+  "sha": "438298b9e88f9dafa7020e99d7c7b4c98f93aea6",
+  "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/trees/438298b9e88f9dafa7020e99d7c7b4c98f93aea6",
+  "tree": [
+    {
+      "path": "LICENSE",
+      "mode": "100644",
+      "type": "blob",
+      "sha": "f288702d2fa16d3cdf0035b15a9fcbc552cd88e7",
+      "size": 35149,
+      "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/blobs/f288702d2fa16d3cdf0035b15a9fcbc552cd88e7"
+    },
+    {
+      "path": "README.md",
+      "mode": "100644",
+      "type": "blob",
+      "sha": "e974cfc9b973d4a041f03e693ea20563a933b7ca",
+      "size": 955,
+      "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/blobs/e974cfc9b973d4a041f03e693ea20563a933b7ca"
+    },
+    {
+      "path": "github_sub",
+      "mode": "040000",
+      "type": "tree",
+      "sha": "0f7d76bcf472e2ab0610fa542b067633d6e3ae7e",
+      "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/trees/0f7d76bcf472e2ab0610fa542b067633d6e3ae7e"
+    },
+    {
+      "path": "github_sub/__init__.py",
+      "mode": "100644",
+      "type": "blob",
+      "sha": "7d17fd49fe82fa3897afcef61b2c694ed93a4ba3",
+      "size": 7551,
+      "url": "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/blobs/7d17fd49fe82fa3897afcef61b2c694ed93a4ba3"
+    }
+  ],
+  "truncated": false
+}

zhenxun/builtin_plugins/__init__.py

@@ -86,7 +86,7 @@ from bag_users t1
 @PriorityLifecycle.on_startup(priority=5)
 async def _():
     if not ZhenxunRepoManager.check_resources_exists():
-        await ZhenxunRepoManager.resources_update()
+        await ZhenxunRepoManager.resources_update(branch="test")
     """签到与用户的数据迁移"""
     if goods_list := await GoodsInfo.filter(uuid__isnull=True).all():
         for goods in goods_list:

zhenxun/builtin_plugins/admin/admin_help/__init__.py

@@ -2,14 +2,18 @@ from nonebot.plugin import PluginMetadata
 from nonebot_plugin_alconna import Alconna, Arparma, on_alconna
 from nonebot_plugin_session import EventSession
 
-from zhenxun.configs.utils import PluginExtraData
-from zhenxun.services.help_service import create_plugin_help_image
+from zhenxun.configs.config import Config
+from zhenxun.configs.utils import PluginExtraData, RegisterConfig
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.exception import EmptyError
 from zhenxun.utils.message import MessageUtils
 from zhenxun.utils.rules import admin_check, ensure_group
 
+from .config import ADMIN_HELP_IMAGE
+from .html_help import build_html_help
+from .normal_help import build_help
+
 __plugin_meta__ = PluginMetadata(
     name="群组管理员帮助",
     description="管理员帮助列表",
@@ -26,19 +30,17 @@ __plugin_meta__ = PluginMetadata(
         precautions=[
             "只有群主/群管理 才能使用哦，群主拥有6级权限，管理员拥有5级权限！"
         ],
-        configs=[],
+        configs=[
+            RegisterConfig(
+                key="type",
+                value="zhenxun",
+                help="管理员帮助样式，normal, zhenxun",
+                default_value="zhenxun",
+            )
+        ],
     ).to_dict(),
 )
 
-
-async def build_html_help() -> bytes:
-    """构建管理员帮助图片"""
-    return await create_plugin_help_image(
-        plugin_types=[PluginType.ADMIN, PluginType.SUPER_AND_ADMIN],
-        page_title="群管理员帮助手册",
-    )
-
-
 _matcher = on_alconna(
     Alconna("管理员帮助"),
     rule=admin_check(1) & ensure_group,
@@ -52,9 +54,15 @@ async def _(
     session: EventSession,
     arparma: Arparma,
 ):
-    try:
-        image_bytes = await build_html_help()
-        await MessageUtils.build_message(image_bytes).send()
-    except EmptyError:
-        await MessageUtils.build_message("当前管理员帮助为空...").finish(reply_to=True)
+    if not ADMIN_HELP_IMAGE.exists():
+        try:
+            if Config.get_config("admin_help", "type") == "zhenxun":
+                await build_html_help()
+            else:
+                await build_help()
+        except EmptyError:
+            await MessageUtils.build_message("当前管理员帮助为空...").finish(
+                reply_to=True
+            )
+    await MessageUtils.build_message(ADMIN_HELP_IMAGE).send()
     logger.info("查看管理员帮助", arparma.header_result, session=session)

zhenxun/builtin_plugins/admin/admin_help/config.py

@@ -0,0 +1,23 @@
+from nonebot.plugin import PluginMetadata
+from pydantic import BaseModel
+
+from zhenxun.configs.path_config import IMAGE_PATH
+from zhenxun.models.plugin_info import PluginInfo
+
+ADMIN_HELP_IMAGE = IMAGE_PATH / "ADMIN_HELP.png"
+if ADMIN_HELP_IMAGE.exists():
+    ADMIN_HELP_IMAGE.unlink()
+
+
+class PluginData(BaseModel):
+    """
+    插件信息
+    """
+
+    plugin: PluginInfo
+    """插件信息"""
+    metadata: PluginMetadata
+    """元数据"""
+
+    class Config:
+        arbitrary_types_allowed = True

zhenxun/builtin_plugins/admin/admin_help/html_help.py

@@ -0,0 +1,57 @@
+from nonebot_plugin_htmlrender import template_to_pic
+
+from zhenxun.builtin_plugins.admin.admin_help.config import ADMIN_HELP_IMAGE
+from zhenxun.configs.config import BotConfig
+from zhenxun.configs.path_config import TEMPLATE_PATH
+from zhenxun.models.task_info import TaskInfo
+from zhenxun.utils._build_image import BuildImage
+
+from .utils import get_plugins
+
+
+async def get_task() -> dict[str, str] | None:
+    """获取被动技能帮助"""
+    if task_list := await TaskInfo.all():
+        return {
+            "name": "被动技能",
+            "description": "控制群组中的被动技能状态",
+            "usage": "通过 开启/关闭群被动 来控制群被动 <br>"
+            + " 示例：开启/关闭群被动早晚安 <br> 示例：开启/关闭全部群被动"
+            + " <br> ---------- <br> "
+            + "<br>".join([task.name for task in task_list]),
+        }
+    return None
+
+
+async def build_html_help():
+    """构建帮助图片"""
+    plugins = await get_plugins()
+    plugin_list = [
+        {
+            "name": data.plugin.name,
+            "description": data.metadata.description.replace("\n", "<br>"),
+            "usage": data.metadata.usage.replace("\n", "<br>"),
+        }
+        for data in plugins
+    ]
+    if task := await get_task():
+        plugin_list.append(task)
+    plugin_list.sort(key=lambda p: len(p["description"]) + len(p["usage"]))
+    pic = await template_to_pic(
+        template_path=str((TEMPLATE_PATH / "help").absolute()),
+        template_name="main.html",
+        templates={
+            "data": {
+                "plugin_list": plugin_list,
+                "nickname": BotConfig.self_nickname,
+                "help_name": "群管理员",
+            }
+        },
+        pages={
+            "viewport": {"width": 824, "height": 10},
+            "base_url": f"file://{TEMPLATE_PATH}",
+        },
+        wait=2,
+    )
+    result = await BuildImage.open(pic).resize(0.5)
+    await result.save(ADMIN_HELP_IMAGE)

zhenxun/builtin_plugins/admin/admin_help/normal_help.py

@@ -0,0 +1,127 @@
+from nonebot.plugin import PluginMetadata
+from PIL.ImageFont import FreeTypeFont
+
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.models.task_info import TaskInfo
+from zhenxun.services.log import logger
+from zhenxun.utils._build_image import BuildImage
+from zhenxun.utils.image_utils import build_sort_image, group_image, text2image
+
+from .config import ADMIN_HELP_IMAGE
+from .utils import get_plugins
+
+
+async def build_usage_des_image(
+    metadata: PluginMetadata,
+) -> tuple[BuildImage | None, BuildImage | None]:
+    """构建用法和描述图片
+
+    参数:
+        metadata: PluginMetadata
+
+    返回:
+        tuple[BuildImage | None, BuildImage | None]: 用法和描述图片
+    """
+    usage = None
+    description = None
+    if metadata.usage:
+        usage = await text2image(
+            metadata.usage,
+            padding=5,
+            color=(255, 255, 255),
+            font_color=(0, 0, 0),
+        )
+    if metadata.description:
+        description = await text2image(
+            metadata.description,
+            padding=5,
+            color=(255, 255, 255),
+            font_color=(0, 0, 0),
+        )
+    return usage, description
+
+
+async def build_image(
+    plugin: PluginInfo, metadata: PluginMetadata, font: FreeTypeFont
+) -> BuildImage:
+    """构建帮助图片
+
+    参数:
+        plugin: PluginInfo
+        metadata: PluginMetadata
+        font: FreeTypeFont
+
+    返回:
+        BuildImage: 帮助图片
+
+    """
+    usage, description = await build_usage_des_image(metadata)
+    width = 0
+    height = 100
+    if usage:
+        width = usage.width
+        height += usage.height
+    if description and description.width > width:
+        width = description.width
+        height += description.height
+    font_width, _ = BuildImage.get_text_size(f"{plugin.name}[{plugin.level}]", font)
+    if font_width > width:
+        width = font_width
+    A = BuildImage(width + 30, height + 120, "#EAEDF2")
+    await A.text((15, 10), f"{plugin.name}[{plugin.level}]")
+    await A.text((15, 70), "简介:")
+    if not description:
+        description = BuildImage(A.width - 30, 30, (255, 255, 255))
+    await description.circle_corner(10)
+    await A.paste(description, (15, 100))
+    if not usage:
+        usage = BuildImage(A.width - 30, 30, (255, 255, 255))
+    await usage.circle_corner(10)
+    await A.text((15, description.height + 115), "用法:")
+    await A.paste(usage, (15, description.height + 145))
+    await A.circle_corner(10)
+    return A
+
+
+async def build_help():
+    """构造管理员帮助图片
+
+    返回:
+        BuildImage: 管理员帮助图片
+    """
+    font = BuildImage.load_font("HYWenHei-85W.ttf", 20)
+    image_list = []
+    for data in await get_plugins():
+        plugin = data.plugin
+        metadata = data.metadata
+        try:
+            A = await build_image(plugin, metadata, font)
+            image_list.append(A)
+        except Exception as e:
+            logger.warning(
+                f"获取群管理员插件 {plugin.module}: {plugin.name} 设置失败...",
+                "管理员帮助",
+                e=e,
+            )
+    if task_list := await TaskInfo.all():
+        task_str = "\n".join([task.name for task in task_list])
+        task_str = "通过 开启/关闭群被动 来控制群被动\n----------\n" + task_str
+        task_image = await text2image(task_str, padding=5, color=(255, 255, 255))
+        await task_image.circle_corner(10)
+        A = BuildImage(task_image.width + 50, task_image.height + 85, "#EAEDF2")
+        await A.text((25, 10), "被动技能")
+        await A.paste(task_image, (25, 50))
+        await A.circle_corner(10)
+        image_list.append(A)
+    image_group, _ = group_image(image_list)
+    A = await build_sort_image(image_group, color=(255, 255, 255), padding_top=160)
+    text = await BuildImage.build_text_image(
+        "群管理员帮助",
+        size=40,
+    )
+    tip = await BuildImage.build_text_image(
+        "注: ‘*’ 代表可有多个相同参数 ‘?’ 代表可省略该参数", size=25, font_color="red"
+    )
+    await A.paste(text, (50, 30))
+    await A.paste(tip, (50, 90))
+    await A.save(ADMIN_HELP_IMAGE)

zhenxun/builtin_plugins/admin/admin_help/utils.py

@@ -0,0 +1,22 @@
+import nonebot
+
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.utils.enum import PluginType
+from zhenxun.utils.exception import EmptyError
+
+from .config import PluginData
+
+
+async def get_plugins() -> list[PluginData]:
+    """获取插件数据"""
+    plugin_list = await PluginInfo.filter(
+        plugin_type__in=[PluginType.ADMIN, PluginType.SUPER_AND_ADMIN]
+    ).all()
+    data_list = []
+    for plugin in plugin_list:
+        if _plugin := nonebot.get_plugin_by_module_name(plugin.module_path):
+            if _plugin.metadata:
+                data_list.append(PluginData(plugin=plugin, metadata=_plugin.metadata))
+    if not data_list:
+        raise EmptyError()
+    return data_list

zhenxun/builtin_plugins/admin/ban/_data_source.py

@@ -65,9 +65,6 @@ class BanManage:
                 duration = "∞"
             else:
                 duration = int((data.ban_time + data.duration - time.time()) / 60)
-            if isinstance(duration, int) and duration < 0:
-                await data.delete()
-                continue
             row_data.append(
                 [
                     data.id,
@@ -114,7 +111,7 @@ class BanManage:
             is_superuser: 是否为超级用户操作
 
         返回:
-            tuple[bool, str | Non]: 是否unban成功, 群组/用户id或提示
+            tuple[bool, str]: 是否unban成功, 群组/用户id或提示
         """
         user_level = 9999
         if not is_superuser and user_id and session.id1:
@@ -126,10 +123,15 @@ class BanManage:
             if ban_data.ban_level > user_level:
                 return False, "unBan权限等级不足捏..."
             await ban_data.delete()
-            return True, ban_data.user_id or ban_data.group_id
+            return (
+                True,
+                f"用户 {ban_data.user_id}"
+                if ban_data.user_id
+                else f"群组 {ban_data.group_id}",
+            )
         elif await BanConsole.check_ban_level(user_id, group_id, user_level):
             await BanConsole.unban(user_id, group_id)
-            return True, group_id or ""
+            return True, f"群组 {group_id}"
         return False, "该用户/群组不在黑名单中不足捏..."
 
     @classmethod

zhenxun/builtin_plugins/admin/group_member_update/__init__.py

@@ -1,11 +1,7 @@
-import asyncio
-import random
-
 import nonebot
 from nonebot import on_notice
 from nonebot.adapters import Bot
 from nonebot.adapters.onebot.v11 import GroupIncreaseNoticeEvent
-from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
 from nonebot_plugin_alconna import Alconna, Arparma, on_alconna
 from nonebot_plugin_apscheduler import scheduler
@@ -14,7 +10,6 @@ from nonebot_plugin_session import EventSession
 from zhenxun.configs.config import BotConfig
 from zhenxun.configs.utils import PluginExtraData
 from zhenxun.services.log import logger
-from zhenxun.services.tags import tag_manager
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.message import MessageUtils
 from zhenxun.utils.platform import PlatformUtils
@@ -50,79 +45,12 @@ _matcher = on_alconna(
 _notice = on_notice(priority=1, block=False, rule=notice_rule(GroupIncreaseNoticeEvent))
 
 
-_update_all_matcher = on_alconna(
-    Alconna("更新所有群组信息"),
-    permission=SUPERUSER,
-    priority=1,
-    block=True,
-)
-
-
-async def _update_all_groups_task(bot: Bot, session: EventSession):
-    """
-    在后台执行所有群组的更新任务，并向超级用户发送最终报告。
-    """
-    success_count = 0
-    fail_count = 0
-    total_count = 0
-    bot_id = bot.self_id
-
-    logger.info(f"Bot {bot_id}: 开始执行所有群组信息更新任务...", "更新所有群组")
-    try:
-        group_list, _ = await PlatformUtils.get_group_list(bot)
-        total_count = len(group_list)
-        for i, group in enumerate(group_list):
-            try:
-                logger.debug(
-                    f"Bot {bot_id}: 正在更新第 {i + 1}/{total_count} 个群组: "
-                    f"{group.group_id}",
-                    "更新所有群组",
-                )
-                await MemberUpdateManage.update_group_member(bot, group.group_id)
-                success_count += 1
-            except Exception as e:
-                fail_count += 1
-                logger.error(
-                    f"Bot {bot_id}: 更新群组 {group.group_id} 信息失败",
-                    "更新所有群组",
-                    e=e,
-                )
-            await asyncio.sleep(random.uniform(1.5, 3.0))
-    except Exception as e:
-        logger.error(f"Bot {bot_id}: 获取群组列表失败，任务中断", "更新所有群组", e=e)
-        await PlatformUtils.send_superuser(
-            bot,
-            f"Bot {bot_id} 更新所有群组信息任务失败：无法获取群组列表。",
-            session.id1,
-        )
-        return
-
-    await tag_manager._invalidate_cache()
-    summary_message = (
-        f"🤖 Bot {bot_id} 所有群组信息更新任务完成！\n"
-        f"总计群组: {total_count}\n"
-        f"✅ 成功: {success_count}\n"
-        f"❌ 失败: {fail_count}"
-    )
-    logger.info(summary_message.replace("\n", " | "), "更新所有群组")
-    await PlatformUtils.send_superuser(bot, summary_message, session.id1)
-
-
-@_update_all_matcher.handle()
-async def _(bot: Bot, session: EventSession):
-    await MessageUtils.build_message(
-        "已开始在后台更新所有群组信息，过程可能需要几分钟到几十分钟，完成后将私聊通知您。"
-    ).send(reply_to=True)
-    asyncio.create_task(_update_all_groups_task(bot, session))  # noqa: RUF006
-
-
 @_matcher.handle()
 async def _(bot: Bot, session: EventSession, arparma: Arparma):
     if gid := session.id3 or session.id2:
         logger.info("更新群组成员信息", arparma.header_result, session=session)
         result = await MemberUpdateManage.update_group_member(bot, gid)
         await MessageUtils.build_message(result).finish(reply_to=True)
-        await tag_manager._invalidate_cache()
     await MessageUtils.build_message("群组id为空...").send()
 
 
@@ -136,7 +64,6 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
             session=event.user_id,
             group_id=event.group_id,
         )
-        await tag_manager._invalidate_cache()
 
 
 @scheduler.scheduled_job(
@@ -164,5 +91,3 @@ async def _():
             except Exception as e:
                 logger.error(f"Bot: {bot.self_id} 自动更新群组信息", e=e)
         logger.debug(f"自动 Bot: {bot.self_id} 更新群组成员信息成功...")
-
-    await tag_manager._invalidate_cache()

zhenxun/builtin_plugins/admin/group_member_update/_data_source.py

@@ -6,7 +6,6 @@ from nonebot.adapters import Bot
 from nonebot_plugin_uninfo import Member, SceneType, get_interface
 
 from zhenxun.configs.config import Config
-from zhenxun.models.group_console import GroupConsole
 from zhenxun.models.group_member_info import GroupInfoUser
 from zhenxun.models.level_user import LevelUser
 from zhenxun.services.log import logger
@@ -95,25 +94,6 @@ class MemberUpdateManage:
                 )
                 return "更新群组失败，群组不存在..."
             members = await interface.get_members(SceneType.GROUP, group_list[0].id)
-
-            try:
-                group_console, _ = await GroupConsole.get_or_create(
-                    group_id=group_id, defaults={"platform": platform}
-                )
-                group_console.member_count = len(members)
-                group_console.group_name = group_list[0].name or ""
-                await group_console.save(update_fields=["member_count", "group_name"])
-                logger.debug(
-                    f"已更新群组 {group_id} 的成员总数为 {len(members)}",
-                    "更新群组成员信息",
-                )
-            except Exception as e:
-                logger.error(
-                    f"更新群组 {group_id} 的 GroupConsole 信息失败",
-                    "更新群组成员信息",
-                    e=e,
-                )
-
             db_user = await GroupInfoUser.filter(group_id=group_id).all()
             db_user_uid = [u.user_id for u in db_user]
             data_list = ([], [], [])

zhenxun/builtin_plugins/admin/plugin_switch/__init__.py

@@ -9,7 +9,7 @@ from zhenxun.services.log import logger
 from zhenxun.utils.enum import BlockType, PluginType
 from zhenxun.utils.message import MessageUtils
 
-from ._data_source import PluginManager, build_plugin, build_task
+from ._data_source import PluginManager, build_plugin, build_task, delete_help_image
 from .command import _group_status_matcher, _status_matcher
 
 base_config = Config.get("plugin_switch")
@@ -154,6 +154,7 @@ async def _(
         else:
             result = await PluginManager.unblock_group_plugin(name, group_id)
             logger.info(f"开启功能 {name}", arparma.header_result, session=session)
+        delete_help_image(group_id)
         await MessageUtils.build_message(result).finish(reply_to=True)
     elif session.user.id in bot.config.superusers:
         """私聊"""
@@ -217,6 +218,7 @@ async def _(
                 session=session,
                 target=group_id,
             )
+        delete_help_image()
         await MessageUtils.build_message(result).finish(reply_to=True)
 
 
@@ -264,6 +266,7 @@ async def _(
         else:
             result = await PluginManager.block_group_plugin(name, group_id)
             logger.info(f"关闭功能 {name}", arparma.header_result, session=session)
+        delete_help_image(group_id)
         await MessageUtils.build_message(result).finish(reply_to=True)
     elif session.user.id in bot.config.superusers:
         group_id = group.result if group.available else None
@@ -335,6 +338,7 @@ async def _(
                 session=session,
                 target=group_id,
             )
+        delete_help_image()
         await MessageUtils.build_message(result).finish(reply_to=True)
 
 

zhenxun/builtin_plugins/admin/plugin_switch/_data_source.py

@@ -1,5 +1,7 @@
+import os
 from typing import cast
 
+from zhenxun.configs.path_config import DATA_PATH, IMAGE_PATH
 from zhenxun.models.group_console import GroupConsole
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.task_info import TaskInfo
@@ -9,6 +11,23 @@ from zhenxun.utils.enum import BlockType, CacheType, PluginType
 from zhenxun.utils.exception import GroupInfoNotFound
 from zhenxun.utils.image_utils import BuildImage, ImageTemplate, RowStyle
 
+HELP_FILE = IMAGE_PATH / "SIMPLE_HELP.png"
+
+GROUP_HELP_PATH = DATA_PATH / "group_help"
+
+
+def delete_help_image(gid: str | None = None):
+    """删除帮助图片"""
+    if gid:
+        for file in os.listdir(GROUP_HELP_PATH):
+            if file.startswith(f"{gid}"):
+                os.remove(GROUP_HELP_PATH / file)
+    else:
+        if HELP_FILE.exists():
+            HELP_FILE.unlink()
+        for file in GROUP_HELP_PATH.iterdir():
+            file.unlink()
+
 
 def plugin_row_style(column: str, text: str) -> RowStyle:
     """被动技能文本风格

zhenxun/builtin_plugins/auto_update/__init__.py

@@ -84,16 +84,13 @@ async def _(
 ):
     result = ""
     await MessageUtils.build_message("正在进行检查更新...").send(reply_to=True)
-
-    if not ver_type.available:
-        result += await UpdateManager.check_version()
-        logger.info("查看当前版本...", "检查更新", session=session)
-        await MessageUtils.build_message(result).finish()
-        return
-
     ver_type_str = ver_type.result
     source_str = source.result
     if ver_type_str in {"main", "release"}:
+        if not ver_type.available:
+            result += await UpdateManager.check_version()
+            logger.info("查看当前版本...", "检查更新", session=session)
+            await MessageUtils.build_message(result).finish()
         try:
             result += await UpdateManager.update_zhenxun(
                 bot,
@@ -103,6 +100,7 @@ async def _(
                 source_str,  # type: ignore
                 zip.result,
             )
+            await MessageUtils.build_message(result).finish(reply_to=True)
         except Exception as e:
             logger.error("版本更新失败...", "检查更新", session=session, e=e)
             await MessageUtils.build_message(f"更新版本失败...e: {e}").finish()
@@ -112,8 +110,7 @@ async def _(
         try:
             result += await UpdateManager.update_webui(
                 source_str,  # type: ignore
-                "test",
-                True,
+                "dist",
             )
         except Exception as e:
             logger.error("WebUI更新失败...", "检查更新", session=session, e=e)

zhenxun/builtin_plugins/auto_update/_data_source.py

@@ -1,141 +1,40 @@
-import asyncio
 from typing import Literal
 
 from nonebot.adapters import Bot
-from packaging.specifiers import SpecifierSet
-from packaging.version import InvalidVersion, Version
 
 from zhenxun.services.log import logger
-from zhenxun.utils.http_utils import AsyncHttpx
 from zhenxun.utils.manager.virtual_env_package_manager import VirtualEnvPackageManager
-from zhenxun.utils.manager.zhenxun_repo_manager import (
-    ZhenxunRepoConfig,
-    ZhenxunRepoManager,
-)
+from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
 from zhenxun.utils.platform import PlatformUtils
-from zhenxun.utils.repo_utils import RepoFileManager
 
-LOG_COMMAND = "AutoUpdate"
+from .config import LOG_COMMAND, REQUIREMENTS_FILE, VERSION_FILE
 
 
 class UpdateManager:
-    @staticmethod
-    async def _get_latest_commit_date(owner: str, repo: str, path: str) -> str:
-        """获取文件最新 commit 日期"""
-        api_url = f"https://api.github.com/repos/{owner}/{repo}/commits"
-        params = {"path": path, "page": 1, "per_page": 1}
-        try:
-            data = await AsyncHttpx.get_json(api_url, params=params)
-            if data and isinstance(data, list) and data[0]:
-                date_str = data[0]["commit"]["committer"]["date"]
-                return date_str.split("T")[0]
-        except Exception as e:
-            logger.warning(f"获取 {owner}/{repo}/{path} 的 commit 日期失败", e=e)
-        return "获取失败"
-
     @classmethod
     async def check_version(cls) -> str:
-        """检查真寻和资源的版本"""
-        bot_cur_version = cls.__get_version()
+        """检查更新版本
 
-        release_task = ZhenxunRepoManager.zhenxun_get_latest_releases_data()
-        dev_version_task = RepoFileManager.get_file_content(
-            ZhenxunRepoConfig.ZHENXUN_BOT_GITHUB_URL, "__version__"
+        返回:
+            str: 更新信息
+        """
+        cur_version = cls.__get_version()
+        release_data = await ZhenxunRepoManager.zhenxun_get_latest_releases_data()
+        if not release_data:
+            return "检查更新获取版本失败..."
+        return (
+            "检测到当前版本更新\n"
+            f"当前版本：{cur_version}\n"
+            f"最新版本：{release_data.get('name')}\n"
+            f"创建日期：{release_data.get('created_at')}\n"
+            f"更新内容：\n{release_data.get('body')}"
         )
-        bot_commit_date_task = cls._get_latest_commit_date(
-            "HibiKier", "zhenxun_bot", "__version__"
-        )
-        res_commit_date_task = cls._get_latest_commit_date(
-            "zhenxun-org", "zhenxun-bot-resources", "__version__"
-        )
-
-        (
-            release_data,
-            dev_version_text,
-            bot_commit_date,
-            res_commit_date,
-        ) = await asyncio.gather(
-            release_task,
-            dev_version_task,
-            bot_commit_date_task,
-            res_commit_date_task,
-            return_exceptions=True,
-        )
-
-        if isinstance(release_data, dict):
-            bot_release_version = release_data.get("name", "获取失败")
-            bot_release_date = release_data.get("created_at", "").split("T")[0]
-        else:
-            bot_release_version = "获取失败"
-            bot_release_date = "获取失败"
-            logger.warning(f"获取 Bot release 信息失败: {release_data}")
-
-        if isinstance(dev_version_text, str):
-            bot_dev_version = dev_version_text.split(":")[-1].strip()
-        else:
-            bot_dev_version = "获取失败"
-            bot_commit_date = "获取失败"
-            logger.warning(f"获取 Bot dev 版本信息失败: {dev_version_text}")
-
-        bot_update_hint = ""
-        try:
-            cur_base_v = bot_cur_version.split("-")[0].lstrip("v")
-            dev_base_v = bot_dev_version.split("-")[0].lstrip("v")
-
-            if Version(cur_base_v) < Version(dev_base_v):
-                bot_update_hint = "\n-> 发现新开发版本, 可用 `检查更新 main` 更新"
-            elif (
-                Version(cur_base_v) == Version(dev_base_v)
-                and bot_cur_version != bot_dev_version
-            ):
-                bot_update_hint = "\n-> 发现新开发版本, 可用 `检查更新 main` 更新"
-        except (InvalidVersion, TypeError, IndexError):
-            if bot_cur_version != bot_dev_version and bot_dev_version != "获取失败":
-                bot_update_hint = "\n-> 发现新开发版本, 可用 `检查更新 main` 更新"
-
-        bot_update_info = (
-            f"当前版本: {bot_cur_version}\n"
-            f"最新开发版: {bot_dev_version} (更新于: {bot_commit_date})\n"
-            f"最新正式版: {bot_release_version} (发布于: {bot_release_date})"
-            f"{bot_update_hint}"
-        )
-
-        res_version_file = ZhenxunRepoConfig.RESOURCE_PATH / "__version__"
-        res_cur_version = "未找到"
-        if res_version_file.exists():
-            if text := res_version_file.open(encoding="utf8").readline():
-                res_cur_version = text.split(":")[-1].strip()
-
-        res_latest_version = "获取失败"
-        try:
-            res_latest_version_text = await RepoFileManager.get_file_content(
-                ZhenxunRepoConfig.RESOURCE_GITHUB_URL, "__version__"
-            )
-            res_latest_version = res_latest_version_text.split(":")[-1].strip()
-        except Exception as e:
-            res_commit_date = "获取失败"
-            logger.warning(f"获取资源版本信息失败: {e}")
-
-        res_update_hint = ""
-        try:
-            if Version(res_cur_version) < Version(res_latest_version):
-                res_update_hint = "\n-> 发现新资源版本, 可用 `检查更新 resource` 更新"
-        except (InvalidVersion, TypeError):
-            pass
-
-        res_update_info = (
-            f"当前版本: {res_cur_version}\n"
-            f"最新版本: {res_latest_version} (更新于: {res_commit_date})"
-            f"{res_update_hint}"
-        )
-
-        return f"『绪山真寻 Bot』\n{bot_update_info}\n\n『真寻资源』\n{res_update_info}"
 
     @classmethod
     async def update_webui(
         cls,
         source: Literal["git", "ali"] | None,
-        branch: str = "dist",
+        branch: str = "main",
         force: bool = False,
     ):
         """更新WebUI
@@ -223,16 +122,13 @@ class UpdateManager:
             f"检测真寻已更新，当前版本：{cur_version}\n开始更新...",
             user_id,
         )
-        result_message = ""
         if zip:
             new_version = await ZhenxunRepoManager.zhenxun_zip_update(version_type)
             await PlatformUtils.send_superuser(
                 bot, "真寻更新完成，开始安装依赖...", user_id
             )
-            await VirtualEnvPackageManager.install_requirement(
-                ZhenxunRepoConfig.REQUIREMENTS_FILE
-            )
-            result_message = (
+            await VirtualEnvPackageManager.install_requirement(REQUIREMENTS_FILE)
+            return (
                 f"版本更新完成！\n版本: {cur_version} -> {new_version}\n"
                 "请重新启动真寻以完成更新!"
             )
@@ -251,57 +147,14 @@ class UpdateManager:
             await PlatformUtils.send_superuser(
                 bot, "真寻更新完成，开始安装依赖...", user_id
             )
-            await VirtualEnvPackageManager.install_requirement(
-                ZhenxunRepoConfig.REQUIREMENTS_FILE
-            )
-            result_message = (
+            await VirtualEnvPackageManager.install_requirement(REQUIREMENTS_FILE)
+            return (
                 f"版本更新完成！\n"
                 f"版本: {cur_version} -> {result.new_version}\n"
                 f"变更文件个数: {len(result.changed_files)}"
                 f"{'' if source == 'git' else '（阿里云更新不支持查看变更文件）'}\n"
                 "请重新启动真寻以完成更新!"
             )
-        resource_warning = ""
-        if version_type == "main":
-            try:
-                spec_content = await RepoFileManager.get_file_content(
-                    ZhenxunRepoConfig.ZHENXUN_BOT_GITHUB_URL, "resources.spec"
-                )
-                required_spec_str = None
-                for line in spec_content.splitlines():
-                    if line.startswith("require_resources_version:"):
-                        required_spec_str = line.split(":", 1)[1].strip().strip("\"'")
-                        break
-                if required_spec_str:
-                    res_version_file = ZhenxunRepoConfig.RESOURCE_PATH / "__version__"
-                    local_res_version_str = "0.0.0"
-                    if res_version_file.exists():
-                        if text := res_version_file.open(encoding="utf8").readline():
-                            local_res_version_str = text.split(":")[-1].strip()
-
-                    spec = SpecifierSet(required_spec_str)
-                    local_ver = Version(local_res_version_str)
-                    if not spec.contains(local_ver):
-                        warning_header = (
-                            f"⚠️ **资源版本不兼容!**\n"
-                            f"当前代码需要资源版本: `{required_spec_str}`\n"
-                            f"您当前的资源版本是: `{local_res_version_str}`\n"
-                            "**将自动为您更新资源文件...**"
-                        )
-                        await PlatformUtils.send_superuser(bot, warning_header, user_id)
-                        resource_update_source = None if zip else source
-                        resource_update_result = await cls.update_resources(
-                            source=resource_update_source, force=force
-                        )
-                        resource_warning = (
-                            f"\n\n{warning_header}\n{resource_update_result}"
-                        )
-            except Exception as e:
-                logger.warning(f"检查资源版本兼容性时出错: {e}", LOG_COMMAND, e=e)
-                resource_warning = (
-                    "\n\n⚠️ 检查资源版本兼容性时出错，建议手动运行 `检查更新 resource`"
-                )
-        return result_message + resource_warning
 
     @classmethod
     def __get_version(cls) -> str:
@@ -311,9 +164,7 @@ class UpdateManager:
             str: 当前版本号
         """
         _version = "v0.0.0"
-        if ZhenxunRepoConfig.ZHENXUN_BOT_VERSION_FILE.exists():
-            if text := ZhenxunRepoConfig.ZHENXUN_BOT_VERSION_FILE.open(
-                encoding="utf8"
-            ).readline():
+        if VERSION_FILE.exists():
+            if text := VERSION_FILE.open(encoding="utf8").readline():
                 _version = text.split(":")[-1].strip()
         return _version

zhenxun/builtin_plugins/auto_update/config.py

@@ -0,0 +1,7 @@
+from pathlib import Path
+
+LOG_COMMAND = "AutoUpdate"
+
+VERSION_FILE = Path() / "__version__"
+
+REQUIREMENTS_FILE = Path() / "requirements.txt"

zhenxun/builtin_plugins/chat_history/chat_message_handle.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timedelta
+from io import BytesIO
 
 from nonebot.plugin import PluginMetadata
 from nonebot_plugin_alconna import (
@@ -14,17 +15,15 @@ from nonebot_plugin_alconna import (
 from nonebot_plugin_session import EventSession
 import pytz
 
-from zhenxun import ui
 from zhenxun.configs.config import Config
 from zhenxun.configs.utils import Command, PluginExtraData, RegisterConfig
 from zhenxun.models.chat_history import ChatHistory
 from zhenxun.models.group_member_info import GroupInfoUser
-from zhenxun.services import avatar_service
 from zhenxun.services.log import logger
-from zhenxun.ui.builders import TableBuilder
-from zhenxun.ui.models import ImageCell, TextCell
 from zhenxun.utils.enum import PluginType
+from zhenxun.utils.image_utils import BuildImage, ImageTemplate
 from zhenxun.utils.message import MessageUtils
+from zhenxun.utils.platform import PlatformUtils
 
 __plugin_meta__ = PluginMetadata(
     name="消息统计",
@@ -124,63 +123,64 @@ async def _(
     if rank_data := await ChatHistory.get_group_msg_rank(
         group_id, fetch_count, "DES" if arparma.find("des") else "DESC", date_scope
     ):
-        rows_data = []
-        platform = "qq"
+        idx = 1
+        data_list = []
 
-        user_ids_in_rank = [str(uid) for uid, _ in rank_data]
-        users_in_group_query = GroupInfoUser.filter(
-            user_id__in=user_ids_in_rank, group_id=group_id
-        )
-        users_in_group = {u.user_id: u for u in await users_in_group_query}
-
-        for idx, (uid, num) in enumerate(rank_data):
-            if len(rows_data) >= count.result:
+        for uid, num in rank_data:
+            if len(data_list) >= count.result:
                 break
 
-            uid_str = str(uid)
-            user_in_group = users_in_group.get(uid_str)
+            user_in_group = await GroupInfoUser.filter(
+                user_id=uid, group_id=group_id
+            ).first()
 
             if not user_in_group and not show_quit_member:
                 continue
 
-            user_name = (
-                user_in_group.user_name if user_in_group else f"{uid_str}(已退群)"
-            )
+            if user_in_group:
+                user_name = user_in_group.user_name
+            else:
+                user_name = f"{uid}(已退群)"
 
-            avatar_path = await avatar_service.get_avatar_path(platform, uid_str)
+            avatar_size = 40
+            try:
+                avatar_bytes = await PlatformUtils.get_user_avatar(str(uid), "qq")
+                if avatar_bytes:
+                    avatar_img = BuildImage(
+                        avatar_size, avatar_size, background=BytesIO(avatar_bytes)
+                    )
+                    await avatar_img.circle()
+                    avatar_tuple = (avatar_img, avatar_size, avatar_size)
+                else:
+                    avatar_img = BuildImage(avatar_size, avatar_size, color="#CCCCCC")
+                    await avatar_img.circle()
+                    avatar_tuple = (avatar_img, avatar_size, avatar_size)
+            except Exception as e:
+                logger.warning(f"获取用户头像失败: {e}", "chat_history")
+                avatar_img = BuildImage(avatar_size, avatar_size, color="#CCCCCC")
+                await avatar_img.circle()
+                avatar_tuple = (avatar_img, avatar_size, avatar_size)
 
-            rows_data.append(
-                [
-                    TextCell(content=str(len(rows_data) + 1)),
-                    ImageCell(
-                        src=avatar_path.as_uri() if avatar_path else "", shape="circle"
-                    ),
-                    TextCell(content=user_name),
-                    TextCell(content=str(num), bold=True),
-                ]
-            )
+            data_list.append([idx, avatar_tuple, user_name, num])
+            idx += 1
         if not date_scope:
-            first_msg_time = await ChatHistory.get_group_first_msg_datetime(group_id)
-            if first_msg_time:
-                date_scope_start = first_msg_time.astimezone(
+            if date_scope := await ChatHistory.get_group_first_msg_datetime(group_id):
+                date_scope = date_scope.astimezone(
                     pytz.timezone("Asia/Shanghai")
                 ).replace(microsecond=0)
-                date_str = f"{str(date_scope_start).split('+')[0]} - 至今"
             else:
-                date_str = f"{time_now.replace(microsecond=0)} - 至今"
+                date_scope = time_now.replace(microsecond=0)
+            date_str = f"{str(date_scope).split('+')[0]} - 至今"
         else:
             date_str = (
                 f"{date_scope[0].replace(microsecond=0)} - "
                 f"{date_scope[1].replace(microsecond=0)}"
             )
-
-        builder = TableBuilder(f"消息排行({count.result})", date_str)
-        builder.set_headers(column_name).add_rows(rows_data)
-
-        image_bytes = await ui.render(builder.build())
-
+        A = await ImageTemplate.table_page(
+            f"消息排行({count.result})", date_str, column_name, data_list
+        )
         logger.info(
             f"查看消息排行 数量={count.result}", arparma.header_result, session=session
         )
-        await MessageUtils.build_message(image_bytes).finish(reply_to=True)
+        await MessageUtils.build_message(A).finish(reply_to=True)
     await MessageUtils.build_message("群组消息记录为空...").finish()

zhenxun/builtin_plugins/check/__init__.py

@@ -4,9 +4,10 @@ from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
 from nonebot.rule import Rule, to_me
 from nonebot_plugin_alconna import Alconna, on_alconna
+from nonebot_plugin_htmlrender import template_to_pic
 
-from zhenxun import ui
 from zhenxun.configs.config import Config
+from zhenxun.configs.path_config import TEMPLATE_PATH
 from zhenxun.configs.utils import PluginExtraData, RegisterConfig
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
@@ -26,7 +27,7 @@ __plugin_meta__ = PluginMetadata(
     """.strip(),
     extra=PluginExtraData(
         author="HibiKier",
-        version="0.2",
+        version="0.1",
         plugin_type=PluginType.SUPERUSER,
         configs=[
             RegisterConfig(
@@ -66,14 +67,18 @@ _self_check_poke_matcher = on_notice(
 
 async def handle_self_check():
     try:
-        data_dict = await get_status_info()
-
-        image_bytes = await ui.render_template(
-            "pages/builtin/check",
-            data=data_dict,
+        data = await get_status_info()
+        image = await template_to_pic(
+            template_path=str((TEMPLATE_PATH / "check").absolute()),
+            template_name="main.html",
+            templates={"data": data},
+            pages={
+                "viewport": {"width": 195, "height": 750},
+                "base_url": f"file://{TEMPLATE_PATH}",
+            },
+            wait=2,
         )
-
-        await MessageUtils.build_message(image_bytes).send()
+        await MessageUtils.build_message(image).send()
         logger.info("自检成功", "自检")
     except Exception as e:
         await MessageUtils.build_message(f"自检失败: {e}").send()

zhenxun/builtin_plugins/check/data_source.py

@@ -1,4 +1,3 @@
-import contextlib
 from dataclasses import dataclass
 import os
 from pathlib import Path
@@ -19,47 +18,7 @@ BAIDU_URL = "https://www.baidu.com/"
 GOOGLE_URL = "https://www.google.com/"
 
 VERSION_FILE = Path() / "__version__"
-
-
-def get_arm_cpu_freq_safe():
-    """获取ARM设备CPU频率"""
-    # 方法1: 优先从系统频率文件读取
-    freq_files = [
-        "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq",
-        "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
-        "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq",
-        "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-    ]
-
-    for freq_file in freq_files:
-        try:
-            with open(freq_file) as f:
-                frequency = int(f.read().strip())
-                return round(frequency / 1000000, 2)  # 转换为GHz
-        except (OSError, ValueError):
-            continue
-
-    # 方法2: 解析/proc/cpuinfo
-    with contextlib.suppress(OSError, FileNotFoundError, ValueError, PermissionError):
-        with open("/proc/cpuinfo") as f:
-            for line in f:
-                if "CPU MHz" in line:
-                    freq = float(line.split(":")[1].strip())
-                    return round(freq / 1000, 2)  # 转换为GHz
-    # 方法3: 使用lscpu命令
-    with contextlib.suppress(OSError, subprocess.SubprocessError, ValueError):
-        env = os.environ.copy()
-        env["LC_ALL"] = "C"
-        result = subprocess.run(
-            ["lscpu"], capture_output=True, text=True, env=env, timeout=10
-        )
-
-        if result.returncode == 0:
-            for line in result.stdout.split("\n"):
-                if "CPU max MHz" in line or "CPU MHz" in line:
-                    freq = float(line.split(":")[1].strip())
-                    return round(freq / 1000, 2)  # 转换为GHz
-    return 0  # 如果所有方法都失败，返回0
+ARM_KEY = "aarch64"
 
 
 @dataclass
@@ -78,7 +37,7 @@ class CPUInfo:
         if _cpu_freq := psutil.cpu_freq():
             cpu_freq = round(_cpu_freq.current / 1000, 2)
         else:
-            cpu_freq = get_arm_cpu_freq_safe()
+            cpu_freq = 0
         return CPUInfo(core=cpu_core, usage=cpu_usage, freq=cpu_freq)
 
 
@@ -201,13 +160,44 @@ def __get_version() -> str | None:
     return None
 
 
+def __get_arm_cpu():
+    env = os.environ.copy()
+    env["LC_ALL"] = "en_US.UTF-8"
+    cpu_info = subprocess.check_output(["lscpu"], env=env).decode()
+    model_name = ""
+    cpu_freq = 0
+    for line in cpu_info.splitlines():
+        if "Model name" in line:
+            model_name = line.split(":")[1].strip()
+        if "CPU MHz" in line:
+            cpu_freq = float(line.split(":")[1].strip())
+    return model_name, cpu_freq
+
+
+def __get_arm_oracle_cpu_freq():
+    cpu_freq = subprocess.check_output(
+        ["dmidecode", "-s", "processor-frequency"]
+    ).decode()
+    return round(float(cpu_freq.split()[0]) / 1000, 2)
+
+
 async def get_status_info() -> dict:
     """获取信息"""
     data = await __build_status()
 
     system = platform.uname()
-    data = data.get_system_info()
-    data["brand_raw"] = cpuinfo.get_cpu_info().get("brand_raw", "Unknown")
+    if system.machine == ARM_KEY and not (
+        cpuinfo.get_cpu_info().get("brand_raw") and data.cpu.freq
+    ):
+        model_name, cpu_freq = __get_arm_cpu()
+        if not data.cpu.freq:
+            data.cpu.freq = cpu_freq or __get_arm_oracle_cpu_freq()
+        data = data.get_system_info()
+        data["brand_raw"] = model_name
+    else:
+        data = data.get_system_info()
+        data["brand_raw"] = cpuinfo.get_cpu_info().get("brand_raw", "Unknown")
+
     baidu, google = await __get_network_info()
     data["baidu"] = "#8CC265" if baidu else "red"
     data["google"] = "#8CC265" if google else "red"

zhenxun/builtin_plugins/help/__init__.py

@@ -13,6 +13,11 @@ from nonebot_plugin_alconna import (
 )
 from nonebot_plugin_uninfo import Uninfo
 
+from zhenxun.builtin_plugins.help._config import (
+    GROUP_HELP_PATH,
+    SIMPLE_DETAIL_HELP_IMAGE,
+    SIMPLE_HELP_IMAGE,
+)
 from zhenxun.configs.config import Config
 from zhenxun.configs.utils import PluginExtraData, RegisterConfig
 from zhenxun.services.log import logger
@@ -31,6 +36,18 @@ __plugin_meta__ = PluginMetadata(
         plugin_type=PluginType.DEPENDANT,
         is_show=False,
         configs=[
+            RegisterConfig(
+                key="type",
+                value="zhenxun",
+                help="帮助图片样式 [normal, HTML, zhenxun]",
+                default_value="zhenxun",
+            ),
+            RegisterConfig(
+                key="detail_type",
+                value="zhenxun",
+                help="帮助详情图片样式 ['normal', 'zhenxun']",
+                default_value="zhenxun",
+            ),
             RegisterConfig(
                 key="ENABLE_LLM_HELPER",
                 value=False,
@@ -59,13 +76,6 @@ __plugin_meta__ = PluginMetadata(
                 default_value=100,
                 type=int,
             ),
-            RegisterConfig(
-                key="HELP_STYLE",
-                value="default",
-                help="帮助页面的显示样式 (可选值: 'default', 'simple')",
-                default_value="default",
-                type=str,
-            ),
         ],
     ).to_dict(),
 )
@@ -103,17 +113,9 @@ async def _(
 ):
     _is_superuser = is_superuser.result if is_superuser.available else False
 
-    if _is_superuser and session.user.id not in bot.config.superusers:
-        await MessageUtils.build_message("权限不足，无法查看超级用户帮助").finish(
-            reply_to=True
-        )
-
     if name.available:
-        help_style = Config.get_config("help", "HELP_STYLE")
-        variant = help_style if help_style != "default" else None
-
         traditional_help_result = await get_plugin_help(
-            session.user.id, name.result, _is_superuser, variant=variant
+            session.user.id, name.result, _is_superuser
         )
 
         is_plugin_found = not (
@@ -137,8 +139,15 @@ async def _(
                 f"查看帮助详情失败，未找到: {name.result}", "帮助", session=session
             )
     elif session.group and (gid := session.group.id):
-        image_bytes = await create_help_img(session, gid, is_detail.result)
-        await MessageUtils.build_message(image_bytes).finish()
+        _image_path = GROUP_HELP_PATH / f"{gid}_{is_detail.result}.png"
+        if not _image_path.exists():
+            await create_help_img(session, gid, is_detail.result)
+        await MessageUtils.build_message(_image_path).finish()
     else:
-        image_bytes = await create_help_img(session, None, is_detail.result)
-        await MessageUtils.build_message(image_bytes).finish()
+        if is_detail.result:
+            _image_path = SIMPLE_DETAIL_HELP_IMAGE
+        else:
+            _image_path = SIMPLE_HELP_IMAGE
+        if not _image_path.exists():
+            await create_help_img(session, None, is_detail.result)
+        await MessageUtils.build_message(_image_path).finish()

zhenxun/builtin_plugins/help/_data_source.py

@@ -1,126 +1,74 @@
+from pathlib import Path
+
 import nonebot
+from nonebot.plugin import PluginMetadata
+from nonebot_plugin_htmlrender import template_to_pic
 from nonebot_plugin_uninfo import Uninfo
 
-from zhenxun import ui
-from zhenxun.configs.config import BotConfig, Config
-from zhenxun.configs.path_config import IMAGE_PATH
+from zhenxun.configs.config import Config
+from zhenxun.configs.path_config import IMAGE_PATH, TEMPLATE_PATH
 from zhenxun.configs.utils import PluginExtraData
-from zhenxun.models.bot_console import BotConsole
-from zhenxun.models.group_console import GroupConsole
 from zhenxun.models.level_user import LevelUser
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.statistics import Statistics
 from zhenxun.services import (
     LLMException,
     LLMMessage,
-    avatar_service,
     generate,
 )
 from zhenxun.services.log import logger
-from zhenxun.ui.builders import (
-    NotebookBuilder,
-    PluginMenuBuilder,
-)
-from zhenxun.ui.models import PluginMenuCategory
-from zhenxun.utils.common_utils import format_usage_for_markdown
-from zhenxun.utils.enum import BlockType, PluginType
-from zhenxun.utils.platform import PlatformUtils
+from zhenxun.utils._image_template import Markdown
+from zhenxun.utils.enum import PluginType
+from zhenxun.utils.image_utils import BuildImage, ImageTemplate
 
-from ._utils import classify_plugin
+from ._config import (
+    GROUP_HELP_PATH,
+    SIMPLE_DETAIL_HELP_IMAGE,
+    SIMPLE_HELP_IMAGE,
+    base_config,
+)
+from .html_help import build_html_image
+from .normal_help import build_normal_image
+from .zhenxun_help import build_zhenxun_image
 
 random_bk_path = IMAGE_PATH / "background" / "help" / "simple_help"
+
 background = IMAGE_PATH / "background" / "0.png"
 
+
 driver = nonebot.get_driver()
 
 
-def _create_plugin_menu_item(
-    bot: BotConsole | None,
-    plugin: PluginInfo,
-    group: GroupConsole | None,
-    is_detail: bool,
-) -> dict:
-    """为插件菜单构造一个插件菜单项数据字典"""
-    status = True
-    has_superuser_help = False
-    nb_plugin = nonebot.get_plugin_by_module_name(plugin.module_path)
-    if nb_plugin and nb_plugin.metadata and nb_plugin.metadata.extra:
-        extra_data = PluginExtraData(**nb_plugin.metadata.extra)
-        if extra_data.superuser_help:
-            has_superuser_help = True
-
-    if not plugin.status:
-        if plugin.block_type == BlockType.ALL:
-            status = False
-        elif group and plugin.block_type == BlockType.GROUP:
-            status = False
-        elif not group and plugin.block_type == BlockType.PRIVATE:
-            status = False
-    elif group and f"{plugin.module}," in group.block_plugin:
-        status = False
-    elif bot and f"{plugin.module}," in bot.block_plugins:
-        status = False
-
-    commands = []
-    if is_detail and nb_plugin and nb_plugin.metadata and nb_plugin.metadata.extra:
-        extra_data = PluginExtraData(**nb_plugin.metadata.extra)
-        commands = [cmd.command for cmd in extra_data.commands]
-
-    return {
-        "id": str(plugin.id),
-        "name": plugin.name,
-        "status": status,
-        "has_superuser_help": has_superuser_help,
-        "commands": commands,
-    }
-
-
 async def create_help_img(
     session: Uninfo, group_id: str | None, is_detail: bool
-) -> bytes:
-    """使用渲染服务生成帮助图片"""
-    classified_data = await classify_plugin(
-        session, group_id, is_detail, _create_plugin_menu_item
-    )
+) -> Path:
+    """生成帮助图片
 
-    sorted_categories = dict(
-        sorted(classified_data.items(), key=lambda x: len(x[1]), reverse=True)
-    )
-    categories_for_model = []
-    plugin_count = 0
-    active_count = 0
+    参数:
+        session: Uninfo
+        group_id: 群号
+    """
+    help_type = base_config.get("type", "").strip().lower()
 
-    if sorted_categories:
-        menu_key = next(iter(sorted_categories.keys()))
-        max_data = sorted_categories.pop(menu_key)
-        main_category_name = "主要功能" if menu_key in ["normal", "功能"] else menu_key
-        categories_for_model.append({"name": main_category_name, "items": max_data})
-        plugin_count += len(max_data)
-        active_count += sum(1 for item in max_data if item["status"])
-
-    for menu, value in sorted_categories.items():
-        category_name = "主要功能" if menu in ["normal", "功能"] else menu
-        categories_for_model.append({"name": category_name, "items": value})
-        plugin_count += len(value)
-        active_count += sum(1 for item in value if item["status"])
-
-    platform = PlatformUtils.get_platform(session)
-    bot_id = BotConfig.get_qbot_uid(session.self_id) or session.self_id
-    bot_avatar_path = await avatar_service.get_avatar_path(platform, bot_id)
-    bot_avatar_url = bot_avatar_path.as_uri() if bot_avatar_path else ""
-
-    builder = PluginMenuBuilder(
-        bot_name=BotConfig.self_nickname,
-        bot_avatar_url=bot_avatar_url,
-        is_detail=is_detail,
-    )
-
-    for category in categories_for_model:
-        builder.add_category(
-            PluginMenuCategory(name=category["name"], items=category["items"])
-        )
-
-    return await ui.render(builder.build())
+    match help_type:
+        case "html":
+            result = BuildImage.open(
+                await build_html_image(session, group_id, is_detail)
+            )
+        case "zhenxun":
+            result = BuildImage.open(
+                await build_zhenxun_image(session, group_id, is_detail)
+            )
+        case _:
+            result = await build_normal_image(group_id, is_detail)
+    if group_id:
+        save_path = GROUP_HELP_PATH / f"{group_id}_{is_detail}.png"
+    elif is_detail:
+        save_path = SIMPLE_DETAIL_HELP_IMAGE
+    else:
+        save_path = SIMPLE_HELP_IMAGE
+    await result.save(save_path)
+    return save_path
 
 
 async def get_user_allow_help(user_id: str) -> list[PluginType]:
@@ -144,6 +92,36 @@ async def get_user_allow_help(user_id: str) -> list[PluginType]:
     return type_list
 
 
+async def get_normal_help(
+    metadata: PluginMetadata, extra: PluginExtraData, is_superuser: bool
+) -> str | bytes:
+    """构建默认帮助详情
+
+    参数:
+        metadata: PluginMetadata
+        extra: PluginExtraData
+        is_superuser: 是否超级用户帮助
+
+    返回:
+        str | bytes: 返回信息
+    """
+    items = None
+    if is_superuser:
+        if usage := extra.superuser_help:
+            items = {
+                "简介": metadata.description,
+                "用法": usage,
+            }
+    else:
+        items = {
+            "简介": metadata.description,
+            "用法": metadata.usage,
+        }
+    if items:
+        return (await ImageTemplate.hl_page(metadata.name, items)).pic2bytes()
+    return "该功能没有帮助信息"
+
+
 def min_leading_spaces(str_list: list[str]) -> int:
     min_spaces = 9999
 
@@ -164,16 +142,52 @@ def split_text(text: str):
     return [s.replace(" ", " ") for s in split_text]
 
 
-async def get_plugin_help(
-    user_id: str, name: str, is_superuser: bool, variant: str | None = None
+async def get_zhenxun_help(
+    module: str, metadata: PluginMetadata, extra: PluginExtraData, is_superuser: bool
 ) -> str | bytes:
+    """构建ZhenXun帮助详情
+
+    参数:
+        module: 模块名
+        metadata: PluginMetadata
+        extra: PluginExtraData
+        is_superuser: 是否超级用户帮助
+
+    返回:
+        str | bytes: 返回信息
+    """
+    call_count = await Statistics.filter(plugin_name=module).count()
+    usage = metadata.usage
+    if is_superuser:
+        if not extra.superuser_help:
+            return "该功能没有超级用户帮助信息"
+        usage = extra.superuser_help
+    return await template_to_pic(
+        template_path=str((TEMPLATE_PATH / "help_detail").absolute()),
+        template_name="main.html",
+        templates={
+            "title": metadata.name,
+            "author": extra.author,
+            "version": extra.version,
+            "call_count": call_count,
+            "descriptions": split_text(metadata.description),
+            "usages": split_text(usage),
+        },
+        pages={
+            "viewport": {"width": 824, "height": 590},
+            "base_url": f"file://{TEMPLATE_PATH}",
+        },
+        wait=2,
+    )
+
+
+async def get_plugin_help(user_id: str, name: str, is_superuser: bool) -> str | bytes:
     """获取功能的帮助信息
 
     参数:
         user_id: 用户id
         name: 插件名称或id
         is_superuser: 是否为超级用户
-        variant: 使用的皮肤/变体名称
     """
     type_list = await get_user_allow_help(user_id)
     if name.isdigit():
@@ -182,45 +196,16 @@ async def get_plugin_help(
         plugin = await PluginInfo.get_or_none(
             name__iexact=name, load_status=True, plugin_type__in=type_list
         )
-
     if plugin:
         _plugin = nonebot.get_plugin_by_module_name(plugin.module_path)
         if _plugin and _plugin.metadata:
             extra_data = PluginExtraData(**_plugin.metadata.extra)
-
-            call_count = await Statistics.filter(plugin_name=plugin.module).count()
-            usage = _plugin.metadata.usage
-            if is_superuser:
-                if not extra_data.superuser_help:
-                    return "该功能没有超级用户帮助信息"
-                usage = extra_data.superuser_help
-
-            metadata_items = [
-                {"label": "作者", "value": extra_data.author or "未知"},
-                {"label": "版本", "value": extra_data.version or "未知"},
-                {"label": "调用次数", "value": call_count},
-            ]
-
-            processed_description = format_usage_for_markdown(
-                _plugin.metadata.description.strip()
-            )
-            processed_usage = format_usage_for_markdown(usage.strip())
-
-            sections = [
-                {"title": "简介", "content": [processed_description]},
-                {"title": "使用方法", "content": [processed_usage]},
-            ]
-
-            page_data = {
-                "title": _plugin.metadata.name,
-                "metadata": metadata_items,
-                "sections": sections,
-            }
-
-            component = ui.template("pages/builtin/help", data=page_data)
-            if variant:
-                component.variant = variant
-            return await ui.render(component, use_cache=True, device_scale_factor=2)
+            if Config.get_config("help", "detail_type") == "zhenxun":
+                return await get_zhenxun_help(
+                    plugin.module, _plugin.metadata, extra_data, is_superuser
+                )
+            else:
+                return await get_normal_help(_plugin.metadata, extra_data, is_superuser)
         return "糟糕! 该功能没有帮助喔..."
     return "没有查找到这个功能噢..."
 
@@ -297,12 +282,10 @@ async def get_llm_help(question: str, user_id: str) -> str | bytes:
 
         reply_text = response.text if response else "抱歉，我暂时无法回答这个问题。"
         threshold = Config.get_config("help", "LLM_HELPER_REPLY_AS_IMAGE_THRESHOLD", 50)
-
         if len(reply_text) > threshold:
-            builder = NotebookBuilder()
-            builder.text(reply_text)
-            return await ui.render(builder.build())
-
+            markdown = Markdown()
+            markdown.text(reply_text)
+            return await markdown.build()
         return reply_text
 
     except LLMException as e:

zhenxun/builtin_plugins/help/_utils.py

@@ -53,5 +53,5 @@ async def classify_plugin(
                 classify[menu] = []
             classify[menu].append(handle(bot, plugin, group, is_detail))
     for value in classify.values():
-        value.sort(key=lambda x: int(x["id"]))
+        value.sort(key=lambda x: x.id)
     return classify

zhenxun/builtin_plugins/help/html_help.py

@@ -0,0 +1,150 @@
+import os
+import random
+
+from nonebot_plugin_htmlrender import template_to_pic
+from nonebot_plugin_uninfo import Uninfo
+from pydantic import BaseModel
+
+from zhenxun.configs.path_config import TEMPLATE_PATH
+from zhenxun.models.bot_console import BotConsole
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.utils.enum import BlockType
+
+from ._utils import classify_plugin
+
+LOGO_PATH = TEMPLATE_PATH / "menu" / "res" / "logo"
+
+
+class Item(BaseModel):
+    plugin_name: str
+    """插件名称"""
+    sta: int
+    """插件状态"""
+    id: int
+    """插件id"""
+
+
+class PluginList(BaseModel):
+    plugin_type: str
+    """菜单名称"""
+    icon: str
+    """图标"""
+    logo: str
+    """logo"""
+    items: list[Item]
+    """插件列表"""
+
+
+ICON2STR = {
+    "normal": "fa fa-cog",
+    "原神相关": "fa fa-circle-o",
+    "常规插件": "fa fa-cubes",
+    "联系管理员": "fa fa-envelope-o",
+    "抽卡相关": "fa fa-credit-card-alt",
+    "来点好康的": "fa fa-picture-o",
+    "数据统计": "fa fa-bar-chart",
+    "一些工具": "fa fa-shopping-cart",
+    "商店": "fa fa-shopping-cart",
+    "其它": "fa fa-tags",
+    "群内小游戏": "fa fa-gamepad",
+}
+
+
+def __handle_item(
+    bot: BotConsole, plugin: PluginInfo, group: GroupConsole | None, is_detail: bool
+) -> Item:
+    """构造Item
+
+    参数:
+        bot: BotConsole
+        plugin: PluginInfo
+        group: 群组
+        is_detail: 是否详细
+
+    返回:
+        Item: Item
+    """
+    sta = 0
+    if not plugin.status:
+        if group and plugin.block_type in [
+            BlockType.ALL,
+            BlockType.GROUP,
+        ]:
+            sta = 2
+        if not group and plugin.block_type in [
+            BlockType.ALL,
+            BlockType.PRIVATE,
+        ]:
+            sta = 2
+    if group:
+        if f"{plugin.module}," in group.superuser_block_plugin:
+            sta = 2
+        if f"{plugin.module}," in group.block_plugin:
+            sta = 1
+    if bot and f"{plugin.module}," in bot.block_plugins:
+        sta = 2
+    return Item(plugin_name=plugin.name, sta=sta, id=plugin.id)
+
+
+def build_plugin_data(classify: dict[str, list[Item]]) -> list[dict[str, str]]:
+    """构建前端插件数据
+
+    参数:
+        classify: 插件数据
+
+    返回:
+        list[dict[str, str]]: 前端插件数据
+    """
+    lengths = [len(classify[c]) for c in classify]
+    index = lengths.index(max(lengths))
+    menu_key = list(classify.keys())[index]
+    max_data = classify[menu_key]
+    del classify[menu_key]
+    plugin_list = []
+    for menu_type in classify:
+        icon = "fa fa-pencil-square-o"
+        if menu_type in ICON2STR.keys():
+            icon = ICON2STR[menu_type]
+        logo = LOGO_PATH / random.choice(os.listdir(LOGO_PATH))
+        data = {
+            "name": menu_type if menu_type != "normal" else "功能",
+            "items": classify[menu_type],
+            "icon": icon,
+            "logo": str(logo.absolute()),
+        }
+        plugin_list.append(data)
+    plugin_list.insert(
+        0,
+        {
+            "name": menu_key if menu_key != "normal" else "功能",
+            "items": max_data,
+            "icon": "fa fa-pencil-square-o",
+            "logo": str((LOGO_PATH / random.choice(os.listdir(LOGO_PATH))).absolute()),
+        },
+    )
+    return plugin_list
+
+
+async def build_html_image(
+    session: Uninfo, group_id: str | None, is_detail: bool
+) -> bytes:
+    """构造HTML帮助图片
+
+    参数:
+        session: Uninfo
+        group_id: 群号
+        is_detail: 是否详细帮助
+    """
+    classify = await classify_plugin(session, group_id, is_detail, __handle_item)
+    plugin_list = build_plugin_data(classify)
+    return await template_to_pic(
+        template_path=str((TEMPLATE_PATH / "menu").absolute()),
+        template_name="zhenxun_menu.html",
+        templates={"plugin_list": plugin_list},
+        pages={
+            "viewport": {"width": 1903, "height": 10},
+            "base_url": f"file://{TEMPLATE_PATH}",
+        },
+        wait=2,
+    )

zhenxun/builtin_plugins/help/normal_help.py

@@ -0,0 +1,100 @@
+from zhenxun.configs.path_config import IMAGE_PATH
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.utils._build_image import BuildImage
+from zhenxun.utils.enum import BlockType
+from zhenxun.utils.image_utils import build_sort_image, group_image
+
+from ._utils import sort_type
+
+BACKGROUND_PATH = IMAGE_PATH / "background" / "help" / "simple_help"
+
+
+async def build_normal_image(group_id: str | None, is_detail: bool) -> BuildImage:
+    """构造PIL帮助图片
+
+    参数:
+         group_id: 群号
+         is_detail: 详细帮助
+    """
+    image_list = []
+    font_size = 24
+    font = BuildImage.load_font("HYWenHei-85W.ttf", 20)
+    sort_data = await sort_type()
+    for idx, menu_type in enumerate(sort_data):
+        plugin_list = sort_data[menu_type]
+        """拿到最大宽度和结算高度"""
+        wh_list = [
+            BuildImage.get_text_size(f"{x.id}.{x.name}", font) for x in plugin_list
+        ]
+        wh_list.append(BuildImage.get_text_size(menu_type, font))
+        sum_height = (font_size + 6) * len(plugin_list) + 10
+        max_width = max(x[0] for x in wh_list) + 30
+        bk = BuildImage(
+            max_width + 40,
+            sum_height + 50,
+            font_size=30,
+            color="#a7d1fc",
+            font="CJGaoDeGuo.otf",
+        )
+        title_size = bk.getsize(menu_type)
+        max_width = max_width if max_width > title_size[0] else title_size[0]
+        row = BuildImage(
+            max_width + 40,
+            sum_height,
+            font_size=font_size,
+            color="black" if idx % 2 else "white",
+        )
+        curr_h = 10
+        group = await GroupConsole.get_group(group_id=group_id) if group_id else None
+        for _, plugin in enumerate(plugin_list):
+            text_color = (255, 255, 255) if idx % 2 else (0, 0, 0)
+            if group and f"{plugin.module}," in group.block_plugin:
+                text_color = (252, 75, 13)
+            pos = None
+            # 禁用状态划线
+            if plugin.block_type in [BlockType.ALL, BlockType.GROUP] or (
+                group and f"super:{plugin.module}," in group.block_plugin
+            ):
+                w = curr_h + int(row.getsize(plugin.name)[1] / 2) + 2
+                line_width = row.getsize(plugin.name)[0] + 35
+                pos = (7, w, line_width, w)
+            await row.text((10, curr_h), f"{plugin.id}.{plugin.name}", text_color)
+            if pos:
+                await row.line(pos, (236, 66, 7), 3)
+            curr_h += font_size + 5
+        await bk.text((0, 14), menu_type, center_type="width")
+        await bk.paste(row, (0, 50))
+        await bk.transparent(2)
+        image_list.append(bk)
+    image_group, h = group_image(image_list)
+
+    async def _a(image: BuildImage):
+        await image.filter("GaussianBlur", 5)
+
+    result = await build_sort_image(
+        image_group,
+        h,
+        background_path=BACKGROUND_PATH,
+        background_handle=_a,
+    )
+    width, height = 10, 10
+    for s in [
+        "目前支持的功能列表:",
+        "可以通过 '帮助 [功能名称或功能Id]' 来获取对应功能的使用方法",
+    ]:
+        text = await BuildImage.build_text_image(s, "HYWenHei-85W.ttf", 24)
+        await result.paste(text, (width, height))
+        height += 50
+        if s == "目前支持的功能列表:":
+            width += 50
+    text = await BuildImage.build_text_image(
+        "注: 红字代表功能被群管理员禁用，红线代表功能正在维护",
+        "HYWenHei-85W.ttf",
+        24,
+        (231, 74, 57),
+    )
+    await result.paste(
+        text,
+        (300, 10),
+    )
+    return result

zhenxun/builtin_plugins/help/zhenxun_help.py

@@ -0,0 +1,143 @@
+import nonebot
+from nonebot_plugin_htmlrender import template_to_pic
+from nonebot_plugin_uninfo import Uninfo
+from pydantic import BaseModel
+
+from zhenxun.configs.config import BotConfig
+from zhenxun.configs.path_config import TEMPLATE_PATH
+from zhenxun.configs.utils import PluginExtraData
+from zhenxun.models.bot_console import BotConsole
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.utils.enum import BlockType
+from zhenxun.utils.platform import PlatformUtils
+
+from ._utils import classify_plugin
+
+
+class Item(BaseModel):
+    plugin_name: str
+    """插件名称"""
+    commands: list[str]
+    """插件命令"""
+    id: str
+    """插件id"""
+    status: bool
+    """插件状态"""
+    has_superuser_help: bool
+    """插件是否拥有超级用户帮助"""
+
+
+def __handle_item(
+    bot: BotConsole | None,
+    plugin: PluginInfo,
+    group: GroupConsole | None,
+    is_detail: bool,
+):
+    """构造Item
+
+    参数:
+        bot: BotConsole
+        plugin: PluginInfo
+        group: 群组
+        is_detail: 是否为详细
+
+    返回:
+        Item: Item
+    """
+    status = True
+    has_superuser_help = False
+    nb_plugin = nonebot.get_plugin_by_module_name(plugin.module_path)
+    if nb_plugin and nb_plugin.metadata and nb_plugin.metadata.extra:
+        extra_data = PluginExtraData(**nb_plugin.metadata.extra)
+        if extra_data.superuser_help:
+            has_superuser_help = True
+    if not plugin.status:
+        if plugin.block_type == BlockType.ALL:
+            status = False
+        elif group and plugin.block_type == BlockType.GROUP:
+            status = False
+        elif not group and plugin.block_type == BlockType.PRIVATE:
+            status = False
+    elif group and f"{plugin.module}," in group.block_plugin:
+        status = False
+    elif bot and f"{plugin.module}," in bot.block_plugins:
+        status = False
+    commands = []
+    nb_plugin = nonebot.get_plugin_by_module_name(plugin.module_path)
+    if is_detail and nb_plugin and nb_plugin.metadata and nb_plugin.metadata.extra:
+        extra_data = PluginExtraData(**nb_plugin.metadata.extra)
+        commands = [cmd.command for cmd in extra_data.commands]
+    return Item(
+        plugin_name=plugin.name,
+        commands=commands,
+        id=str(plugin.id),
+        status=status,
+        has_superuser_help=has_superuser_help,
+    )
+
+
+def build_plugin_data(classify: dict[str, list[Item]]) -> list[dict[str, str]]:
+    """构建前端插件数据
+
+    参数:
+        classify: 插件数据
+
+    返回:
+        list[dict[str, str]]: 前端插件数据
+    """
+    classify = dict(sorted(classify.items(), key=lambda x: len(x[1]), reverse=True))
+    menu_key = next(iter(classify.keys()))
+    max_data = classify[menu_key]
+    del classify[menu_key]
+    plugin_list = [
+        {
+            "name": "主要功能" if menu in ["normal", "功能"] else menu,
+            "items": value,
+        }
+        for menu, value in classify.items()
+    ]
+    plugin_list.insert(0, {"name": menu_key, "items": max_data})
+    for plugin in plugin_list:
+        plugin["items"].sort(key=lambda x: x.id)
+    return plugin_list
+
+
+async def build_zhenxun_image(
+    session: Uninfo, group_id: str | None, is_detail: bool
+) -> bytes:
+    """构造真寻帮助图片
+
+    参数:
+        bot_id: bot_id
+        group_id: 群号
+        is_detail: 是否详细帮助
+    """
+    classify = await classify_plugin(session, group_id, is_detail, __handle_item)
+    plugin_list = build_plugin_data(classify)
+    platform = PlatformUtils.get_platform(session)
+    bot_id = BotConfig.get_qbot_uid(session.self_id) or session.self_id
+    bot_ava = PlatformUtils.get_user_avatar_url(bot_id, platform)
+    width = int(637 * 1.5) if is_detail else 637
+    title_font = int(53 * 1.5) if is_detail else 53
+    tip_font = int(19 * 1.5) if is_detail else 19
+    plugin_count = sum(len(plugin["items"]) for plugin in plugin_list)
+    return await template_to_pic(
+        template_path=str((TEMPLATE_PATH / "ss_menu").absolute()),
+        template_name="main.html",
+        templates={
+            "data": {
+                "plugin_list": plugin_list,
+                "ava": bot_ava,
+                "width": width,
+                "font_size": (title_font, tip_font),
+                "is_detail": is_detail,
+                "plugin_count": plugin_count,
+            }
+        },
+        pages={
+            "viewport": {"width": width, "height": 10},
+            "base_url": f"file://{TEMPLATE_PATH}",
+        },
+        wait=2,
+    )

zhenxun/builtin_plugins/help_help.py

@@ -74,8 +74,8 @@ async def _(matcher: Matcher, message: UniMsg, session: EventSession):
         message_list.append(image)
     message_list.append(
         "桀桀桀，预判到会有 '笨蛋' 把功能名称当命令用，特地前来嘲笑！"
-        f"但还是好心来帮帮你啦！\n请at我发送 '帮助 {plugin.name}' 或者"
-        f" '帮助 {plugin.id}' 来获取该功能帮助！"
+        f"但还是好心来帮帮你啦！\n请at我发送 '帮助{plugin.name}' 或者"
+        f" '帮助{plugin.id}' 来获取该功能帮助！"
     )
     logger.info("检测到功能名称当命令使用，已发送帮助信息", "功能帮助", session=session)
     await MessageUtils.build_message(message_list).send(reply_to=True)

zhenxun/builtin_plugins/hooks/__init__.py

@@ -58,14 +58,5 @@ Config.add_plugin_config(
     type=bool,
 )
 
-Config.add_plugin_config(
-    "hook",
-    "AUTH_HOOKS_CONCURRENCY_LIMIT",
-    5,
-    help="同步进入权限钩子最大并发数",
-    default_value=5,
-    type=int,
-)
-
 
 nonebot.load_plugins(str(Path(__file__).parent.resolve()))

zhenxun/builtin_plugins/hooks/auth/auth_ban.py

@@ -96,6 +96,7 @@ async def is_ban(user_id: str | None, group_id: str | None) -> int:
                     f"查询ban记录超时: user_id={user_id}, group_id={group_id}",
                     LOGGER_COMMAND,
                 )
+                # 超时时返回0，避免阻塞
                 return 0
 
         # 检查记录并计算ban时间
@@ -198,7 +199,7 @@ async def group_handle(group_id: str) -> None:
             )
 
 
-async def user_handle(plugin: PluginInfo, entity: EntityIDs, session: Uninfo) -> None:
+async def user_handle(module: str, entity: EntityIDs, session: Uninfo) -> None:
     """用户ban检查
 
     参数:
@@ -216,12 +217,22 @@ async def user_handle(plugin: PluginInfo, entity: EntityIDs, session: Uninfo) ->
         if not time_val:
             return
         time_str = format_time(time_val)
+        plugin_dao = DataAccess(PluginInfo)
+        try:
+            db_plugin = await asyncio.wait_for(
+                plugin_dao.safe_get_or_none(module=module), timeout=DB_TIMEOUT_SECONDS
+            )
+        except asyncio.TimeoutError:
+            logger.error(f"查询插件信息超时: {module}", LOGGER_COMMAND)
+            # 超时时不阻塞，继续执行
+            raise SkipPluginException("用户处于黑名单中...")
 
         if (
-            plugin
+            db_plugin
+            and not db_plugin.ignore_prompt
             and time_val != -1
             and ban_result
-            and freq.is_send_limit_message(plugin, entity.user_id, False)
+            and freq.is_send_limit_message(db_plugin, entity.user_id, False)
         ):
             try:
                 await asyncio.wait_for(
@@ -249,9 +260,7 @@ async def user_handle(plugin: PluginInfo, entity: EntityIDs, session: Uninfo) ->
             )
 
 
-async def auth_ban(
-    matcher: Matcher, bot: Bot, session: Uninfo, plugin: PluginInfo
-) -> None:
+async def auth_ban(matcher: Matcher, bot: Bot, session: Uninfo) -> None:
     """权限检查 - ban 检查
 
     参数:
@@ -280,7 +289,7 @@ async def auth_ban(
         if entity.user_id:
             try:
                 await asyncio.wait_for(
-                    user_handle(plugin, entity, session),
+                    user_handle(matcher.plugin_name, entity, session),
                     timeout=DB_TIMEOUT_SECONDS,
                 )
             except asyncio.TimeoutError:

zhenxun/builtin_plugins/hooks/auth/auth_group.py

@@ -1,36 +1,50 @@
+import asyncio
 import time
 
 from nonebot_plugin_alconna import UniMsg
 
 from zhenxun.models.group_console import GroupConsole
 from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.services.data_access import DataAccess
+from zhenxun.services.db_context import DB_TIMEOUT_SECONDS
 from zhenxun.services.log import logger
+from zhenxun.utils.utils import EntityIDs
 
 from .config import LOGGER_COMMAND, WARNING_THRESHOLD, SwitchEnum
 from .exception import SkipPluginException
 
 
-async def auth_group(
-    plugin: PluginInfo,
-    group: GroupConsole | None,
-    message: UniMsg,
-    group_id: str | None,
-):
+async def auth_group(plugin: PluginInfo, entity: EntityIDs, message: UniMsg):
     """群黑名单检测 群总开关检测
 
     参数:
         plugin: PluginInfo
-        group: GroupConsole
+        entity: EntityIDs
         message: UniMsg
     """
-    if not group_id:
-        return
-
     start_time = time.time()
 
+    if not entity.group_id:
+        return
+
     try:
         text = message.extract_plain_text()
 
+        # 从数据库或缓存中获取群组信息
+        group_dao = DataAccess(GroupConsole)
+
+        try:
+            group: GroupConsole | None = await asyncio.wait_for(
+                group_dao.safe_get_or_none(
+                    group_id=entity.group_id, channel_id__isnull=True
+                ),
+                timeout=DB_TIMEOUT_SECONDS,
+            )
+        except asyncio.TimeoutError:
+            logger.error("查询群组信息超时", LOGGER_COMMAND, session=entity.user_id)
+            # 超时时不阻塞，继续执行
+            return
+
         if not group:
             raise SkipPluginException("群组信息不存在...")
         if group.level < 0:
@@ -49,5 +63,6 @@ async def auth_group(
             logger.warning(
                 f"auth_group 耗时: {elapsed:.3f}s, plugin={plugin.module}",
                 LOGGER_COMMAND,
-                group_id=group_id,
+                session=entity.user_id,
+                group_id=entity.group_id,
             )

zhenxun/builtin_plugins/hooks/auth/auth_plugin.py

@@ -6,10 +6,12 @@ from nonebot_plugin_uninfo import Uninfo
 
 from zhenxun.models.group_console import GroupConsole
 from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.services.data_access import DataAccess
 from zhenxun.services.db_context import DB_TIMEOUT_SECONDS
 from zhenxun.services.log import logger
 from zhenxun.utils.common_utils import CommonUtils
 from zhenxun.utils.enum import BlockType
+from zhenxun.utils.utils import get_entity_ids
 
 from .config import LOGGER_COMMAND, WARNING_THRESHOLD
 from .exception import IsSuperuserException, SkipPluginException
@@ -18,17 +20,30 @@ from .utils import freq, is_poke, send_message
 
 class GroupCheck:
     def __init__(
-        self, plugin: PluginInfo, group: GroupConsole, session: Uninfo, is_poke: bool
+        self, plugin: PluginInfo, group_id: str, session: Uninfo, is_poke: bool
     ) -> None:
+        self.group_id = group_id
         self.session = session
         self.is_poke = is_poke
         self.plugin = plugin
-        self.group_data = group
-        self.group_id = group.group_id
+        self.group_dao = DataAccess(GroupConsole)
+        self.group_data = None
 
     async def check(self):
         start_time = time.time()
         try:
+            # 只查询一次数据库，使用 DataAccess 的缓存机制
+            try:
+                self.group_data = await asyncio.wait_for(
+                    self.group_dao.safe_get_or_none(
+                        group_id=self.group_id, channel_id__isnull=True
+                    ),
+                    timeout=DB_TIMEOUT_SECONDS,
+                )
+            except asyncio.TimeoutError:
+                logger.error(f"查询群组数据超时: {self.group_id}", LOGGER_COMMAND)
+                return  # 超时时不阻塞，继续执行
+
             # 检查超级用户禁用
             if (
                 self.group_data
@@ -98,13 +113,12 @@ class GroupCheck:
 
 
 class PluginCheck:
-    def __init__(self, group: GroupConsole | None, session: Uninfo, is_poke: bool):
+    def __init__(self, group_id: str | None, session: Uninfo, is_poke: bool):
         self.session = session
         self.is_poke = is_poke
-        self.group_data = group
-        self.group_id = None
-        if group:
-            self.group_id = group.group_id
+        self.group_id = group_id
+        self.group_dao = DataAccess(GroupConsole)
+        self.group_data = None
 
     async def check_user(self, plugin: PluginInfo):
         """全局私聊禁用检测
@@ -142,8 +156,21 @@ class PluginCheck:
             if plugin.status or plugin.block_type != BlockType.ALL:
                 return
             """全局状态"""
-            if self.group_data and self.group_data.is_super:
-                raise IsSuperuserException()
+            if self.group_id:
+                # 使用 DataAccess 的缓存机制
+                try:
+                    self.group_data = await asyncio.wait_for(
+                        self.group_dao.safe_get_or_none(
+                            group_id=self.group_id, channel_id__isnull=True
+                        ),
+                        timeout=DB_TIMEOUT_SECONDS,
+                    )
+                except asyncio.TimeoutError:
+                    logger.error(f"查询群组数据超时: {self.group_id}", LOGGER_COMMAND)
+                    return  # 超时时不阻塞，继续执行
+
+                if self.group_data and self.group_data.is_super:
+                    raise IsSuperuserException()
 
             sid = self.group_id or self.session.user.id
             if freq.is_send_limit_message(plugin, sid, self.is_poke):
@@ -166,9 +193,7 @@ class PluginCheck:
                 )
 
 
-async def auth_plugin(
-    plugin: PluginInfo, group: GroupConsole | None, session: Uninfo, event: Event
-):
+async def auth_plugin(plugin: PluginInfo, session: Uninfo, event: Event):
     """插件状态
 
     参数:
@@ -178,23 +203,35 @@ async def auth_plugin(
     """
     start_time = time.time()
     try:
+        entity = get_entity_ids(session)
         is_poke_event = is_poke(event)
-        user_check = PluginCheck(group, session, is_poke_event)
+        user_check = PluginCheck(entity.group_id, session, is_poke_event)
 
-        tasks = []
-        if group:
-            tasks.append(GroupCheck(plugin, group, session, is_poke_event).check())
+        if entity.group_id:
+            group_check = GroupCheck(plugin, entity.group_id, session, is_poke_event)
+            try:
+                await asyncio.wait_for(
+                    group_check.check(), timeout=DB_TIMEOUT_SECONDS * 2
+                )
+            except asyncio.TimeoutError:
+                logger.error(f"群组检查超时: {entity.group_id}", LOGGER_COMMAND)
+                # 超时时不阻塞，继续执行
         else:
-            tasks.append(user_check.check_user(plugin))
-        tasks.append(user_check.check_global(plugin))
+            try:
+                await asyncio.wait_for(
+                    user_check.check_user(plugin), timeout=DB_TIMEOUT_SECONDS
+                )
+            except asyncio.TimeoutError:
+                logger.error("用户检查超时", LOGGER_COMMAND)
+                # 超时时不阻塞，继续执行
 
         try:
             await asyncio.wait_for(
-                asyncio.gather(*tasks), timeout=DB_TIMEOUT_SECONDS * 2
+                user_check.check_global(plugin), timeout=DB_TIMEOUT_SECONDS
             )
         except asyncio.TimeoutError:
-            logger.error("插件用户/群组/全局检查超时...", LOGGER_COMMAND)
-
+            logger.error("全局检查超时", LOGGER_COMMAND)
+            # 超时时不阻塞，继续执行
     finally:
         # 记录总执行时间
         elapsed = time.time() - start_time

zhenxun/builtin_plugins/hooks/auth/utils.py

@@ -85,7 +85,7 @@ class FreqUtils:
             return False
         if plugin.plugin_type == PluginType.DEPENDANT:
             return False
-        return False if plugin.ignore_prompt else self._flmt_s.check(sid)
+        return plugin.module != "ai" if self._flmt_s.check(sid) else False
 
 
 freq = FreqUtils()

zhenxun/builtin_plugins/hooks/auth_checker.py

@@ -8,7 +8,6 @@ from nonebot_plugin_alconna import UniMsg
 from nonebot_plugin_uninfo import Uninfo
 from tortoise.exceptions import IntegrityError
 
-from zhenxun.models.group_console import GroupConsole
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.user_console import UserConsole
 from zhenxun.services.data_access import DataAccess
@@ -32,7 +31,6 @@ from .auth.exception import (
     PermissionExemption,
     SkipPluginException,
 )
-from .auth.utils import base_config
 
 # 超时设置（秒）
 TIMEOUT_SECONDS = 5.0
@@ -48,16 +46,6 @@ CIRCUIT_BREAKERS = {
 # 熔断重置时间（秒）
 CIRCUIT_RESET_TIME = 300  # 5分钟
 
-# 并发控制：限制同时进入 hooks 并行检查的协程数
-
-# 默认为 6，可通过环境变量 AUTH_HOOKS_CONCURRENCY_LIMIT 调整
-HOOKS_CONCURRENCY_LIMIT = base_config.get("AUTH_HOOKS_CONCURRENCY_LIMIT")
-
-# 全局信号量与计数器
-HOOKS_SEMAPHORE = asyncio.Semaphore(HOOKS_CONCURRENCY_LIMIT)
-HOOKS_ACTIVE_COUNT = 0
-HOOKS_ACTIVE_LOCK = asyncio.Lock()
-
 
 # 超时装饰器
 async def with_timeout(coro, timeout=TIMEOUT_SECONDS, name=None):
@@ -162,10 +150,6 @@ async def get_plugin_and_user(
         )
     except IntegrityError:
         await asyncio.sleep(0.5)
-        plugin_task = plugin_dao.safe_get_or_none(module=module)
-        user_task = user_dao.get_by_func_or_none(
-            UserConsole.get_user, False, user_id=user_id
-        )
         plugin, user = await with_timeout(
             asyncio.gather(plugin_task, user_task), name="get_plugin_and_user"
         )
@@ -271,30 +255,6 @@ async def time_hook(coro, name, time_dict):
             time_dict[name] = f"{time.time() - start:.3f}s"
 
 
-async def _enter_hooks_section():
-    """尝试获取全局信号量并更新计数器，超时则抛出 PermissionExemption。"""
-    global HOOKS_ACTIVE_COUNT
-    # 队列模式：如果达到上限，协程将排队等待直到获取到信号量
-    await HOOKS_SEMAPHORE.acquire()
-    async with HOOKS_ACTIVE_LOCK:
-        HOOKS_ACTIVE_COUNT += 1
-        logger.debug(f"当前并发权限检查数量: {HOOKS_ACTIVE_COUNT}", LOGGER_COMMAND)
-
-
-async def _leave_hooks_section():
-    """释放信号量并更新计数器。"""
-    global HOOKS_ACTIVE_COUNT
-    from contextlib import suppress
-
-    with suppress(Exception):
-        HOOKS_SEMAPHORE.release()
-    async with HOOKS_ACTIVE_LOCK:
-        HOOKS_ACTIVE_COUNT -= 1
-        # 保证计数不为负
-        HOOKS_ACTIVE_COUNT = max(HOOKS_ACTIVE_COUNT, 0)
-        logger.debug(f"当前并发权限检查数量: {HOOKS_ACTIVE_COUNT}", LOGGER_COMMAND)
-
-
 async def auth(
     matcher: Matcher,
     event: Event,
@@ -321,9 +281,6 @@ async def auth(
     hook_times = {}
     hooks_time = 0  # 初始化 hooks_time 变量
 
-    # 记录是否已进入 hooks 区域（用于 finally 中释放）
-    entered_hooks = False
-
     try:
         if not module:
             raise PermissionExemption("Matcher插件名称不存在...")
@@ -343,10 +300,6 @@ async def auth(
             )
             raise PermissionExemption("获取插件和用户数据超时，请稍后再试...")
 
-        # 进入 hooks 并行检查区域（会在高并发时排队）
-        await _enter_hooks_section()
-        entered_hooks = True
-
         # 获取插件费用
         cost_start = time.time()
         try:
@@ -363,32 +316,16 @@ async def auth(
         # 执行 bot_filter
         bot_filter(session)
 
-        group = None
-        if entity.group_id:
-            group_dao = DataAccess(GroupConsole)
-            group = await with_timeout(
-                group_dao.safe_get_or_none(
-                    group_id=entity.group_id, channel_id__isnull=True
-                ),
-                name="get_group",
-            )
-
         # 并行执行所有 hook 检查，并记录执行时间
         hooks_start = time.time()
 
         # 创建所有 hook 任务
         hook_tasks = [
-            time_hook(auth_ban(matcher, bot, session, plugin), "auth_ban", hook_times),
+            time_hook(auth_ban(matcher, bot, session), "auth_ban", hook_times),
             time_hook(auth_bot(plugin, bot.self_id), "auth_bot", hook_times),
-            time_hook(
-                auth_group(plugin, group, message, entity.group_id),
-                "auth_group",
-                hook_times,
-            ),
+            time_hook(auth_group(plugin, entity, message), "auth_group", hook_times),
             time_hook(auth_admin(plugin, session), "auth_admin", hook_times),
-            time_hook(
-                auth_plugin(plugin, group, session, event), "auth_plugin", hook_times
-            ),
+            time_hook(auth_plugin(plugin, session, event), "auth_plugin", hook_times),
             time_hook(auth_limit(plugin, session), "auth_limit", hook_times),
         ]
 
@@ -417,17 +354,7 @@ async def auth(
         logger.debug("超级用户跳过权限检测...", LOGGER_COMMAND, session=session)
     except PermissionExemption as e:
         logger.info(str(e), LOGGER_COMMAND, session=session)
-    finally:
-        # 如果进入过 hooks 区域，确保释放信号量（即使上层处理抛出了异常）
-        if entered_hooks:
-            try:
-                await _leave_hooks_section()
-            except Exception:
-                logger.error(
-                    "释放 hooks 信号量时出错",
-                    LOGGER_COMMAND,
-                    session=session,
-                )
+
     # 扣除金币
     if not ignore_flag and cost_gold > 0:
         gold_start = time.time()

zhenxun/builtin_plugins/hooks/call_hook.py

@@ -6,7 +6,6 @@ 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.log_sanitizer import sanitize_for_logging
 from zhenxun.utils.manager.message_manager import MessageManager
 from zhenxun.utils.platform import PlatformUtils
 
@@ -53,6 +52,7 @@ async def handle_api_result(
     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(
@@ -78,8 +78,7 @@ async def handle_api_result(
             else replace_message(message),
             platform=PlatformUtils.get_platform(bot),
         )
-        sanitized_message = sanitize_for_logging(message, context="nonebot_message")
-        logger.debug(f"消息发送记录，message: {sanitized_message}")
+        logger.debug(f"消息发送记录，message: {message}")
     except Exception as e:
         logger.warning(
             f"消息发送记录发生错误...data: {data}, result: {result}",

zhenxun/builtin_plugins/hooks/chkdsk_hook.py

@@ -43,20 +43,18 @@ class BanCheckLimiter:
 
     def check(self, key: str | float) -> bool:
         if time.time() - self.mtime[key] > self.default_check_time:
-            return self._extracted_from_check_3(key, False)
+            self.mtime[key] = time.time()
+            self.mint[key] = 0
+            return False
         if (
             self.mint[key] >= self.default_count
             and time.time() - self.mtime[key] < self.default_check_time
         ):
-            return self._extracted_from_check_3(key, True)
+            self.mtime[key] = time.time()
+            self.mint[key] = 0
+            return True
         return False
 
-    # TODO Rename this here and in `check`
-    def _extracted_from_check_3(self, key, arg1):
-        self.mtime[key] = time.time()
-        self.mint[key] = 0
-        return arg1
-
 
 _blmt = BanCheckLimiter(
     malicious_check_time,
@@ -72,15 +70,16 @@ async def _(
     module = None
     if plugin := matcher.plugin:
         module = plugin.module_name
-        if not (metadata := plugin.metadata):
-            return
-        extra = metadata.extra
-        if extra.get("plugin_type") in [
-            PluginType.HIDDEN,
-            PluginType.DEPENDANT,
-            PluginType.ADMIN,
-            PluginType.SUPERUSER,
-        ]:
+        if metadata := plugin.metadata:
+            extra = metadata.extra
+            if extra.get("plugin_type") in [
+                PluginType.HIDDEN,
+                PluginType.DEPENDANT,
+                PluginType.ADMIN,
+                PluginType.SUPERUSER,
+            ]:
+                return
+        else:
             return
     if matcher.type == "notice":
         return
@@ -89,31 +88,32 @@ async def _(
     malicious_ban_time = Config.get_config("hook", "MALICIOUS_BAN_TIME")
     if not malicious_ban_time:
         raise ValueError("模块: [hook], 配置项: [MALICIOUS_BAN_TIME] 为空或小于0")
-    if user_id and module:
-        if _blmt.check(f"{user_id}__{module}"):
-            await BanConsole.ban(
-                user_id,
-                group_id,
-                9,
-                "恶意触发命令检测",
-                malicious_ban_time * 60,
-                bot.self_id,
-            )
-            logger.info(
-                f"触发了恶意触发检测: {matcher.plugin_name}",
-                "HOOK",
-                session=session,
-            )
-            await MessageUtils.build_message(
-                [
-                    At(flag="user", target=user_id),
-                    "检测到恶意触发命令，您将被封禁 30 分钟",
-                ]
-            ).send()
-            logger.debug(
-                f"触发了恶意触发检测: {matcher.plugin_name}",
-                "HOOK",
-                session=session,
-            )
-            raise IgnoredException("检测到恶意触发命令")
-        _blmt.add(f"{user_id}__{module}")
+    if user_id:
+        if module:
+            if _blmt.check(f"{user_id}__{module}"):
+                await BanConsole.ban(
+                    user_id,
+                    group_id,
+                    9,
+                    "恶意触发命令检测",
+                    malicious_ban_time * 60,
+                    bot.self_id,
+                )
+                logger.info(
+                    f"触发了恶意触发检测: {matcher.plugin_name}",
+                    "HOOK",
+                    session=session,
+                )
+                await MessageUtils.build_message(
+                    [
+                        At(flag="user", target=user_id),
+                        "检测到恶意触发命令，您将被封禁 30 分钟",
+                    ]
+                ).send()
+                logger.debug(
+                    f"触发了恶意触发检测: {matcher.plugin_name}",
+                    "HOOK",
+                    session=session,
+                )
+                raise IgnoredException("检测到恶意触发命令")
+            _blmt.add(f"{user_id}__{module}")

zhenxun/builtin_plugins/info/my_info.py

@@ -1,17 +1,17 @@
 from datetime import datetime, timedelta
 import random
 
+from nonebot_plugin_htmlrender import template_to_pic
 from nonebot_plugin_uninfo import Uninfo
 from tortoise.expressions import RawSQL
 from tortoise.functions import Count
 
-from zhenxun import ui
+from zhenxun.configs.path_config import TEMPLATE_PATH
 from zhenxun.models.chat_history import ChatHistory
 from zhenxun.models.level_user import LevelUser
 from zhenxun.models.sign_user import SignUser
 from zhenxun.models.statistics import Statistics
 from zhenxun.models.user_console import UserConsole
-from zhenxun.services import avatar_service
 from zhenxun.utils.platform import PlatformUtils
 
 RACE = [
@@ -90,7 +90,7 @@ def get_level(impression: float) -> int:
 
 async def get_chat_history(
     user_id: str, group_id: str | None
-) -> tuple[list[str], list[int]]:
+) -> tuple[list[str], list[str]]:
     """获取用户聊天记录
 
     参数:
@@ -98,11 +98,11 @@ async def get_chat_history(
         group_id: 群id
 
     返回:
-        tuple[list[str], list[int]]: 日期列表, 次数列表
+        tuple[list[str], list[str]]: 日期列表, 次数列表
 
     """
     now = datetime.now()
-    filter_date = now - timedelta(days=7)
+    filter_date = now - timedelta(days=7, hours=now.hour, minutes=now.minute)
     date_list = (
         await ChatHistory.filter(
             user_id=user_id, group_id=group_id, create_time__gte=filter_date
@@ -111,15 +111,19 @@ async def get_chat_history(
         .group_by("date")
         .values("date", "count")
     )
-    chart_date: list[str] = []
-    count_list: list[int] = []
-    date2cnt = {str(item["date"]): item["count"] for item in date_list}
-    current_date = now.date()
+    chart_date = []
+    count_list = []
+    date2cnt = {str(date["date"]): date["count"] for date in date_list}
+    date = now.date()
     for _ in range(7):
-        date_str = str(current_date)
-        count_list.append(date2cnt.get(date_str, 0))
-        chart_date.append(date_str[5:])
-        current_date -= timedelta(days=1)
+        if str(date) in date2cnt:
+            count_list.append(date2cnt[str(date)])
+        else:
+            count_list.append(0)
+        chart_date.append(str(date))
+        date -= timedelta(days=1)
+    for c in chart_date:
+        chart_date[chart_date.index(c)] = c[5:]
     chart_date.reverse()
     count_list.reverse()
     return chart_date, count_list
@@ -132,6 +136,7 @@ async def get_user_info(
 
     参数:
         session: Uninfo
+        bot: Bot
         user_id: 用户id
         group_id: 群id
         nickname: 用户昵称
@@ -140,62 +145,50 @@ async def get_user_info(
         bytes: 图片数据
     """
     platform = PlatformUtils.get_platform(session) or "qq"
-    avatar_path = await avatar_service.get_avatar_path(platform, user_id)
-    avatar_url = avatar_path.as_uri() if avatar_path else ""
-
+    ava_url = PlatformUtils.get_user_avatar_url(user_id, platform, session.self_id)
     user = await UserConsole.get_user(user_id, platform)
-    permission_level = await LevelUser.get_user_level(user_id, group_id)
-
+    level = await LevelUser.get_user_level(user_id, group_id)
     sign_level = 0
     if sign_user := await SignUser.get_or_none(user_id=user_id):
         sign_level = get_level(float(sign_user.impression))
-
     chat_count = await ChatHistory.filter(user_id=user_id, group_id=group_id).count()
     stat_count = await Statistics.filter(user_id=user_id, group_id=group_id).count()
-
-    selected_indices = [""] * 9
-    selected_indices[sign_level] = "select"
-
+    select_index = ["" for _ in range(9)]
+    select_index[sign_level] = "select"
     uid = f"{user.uid}".rjust(8, "0")
-    uid_formatted = f"{uid[:4]} {uid[4:]}"
-
+    uid = f"{uid[:4]} {uid[4:]}"
     now = datetime.now()
-    weather_icon_name = "moon" if now.hour < 6 or now.hour > 19 else "sun"
-
-    chart_labels, chart_data = await get_chat_history(user_id, group_id)
-
-    profile_data = {
-        "page": {
-            "date": str(now.date()),
-            "weather_icon_name": weather_icon_name,
-        },
-        "info": {
-            "avatar_url": avatar_url,
-            "nickname": nickname,
-            "title": "勇 者",
-            "race": random.choice(RACE),
-            "sex": random.choice(SEX),
-            "occupation": random.choice(OCC),
-            "uid": uid_formatted,
-            "description": (
-                "这是一个传奇的故事,人类的赞歌是勇气的赞歌,人类的伟大是勇气的伟大"
-            ),
-        },
-        "stats": {
-            "gold": user.gold,
-            "prop_count": len(user.props),
-            "call_count": stat_count,
-            "chat_count": chat_count,
-        },
-        "favorability": {
-            "level": sign_level,
-            "selected_indices": selected_indices,
-        },
-        "permission_level": permission_level,
-        "chart": {
-            "labels": chart_labels,
-            "data": chart_data,
-        },
+    weather = "moon" if now.hour < 6 or now.hour > 19 else "sun"
+    chart_date, count_list = await get_chat_history(user_id, group_id)
+    data = {
+        "date": now.date(),
+        "weather": weather,
+        "ava_url": ava_url,
+        "nickname": nickname,
+        "title": "勇 者",
+        "race": random.choice(RACE),
+        "sex": random.choice(SEX),
+        "occ": random.choice(OCC),
+        "uid": uid,
+        "description": "这是一个传奇的故事，"
+        "人类的赞歌是勇气的赞歌,人类的伟大是勇气的伟译。",
+        "sign_level": sign_level,
+        "level": level,
+        "gold": user.gold,
+        "prop": len(user.props),
+        "call": stat_count,
+        "say": chat_count,
+        "select_index": select_index,
+        "chart_date": chart_date,
+        "count_list": count_list,
     }
-
-    return await ui.render_template("pages/builtin/my_info", data=profile_data)
+    return await template_to_pic(
+        template_path=str((TEMPLATE_PATH / "my_info").absolute()),
+        template_name="main.html",
+        templates={"data": data},
+        pages={
+            "viewport": {"width": 1754, "height": 1240},
+            "base_url": f"file://{TEMPLATE_PATH}",
+        },
+        wait=2,
+    )

zhenxun/builtin_plugins/init/__init_cache.py

@@ -7,7 +7,6 @@
 from zhenxun.models.ban_console import BanConsole
 from zhenxun.models.bot_console import BotConsole
 from zhenxun.models.group_console import GroupConsole
-from zhenxun.models.group_plugin_setting import GroupPluginSetting
 from zhenxun.models.level_user import LevelUser
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.user_console import UserConsole
@@ -24,11 +23,6 @@ def register_cache_types():
     CacheRegistry.register(CacheType.GROUPS, GroupConsole)
     CacheRegistry.register(CacheType.BOT, BotConsole)
     CacheRegistry.register(CacheType.USERS, UserConsole)
-    CacheRegistry.register(
-        CacheType.GROUP_PLUGIN_SETTINGS,
-        GroupPluginSetting,
-        key_format="{group_id}_{plugin_name}_{key}",
-    )
     CacheRegistry.register(
         CacheType.LEVEL, LevelUser, key_format="{user_id}_{group_id}"
     )

zhenxun/builtin_plugins/llm_manager/__init__.py

@@ -1,5 +1,3 @@
-from collections import defaultdict
-
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
 from nonebot_plugin_alconna import (
@@ -60,12 +58,7 @@ __plugin_meta__ = PluginMetadata(
 llm_cmd = on_alconna(
     Alconna(
         "llm",
-        Subcommand(
-            "list",
-            Option("--text", action=store_true, help_text="以纯文本格式输出模型列表"),
-            alias=["ls"],
-            help_text="查看模型列表",
-        ),
+        Subcommand("list", alias=["ls"], help_text="查看模型列表"),
         Subcommand("info", Args["model_name", str], help_text="查看模型详情"),
         Subcommand("default", Args["model_name?", str], help_text="查看或设置默认模型"),
         Subcommand(
@@ -87,36 +80,13 @@ llm_cmd = on_alconna(
 
 
 @llm_cmd.assign("list")
-async def handle_list(
-    arp: Arparma,
-    show_all: Query[bool] = Query("all"),
-    text_mode: Query[bool] = Query("list.text.value", False),
-):
+async def handle_list(arp: Arparma, show_all: Query[bool] = Query("all")):
     """处理 'llm list' 命令"""
     logger.info("获取LLM模型列表", command="LLM Manage", session=arp.header_result)
     models = await DataSource.get_model_list(show_all=show_all.result)
 
-    if text_mode.result:
-        if not models:
-            await llm_cmd.finish("当前没有配置任何LLM模型。")
-
-        grouped_models = defaultdict(list)
-        for model in models:
-            grouped_models[model["provider_name"]].append(model)
-
-        response_parts = ["可用的LLM模型列表:"]
-        for provider, model_list in grouped_models.items():
-            response_parts.append(f"\n{provider}:")
-            for model in model_list:
-                response_parts.append(
-                    f"  {model['provider_name']}/{model['model_name']}"
-                )
-
-        response_text = "\n".join(response_parts)
-        await llm_cmd.finish(response_text)
-    else:
-        image = await Presenters.format_model_list_as_image(models, show_all.result)
-        await llm_cmd.finish(MessageUtils.build_message(image))
+    image = await Presenters.format_model_list_as_image(models, show_all.result)
+    await llm_cmd.finish(MessageUtils.build_message(image))
 
 
 @llm_cmd.assign("info")
@@ -144,7 +114,7 @@ async def handle_default(arp: Arparma, model_name: Match[str]):
             command="LLM Manage",
             session=arp.header_result,
         )
-        _success, message = await DataSource.set_default_model(model_name.result)
+        success, message = await DataSource.set_default_model(model_name.result)
         await llm_cmd.finish(message)
     else:
         logger.info("查看默认模型", command="LLM Manage", session=arp.header_result)
@@ -162,7 +132,7 @@ async def handle_test(arp: Arparma, model_name: Match[str]):
     )
     await llm_cmd.send(f"正在测试模型 '{model_name.result}'，请稍候...")
 
-    _success, message = await DataSource.test_model_connectivity(model_name.result)
+    success, message = await DataSource.test_model_connectivity(model_name.result)
     await llm_cmd.finish(message)
 
 
@@ -197,5 +167,5 @@ async def handle_reset_key(
     )
     logger.info(log_msg, command="LLM Manage", session=arp.header_result)
 
-    _success, message = await DataSource.reset_key(provider_name.result, key_to_reset)
+    success, message = await DataSource.reset_key(provider_name.result, key_to_reset)
     await llm_cmd.finish(message)

zhenxun/builtin_plugins/llm_manager/data_source.py

@@ -12,7 +12,6 @@ from zhenxun.services.llm.core import KeyStatus
 from zhenxun.services.llm.manager import (
     reset_key_status,
 )
-from zhenxun.services.llm.types import LLMMessage
 
 
 class DataSource:
@@ -59,7 +58,7 @@ class DataSource:
         start_time = time.monotonic()
         try:
             async with await get_model_instance(model_name_str) as model:
-                await model.generate_response([LLMMessage.user("你好")])
+                await model.generate_text("你好")
             end_time = time.monotonic()
             latency = (end_time - start_time) * 1000
             return (

zhenxun/builtin_plugins/llm_manager/presenters.py

@@ -1,10 +1,9 @@
 from typing import Any
 
-from zhenxun.services import renderer_service
 from zhenxun.services.llm.core import KeyStatus
 from zhenxun.services.llm.types import ModelModality
-from zhenxun.ui.builders import MarkdownBuilder, TableBuilder
-from zhenxun.ui.models import StatusBadgeCell, TextCell
+from zhenxun.utils._build_image import BuildImage
+from zhenxun.utils._image_template import ImageTemplate, Markdown, RowStyle
 
 
 def _format_seconds(seconds: int) -> str:
@@ -28,40 +27,35 @@ class Presenters:
     @staticmethod
     async def format_model_list_as_image(
         models: list[dict[str, Any]], show_all: bool
-    ) -> bytes:
+    ) -> BuildImage:
         """将模型列表格式化为表格图片"""
-        title = "LLM模型列表" + (" (所有已配置模型)" if show_all else " (仅可用)")
+        title = "📋 LLM模型列表" + (" (所有已配置模型)" if show_all else " (仅可用)")
 
         if not models:
-            builder = TableBuilder(
-                title=title, tip="当前没有配置任何LLM模型。"
-            ).set_headers(["提供商", "模型名称", "API类型", "状态"])
-            return await renderer_service.render(builder.build())
+            return await BuildImage.build_text_image(
+                f"{title}\n\n当前没有配置任何LLM模型。"
+            )
 
         column_name = ["提供商", "模型名称", "API类型", "状态"]
-        rows_data = []
+        data_list = []
         for model in models:
-            is_available = model.get("is_available", True)
+            status_text = "✅ 可用" if model.get("is_available", True) else "❌ 不可用"
             embed_tag = " (Embed)" if model.get("is_embedding_model", False) else ""
-            rows_data.append(
+            data_list.append(
                 [
-                    TextCell(content=model.get("provider_name", "N/A")),
-                    TextCell(content=f"{model.get('model_name', 'N/A')}{embed_tag}"),
-                    TextCell(content=model.get("api_type", "N/A")),
-                    StatusBadgeCell(
-                        text="可用" if is_available else "不可用",
-                        status_type="ok" if is_available else "error",
-                    ),
+                    model.get("provider_name", "N/A"),
+                    f"{model.get('model_name', 'N/A')}{embed_tag}",
+                    model.get("api_type", "N/A"),
+                    status_text,
                 ]
             )
 
-        builder = TableBuilder(
-            title=title, tip="使用 `llm info <Provider/ModelName>` 查看详情"
+        return await ImageTemplate.table_page(
+            head_text=title,
+            tip_text="使用 `llm info <Provider/ModelName>` 查看详情",
+            column_name=column_name,
+            data_list=data_list,
         )
-        builder.set_headers(column_name)
-        builder.set_column_alignments(["left", "left", "left", "center"])
-        builder.add_rows(rows_data)
-        return await renderer_service.render(builder.build(), use_cache=True)
 
     @staticmethod
     async def format_model_details_as_markdown_image(details: dict[str, Any]) -> bytes:
@@ -82,33 +76,77 @@ class Presenters:
         if caps.is_embedding_model:
             cap_list.append("文本嵌入")
 
-        builder = MarkdownBuilder()
-        builder.head(f"🔎 模型详情: {provider.name}/{model.model_name}", 1)
-        builder.text("---")
-        builder.head("提供商信息", 2)
-        builder.text(f"- **名称**: {provider.name}")
-        builder.text(f"- **API 类型**: {provider.api_type}")
-        builder.text(f"- **API Base**: {provider.api_base or '默认'}")
-
-        builder.head("模型详情", 2)
+        md = Markdown()
+        md.head(f"🔎 模型详情: {provider.name}/{model.model_name}", level=1)
+        md.text("---")
+        md.head("提供商信息", level=2)
+        md.list(
+            [
+                f"**名称**: {provider.name}",
+                f"**API 类型**: {provider.api_type}",
+                f"**API Base**: {provider.api_base or '默认'}",
+            ]
+        )
+        md.head("模型详情", level=2)
 
         temp_value = model.temperature or provider.temperature or "未设置"
         token_value = model.max_tokens or provider.max_tokens or "未设置"
 
-        builder.text(f"- **名称**: {model.model_name}")
-        builder.text(f"- **默认温度**: {temp_value}")
-        builder.text(f"- **最大Token**: {token_value}")
-        builder.text(f"- **核心能力**: {', '.join(cap_list) or '纯文本'}")
+        md.list(
+            [
+                f"**名称**: {model.model_name}",
+                f"**默认温度**: {temp_value}",
+                f"**最大Token**: {token_value}",
+                f"**核心能力**: {', '.join(cap_list) or '纯文本'}",
+            ]
+        )
 
-        return await renderer_service.render(builder.with_style("light").build())
+        return await md.build()
 
     @staticmethod
     async def format_key_status_as_image(
         provider_name: str, sorted_stats: list[dict[str, Any]]
-    ) -> bytes:
+    ) -> BuildImage:
         """将已排序的、详细的API Key状态格式化为表格图片"""
         title = f"🔑 '{provider_name}' API Key 状态"
 
+        if not sorted_stats:
+            return await BuildImage.build_text_image(
+                f"{title}\n\n该提供商没有配置API Keys。"
+            )
+
+        def _status_row_style(column: str, text: str) -> RowStyle:
+            style = RowStyle()
+            if column == "状态":
+                if "✅ 健康" in text:
+                    style.font_color = "#67C23A"
+                elif "⚠️ 告警" in text:
+                    style.font_color = "#E6A23C"
+                elif "❌ 错误" in text or "🚫" in text:
+                    style.font_color = "#F56C6C"
+                elif "❄️ 冷却中" in text:
+                    style.font_color = "#409EFF"
+            elif column == "成功率":
+                try:
+                    if text != "N/A":
+                        rate = float(text.replace("%", ""))
+                        if rate < 80:
+                            style.font_color = "#F56C6C"
+                        elif rate < 95:
+                            style.font_color = "#E6A23C"
+                except (ValueError, TypeError):
+                    pass
+            return style
+
+        column_name = [
+            "Key (部分)",
+            "状态",
+            "总调用",
+            "成功率",
+            "平均延迟(s)",
+            "上次错误",
+            "建议操作",
+        ]
         data_list = []
 
         for key_info in sorted_stats:
@@ -117,19 +155,15 @@ class Presenters:
             if status_enum == KeyStatus.COOLDOWN:
                 cooldown_seconds = int(key_info["cooldown_seconds_left"])
                 formatted_time = _format_seconds(cooldown_seconds)
-                status_cell = StatusBadgeCell(
-                    text=f"冷却中({formatted_time})", status_type="info"
-                )
+                status_text = f"❄️ 冷却中({formatted_time})"
             else:
-                status_map = {
-                    KeyStatus.DISABLED: ("永久禁用", "error"),
-                    KeyStatus.ERROR: ("错误", "error"),
-                    KeyStatus.WARNING: ("告警", "warning"),
-                    KeyStatus.HEALTHY: ("健康", "ok"),
-                    KeyStatus.UNUSED: ("未使用", "info"),
-                }
-                text, status_type = status_map.get(status_enum, ("未知", "info"))
-                status_cell = StatusBadgeCell(text=text, status_type=status_type)  # type: ignore
+                status_text = {
+                    KeyStatus.DISABLED: "🚫 永久禁用",
+                    KeyStatus.ERROR: "❌ 错误",
+                    KeyStatus.WARNING: "⚠️ 告警",
+                    KeyStatus.HEALTHY: "✅ 健康",
+                    KeyStatus.UNUSED: "⚪️ 未使用",
+                }.get(status_enum, "❔ 未知")
 
             total_calls = key_info["total_calls"]
             total_calls_text = (
@@ -140,13 +174,6 @@ class Presenters:
 
             success_rate = key_info["success_rate"]
             success_rate_text = f"{success_rate:.1f}%" if total_calls > 0 else "N/A"
-            rate_color = None
-            if total_calls > 0:
-                if success_rate < 80:
-                    rate_color = "#F56C6C"
-                elif success_rate < 95:
-                    rate_color = "#E6A23C"
-            success_rate_cell = TextCell(content=success_rate_text, color=rate_color)
 
             avg_latency = key_info["avg_latency"]
             avg_latency_text = f"{avg_latency / 1000:.2f}" if avg_latency > 0 else "N/A"
@@ -157,29 +184,21 @@ class Presenters:
 
             data_list.append(
                 [
-                    TextCell(content=key_info["key_id"]),
-                    status_cell,
-                    TextCell(content=total_calls_text),
-                    success_rate_cell,
-                    TextCell(content=avg_latency_text),
-                    TextCell(content=last_error),
-                    TextCell(content=key_info["suggested_action"]),
+                    key_info["key_id"],
+                    status_text,
+                    total_calls_text,
+                    success_rate_text,
+                    avg_latency_text,
+                    last_error,
+                    key_info["suggested_action"],
                 ]
             )
 
-        builder = TableBuilder(
-            title=title, tip="使用 `llm reset-key <Provider>` 重置Key状态"
+        return await ImageTemplate.table_page(
+            head_text=title,
+            tip_text="使用 `llm reset-key <Provider>` 重置Key状态",
+            column_name=column_name,
+            data_list=data_list,
+            text_style=_status_row_style,
+            column_space=15,
         )
-        builder.set_headers(
-            [
-                "Key (部分)",
-                "状态",
-                "总调用",
-                "成功率",
-                "平均延迟(s)",
-                "上次错误",
-                "建议操作",
-            ]
-        )
-        builder.add_rows(data_list)
-        return await renderer_service.render(builder.build(), use_cache=False)

zhenxun/builtin_plugins/mahiro_bank/__init__.py

@@ -6,7 +6,6 @@ from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_uninfo import Uninfo
 from nonebot_plugin_waiter import prompt_until
 
-from zhenxun import ui
 from zhenxun.configs.utils import PluginExtraData, RegisterConfig
 from zhenxun.services.log import logger
 from zhenxun.utils.depends import UserName
@@ -189,33 +188,15 @@ async def _(session: Uninfo, arparma: Arparma, amount: Match[int]):
 
 @_matcher.assign("user-info")
 async def _(session: Uninfo, arparma: Arparma, uname: str = UserName()):
-    user_payload = await BankManager.get_user_info_data(session, uname)
-
-    render_data = {"page_type": "user", "payload": user_payload}
-
-    image_bytes = await ui.render_template(
-        "pages/builtin/mahiro_bank",
-        data=render_data,
-        viewport={"width": 386, "height": 10},
-    )
-
-    await MessageUtils.build_message(image_bytes).send()
+    result = await BankManager.get_user_info(session, uname)
+    await MessageUtils.build_message(result).send()
     logger.info("查看银行个人信息", arparma.header_result, session=session)
 
 
 @_matcher.assign("bank-info")
 async def _(session: Uninfo, arparma: Arparma):
-    overview_payload = await BankManager.get_bank_info_data()
-
-    render_data = {"page_type": "overview", "payload": overview_payload}
-
-    image_bytes = await ui.render_template(
-        "pages/builtin/mahiro_bank",
-        data=render_data,
-        viewport={"width": 450, "height": 10},
-    )
-
-    await MessageUtils.build_message(image_bytes).send()
+    result = await BankManager.get_bank_info()
+    await MessageUtils.build_message(result).send()
     logger.info("查看银行信息", arparma.header_result, session=session)
 
 

zhenxun/builtin_plugins/mahiro_bank/data_source.py

@@ -2,16 +2,17 @@ import asyncio
 from datetime import datetime, timedelta
 import random
 
+from nonebot_plugin_htmlrender import template_to_pic
 from nonebot_plugin_uninfo import Uninfo
 from tortoise.expressions import RawSQL
 from tortoise.functions import Count, Sum
 
 from zhenxun.configs.config import Config
+from zhenxun.configs.path_config import TEMPLATE_PATH
 from zhenxun.models.mahiro_bank import MahiroBank
 from zhenxun.models.mahiro_bank_log import MahiroBankLog
 from zhenxun.models.sign_user import SignUser
 from zhenxun.models.user_console import UserConsole
-from zhenxun.services import avatar_service
 from zhenxun.utils.enum import BankHandleType, GoldHandle
 from zhenxun.utils.platform import PlatformUtils
 
@@ -157,15 +158,15 @@ class BankManager:
         )
 
     @classmethod
-    async def get_user_info_data(cls, session: Uninfo, uname: str) -> dict:
-        """获取用户数据（返回字典）
+    async def get_user_info(cls, session: Uninfo, uname: str) -> bytes:
+        """获取用户数据
 
         参数:
             session: Uninfo
             uname: 用户id
 
         返回:
-            dict: 用户银行数据字典
+            bytes: 图片数据
         """
         user_id = session.user.id
         user = await cls.get_user(user_id=user_id)
@@ -198,9 +199,9 @@ class BankManager:
         deposit_list = [
             {
                 "id": deposit.id,
-                "date": str(now.date()),
+                "date": now.date(),
                 "start_time": str(deposit.create_time).split(".")[0],
-                "end_time": str(end_time.replace(microsecond=0)),
+                "end_time": end_time.replace(microsecond=0),
                 "amount": deposit.amount,
                 "rate": f"{deposit.rate * 100:.2f}",
                 "projected_revenue": int(
@@ -211,12 +212,12 @@ class BankManager:
             for deposit in user_today_deposit
         ]
         platform = PlatformUtils.get_platform(session)
-        avatar_path = await avatar_service.get_avatar_path(platform, user_id)
-        avatar_url = avatar_path.as_uri() if avatar_path else ""
-        return {
+        data = {
             "name": uname,
             "rank": rank + 1,
-            "avatar_url": avatar_url or "",
+            "avatar_url": PlatformUtils.get_user_avatar_url(
+                user_id, platform, session.self_id
+            ),
             "amount": user.amount,
             "deposit_count": deposit_count,
             "today_deposit_count": len(user_today_deposit),
@@ -224,16 +225,21 @@ class BankManager:
             "projected_revenue": projected_revenue,
             "today_deposit_amount": today_deposit_amount,
             "deposit_list": deposit_list,
-            "create_time": str(now.replace(microsecond=0)),
+            "create_time": now.replace(microsecond=0),
         }
+        return await template_to_pic(
+            template_path=str((TEMPLATE_PATH / "mahiro_bank").absolute()),
+            template_name="user.html",
+            templates={"data": data},
+            pages={
+                "viewport": {"width": 386, "height": 700},
+                "base_url": f"file://{TEMPLATE_PATH}",
+            },
+            wait=2,
+        )
 
     @classmethod
-    async def get_bank_info_data(cls) -> dict:
-        """获取银行总览数据（返回字典）
-
-        返回:
-            dict: 银行总览数据字典
-        """
+    async def get_bank_info(cls) -> bytes:
         now = datetime.now()
         now_start = now - timedelta(
             hours=now.hour, minutes=now.minute, seconds=now.second
@@ -287,17 +293,27 @@ class BankManager:
         if lasted_log:
             date = now.date() - lasted_log.create_time.date()
             date = (date.days or 1) + 1
-        return {
-            "amount_sum": bank_data[0]["amount_sum"] or 0,
-            "user_count": bank_data[0]["user_count"] or 0,
+        data = {
+            "amount_sum": bank_data[0]["amount_sum"],
+            "user_count": bank_data[0]["user_count"],
             "today_count": today_count,
-            "day_amount": int((bank_data[0]["amount_sum"] or 0) / date),
+            "day_amount": int(bank_data[0]["amount_sum"] / date),
             "interest_amount": interest_amount[0]["amount_sum"] or 0,
             "active_user_count": active_user_count[0]["count"] or 0,
             "e_data": e_date,
             "e_amount": e_amount,
-            "create_time": str(now.replace(microsecond=0)),
+            "create_time": now.replace(microsecond=0),
         }
+        return await template_to_pic(
+            template_path=str((TEMPLATE_PATH / "mahiro_bank").absolute()),
+            template_name="bank.html",
+            templates={"data": data},
+            pages={
+                "viewport": {"width": 450, "height": 750},
+                "base_url": f"file://{TEMPLATE_PATH}",
+            },
+            wait=2,
+        )
 
     @classmethod
     async def deposit(
@@ -390,6 +406,7 @@ class BankManager:
             bank_data[log.user_id].append(log)
         log_create_list = []
         log_update_list = []
+        # 计算每日默认金币
         for bank_user in bank_user_list:
             if user := user_data.get(bank_user.user_id):
                 amount = bank_user.amount
@@ -397,6 +414,7 @@ class BankManager:
                     amount -= sum(log.amount for log in logs)
                 if not amount:
                     continue
+                # 计算每日默认金币
                 gold = int(amount * bank_user.rate)
                 user.gold += gold
                 log_create_list.append(
@@ -408,6 +426,7 @@ class BankManager:
                         is_completed=True,
                     )
                 )
+        # 计算每日存款金币
         for user_id, logs in bank_data.items():
             if user := user_data.get(user_id):
                 for log in logs:

zhenxun/builtin_plugins/platform/qq/exception.py

@@ -3,13 +3,9 @@ class ForceAddGroupError(Exception):
     强制拉群
     """
 
-    def __init__(self, info: str, group_id: str):
+    def __init__(self, info: str):
         super().__init__(self)
         self._info = info
-        self._group_id = group_id
 
     def get_info(self) -> str:
         return self._info
-
-    def get_group_id(self) -> str:
-        return self._group_id

zhenxun/builtin_plugins/platform/qq/group_handle/__init__.py

@@ -16,9 +16,6 @@ from zhenxun.configs.config import BotConfig, Config
 from zhenxun.configs.utils import PluginExtraData, RegisterConfig, Task
 from zhenxun.models.event_log import EventLog
 from zhenxun.models.group_console import GroupConsole
-from zhenxun.services.cache import CacheRoot
-from zhenxun.services.log import logger
-from zhenxun.services.tags import tag_manager
 from zhenxun.utils.common_utils import CommonUtils
 from zhenxun.utils.enum import EventLogType, PluginType
 from zhenxun.utils.platform import PlatformUtils
@@ -95,10 +92,6 @@ group_decrease_handle = on_notice(
 )
 """群员减少处理"""
 
-cache = CacheRoot.cache_dict(
-    "REQUEST_CACHE", (base_config.get("TIP_MESSAGE_LIMIT") or 360) * 60, str
-)
-
 
 @group_increase_handle.handle()
 async def _(
@@ -116,9 +109,7 @@ async def _(
                 bot, str(event.operator_id), str(event.group_id), group
             )
         except ForceAddGroupError as e:
-            if not cache.get(e.get_group_id()):
-                cache.set(e.get_group_id(), "1")
-                await PlatformUtils.send_superuser(bot, e.get_info())
+            await PlatformUtils.send_superuser(bot, e.get_info())
     else:
         await GroupManager.add_user(session, bot)
 
@@ -137,11 +128,6 @@ async def _(
         await EventLog.create(
             user_id=user_id, group_id=group_id, event_type=EventLogType.KICK_BOT
         )
-        await tag_manager.remove_group_from_all_tags(group_id)
-        logger.info(
-            f"机器人被移出群聊，已自动从所有静态标签中移除群组 {group_id}",
-            "群组标签管理",
-        )
     elif event.sub_type in ["leave", "kick"]:
         if event.sub_type == "leave":
             """主动退群"""

zhenxun/builtin_plugins/platform/qq/group_handle/data_source.py

@@ -147,13 +147,9 @@ class GroupManager:
                     group_id=group_id,
                     e=e,
                 )
-                raise ForceAddGroupError(
-                    "强制拉群或未有群信息，退出群聊失败...", group_id
-                ) from e
+                raise ForceAddGroupError("强制拉群或未有群信息，退出群聊失败...") from e
             # await GroupConsole.filter(group_id=group_id).delete()
-            raise ForceAddGroupError(
-                f"触发强制入群保护，已成功退出群聊 {group_id}...", group_id
-            )
+            raise ForceAddGroupError(f"触发强制入群保护，已成功退出群聊 {group_id}...")
         else:
             await cls.__handle_add_group(bot, group_id, group)
             """刷新群管理员权限"""

zhenxun/builtin_plugins/plugin_store/__init__.py

@@ -1,6 +1,6 @@
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
-from nonebot_plugin_alconna import Alconna, Args, Match, Option, Subcommand, on_alconna
+from nonebot_plugin_alconna import Alconna, Args, Subcommand, on_alconna
 from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.utils import PluginExtraData
@@ -16,16 +16,11 @@ __plugin_meta__ = PluginMetadata(
     description="插件商店",
     usage="""
     插件商店        : 查看当前的插件商店
-    添加插件 id或module或插件名称 ?[-s [git, ali]]: 添加插件
-        使用-s时指定源，git为github，ali为阿里云
-    移除插件 id或module: 移除插件
-    搜索插件 name或author: 搜索插件
-    更新插件 id或module: 更新插件
+    添加插件 id or module     : 添加插件
+    移除插件 id or module     : 移除插件
+    搜索插件 name or author     : 搜索插件
+    更新插件 id or module     : 更新插件
     更新全部插件     : 更新全部插件
-
-    示例：
-        添加插件 pix
-        添加插件 真寻日报 -s git
     """.strip(),
     extra=PluginExtraData(
         author="HibiKier",
@@ -37,11 +32,7 @@ __plugin_meta__ = PluginMetadata(
 _matcher = on_alconna(
     Alconna(
         "插件商店",
-        Subcommand(
-            "add",
-            Args["plugin_id", str],
-            Option("-s", Args["source", str]),
-        ),
+        Subcommand("add", Args["plugin_id", str]),
         Subcommand("remove", Args["plugin_id", str]),
         Subcommand("search", Args["plugin_name_or_author", str]),
         Subcommand("update", Args["plugin_id", str]),
@@ -100,20 +91,13 @@ async def _(session: EventSession):
 
 
 @_matcher.assign("add")
-async def _(session: EventSession, plugin_id: str, source: Match[str]):
-    if is_number(plugin_id):
-        await MessageUtils.build_message(f"正在添加插件 Id: {plugin_id}").send()
-    else:
-        await MessageUtils.build_message(
-            f"正在添加插件 Module/名称: {plugin_id}"
-        ).send()
-    source_str = source.result if source.available else None
-    if source_str and source_str not in ["ali", "git"]:
-        await MessageUtils.build_message(
-            f"源类型错误: {source_str} 请使用 ali 或 git"
-        ).finish()
+async def _(session: EventSession, plugin_id: str):
     try:
-        result = await StoreManager.add_plugin(plugin_id, source_str)
+        if is_number(plugin_id):
+            await MessageUtils.build_message(f"正在添加插件 Id: {plugin_id}").send()
+        else:
+            await MessageUtils.build_message(f"正在添加插件 Module: {plugin_id}").send()
+        result = await StoreManager.add_plugin(plugin_id)
     except Exception as e:
         logger.error(f"添加插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(

zhenxun/builtin_plugins/plugin_store/data_source.py

@@ -1,4 +1,3 @@
-import os
 from pathlib import Path
 import random
 import shutil
@@ -11,12 +10,11 @@ from zhenxun.configs.path_config import TEMP_PATH
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.services.log import logger
 from zhenxun.services.plugin_init import PluginInitManager
-from zhenxun.utils.enum import PluginType
 from zhenxun.utils.image_utils import BuildImage, ImageTemplate, RowStyle
 from zhenxun.utils.manager.virtual_env_package_manager import VirtualEnvPackageManager
 from zhenxun.utils.repo_utils import RepoFileManager
 from zhenxun.utils.repo_utils.models import RepoFileInfo, RepoType
-from zhenxun.utils.utils import is_number, win_on_rm_error
+from zhenxun.utils.utils import is_number
 
 from .config import (
     BASE_PATH,
@@ -165,17 +163,13 @@ class StoreManager:
 
     @classmethod
     async def get_plugin_by_value(
-        cls,
-        index_or_module: str,
-        is_update: bool = False,
-        is_remove: bool = False,
+        cls, index_or_module: str, is_update: bool = False
     ) -> tuple[StorePluginInfo, bool]:
         """获取插件信息
 
         参数:
             index_or_module: 插件索引或模块名
             is_update: 是否是更新插件
-            is_remove: 是否是移除插件
 
         异常:
             PluginStoreException: 插件不存在
@@ -185,8 +179,6 @@ class StoreManager:
             StorePluginInfo: 插件信息
             bool: 是否是外部插件
         """
-        plugin_list: list[StorePluginInfo]
-        extra_plugin_list: list[StorePluginInfo]
         plugin_list, extra_plugin_list = await cls.get_data()
         plugin_info = None
         is_external = False
@@ -204,32 +196,14 @@ class StoreManager:
                 break
         if not plugin_info:
             raise PluginStoreException(f"插件不存在: {plugin_key}")
-
-        modules = [p[0] for p in db_plugin_list]
-
-        if is_remove:
-            if plugin_info.module not in modules:
-                raise PluginStoreException(f"插件 {plugin_info.name} 未安装，无法移除")
-            if plugin_obj := await PluginInfo.get_plugin(
-                module=plugin_info.module, plugin_type=PluginType.PARENT
-            ):
-                plugin_info.module_path = plugin_obj.module_path
-            elif plugin_obj := await PluginInfo.get_plugin(module=plugin_info.module):
-                plugin_info.module_path = plugin_obj.module_path
-            return plugin_info, is_external
-
-        if is_update:
-            if plugin_info.module not in modules:
-                raise PluginStoreException(f"插件 {plugin_info.name} 未安装，无法更新")
-            return plugin_info, is_external
-
-        if plugin_info.module in modules:
+        if not is_update and plugin_info.module in [p[0] for p in db_plugin_list]:
             raise PluginStoreException(f"插件 {plugin_info.name} 已安装，无需重复安装")
-
+        if plugin_info.module not in [p[0] for p in db_plugin_list] and is_update:
+            raise PluginStoreException(f"插件 {plugin_info.name} 未安装，无法更新")
         return plugin_info, is_external
 
     @classmethod
-    async def add_plugin(cls, index_or_module: str, source: str | None = None) -> str:
+    async def add_plugin(cls, index_or_module: str) -> str:
         """添加插件
 
         参数:
@@ -247,60 +221,43 @@ class StoreManager:
             plugin_info.github_url = f"{github_url_split[0]}/tree/{version_split[1]}"
         logger.info(f"正在安装插件 {plugin_info.name}...", LOG_COMMAND)
         await cls.install_plugin_with_repo(
-            plugin_info,
+            plugin_info.github_url,
+            plugin_info.module_path,
+            plugin_info.is_dir,
             is_external,
-            source,
         )
         return f"插件 {plugin_info.name} 安装成功! 重启后生效"
 
     @classmethod
     async def install_plugin_with_repo(
         cls,
-        plugin_info: StorePluginInfo,
+        github_url: str,
+        module_path: str,
+        is_dir: bool,
         is_external: bool = False,
-        source: str | None = None,
     ):
         """安装插件
 
         参数:
-            plugin_info: 插件信息
+            github_url: 仓库地址
+            module_path: 模块路径
+            is_dir: 是否是文件夹
             is_external: 是否是外部仓库
-            source: 源
         """
         repo_type = RepoType.GITHUB if is_external else None
-        if source == "ali":
-            repo_type = RepoType.ALIYUN
-        elif source == "git":
-            repo_type = RepoType.GITHUB
-        module_path = plugin_info.module_path
-        is_dir = plugin_info.is_dir
-        github_url = plugin_info.github_url
-        assert github_url
-        replace_module_path = module_path.replace(".", "/").lstrip("/")
-        plugin_name = module_path.split(".")[-1] or plugin_info.module
+        replace_module_path = module_path.replace(".", "/")
         if is_dir:
             files = await RepoFileManager.list_directory_files(
                 github_url, replace_module_path, repo_type=repo_type
             )
         else:
             files = [RepoFileInfo(path=f"{replace_module_path}.py", is_dir=False)]
-        if not is_external:
-            target_dir = BASE_PATH
-        elif is_dir and module_path == ".":
-            target_dir = BASE_PATH / "plugins" / plugin_name
-        else:
-            target_dir = BASE_PATH / "plugins"
+        local_path = BASE_PATH / "plugins" if is_external else BASE_PATH
         files = [file for file in files if not file.is_dir]
-        download_files = [(file.path, target_dir / file.path) for file in files]
-        result = await RepoFileManager.download_files(
-            github_url,
-            download_files,
-            repo_type=repo_type,
-            sparse_path=replace_module_path,
-            target_dir=target_dir,
+        download_files = [(file.path, local_path / file.path) for file in files]
+        await RepoFileManager.download_files(
+            github_url, download_files, repo_type=repo_type
         )
-        if not result.success:
-            raise PluginStoreException(result.error_message)
 
         requirement_paths = [
             file
@@ -311,7 +268,7 @@ class StoreManager:
 
         is_install_req = False
         for requirement_path in requirement_paths:
-            requirement_file = target_dir / requirement_path.path
+            requirement_file = local_path / requirement_path.path
             if requirement_file.exists():
                 is_install_req = True
                 await VirtualEnvPackageManager.install_requirement(requirement_file)
@@ -353,21 +310,22 @@ class StoreManager:
         返回:
             str: 返回消息
         """
-        plugin_info, _ = await cls.get_plugin_by_value(index_or_module, is_remove=True)
-        module_path = plugin_info.module_path
-        module = module_path.split(".")[-1]
-        path = BASE_PATH.parent / Path(module_path.replace(".", os.sep))
+        plugin_info, _ = await cls.get_plugin_by_value(index_or_module)
+        path = BASE_PATH
+        if plugin_info.github_url:
+            path = BASE_PATH / "plugins"
+        for p in plugin_info.module_path.split("."):
+            path = path / p
         if not plugin_info.is_dir:
-            path = path.parent / f"{module}.py"
+            path = Path(f"{path}.py")
         if not path.exists():
             return f"插件 {plugin_info.name} 不存在..."
         logger.debug(f"尝试移除插件 {plugin_info.name} 文件: {path}", LOG_COMMAND)
         if plugin_info.is_dir:
-            # 处理 Windows 下 .git 等目录内只读文件导致的 WinError 5
-            shutil.rmtree(path, onerror=win_on_rm_error)
+            shutil.rmtree(path)
         else:
             path.unlink()
-        await PluginInitManager.remove(module_path)
+        await PluginInitManager.remove(f"zhenxun.{plugin_info.module_path}")
         return f"插件 {plugin_info.name} 移除成功! 重启后生效"
 
     @classmethod
@@ -434,7 +392,9 @@ class StoreManager:
         if plugin_info.github_url is None:
             plugin_info.github_url = DEFAULT_GITHUB_URL
         await cls.install_plugin_with_repo(
-            plugin_info,
+            plugin_info.github_url,
+            plugin_info.module_path,
+            plugin_info.is_dir,
             is_external,
         )
         return f"插件 {plugin_info.name} 更新成功! 重启后生效"
@@ -456,7 +416,7 @@ class StoreManager:
         update_success_list = []
         result = "--已更新{}个插件 {}个失败 {}个成功--"
         logger.info(f"尝试更新全部插件 {plugin_name_list}", LOG_COMMAND)
-        for plugin_info in all_plugin_list:
+        for plugin_info in plugin_list:
             try:
                 db_plugin_list = await cls.get_loaded_plugins("module", "version")
                 suc_plugin = {p[0]: (p[1] or "Unknown") for p in db_plugin_list}
@@ -482,7 +442,9 @@ class StoreManager:
                     plugin_info.github_url = DEFAULT_GITHUB_URL
                     is_external = False
                 await cls.install_plugin_with_repo(
-                    plugin_info,
+                    plugin_info.github_url,
+                    plugin_info.module_path,
+                    plugin_info.is_dir,
                     is_external,
                 )
                 update_success_list.append(plugin_info.name)
@@ -534,11 +496,11 @@ class StoreManager:
                 raise PluginStoreException("插件ID不存在...")
             return all_plugin_list[idx].module
         elif isinstance(plugin_id, str):
-            if plugin_id in [v.module for v in all_plugin_list]:
-                return plugin_id
-
-            for plugin_info in all_plugin_list:
-                if plugin_info.name.lower() == plugin_id.lower():
-                    return plugin_info.module
-
-            raise PluginStoreException("插件 Module / 名称 不存在...")
+            result = (
+                None
+                if plugin_id not in [v.module for v in all_plugin_list]
+                else plugin_id
+            ) or next(v for v in all_plugin_list if v.name == plugin_id).module
+            if not result:
+                raise PluginStoreException("插件 Module / 名称 不存在...")
+            return result

zhenxun/builtin_plugins/record_request.py

@@ -1,6 +1,7 @@
 import asyncio
 from datetime import datetime
 import random
+import time
 
 from nonebot import on_message, on_request
 from nonebot.adapters.onebot.v11 import (
@@ -11,6 +12,7 @@ from nonebot.adapters.onebot.v11 import (
 from nonebot.adapters.onebot.v11 import Bot as v11Bot
 from nonebot.adapters.onebot.v12 import Bot as v12Bot
 from nonebot.plugin import PluginMetadata
+from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import BotConfig, Config
@@ -19,7 +21,6 @@ from zhenxun.models.event_log import EventLog
 from zhenxun.models.fg_request import FgRequest
 from zhenxun.models.friend_user import FriendUser
 from zhenxun.models.group_console import GroupConsole
-from zhenxun.services.cache import CacheRoot
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import EventLogType, PluginType, RequestHandleType, RequestType
 from zhenxun.utils.platform import PlatformUtils
@@ -51,19 +52,24 @@ __plugin_meta__ = PluginMetadata(
                 type=bool,
                 default_value=False,
             ),
-            RegisterConfig(
-                module="invite_manager",
-                key="TIP_MESSAGE_LIMIT",
-                value=360,
-                help="重复申请与退群提醒过滤时间（分钟）",
-                type=int,
-                default_value=360,
-            ),
         ],
     ).to_dict(),
 )
 
 
+class Timer:
+    data: dict[str, float] = {}  # noqa: RUF012
+
+    @classmethod
+    def check(cls, uid: int | str):
+        return True if uid not in cls.data else time.time() - cls.data[uid] > 5 * 60
+
+    @classmethod
+    def clear(cls):
+        now = time.time()
+        cls.data = {k: v for k, v in cls.data.items() if v - now < 5 * 60}
+
+
 # TODO: 其他平台请求
 
 friend_req = on_request(priority=5, block=True)
@@ -71,47 +77,42 @@ group_req = on_request(priority=5, block=True)
 _t = on_message(priority=999, block=False, rule=lambda: False)
 
 
-cache = CacheRoot.cache_dict("REQUEST_CACHE", 60, str)
-
-
 @friend_req.handle()
 async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSession):
-    logger.debug("收录好友请求...", "好友请求", target=event.user_id)
-    user = await bot.get_stranger_info(user_id=event.user_id)
-    nickname = user["nickname"]
-    # sex = user["sex"]
-    # age = str(user["age"])
-    comment = event.comment
-    if base_config.get("AUTO_ADD_FRIEND"):
-        logger.debug(
-            "已开启好友请求自动同意，成功通过该请求",
-            "好友请求",
-            target=event.user_id,
-        )
-        await asyncio.sleep(random.randint(1, 10))
-        await bot.set_friend_add_request(flag=event.flag, approve=True)
-        await FriendUser.create(
-            user_id=str(user["user_id"]), user_name=user["nickname"]
-        )
-    else:
-        # 旧请求全部设置为过期
-        await FgRequest.filter(
-            request_type=RequestType.FRIEND,
-            user_id=str(event.user_id),
-            handle_type__isnull=True,
-        ).update(handle_type=RequestHandleType.EXPIRE)
-        f = await FgRequest.create(
-            request_type=RequestType.FRIEND,
-            platform=session.platform,
-            bot_id=bot.self_id,
-            flag=event.flag,
-            user_id=event.user_id,
-            nickname=nickname,
-            comment=comment,
-        )
-        cache_key = str(event.user_id)
-        if not cache.get(cache_key):
-            cache.set(cache_key, "1")
+    if event.user_id and Timer.check(event.user_id):
+        logger.debug("收录好友请求...", "好友请求", target=event.user_id)
+        user = await bot.get_stranger_info(user_id=event.user_id)
+        nickname = user["nickname"]
+        # sex = user["sex"]
+        # age = str(user["age"])
+        comment = event.comment
+        if base_config.get("AUTO_ADD_FRIEND"):
+            logger.debug(
+                "已开启好友请求自动同意，成功通过该请求",
+                "好友请求",
+                target=event.user_id,
+            )
+            await asyncio.sleep(random.randint(1, 10))
+            await bot.set_friend_add_request(flag=event.flag, approve=True)
+            await FriendUser.create(
+                user_id=str(user["user_id"]), user_name=user["nickname"]
+            )
+        else:
+            # 旧请求全部设置为过期
+            await FgRequest.filter(
+                request_type=RequestType.FRIEND,
+                user_id=str(event.user_id),
+                handle_type__isnull=True,
+            ).update(handle_type=RequestHandleType.EXPIRE)
+            f = await FgRequest.create(
+                request_type=RequestType.FRIEND,
+                platform=session.platform,
+                bot_id=bot.self_id,
+                flag=event.flag,
+                user_id=event.user_id,
+                nickname=nickname,
+                comment=comment,
+            )
             results = await PlatformUtils.send_superuser(
                 bot,
                 f"*****一份好友申请*****\n"
@@ -128,13 +129,8 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
             ]:
                 f.message_ids = ",".join(message_ids)
                 await f.save(update_fields=["message_ids"])
-        else:
-            tip_limit = base_config.get("TIP_MESSAGE_LIMIT") or 360
-            logger.debug(
-                f"好友请求{tip_limit}分钟内重复, 已忽略",
-                "好友请求",
-                target=cache_key,
-            )
+    else:
+        logger.debug("好友请求五分钟内重复, 已忽略", "好友请求", target=event.user_id)
 
 
 @group_req.handle()
@@ -214,8 +210,7 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
                 "\n在群组中 群组管理员与群主 允许使用管理员帮助"
                 "（包括ban与功能开关等）\n请在群组中发送 '管理员帮助'",
             )
-    elif not cache.get(f"{event.group_id}"):
-        cache.set(f"{event.group_id}", "1")
+    elif Timer.check(f"{event.user_id}:{event.group_id}"):
         logger.debug(
             f"收录 用户[{event.user_id}] 群聊[{event.group_id}] 群聊请求",
             "群聊请求",
@@ -271,3 +266,15 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
             "群聊请求",
             target=f"{event.user_id}:{event.group_id}",
         )
+
+
+@scheduler.scheduled_job(
+    "interval",
+    minutes=5,
+)
+async def _():
+    Timer.clear()
+
+
+async def _():
+    Timer.clear()

zhenxun/builtin_plugins/scheduler/auto_update_group.py

@@ -2,7 +2,6 @@ import nonebot
 from nonebot_plugin_apscheduler import scheduler
 
 from zhenxun.services.log import logger
-from zhenxun.services.tags import tag_manager
 from zhenxun.utils.platform import PlatformUtils
 
 
@@ -38,20 +37,3 @@ async def _():
                 f"Bot: {bot.self_id} 自动更新好友信息错误", "自动更新好友", e=e
             )
     logger.info("自动更新好友信息成功...")
-
-
-# 自动清理静态标签中的无效群组
-@scheduler.scheduled_job(
-    "cron",
-    hour=23,
-    minute=30,
-)
-async def _prune_stale_tags():
-    deleted_count = await tag_manager.prune_stale_group_links()
-    if deleted_count > 0:
-        logger.info(
-            f"定时任务：成功清理了 {deleted_count} 个无效的群组标签" f"关联。",
-            "群组标签管理",
-        )
-    else:
-        logger.debug("定时任务：未发现无效的群组标签关联。", "群组标签管理")

zhenxun/builtin_plugins/scheduler_admin/__init__.py

@@ -10,54 +10,47 @@ __all__ = ["commands", "handlers"]
 __plugin_meta__ = PluginMetadata(
     name="定时任务管理",
     description="查看和管理由 SchedulerManager 控制的定时任务。",
-    usage="""### 📋 定时任务管理
----
-#### 🔍 **查看任务**
--   **命令**: `定时任务 查看 [选项]` (别名: `ls`, `list`)
--   **选项**:
-    -   `--all`: 查看所有群组的任务 **(SUPERUSER)**。
-    -   `-g <群号>`: 查看指定群组的任务 **(SUPERUSER)**。
-    -   `-p <插件名>`: 按插件名筛选。
-    -   `--page <页码>`: 指定页码。
--   **说明**:
-    -   在群聊中不带选项使用，默认查看本群任务。
-    -   在私聊中必须使用 `-g <群号>` 或 `--all`。
+    usage="""
+📋 定时任务管理 - 支持群聊和私聊操作
 
-#### 📊 **任务状态**
--   **命令**: `定时任务 状态 <任务ID>` (别名: `status`, `info`, `任务状态`)
--   **说明**: 查看单个任务的详细信息和状态。
+🔍 查看任务:
+  定时任务 查看 [-all] [-g <群号>] [-p <插件>] [--page <页码>]
+  • 群聊中: 查看本群任务
+  • 私聊中: 必须使用 -g <群号> 或 -all 选项 (SUPERUSER)
 
-#### ⚙️ **任务管理 (SUPERUSER)**
--   **设置**: `定时任务 设置 <插件>` (别名: `add`, `开启`)
-    -   **选项**:
-        -   `<时间选项>`: 详见下文。
-        -   `-g <群号|all>`: 指定目标群组。
-        -   `--kwargs "<参数>"`: 设置任务参数 (例: `"key=value"`)。
--   **删除**: `定时任务 删除 <ID>` (别名: `del`, `rm`, `remove`, `关闭`, `取消`)
--   **暂停**: `定时任务 暂停 <ID>` (别名: `pause`)
--   **恢复**: `定时任务 恢复 <ID>` (别名: `resume`)
--   **执行**: `定时任务 执行 <ID>` (别名: `trigger`, `run`)
--   **更新**: `定时任务 更新 <ID>` (别名: `update`, `modify`, `修改`)
-    -   **选项**:
-        -   `<时间选项>`: 详见下文。
-        -   `--kwargs "<参数>"`: 更新任务参数。
-    -   **批量操作**: `删除/暂停/恢复` 命令支持通过 `-p <插件名>` 或 `--all`
-    (当前群) 进行批量操作。
+📊 任务状态:
+  定时任务 状态 <任务ID>  或  任务状态 <任务ID>
+  • 查看单个任务的详细信息和状态
 
-#### 📝 **时间选项 (设置/更新时三选一)**
--   `--cron "<分> <时> <日> <月> <周>"` (例: `--cron "0 8 * * *"`)
--   `--interval <时间间隔>` (例: `--interval 30m`, `2h`, `10s`)
--   `--date "<YYYY-MM-DD HH:MM:SS>"` (例: `--date "2024-01-01 08:00:00"`)
--   `--daily "<HH:MM>"` (例: `--daily "08:30"`)
+⚙️ 任务管理 (SUPERUSER):
+  定时任务 设置 <插件> [时间选项] [-g <群号> | -g all] [--kwargs <参数>]
+  定时任务 删除 <任务ID> | -p <插件> [-g <群号>] | -all
+  定时任务 暂停 <任务ID> | -p <插件> [-g <群号>] | -all
+  定时任务 恢复 <任务ID> | -p <插件> [-g <群号>] | -all
+  定时任务 执行 <任务ID>
+  定时任务 更新 <任务ID> [时间选项] [--kwargs <参数>]
+  # [修改] 增加说明
+  • 说明: -p 选项可单独使用，用于操作指定插件的所有任务
 
-#### 📚 **其他功能**
--   **命令**: `定时任务 插件列表` (别名: `plugins`)
--   **说明**: 查看所有可设置定时任务的插件 **(SUPERUSER)**。
+📝 时间选项 (三选一):
+  --cron "<分> <时> <日> <月> <周>"     # 例: --cron "0 8 * * *"
+  --interval <时间间隔>               # 例: --interval 30m, 2h, 10s
+  --date "<YYYY-MM-DD HH:MM:SS>"     # 例: --date "2024-01-01 08:00:00"
+  --daily "<HH:MM>"                  # 例: --daily "08:30"
+
+📚 其他功能:
+  定时任务 插件列表  # 查看所有可设置定时任务的插件 (SUPERUSER)
+
+🏷️ 别名支持:
+  查看: ls, list  |  设置: add, 开启  |  删除: del, rm, remove, 关闭, 取消
+  暂停: pause  |  恢复: resume  |  执行: trigger, run  |  状态: status, info
+  更新: update, modify, 修改  |  插件列表: plugins
     """.strip(),
     extra=PluginExtraData(
         author="HibiKier",
         version="0.1.2",
         plugin_type=PluginType.SUPERUSER,
+        is_show=False,
         configs=[
             RegisterConfig(
                 module="SchedulerManager",
@@ -87,38 +80,6 @@ __plugin_meta__ = PluginMetadata(
                 help="定时任务使用的时区，默认为 Asia/Shanghai",
                 type=str,
             ),
-            RegisterConfig(
-                module="SchedulerManager",
-                key="SCHEDULE_ADMIN_LEVEL",
-                value=5,
-                help="设置'定时任务'系列命令的基础使用权限等级",
-                default_value=5,
-                type=int,
-            ),
-            RegisterConfig(
-                module="SchedulerManager",
-                key="DEFAULT_JITTER_SECONDS",
-                value=60,
-                help="为多目标定时任务（如 --all, -t）设置的默认触发抖动秒数，避免所有任务同时启动。",  # noqa: E501
-                default_value=60,
-                type=int,
-            ),
-            RegisterConfig(
-                module="SchedulerManager",
-                key="DEFAULT_SPREAD_SECONDS",
-                value=300,
-                help="为多目标定时任务设置的默认执行分散秒数，将任务执行分散在一个时间窗口内。",
-                default_value=300,
-                type=int,
-            ),
-            RegisterConfig(
-                module="SchedulerManager",
-                key="DEFAULT_INTERVAL_SECONDS",
-                value=0,
-                help="为多目标定时任务设置的默认串行执行间隔秒数(大于0时生效)，用于控制任务间的固定时间间隔。",
-                default_value=0,
-                type=int,
-            ),
         ],
     ).to_dict(),
 )

zhenxun/builtin_plugins/scheduler_admin/commands.py

@@ -1,101 +1,33 @@
-from arclet.alconna import ArparmaBehavior
+import re
+
+from nonebot.adapters import Event
+from nonebot.adapters.onebot.v11 import Bot
+from nonebot.params import Depends
+from nonebot.permission import SUPERUSER
 from nonebot_plugin_alconna import (
     Alconna,
+    AlconnaMatch,
     Args,
-    Arparma,
-    Field,
-    MultiVar,
+    Match,
     Option,
+    Query,
     Subcommand,
     on_alconna,
-    store_true,
 )
 
+from zhenxun.configs.config import Config
+from zhenxun.services.scheduler import scheduler_manager
+from zhenxun.services.scheduler.targeter import ScheduleTargeter
 from zhenxun.utils.rules import admin_check
 
-
-def create_time_options() -> list[Option]:
-    """创建一组用于定义任务执行时间的通用选项"""
-    return [
-        Option("--cron", Args["cron_expr", str], help_text="设置 cron 表达式"),
-        Option("--interval", Args["interval_expr", str], help_text="设置时间间隔"),
-        Option("--date", Args["date_expr", str], help_text="设置特定执行日期"),
-        Option(
-            "--daily",
-            Args["daily_expr", str],
-            help_text="设置每天执行的时间 (如 08:20)",
-        ),
-    ]
-
-
-def create_targeting_options() -> list[Option]:
-    """创建一组用于定位定时任务的通用选项"""
-    return [
-        Option("-p", Args["plugin_name", str], help_text="按插件名筛选"),
-        Option("-u", Args["user_id", str], help_text="指定用户ID"),
-        Option(
-            "-g",
-            Args["group_ids", MultiVar(str)],
-            help_text="指定一个或多个群组ID (SUPERUSER)",
-        ),
-        Option("-t", Args["tag_name", str], help_text="指定标签"),
-        Option("--all", action=store_true, help_text="对所有群生效"),
-        Option("--global", action=store_true, help_text="操作全局任务"),
-        Option("--bot", Args["bot_id", str], help_text="指定操作的Bot ID (SUPERUSER)"),
-    ]
-
-
-class SchedulerAdminBehavior(ArparmaBehavior):
-    """对定时任务命令的参数进行复杂的复合验证。"""
-
-    def _validate_time_options(self, interface: Arparma, subcommand: str):
-        """验证时间选项 (--cron, --interval, --date, --daily) 的互斥性。"""
-        time_options = ["cron", "interval", "date", "daily"]
-        provided_options = [
-            f"--{opt}" for opt in time_options if interface.query(f"{subcommand}.{opt}")
-        ]
-        if len(provided_options) > 1:
-            interface.behave_fail(
-                f"时间选项 {', '.join(provided_options)} 不能同时使用，请只选择一个。"
-            )
-
-    def _validate_target_options(self, interface: Arparma, subcommand: str):
-        """验证目标选项 (-u, -g, -t, --all, --global) 的互斥性。"""
-        target_flags = {
-            "-u": "u",
-            "-g": "g",
-            "-t": "t",
-            "--all": "all",
-            "--global": "global",
-        }
-        provided_flags = [
-            flag
-            for flag, name in target_flags.items()
-            if interface.query(f"{subcommand}.{name}")
-        ]
-
-        if len(provided_flags) > 1:
-            interface.behave_fail(
-                f"目标选项 {', '.join(provided_flags)} 是互斥的，请只选择一个。"
-            )
-
-    def operate(self, interface: Arparma):
-        subcommand = next(iter(interface.subcommands.keys()), None)
-        if not subcommand:
-            return
-
-        if subcommand in {"设置", "更新"}:
-            self._validate_time_options(interface, subcommand)
-        if subcommand in {"查看", "设置", "删除", "暂停", "恢复"}:
-            self._validate_target_options(interface, subcommand)
-
-
 schedule_cmd = on_alconna(
     Alconna(
         "定时任务",
         Subcommand(
             "查看",
-            *create_targeting_options(),
+            Option("-g", Args["target_group_id", str]),
+            Option("-all", help_text="查看所有群聊 (SUPERUSER)"),
+            Option("-p", Args["plugin_name", str], help_text="按插件名筛选"),
             Option("--page", Args["page", int, 1], help_text="指定页码"),
             alias=["ls", "list"],
             help_text="查看定时任务",
@@ -103,41 +35,17 @@ schedule_cmd = on_alconna(
         Subcommand(
             "设置",
             Args["plugin_name", str],
-            *create_time_options(),
+            Option("--cron", Args["cron_expr", str], help_text="设置 cron 表达式"),
+            Option("--interval", Args["interval_expr", str], help_text="设置时间间隔"),
+            Option("--date", Args["date_expr", str], help_text="设置特定执行日期"),
             Option(
-                "-g", Args["group_ids", MultiVar(str)], help_text="指定一个或多个群组ID"
+                "--daily",
+                Args["daily_expr", str],
+                help_text="设置每天执行的时间 (如 08:20)",
             ),
-            Option("-u", Args["user_id", str], help_text="指定用户ID"),
-            Option("-t", Args["tag_name", str], help_text="指定一个群组标签"),
-            Option("--all", action=store_true, help_text="对所有群生效"),
-            Option("--global", action=store_true, help_text="设置为全局任务"),
-            Option("--name", Args["job_name", str], help_text="为任务设置一个别名"),
+            Option("-g", Args["group_id", str], help_text="指定群组ID或'all'"),
+            Option("-all", help_text="对所有群生效 (等同于 -g all)"),
             Option("--kwargs", Args["kwargs_str", str], help_text="设置任务参数"),
-            Option(
-                "--params-cli",
-                Args["cli_string", str],
-                help_text="传递给插件任务的原始命令行参数字符串",
-            ),
-            Option(
-                "--jitter",
-                Args["jitter_seconds", int],
-                help_text="设置触发时间抖动(秒)",
-            ),
-            Option(
-                "--spread",
-                Args["spread_seconds", int],
-                help_text="设置多目标执行的分散延迟(秒)",
-            ),
-            Option(
-                "--fixed-interval",
-                Args["interval_seconds", int],
-                help_text="设置任务间的固定执行间隔(秒)，将强制串行",
-            ),
-            Option(
-                "--permission",
-                Args["perm_level", int],
-                help_text="设置任务的管理权限等级",
-            ),
             Option(
                 "--bot", Args["bot_id", str], help_text="指定操作的Bot ID (SUPERUSER)"
             ),
@@ -146,75 +54,64 @@ schedule_cmd = on_alconna(
         ),
         Subcommand(
             "删除",
-            Args[
-                "schedule_ids?",
-                MultiVar(int),
-                Field(unmatch_tips=lambda text: f"任务ID '{text}' 必须是数字！"),
-            ],
-            *create_targeting_options(),
+            Args["schedule_id?", int],
+            Option("-p", Args["plugin_name", str], help_text="指定插件名"),
+            Option("-g", Args["group_id", str], help_text="指定群组ID"),
+            Option("-all", help_text="对所有群生效"),
+            Option(
+                "--bot", Args["bot_id", str], help_text="指定操作的Bot ID (SUPERUSER)"
+            ),
             alias=["del", "rm", "remove", "关闭", "取消"],
             help_text="删除一个或多个定时任务",
         ),
         Subcommand(
             "暂停",
-            Args[
-                "schedule_ids?",
-                MultiVar(int),
-                Field(unmatch_tips=lambda text: f"任务ID '{text}' 必须是数字！"),
-            ],
-            *create_targeting_options(),
+            Args["schedule_id?", int],
+            Option("-all", help_text="对当前群所有任务生效"),
+            Option("-p", Args["plugin_name", str], help_text="指定插件名"),
+            Option("-g", Args["group_id", str], help_text="指定群组ID (SUPERUSER)"),
+            Option(
+                "--bot", Args["bot_id", str], help_text="指定操作的Bot ID (SUPERUSER)"
+            ),
             alias=["pause"],
             help_text="暂停一个或多个定时任务",
         ),
         Subcommand(
             "恢复",
-            Args[
-                "schedule_ids?",
-                MultiVar(int),
-                Field(unmatch_tips=lambda text: f"任务ID '{text}' 必须是数字！"),
-            ],
-            *create_targeting_options(),
+            Args["schedule_id?", int],
+            Option("-all", help_text="对当前群所有任务生效"),
+            Option("-p", Args["plugin_name", str], help_text="指定插件名"),
+            Option("-g", Args["group_id", str], help_text="指定群组ID (SUPERUSER)"),
+            Option(
+                "--bot", Args["bot_id", str], help_text="指定操作的Bot ID (SUPERUSER)"
+            ),
             alias=["resume"],
             help_text="恢复一个或多个定时任务",
         ),
         Subcommand(
             "执行",
-            Args[
-                "schedule_id",
-                int,
-                Field(
-                    missing_tips=lambda: "请提供要立即执行的任务ID！",
-                    unmatch_tips=lambda text: f"任务ID '{text}' 必须是数字！",
-                ),
-            ],
+            Args["schedule_id", int],
             alias=["trigger", "run"],
             help_text="立即执行一次任务",
         ),
         Subcommand(
             "更新",
-            Args[
-                "schedule_id",
-                int,
-                Field(
-                    missing_tips=lambda: "请提供要更新的任务ID！",
-                    unmatch_tips=lambda text: f"任务ID '{text}' 必须是数字！",
-                ),
-            ],
-            *create_time_options(),
+            Args["schedule_id", int],
+            Option("--cron", Args["cron_expr", str], help_text="设置 cron 表达式"),
+            Option("--interval", Args["interval_expr", str], help_text="设置时间间隔"),
+            Option("--date", Args["date_expr", str], help_text="设置特定执行日期"),
+            Option(
+                "--daily",
+                Args["daily_expr", str],
+                help_text="更新每天执行的时间 (如 08:20)",
+            ),
             Option("--kwargs", Args["kwargs_str", str], help_text="更新参数"),
             alias=["update", "modify", "修改"],
             help_text="更新任务配置",
         ),
         Subcommand(
             "状态",
-            Args[
-                "schedule_id",
-                int,
-                Field(
-                    missing_tips=lambda: "请提供要查看状态的任务ID！",
-                    unmatch_tips=lambda text: f"任务ID '{text}' 必须是数字！",
-                ),
-            ],
+            Args["schedule_id", int],
             alias=["status", "info"],
             help_text="查看单个任务的详细状态",
         ),
@@ -223,19 +120,179 @@ schedule_cmd = on_alconna(
             alias=["plugins"],
             help_text="列出所有可用的插件",
         ),
-        behaviors=[SchedulerAdminBehavior()],
     ),
     priority=5,
     block=True,
-    skip_for_unmatch=False,
-    aliases={"schedule", "cron", "job"},
-    rule=admin_check("SchedulerManager", "SCHEDULE_ADMIN_LEVEL"),
+    rule=admin_check(1),
 )
 
-
 schedule_cmd.shortcut(
     "任务状态",
     command="定时任务",
     arguments=["状态", "{%0}"],
     prefix=True,
 )
+
+
+class ScheduleTarget:
+    pass
+
+
+class TargetByID(ScheduleTarget):
+    def __init__(self, id: int):
+        self.id = id
+
+
+class TargetByPlugin(ScheduleTarget):
+    def __init__(
+        self, plugin: str, group_id: str | None = None, all_groups: bool = False
+    ):
+        self.plugin = plugin
+        self.group_id = group_id
+        self.all_groups = all_groups
+
+
+class TargetAll(ScheduleTarget):
+    def __init__(self, for_group: str | None = None):
+        self.for_group = for_group
+
+
+TargetScope = TargetByID | TargetByPlugin | TargetAll | None
+
+
+def create_target_parser(subcommand_name: str):
+    async def dependency(
+        event: Event,
+        schedule_id: Match[int] = AlconnaMatch("schedule_id"),
+        plugin_name: Match[str] = AlconnaMatch("plugin_name"),
+        group_id: Match[str] = AlconnaMatch("group_id"),
+        all_enabled: Query[bool] = Query(f"{subcommand_name}.all"),
+    ) -> TargetScope:
+        if schedule_id.available:
+            return TargetByID(schedule_id.result)
+
+        if plugin_name.available:
+            p_name = plugin_name.result
+            if all_enabled.available:
+                return TargetByPlugin(plugin=p_name, all_groups=True)
+            elif group_id.available:
+                gid = group_id.result
+                if gid.lower() == "all":
+                    return TargetByPlugin(plugin=p_name, all_groups=True)
+                return TargetByPlugin(plugin=p_name, group_id=gid)
+            else:
+                current_group_id = getattr(event, "group_id", None)
+                return TargetByPlugin(
+                    plugin=p_name,
+                    group_id=str(current_group_id) if current_group_id else None,
+                )
+
+        if all_enabled.available:
+            current_group_id = getattr(event, "group_id", None)
+            if not current_group_id:
+                await schedule_cmd.finish(
+                    "私聊中单独使用 -all 选项时，必须使用 -g <群号> 指定目标。"
+                )
+            return TargetAll(for_group=str(current_group_id))
+
+        return None
+
+    return dependency
+
+
+def parse_interval(interval_str: str) -> dict:
+    match = re.match(r"(\d+)([smhd])", interval_str.lower())
+    if not match:
+        raise ValueError("时间间隔格式错误, 请使用如 '30m', '2h', '1d', '10s' 的格式。")
+    value, unit = int(match.group(1)), match.group(2)
+    if unit == "s":
+        return {"seconds": value}
+    if unit == "m":
+        return {"minutes": value}
+    if unit == "h":
+        return {"hours": value}
+    if unit == "d":
+        return {"days": value}
+    return {}
+
+
+def parse_daily_time(time_str: str) -> dict:
+    if match := re.match(r"^(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?$", time_str):
+        hour, minute, second = match.groups()
+        hour, minute = int(hour), int(minute)
+        if not (0 <= hour <= 23 and 0 <= minute <= 59):
+            raise ValueError("小时或分钟数值超出范围。")
+        cron_config = {
+            "minute": str(minute),
+            "hour": str(hour),
+            "day": "*",
+            "month": "*",
+            "day_of_week": "*",
+            "timezone": Config.get_config("SchedulerManager", "SCHEDULER_TIMEZONE"),
+        }
+        if second is not None:
+            if not (0 <= int(second) <= 59):
+                raise ValueError("秒数值超出范围。")
+            cron_config["second"] = str(second)
+        return cron_config
+    else:
+        raise ValueError("时间格式错误，请使用 'HH:MM' 或 'HH:MM:SS' 格式。")
+
+
+async def GetBotId(bot: Bot, bot_id_match: Match[str] = AlconnaMatch("bot_id")) -> str:
+    if bot_id_match.available:
+        return bot_id_match.result
+    return bot.self_id
+
+
+def GetTargeter(subcommand: str):
+    """
+    依赖注入函数，用于解析命令参数并返回一个配置好的 ScheduleTargeter 实例。
+    """
+
+    async def dependency(
+        event: Event,
+        bot: Bot,
+        schedule_id: Match[int] = AlconnaMatch("schedule_id"),
+        plugin_name: Match[str] = AlconnaMatch("plugin_name"),
+        group_id: Match[str] = AlconnaMatch("group_id"),
+        all_enabled: Query[bool] = Query(f"{subcommand}.all"),
+        bot_id_to_operate: str = Depends(GetBotId),
+    ) -> ScheduleTargeter:
+        if schedule_id.available:
+            return scheduler_manager.target(id=schedule_id.result)
+
+        if plugin_name.available:
+            if all_enabled.available:
+                return scheduler_manager.target(plugin_name=plugin_name.result)
+
+            current_group_id = getattr(event, "group_id", None)
+            gid = group_id.result if group_id.available else current_group_id
+            return scheduler_manager.target(
+                plugin_name=plugin_name.result,
+                group_id=str(gid) if gid else None,
+                bot_id=bot_id_to_operate,
+            )
+
+        if all_enabled.available:
+            current_group_id = getattr(event, "group_id", None)
+            gid = group_id.result if group_id.available else current_group_id
+            is_su = await SUPERUSER(bot, event)
+            if not gid and not is_su:
+                await schedule_cmd.finish(
+                    f"在私聊中对所有任务进行'{subcommand}'操作需要超级用户权限。"
+                )
+
+            if (gid and str(gid).lower() == "all") or (not gid and is_su):
+                return scheduler_manager.target()
+
+            return scheduler_manager.target(
+                group_id=str(gid) if gid else None, bot_id=bot_id_to_operate
+            )
+
+        await schedule_cmd.finish(
+            f"'{subcommand}'操作失败：请提供任务ID，"
+            f"或通过 -p <插件名> 或 -all 指定要操作的任务。"
+        )
+
+    return Depends(dependency)

zhenxun/builtin_plugins/scheduler_admin/data_source.py

@@ -1,314 +0,0 @@
-from typing import Any
-
-from pydantic import BaseModel, ValidationError
-
-from zhenxun.models.level_user import LevelUser
-from zhenxun.models.scheduled_job import ScheduledJob
-from zhenxun.services import scheduler_manager
-from zhenxun.services.log import logger
-from zhenxun.services.scheduler.repository import ScheduleRepository
-from zhenxun.utils.pydantic_compat import model_dump, model_validate
-
-from . import presenters
-
-
-class SchedulerAdminService:
-    """封装定时任务管理的所有业务逻辑"""
-
-    async def get_schedules_view(
-        self,
-        user_id: str,
-        group_id: str | None,
-        is_superuser: bool,
-        filters: dict[str, Any],
-        page: int,
-    ) -> bytes | str:
-        """获取任务列表视图"""
-        page_size = 30
-        schedules, total_items = await scheduler_manager.get_schedules(
-            page=page, page_size=page_size, **filters
-        )
-
-        if not schedules:
-            return "没有找到任何相关的定时任务。"
-
-        permitted_schedules = schedules
-        skipped_count = 0
-        if not is_superuser:
-            permitted_schedules, skipped_count = await self._filter_schedules_for_user(
-                schedules, user_id, group_id
-            )
-
-        if not permitted_schedules:
-            return (
-                f"您没有权限查看任何匹配的任务。（因权限不足跳过 {skipped_count} 个）"
-            )
-
-        title = self._generate_view_title(filters)
-
-        return await presenters.format_schedule_list_as_image(
-            schedules=permitted_schedules,
-            title=title,
-            current_page=page,
-            total_items=total_items,
-        )
-
-    async def set_schedule(
-        self,
-        targets: list[str],
-        creator_permission_level: int,
-        plugin_name: str,
-        trigger_info: tuple[str, dict],
-        job_kwargs: dict,
-        permission: int,
-        bot_id: str,
-        job_name: str | None,
-        jitter: int | None,
-        spread: int | None,
-        interval: int | None,
-        created_by: str,
-    ) -> str:
-        """创建或更新一个定时任务"""
-        trigger_type, trigger_config = trigger_info
-        success_targets = []
-        failed_targets = []
-        permission_denied_targets = []
-        execution_options = {}
-        if jitter is not None:
-            execution_options["jitter"] = jitter
-        if spread is not None:
-            execution_options["spread"] = spread
-        if interval is not None:
-            execution_options["interval"] = interval
-
-        for target_desc in targets:
-            target_type, target_id = self._resolve_target_descriptor(target_desc)
-
-            existing_schedule = await ScheduleRepository.filter(
-                plugin_name=plugin_name,
-                target_type=target_type,
-                target_identifier=target_id,
-                bot_id=bot_id,
-            ).first()
-
-            if (
-                existing_schedule
-                and creator_permission_level < existing_schedule.required_permission
-            ):
-                permission_denied_targets.append(
-                    (
-                        target_desc,
-                        f"需要 {existing_schedule.required_permission} 级权限",
-                    )
-                )
-                continue
-
-            if target_type in ["TAG", "ALL_GROUPS"]:
-                logger.debug(
-                    f"检测到多目标任务 (类型: {target_type})，"
-                    f"将所需权限强制提升至超级用户级别。"
-                )
-                permission = 9
-
-            try:
-                schedule = await scheduler_manager.add_schedule(
-                    plugin_name=plugin_name,
-                    target_type=target_type,
-                    target_identifier=target_id,
-                    trigger_type=trigger_type,
-                    trigger_config=trigger_config,
-                    job_kwargs=job_kwargs,
-                    bot_id=bot_id,
-                    required_permission=permission,
-                    name=job_name,
-                    created_by=created_by,
-                    execution_options=execution_options if execution_options else None,
-                )
-                if schedule:
-                    success_targets.append((target_desc, schedule.id))
-                else:
-                    failed_targets.append((target_desc, "服务返回失败"))
-            except Exception as e:
-                failed_targets.append((target_desc, str(e)))
-
-        return self._format_set_result_message(
-            targets, success_targets, failed_targets, permission_denied_targets
-        )
-
-    async def perform_bulk_operation(
-        self,
-        operation_name: str,
-        user_id: str,
-        group_id: str | None,
-        is_superuser: bool,
-        targeter,
-        all_flag: bool,
-        global_flag: bool,
-    ) -> str:
-        """执行批量操作（删除、暂停、恢复）"""
-        if not is_superuser:
-            permission_denied = False
-            if all_flag or global_flag:
-                permission_denied = True
-            elif targeter._filters.get("target_type") in ["TAG", "ALL_GROUPS"]:
-                permission_denied = True
-
-            if permission_denied:
-                return "权限不足，只有超级用户才能对所有群组或通过标签进行批量操作。"
-
-        schedules_to_operate = await targeter._get_schedules()
-        if not schedules_to_operate:
-            return "没有找到符合条件的可操作任务。"
-
-        permitted_schedules, skipped_count = (
-            (schedules_to_operate, 0)
-            if is_superuser
-            else await self._filter_schedules_for_user(
-                schedules_to_operate, user_id, group_id
-            )
-        )
-
-        if not permitted_schedules:
-            return (
-                f"您没有权限{operation_name}任何匹配的任务。"
-                f"（因权限不足跳过 {skipped_count} 个）"
-            )
-
-        permitted_ids = [s.id for s in permitted_schedules]
-        final_targeter = scheduler_manager.target(id__in=permitted_ids)
-
-        operation_map = {
-            "删除": final_targeter.remove,
-            "暂停": final_targeter.pause,
-            "恢复": final_targeter.resume,
-        }
-        operation_func = operation_map.get(operation_name)
-        if not operation_func:
-            return f"未知的批量操作: {operation_name}"
-
-        count, _ = await operation_func()
-        msg = f"批量{operation_name}操作完成：\n  - 成功: {count} 个"
-        if skipped_count > 0:
-            msg += f"\n  - 因权限不足跳过: {skipped_count} 个"
-        return msg
-
-    async def trigger_schedule_now(self, schedule: ScheduledJob) -> str:
-        """立即触发一个任务"""
-        success, message = await scheduler_manager.trigger_now(schedule.id)
-        return (
-            presenters.format_trigger_success(schedule)
-            if success
-            else f"❌ 触发失败: {message}"
-        )
-
-    async def update_schedule(
-        self, schedule: ScheduledJob, trigger_info: tuple | None, kwargs_str: str | None
-    ) -> str:
-        """更新一个任务的配置"""
-        trigger_type = trigger_info[0] if trigger_info else None
-        trigger_config = trigger_info[1] if trigger_info else None
-        job_kwargs = await self._parse_and_validate_kwargs_for_update(
-            schedule.plugin_name, kwargs_str
-        )
-        success, message = await scheduler_manager.update_schedule(
-            schedule.id, trigger_type, trigger_config, job_kwargs
-        )
-        if success:
-            updated_schedule = await scheduler_manager.get_schedule_by_id(schedule.id)
-            return (
-                presenters.format_update_success(updated_schedule)
-                if updated_schedule
-                else "✅ 更新成功，但无法获取更新后的任务详情。"
-            )
-        return f"❌ 更新失败: {message}"
-
-    async def get_schedule_status(self, schedule_id: int) -> str:
-        """获取单个任务的状态"""
-        status = await scheduler_manager.get_schedule_status(schedule_id)
-        if not status:
-            return f"未找到ID为 {schedule_id} 的任务。"
-        return presenters.format_single_status_message(status)
-
-    async def get_plugins_list(self) -> str:
-        """获取可定时执行的插件列表"""
-        return await presenters.format_plugins_list()
-
-    async def _filter_schedules_for_user(
-        self, schedules: list[ScheduledJob], user_id: str, group_id: str | None
-    ) -> tuple[list[ScheduledJob], int]:
-        user_level = await LevelUser.get_user_level(user_id, group_id)
-        permitted = [s for s in schedules if user_level >= s.required_permission]
-        skipped_count = len(schedules) - len(permitted)
-        return permitted, skipped_count
-
-    def _generate_view_title(self, filters: dict) -> str:
-        title = "定时任务"
-        if filters.get("target_type") == "ALL_GROUPS":
-            title = "全局定时任务"
-        elif "target_identifier" in filters:
-            title = f"群 {filters['target_identifier']} 的定时任务"
-        if "plugin_name" in filters:
-            title += f" [插件: {filters['plugin_name']}]"
-        return title
-
-    def _resolve_target_descriptor(self, target_desc: str) -> tuple[str, str]:
-        if target_desc == scheduler_manager.ALL_GROUPS:
-            return "ALL_GROUPS", scheduler_manager.ALL_GROUPS
-        if target_desc.startswith("tag:"):
-            return "TAG", target_desc[4:]
-        if target_desc.isdigit():
-            return "GROUP", target_desc
-        return "USER", target_desc
-
-    def _format_set_result_message(
-        self, targets: list, success: list, failed: list, permission_denied: list
-    ) -> str:
-        msg = f"为 {len(targets)} 个目标设置/更新任务完成：\n"
-        if success:
-            msg += f"- 成功: {len(success)} 个"
-            ids_str = ", ".join(str(s[1]) for s in success)
-            msg += f"\n  - ID列表: {ids_str}"
-        else:
-            msg += "- 成功: 0 个"
-        if permission_denied:
-            msg += f"\n- 因权限不足跳过: {len(permission_denied)} 个"
-            for target, reason in permission_denied:
-                msg += f"\n  - 目标 {target}: {reason}"
-        if failed:
-            msg += f"\n- 失败: {len(failed)} 个"
-            for target, reason in failed:
-                msg += f"\n  - 目标 {target}: {reason}"
-        return msg.strip()
-
-    async def _parse_and_validate_kwargs_for_update(
-        self, plugin_name: str, kwargs_str: str | None
-    ) -> dict:
-        if not kwargs_str:
-            return {}
-
-        task_meta = scheduler_manager._registered_tasks.get(plugin_name)
-        if not task_meta:
-            raise ValueError(f"插件 '{plugin_name}' 未注册。")
-
-        params_model = task_meta.get("model")
-        if not (
-            params_model
-            and isinstance(params_model, type)
-            and issubclass(params_model, BaseModel)
-        ):
-            raise ValueError(f"插件 '{plugin_name}' 不支持或配置了无效的参数模型。")
-
-        try:
-            raw_kwargs = dict(
-                item.strip().split("=", 1) for item in kwargs_str.split(";")
-            )
-            validated_model = model_validate(params_model, raw_kwargs)
-            return model_dump(validated_model)
-        except ValidationError as e:
-            errors = [f"  - {err['loc'][0]}: {err['msg']}" for err in e.errors()]
-            raise ValueError("参数验证失败:\n" + "\n".join(errors))
-        except Exception as e:
-            raise ValueError(f"参数格式错误: {e}")
-
-
-scheduler_admin_service = SchedulerAdminService()

zhenxun/builtin_plugins/scheduler_admin/dependencies.py

@@ -1,370 +0,0 @@
-from datetime import datetime
-import re
-from typing import Any
-
-from arclet.alconna import Alconna
-from nonebot.adapters import Bot, Event
-from nonebot.params import Depends
-from nonebot.permission import SUPERUSER
-from nonebot_plugin_alconna import (
-    AlconnaMatch,
-    AlconnaMatcher,
-    AlconnaMatches,
-    AlconnaQuery,
-    Arparma,
-    Match,
-    Query,
-)
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_uninfo import Uninfo
-
-from zhenxun.configs.config import Config
-from zhenxun.models.level_user import LevelUser
-from zhenxun.models.scheduled_job import ScheduledJob
-from zhenxun.services import scheduler_manager
-from zhenxun.utils.time_utils import TimeUtils
-
-
-async def GetCreatorPermissionLevel(
-    bot: Bot,
-    event: Event,
-    session: Uninfo,
-) -> int:
-    """
-    依赖注入函数：获取执行命令的用户的权限等级。
-    """
-    is_superuser = await SUPERUSER(bot, event)
-    if is_superuser:
-        return 999
-
-    current_group_id = session.group.id if session.group else None
-    return await LevelUser.get_user_level(session.user.id, current_group_id)
-
-
-async def RequireTaskPermission(
-    matcher: AlconnaMatcher,
-    bot: Bot,
-    event: Event,
-    session: EventSession,
-    schedule_id_match: Match[int] = AlconnaMatch("schedule_id"),
-) -> ScheduledJob:
-    """
-    依赖注入函数：获取并验证用户对特定任务的操作权限。
-    """
-    if not schedule_id_match.available:
-        await matcher.finish("此操作需要一个有效的任务ID。")
-
-    schedule_id = schedule_id_match.result
-    schedule = await scheduler_manager.get_schedule_by_id(schedule_id)
-    if not schedule:
-        await matcher.finish(f"未找到ID为 {schedule_id} 的任务。")
-
-    is_superuser = await SUPERUSER(bot, event)
-    if is_superuser:
-        return schedule
-
-    user_id = session.id1
-    if not user_id:
-        await matcher.finish("无法获取用户信息，权限检查失败。")
-
-    group_id = session.id3 or session.id2
-    user_level = await LevelUser.get_user_level(user_id, group_id)
-
-    if user_level < schedule.required_permission:
-        await matcher.finish(
-            f"权限不足！操作此任务需要 {schedule.required_permission} 级权限，"
-            f"您当前为 {user_level} 级。"
-        )
-
-    return schedule
-
-
-def parse_daily_time(time_str: str) -> dict:
-    """解析每日时间字符串为 cron 配置字典"""
-    if match := re.match(r"^(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?$", time_str):
-        hour, minute, second = match.groups()
-        hour, minute = int(hour), int(minute)
-        if not (0 <= hour <= 23 and 0 <= minute <= 59):
-            raise ValueError("小时或分钟数值超出范围。")
-        cron_config = {
-            "minute": str(minute),
-            "hour": str(hour),
-            "day": "*",
-            "month": "*",
-            "day_of_week": "*",
-            "timezone": Config.get_config("SchedulerManager", "SCHEDULER_TIMEZONE"),
-        }
-        if second is not None:
-            if not (0 <= int(second) <= 59):
-                raise ValueError("秒数值超出范围。")
-            cron_config["second"] = str(second)
-        return cron_config
-    else:
-        raise ValueError("时间格式错误，请使用 'HH:MM' 或 'HH:MM:SS' 格式。")
-
-
-def _parse_trigger_from_arparma(arp: Arparma) -> tuple[str, dict] | None:
-    """从 Arparma 中解析时间触发器配置"""
-    subcommand_name = next(iter(arp.subcommands.keys()), None)
-    if not subcommand_name:
-        return None
-
-    try:
-        if cron_expr := arp.query[str](f"{subcommand_name}.cron.cron_expr", None):
-            return "cron", dict(
-                zip(
-                    ["minute", "hour", "day", "month", "day_of_week"], cron_expr.split()
-                )
-            )
-        if interval_expr := arp.query[str](
-            f"{subcommand_name}.interval.interval_expr", None
-        ):
-            return "interval", TimeUtils.parse_interval_to_dict(interval_expr)
-        if date_expr := arp.query[str](f"{subcommand_name}.date.date_expr", None):
-            return "date", {"run_date": datetime.fromisoformat(date_expr)}
-        if daily_expr := arp.query[str](f"{subcommand_name}.daily.daily_expr", None):
-            return "cron", parse_daily_time(daily_expr)
-    except ValueError as e:
-        raise ValueError(f"时间参数解析错误: {e}") from e
-    return None
-
-
-async def GetTriggerInfo(
-    matcher: AlconnaMatcher,
-    arp: Arparma = AlconnaMatches(),
-) -> tuple[str, dict]:
-    """依赖注入函数：解析并验证时间触发器"""
-    try:
-        trigger_info = _parse_trigger_from_arparma(arp)
-        if trigger_info:
-            return trigger_info
-    except ValueError as e:
-        await matcher.finish(f"时间参数解析错误: {e}")
-
-    await matcher.finish(
-        "必须提供一种时间选项: --cron, --interval, --date, 或 --daily。"
-    )
-
-
-async def GetBotId(bot: Bot, bot_id_match: Match[str] = AlconnaMatch("bot_id")) -> str:
-    """依赖注入函数：获取要操作的Bot ID"""
-    if bot_id_match.available:
-        return bot_id_match.result
-    return bot.self_id
-
-
-async def GetTargeter(
-    matcher: AlconnaMatcher,
-    event: Event,
-    bot: Bot,
-    arp: Arparma = AlconnaMatches(),
-    schedule_ids: Match[list[int]] = AlconnaMatch("schedule_ids"),
-    plugin_name: Match[str] = AlconnaMatch("plugin_name"),
-    group_ids: Match[list[str]] = AlconnaMatch("group_ids"),
-    user_id: Match[str] = AlconnaMatch("user_id"),
-    tag_name: Match[str] = AlconnaMatch("tag_name"),
-    bot_id_to_operate: str = Depends(GetBotId),
-) -> Any:
-    """
-    依赖注入函数，用于解析命令参数并返回一个配置好的 ScheduleTargeter 实例。
-    """
-    subcommand = next(iter(arp.subcommands.keys()), None)
-    if not subcommand:
-        await matcher.finish("内部错误：无法解析子命令。")
-
-    if schedule_ids.available:
-        return scheduler_manager.target(id__in=schedule_ids.result)
-
-    all_enabled = arp.query(f"{subcommand}.all.value", False)
-    global_flag = arp.query(f"{subcommand}.global.value", False)
-
-    if not any(
-        [
-            plugin_name.available,
-            all_enabled,
-            global_flag,
-            user_id.available,
-            group_ids.available,
-            tag_name.available,
-            getattr(event, "group_id", None),
-        ]
-    ):
-        await matcher.finish(
-            f"'{subcommand}'操作失败：请提供任务ID，"
-            f"或通过 -p <插件名> / --global / --all 指定要操作的任务。"
-        )
-
-    filters: dict[str, Any] = {"bot_id": bot_id_to_operate}
-    if plugin_name.available:
-        filters["plugin_name"] = plugin_name.result
-
-    if global_flag:
-        filters["target_type"] = "ALL_GROUPS"
-        filters["target_identifier"] = scheduler_manager.ALL_GROUPS
-    elif user_id.available:
-        filters["target_type"] = "USER"
-        filters["target_identifier"] = user_id.result
-    elif all_enabled:
-        pass
-    elif tag_name.available:
-        filters["target_type"] = "TAG"
-        filters["target_identifier"] = tag_name.result
-    elif group_ids.available:
-        gids = [str(gid) for gid in group_ids.result]
-        filters["target_type"] = "GROUP"
-        filters["target_identifier__in"] = gids
-    else:
-        current_group_id = getattr(event, "group_id", None)
-        if current_group_id:
-            filters["target_type"] = "GROUP"
-            filters["target_identifier"] = str(current_group_id)
-
-    return scheduler_manager.target(**filters)
-
-
-async def GetValidatedJobKwargs(
-    matcher: AlconnaMatcher,
-    plugin_name: Match[str] = AlconnaMatch("plugin_name"),
-    cli_string: Match[str] = AlconnaMatch("cli_string"),
-    kwargs_str: Match[str] = AlconnaMatch("kwargs_str"),
-) -> dict:
-    """依赖注入函数：解析、合并和验证任务的关键字参数"""
-    p_name = plugin_name.result
-    task_meta = scheduler_manager._registered_tasks.get(p_name)
-    if not task_meta:
-        await matcher.finish(f"插件 '{p_name}' 未注册可定时执行的任务。")
-
-    cli_kwargs = {}
-    if cli_string.available and cli_string.result.strip():
-        if not (cli_parser := task_meta.get("cli_parser")):
-            await matcher.finish(
-                f"插件 '{p_name}' 不支持通过 --params-cli 设置参数，"
-                f"因为它没有注册解析器。"
-            )
-
-        try:
-            temp_parser = Alconna("_", cli_parser.args, *cli_parser.options)  # type: ignore
-            parsed_cli = temp_parser.parse(f"_ {cli_string.result.strip()}")
-
-            if not parsed_cli.matched:
-                raise ValueError(f"参数无法匹配: {parsed_cli.error_info or '未知错误'}")
-
-            cli_kwargs = parsed_cli.all_matched_args
-
-        except Exception as e:
-            await matcher.finish(
-                f"使用 --params-cli 解析参数失败: {e}\n\n请确保参数格式与插件命令一致。"
-            )
-
-    explicit_kwargs = {}
-    if kwargs_str.available and kwargs_str.result.strip():
-        try:
-            explicit_kwargs = dict(
-                item.strip().split("=", 1)
-                for item in kwargs_str.result.split(";")
-                if item.strip()
-            )
-        except ValueError:
-            await matcher.finish(
-                "参数格式错误，--kwargs 请使用 'key=value;key2=value2' 格式。"
-            )
-
-    final_job_kwargs = {**cli_kwargs, **explicit_kwargs}
-
-    is_valid, result = scheduler_manager._validate_and_prepare_kwargs(
-        p_name, final_job_kwargs
-    )
-    if not is_valid:
-        await matcher.finish(f"任务参数校验失败:\n{result}")
-
-    return result if isinstance(result, dict) else {}
-
-
-async def GetFinalPermission(
-    matcher: AlconnaMatcher,
-    bot: Bot,
-    event: Event,
-    session: Uninfo,
-    plugin_name: Match[str] = AlconnaMatch("plugin_name"),
-    perm_level: Match[int] = AlconnaMatch("perm_level"),
-) -> int:
-    """依赖注入函数：计算任务的最终权限等级"""
-    is_superuser = await SUPERUSER(bot, event)
-    current_group_id = session.group.id if session.group else None
-
-    if is_superuser:
-        effective_user_level = 9
-    else:
-        effective_user_level = await LevelUser.get_user_level(
-            session.user.id, current_group_id
-        )
-    if perm_level.available:
-        requested_perm_level = perm_level.result
-        if not is_superuser and requested_perm_level > effective_user_level:
-            await matcher.send(
-                f"⚠️ 警告：您指定的权限等级 ({requested_perm_level}) "
-                f"高于自身权限 ({effective_user_level})。\n"
-                f"任务的管理权限已被自动设置为 {effective_user_level} 级。"
-            )
-            return effective_user_level
-        return requested_perm_level
-
-    else:
-        base_permission = effective_user_level
-        task_meta = scheduler_manager._registered_tasks.get(plugin_name.result)
-        if task_meta and "default_permission" in task_meta:
-            default_perm = task_meta.get("default_permission")
-            if isinstance(default_perm, int):
-                base_permission = default_perm
-
-        return min(base_permission, effective_user_level)
-
-
-async def ResolveTargets(
-    matcher: AlconnaMatcher,
-    bot: Bot,
-    event: Event,
-    session: Uninfo,
-    group_ids: Match[list[str]] = AlconnaMatch("group_ids"),
-    tag_name: Match[str] = AlconnaMatch("tag_name"),
-    user_id: Match[str] = AlconnaMatch("user_id"),
-    all_flag: Query[bool] = AlconnaQuery("设置.all.value", False),
-    global_flag: Query[bool] = AlconnaQuery("设置.global.value", False),
-) -> list[str]:
-    """依赖注入函数，用于解析和计算最终的目标描述符列表，并进行权限检查"""
-    is_superuser = await SUPERUSER(bot, event)
-    current_group_id = session.group.id if session.group else None
-
-    if not is_superuser:
-        permission_denied = False
-        if (
-            global_flag.result
-            or all_flag.result
-            or tag_name.available
-            or user_id.available
-        ):
-            permission_denied = True
-        elif group_ids.available and any(
-            str(gid) != str(current_group_id) for gid in group_ids.result
-        ):
-            permission_denied = True
-
-        if permission_denied:
-            await matcher.finish(
-                "权限不足，只有超级用户才能为其他群组、所有群组或通过标签设置任务。"
-            )
-
-    if user_id.available:
-        return [user_id.result]
-    if all_flag.result or global_flag.result:
-        return [scheduler_manager.ALL_GROUPS]
-    if tag_name.available:
-        return [f"tag:{tag_name.result}"]
-    if group_ids.available:
-        return group_ids.result
-    if current_group_id:
-        return [str(current_group_id)]
-
-    await matcher.finish(
-        "私聊中设置任务必须使用 -u, -g, --all, --global 或 -t 选项指定目标。"
-    )

zhenxun/builtin_plugins/scheduler_admin/handlers.py

@@ -1,238 +1,380 @@
-from typing import cast
+from datetime import datetime
 
-from nonebot.adapters import Bot, Event
+from nonebot.adapters import Event
+from nonebot.adapters.onebot.v11 import Bot
 from nonebot.params import Depends
 from nonebot.permission import SUPERUSER
-from nonebot_plugin_alconna import (
-    AlconnaMatch,
-    AlconnaMatches,
-    AlconnaQuery,
-    Arparma,
-    Match,
-    Query,
-)
-from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_alconna import AlconnaMatch, Arparma, Match, Query
+from pydantic import BaseModel, ValidationError
 
-from zhenxun.configs.config import Config
-from zhenxun.models.scheduled_job import ScheduledJob
-from zhenxun.services import scheduler_manager
+from zhenxun.models.schedule_info import ScheduleInfo
+from zhenxun.services.scheduler import scheduler_manager
+from zhenxun.services.scheduler.targeter import ScheduleTargeter
 from zhenxun.utils.message import MessageUtils
 
-from .commands import schedule_cmd
-from .data_source import scheduler_admin_service
-from .dependencies import (
+from . import presenters
+from .commands import (
     GetBotId,
-    GetCreatorPermissionLevel,
-    GetFinalPermission,
     GetTargeter,
-    GetTriggerInfo,
-    GetValidatedJobKwargs,
-    RequireTaskPermission,
-    ResolveTargets,
-    _parse_trigger_from_arparma,
+    parse_daily_time,
+    parse_interval,
+    schedule_cmd,
 )
 
 
+@schedule_cmd.handle()
+async def _handle_time_options_mutex(arp: Arparma):
+    time_options = ["cron", "interval", "date", "daily"]
+    provided_options = [opt for opt in time_options if arp.query(opt) is not None]
+    if len(provided_options) > 1:
+        await schedule_cmd.finish(
+            f"时间选项 --{', --'.join(provided_options)} 不能同时使用，请只选择一个。"
+        )
+
+
 @schedule_cmd.assign("查看")
 async def handle_view(
     bot: Bot,
     event: Event,
-    session: Uninfo,
+    target_group_id: Match[str] = AlconnaMatch("target_group_id"),
+    all_groups: Query[bool] = Query("查看.all"),
+    plugin_name: Match[str] = AlconnaMatch("plugin_name"),
     page: Match[int] = AlconnaMatch("page"),
-    targeter=Depends(GetTargeter),
 ):
-    """处理 '查看' 子命令"""
     is_superuser = await SUPERUSER(bot, event)
-    current_page = page.result if page.available else 1
+    title = ""
+    gid_filter = None
 
-    result = await scheduler_admin_service.get_schedules_view(
-        user_id=session.user.id,
-        group_id=session.group.id if session.group else None,
-        is_superuser=is_superuser,
-        filters=targeter._filters,
-        page=current_page,
+    current_group_id = getattr(event, "group_id", None)
+    if not (all_groups.available or target_group_id.available) and not current_group_id:
+        await schedule_cmd.finish("私聊中查看任务必须使用 -g <群号> 或 -all 选项。")
+
+    if all_groups.available:
+        if not is_superuser:
+            await schedule_cmd.finish("需要超级用户权限才能查看所有群组的定时任务。")
+        title = "所有群组的定时任务"
+    elif target_group_id.available:
+        if not is_superuser:
+            await schedule_cmd.finish("需要超级用户权限才能查看指定群组的定时任务。")
+        gid_filter = target_group_id.result
+        title = f"群 {gid_filter} 的定时任务"
+    else:
+        gid_filter = str(current_group_id)
+        title = "本群的定时任务"
+
+    p_name_filter = plugin_name.result if plugin_name.available else None
+
+    schedules = await scheduler_manager.get_schedules(
+        plugin_name=p_name_filter, group_id=gid_filter
     )
-    await MessageUtils.build_message(result).send(reply_to=True)
+
+    if p_name_filter:
+        title += f" [插件: {p_name_filter}]"
+
+    if not schedules:
+        await schedule_cmd.finish("没有找到任何相关的定时任务。")
+
+    img = await presenters.format_schedule_list_as_image(
+        schedules=schedules, title=title, current_page=page.result
+    )
+    await MessageUtils.build_message(img).send(reply_to=True)
 
 
 @schedule_cmd.assign("设置")
 async def handle_set(
-    session: Uninfo,
-    target_groups: list[str] = Depends(ResolveTargets),
+    event: Event,
     plugin_name: Match[str] = AlconnaMatch("plugin_name"),
-    tag_name: Match[str] = AlconnaMatch("tag_name"),
-    jitter: Match[int] = AlconnaMatch("jitter_seconds"),
-    spread: Match[int] = AlconnaMatch("spread_seconds"),
-    interval: Match[int] = AlconnaMatch("interval_seconds"),
-    job_name: Match[str] = AlconnaMatch("job_name"),
+    cron_expr: Match[str] = AlconnaMatch("cron_expr"),
+    interval_expr: Match[str] = AlconnaMatch("interval_expr"),
+    date_expr: Match[str] = AlconnaMatch("date_expr"),
+    daily_expr: Match[str] = AlconnaMatch("daily_expr"),
+    group_id: Match[str] = AlconnaMatch("group_id"),
+    kwargs_str: Match[str] = AlconnaMatch("kwargs_str"),
+    all_enabled: Query[bool] = Query("设置.all"),
     bot_id_to_operate: str = Depends(GetBotId),
-    trigger_info: tuple[str, dict] = Depends(GetTriggerInfo),
-    job_kwargs: dict = Depends(GetValidatedJobKwargs),
-    creator_permission_level: int = Depends(GetCreatorPermissionLevel),
-    final_permission: int = Depends(GetFinalPermission),
 ):
-    """处理 '设置' 子命令"""
-    p_name = plugin_name.result
-    jitter_val: int | None = jitter.result if jitter.available else None
-    spread_val: int | None = spread.result if spread.available else None
-    interval_val: int | None = interval.result if interval.available else None
+    if not plugin_name.available:
+        await schedule_cmd.finish("设置任务时必须提供插件名称。")
 
-    is_multi_target = (
-        len(target_groups) > 1
-        or (
-            len(target_groups) == 1 and target_groups[0] == scheduler_manager.ALL_GROUPS
+    has_time_option = any(
+        [
+            cron_expr.available,
+            interval_expr.available,
+            date_expr.available,
+            daily_expr.available,
+        ]
+    )
+    if not has_time_option:
+        await schedule_cmd.finish(
+            "必须提供一种时间选项: --cron, --interval, --date, 或 --daily。"
         )
-        or tag_name.available
+
+    p_name = plugin_name.result
+    if p_name not in scheduler_manager.get_registered_plugins():
+        await schedule_cmd.finish(
+            f"插件 '{p_name}' 没有注册可用的定时任务。\n"
+            f"可用插件: {list(scheduler_manager.get_registered_plugins())}"
+        )
+
+    trigger_type, trigger_config = "", {}
+    try:
+        if cron_expr.available:
+            trigger_type, trigger_config = (
+                "cron",
+                dict(
+                    zip(
+                        ["minute", "hour", "day", "month", "day_of_week"],
+                        cron_expr.result.split(),
+                    )
+                ),
+            )
+        elif interval_expr.available:
+            trigger_type, trigger_config = (
+                "interval",
+                parse_interval(interval_expr.result),
+            )
+        elif date_expr.available:
+            trigger_type, trigger_config = (
+                "date",
+                {"run_date": datetime.fromisoformat(date_expr.result)},
+            )
+        elif daily_expr.available:
+            trigger_type, trigger_config = "cron", parse_daily_time(daily_expr.result)
+        else:
+            await schedule_cmd.finish(
+                "必须提供一种时间选项: --cron, --interval, --date, 或 --daily。"
+            )
+    except ValueError as e:
+        await schedule_cmd.finish(f"时间参数解析错误: {e}")
+
+    job_kwargs = {}
+    if kwargs_str.available:
+        task_meta = scheduler_manager._registered_tasks[p_name]
+        params_model = task_meta.get("model")
+        if not (
+            params_model
+            and isinstance(params_model, type)
+            and issubclass(params_model, BaseModel)
+        ):
+            await schedule_cmd.finish(f"插件 '{p_name}' 不支持或配置了无效的参数模型。")
+        try:
+            raw_kwargs = dict(
+                item.strip().split("=", 1) for item in kwargs_str.result.split(",")
+            )
+
+            model_validate = getattr(params_model, "model_validate", None)
+            if not model_validate:
+                await schedule_cmd.finish(f"插件 '{p_name}' 的参数模型不支持验证")
+
+            validated_model = model_validate(raw_kwargs)
+
+            model_dump = getattr(validated_model, "model_dump", None)
+            if not model_dump:
+                await schedule_cmd.finish(f"插件 '{p_name}' 的参数模型不支持导出")
+
+            job_kwargs = model_dump()
+        except ValidationError as e:
+            errors = [f"  - {err['loc'][0]}: {err['msg']}" for err in e.errors()]
+            await schedule_cmd.finish(
+                f"插件 '{p_name}' 的任务参数验证失败:\n" + "\n".join(errors)
+            )
+        except Exception as e:
+            await schedule_cmd.finish(
+                f"参数格式错误，请使用 'key=value,key2=value2' 格式。错误: {e}"
+            )
+
+    gid_str = group_id.result if group_id.available else None
+    target_group_id = (
+        scheduler_manager.ALL_GROUPS
+        if (gid_str and gid_str.lower() == "all") or all_enabled.available
+        else gid_str or getattr(event, "group_id", None)
     )
+    if not target_group_id:
+        await schedule_cmd.finish(
+            "私聊中设置定时任务时，必须使用 -g <群号> 或 --all 选项指定目标。"
+        )
 
-    if is_multi_target:
-        task_meta = scheduler_manager._registered_tasks.get(p_name)
-        if jitter_val is None:
-            if task_meta and task_meta.get("default_jitter") is not None:
-                jitter_val = cast(int | None, task_meta["default_jitter"])
-            else:
-                jitter_val = Config.get_config(
-                    "SchedulerManager", "DEFAULT_JITTER_SECONDS"
-                )
-        if spread_val is None:
-            if task_meta and task_meta.get("default_spread") is not None:
-                spread_val = cast(int | None, task_meta["default_spread"])
-            else:
-                spread_val = Config.get_config(
-                    "SchedulerManager", "DEFAULT_SPREAD_SECONDS"
-                )
-
-        if interval_val is None:
-            if task_meta and task_meta.get("default_interval") is not None:
-                interval_val = cast(int | None, task_meta["default_interval"])
-            else:
-                interval_val = Config.get_config(
-                    "SchedulerManager", "DEFAULT_INTERVAL_SECONDS"
-                )
-
-    result_message = await scheduler_admin_service.set_schedule(
-        targets=target_groups,
-        creator_permission_level=creator_permission_level,
-        plugin_name=p_name,
-        trigger_info=trigger_info,
-        job_kwargs=job_kwargs,
-        permission=final_permission,
+    schedule = await scheduler_manager.add_schedule(
+        p_name,
+        str(target_group_id),
+        trigger_type,
+        trigger_config,
+        job_kwargs,
         bot_id=bot_id_to_operate,
-        job_name=job_name.result if job_name.available else None,
-        jitter=jitter_val,
-        spread=spread_val,
-        interval=interval_val,
-        created_by=session.user.id,
     )
-    await MessageUtils.build_message(result_message).send()
+
+    target_desc = (
+        f"所有群组 (Bot: {bot_id_to_operate})"
+        if target_group_id == scheduler_manager.ALL_GROUPS
+        else f"群组 {target_group_id}"
+    )
+
+    if schedule:
+        await schedule_cmd.finish(
+            f"为 [{target_desc}] 已成功设置插件 '{p_name}' 的定时任务 "
+            f"(ID: {schedule.id})。"
+        )
+    else:
+        await schedule_cmd.finish(f"为 [{target_desc}] 设置任务失败。")
 
 
 @schedule_cmd.assign("删除")
-async def handle_delete(
-    bot: Bot,
-    event: Event,
-    session: Uninfo,
-    targeter=Depends(GetTargeter),
-    all_flag: Query[bool] = AlconnaQuery("删除.all.value", False),
-    global_flag: Query[bool] = AlconnaQuery("删除.global.value", False),
-):
-    """处理 '删除' 子命令"""
-    is_superuser = await SUPERUSER(bot, event)
-    result_message = await scheduler_admin_service.perform_bulk_operation(
-        operation_name="删除",
-        user_id=session.user.id,
-        group_id=session.group.id if session.group else None,
-        is_superuser=is_superuser,
-        targeter=targeter,
-        all_flag=all_flag.result,
-        global_flag=global_flag.result,
-    )
-    await schedule_cmd.finish(result_message)
+async def handle_delete(targeter: ScheduleTargeter = GetTargeter("删除")):
+    schedules_to_remove: list[ScheduleInfo] = await targeter._get_schedules()
+    if not schedules_to_remove:
+        await schedule_cmd.finish("没有找到可删除的任务。")
+
+    count, _ = await targeter.remove()
+
+    if count > 0 and schedules_to_remove:
+        if len(schedules_to_remove) == 1:
+            message = presenters.format_remove_success(schedules_to_remove[0])
+        else:
+            target_desc = targeter._generate_target_description()
+            message = f"✅ 成功移除了{target_desc} {count} 个任务。"
+    else:
+        message = "没有任务被移除。"
+    await schedule_cmd.finish(message)
 
 
 @schedule_cmd.assign("暂停")
-async def handle_pause(
-    bot: Bot,
-    event: Event,
-    session: Uninfo,
-    targeter=Depends(GetTargeter),
-    all_flag: Query[bool] = AlconnaQuery("暂停.all.value", False),
-    global_flag: Query[bool] = AlconnaQuery("暂停.global.value", False),
-):
-    """处理 '暂停' 子命令"""
-    is_superuser = await SUPERUSER(bot, event)
-    result_message = await scheduler_admin_service.perform_bulk_operation(
-        operation_name="暂停",
-        user_id=session.user.id,
-        group_id=session.group.id if session.group else None,
-        is_superuser=is_superuser,
-        targeter=targeter,
-        all_flag=all_flag.result,
-        global_flag=global_flag.result,
-    )
-    await schedule_cmd.finish(result_message)
+async def handle_pause(targeter: ScheduleTargeter = GetTargeter("暂停")):
+    schedules_to_pause: list[ScheduleInfo] = await targeter._get_schedules()
+    if not schedules_to_pause:
+        await schedule_cmd.finish("没有找到可暂停的任务。")
+
+    count, _ = await targeter.pause()
+
+    if count > 0 and schedules_to_pause:
+        if len(schedules_to_pause) == 1:
+            message = presenters.format_pause_success(schedules_to_pause[0])
+        else:
+            target_desc = targeter._generate_target_description()
+            message = f"✅ 成功暂停了{target_desc} {count} 个任务。"
+    else:
+        message = "没有任务被暂停。"
+    await schedule_cmd.finish(message)
 
 
 @schedule_cmd.assign("恢复")
-async def handle_resume(
-    bot: Bot,
-    event: Event,
-    session: Uninfo,
-    targeter=Depends(GetTargeter),
-    all_flag: Query[bool] = AlconnaQuery("恢复.all.value", False),
-    global_flag: Query[bool] = AlconnaQuery("恢复.global.value", False),
-):
-    """处理 '恢复' 子命令"""
-    is_superuser = await SUPERUSER(bot, event)
-    result_message = await scheduler_admin_service.perform_bulk_operation(
-        operation_name="恢复",
-        user_id=session.user.id,
-        group_id=session.group.id if session.group else None,
-        is_superuser=is_superuser,
-        targeter=targeter,
-        all_flag=all_flag.result,
-        global_flag=global_flag.result,
-    )
-    await schedule_cmd.finish(result_message)
+async def handle_resume(targeter: ScheduleTargeter = GetTargeter("恢复")):
+    schedules_to_resume: list[ScheduleInfo] = await targeter._get_schedules()
+    if not schedules_to_resume:
+        await schedule_cmd.finish("没有找到可恢复的任务。")
+
+    count, _ = await targeter.resume()
+
+    if count > 0 and schedules_to_resume:
+        if len(schedules_to_resume) == 1:
+            message = presenters.format_resume_success(schedules_to_resume[0])
+        else:
+            target_desc = targeter._generate_target_description()
+            message = f"✅ 成功恢复了{target_desc} {count} 个任务。"
+    else:
+        message = "没有任务被恢复。"
+    await schedule_cmd.finish(message)
 
 
 @schedule_cmd.assign("执行")
-async def handle_trigger(schedule: ScheduledJob = Depends(RequireTaskPermission)):
-    """处理 '执行' 子命令"""
-    result_message = await scheduler_admin_service.trigger_schedule_now(schedule)
-    await schedule_cmd.finish(result_message)
+async def handle_trigger(schedule_id: Match[int] = AlconnaMatch("schedule_id")):
+    from zhenxun.services.scheduler.repository import ScheduleRepository
+
+    schedule_info = await ScheduleRepository.get_by_id(schedule_id.result)
+    if not schedule_info:
+        await schedule_cmd.finish(f"未找到 ID 为 {schedule_id.result} 的任务。")
+
+    success, message = await scheduler_manager.trigger_now(schedule_id.result)
+
+    if success:
+        final_message = presenters.format_trigger_success(schedule_info)
+    else:
+        final_message = f"❌ 手动触发失败: {message}"
+    await schedule_cmd.finish(final_message)
 
 
 @schedule_cmd.assign("更新")
 async def handle_update(
-    schedule: ScheduledJob = Depends(RequireTaskPermission),
-    arp: Arparma = AlconnaMatches(),
+    schedule_id: Match[int] = AlconnaMatch("schedule_id"),
+    cron_expr: Match[str] = AlconnaMatch("cron_expr"),
+    interval_expr: Match[str] = AlconnaMatch("interval_expr"),
+    date_expr: Match[str] = AlconnaMatch("date_expr"),
+    daily_expr: Match[str] = AlconnaMatch("daily_expr"),
     kwargs_str: Match[str] = AlconnaMatch("kwargs_str"),
 ):
-    """处理 '更新' 子命令"""
-    trigger_info = _parse_trigger_from_arparma(arp)
-    if not trigger_info and not kwargs_str.available:
+    if not any(
+        [
+            cron_expr.available,
+            interval_expr.available,
+            date_expr.available,
+            daily_expr.available,
+            kwargs_str.available,
+        ]
+    ):
         await schedule_cmd.finish(
             "请提供需要更新的时间 (--cron/--interval/--date/--daily) 或参数 (--kwargs)"
         )
 
-    result_message = await scheduler_admin_service.update_schedule(
-        schedule, trigger_info, kwargs_str.result if kwargs_str.available else None
+    trigger_type, trigger_config, job_kwargs = None, None, None
+    try:
+        if cron_expr.available:
+            trigger_type, trigger_config = (
+                "cron",
+                dict(
+                    zip(
+                        ["minute", "hour", "day", "month", "day_of_week"],
+                        cron_expr.result.split(),
+                    )
+                ),
+            )
+        elif interval_expr.available:
+            trigger_type, trigger_config = (
+                "interval",
+                parse_interval(interval_expr.result),
+            )
+        elif date_expr.available:
+            trigger_type, trigger_config = (
+                "date",
+                {"run_date": datetime.fromisoformat(date_expr.result)},
+            )
+        elif daily_expr.available:
+            trigger_type, trigger_config = "cron", parse_daily_time(daily_expr.result)
+    except ValueError as e:
+        await schedule_cmd.finish(f"时间参数解析错误: {e}")
+
+    if kwargs_str.available:
+        job_kwargs = dict(
+            item.strip().split("=", 1) for item in kwargs_str.result.split(",")
+        )
+
+    success, message = await scheduler_manager.update_schedule(
+        schedule_id.result, trigger_type, trigger_config, job_kwargs
     )
-    await schedule_cmd.finish(result_message)
+
+    if success:
+        from zhenxun.services.scheduler.repository import ScheduleRepository
+
+        updated_schedule = await ScheduleRepository.get_by_id(schedule_id.result)
+        if updated_schedule:
+            final_message = presenters.format_update_success(updated_schedule)
+        else:
+            final_message = "✅ 更新成功，但无法获取更新后的任务详情。"
+    else:
+        final_message = f"❌ 更新失败: {message}"
+
+    await schedule_cmd.finish(final_message)
 
 
 @schedule_cmd.assign("插件列表")
 async def handle_plugins_list():
-    """处理 '插件列表' 子命令"""
-    message = await scheduler_admin_service.get_plugins_list()
+    message = await presenters.format_plugins_list()
     await schedule_cmd.finish(message)
 
 
 @schedule_cmd.assign("状态")
-async def handle_status(
-    schedule: ScheduledJob = Depends(RequireTaskPermission),
-):
-    """处理 '状态' 子命令"""
-    message = await scheduler_admin_service.get_schedule_status(schedule.id)
+async def handle_status(schedule_id: Match[int] = AlconnaMatch("schedule_id")):
+    status = await scheduler_manager.get_schedule_status(schedule_id.result)
+    if not status:
+        await schedule_cmd.finish(f"未找到ID为 {schedule_id.result} 的定时任务。")
+
+    message = presenters.format_single_status_message(status)
     await schedule_cmd.finish(message)

zhenxun/builtin_plugins/scheduler_admin/presenters.py

@@ -1,24 +1,24 @@
-from typing import Any
+import asyncio
 
-from zhenxun import ui
-from zhenxun.models.scheduled_job import ScheduledJob
-from zhenxun.services import scheduler_manager
-from zhenxun.ui.builders import TableBuilder
-from zhenxun.ui.models import StatusBadgeCell, TextCell
-from zhenxun.utils.pydantic_compat import model_json_schema
+from zhenxun.models.schedule_info import ScheduleInfo
+from zhenxun.services.scheduler import scheduler_manager
+from zhenxun.utils._image_template import ImageTemplate, RowStyle
 
 
-def _get_schedule_attr(schedule: ScheduledJob | dict, attr_name: str) -> Any:
-    """兼容地从字典或对象获取属性"""
-    if isinstance(schedule, dict):
-        return schedule.get(attr_name)
-    return getattr(schedule, attr_name, None)
+def _get_type_name(annotation) -> str:
+    """获取类型注解的名称"""
+    if hasattr(annotation, "__name__"):
+        return annotation.__name__
+    elif hasattr(annotation, "_name"):
+        return annotation._name
+    else:
+        return str(annotation)
 
 
-def _format_trigger_info(schedule: ScheduledJob | dict) -> str:
-    """格式化触发器信息为可读字符串（兼容字典和对象）"""
-    trigger_type = _get_schedule_attr(schedule, "trigger_type")
-    config = _get_schedule_attr(schedule, "trigger_config")
+def _format_trigger(schedule: dict) -> str:
+    """格式化触发器信息为可读字符串"""
+    trigger_type = schedule.get("trigger_type")
+    config = schedule.get("trigger_config")
 
     if not isinstance(config, dict):
         return f"配置错误: {config}"
@@ -51,19 +51,68 @@ def _format_trigger_info(schedule: ScheduledJob | dict) -> str:
         return f"未知触发器类型: {trigger_type}"
 
 
+def _format_trigger_for_card(schedule_info: ScheduleInfo | dict) -> str:
+    """为信息卡片格式化触发器规则"""
+    trigger_type = (
+        schedule_info.get("trigger_type")
+        if isinstance(schedule_info, dict)
+        else schedule_info.trigger_type
+    )
+    config = (
+        schedule_info.get("trigger_config")
+        if isinstance(schedule_info, dict)
+        else schedule_info.trigger_config
+    )
+
+    if not isinstance(config, dict):
+        return f"配置错误: {config}"
+
+    if trigger_type == "cron":
+        hour = config.get("hour", "??")
+        minute = config.get("minute", "??")
+        try:
+            hour_int = int(hour)
+            minute_int = int(minute)
+            return f"每天 {hour_int:02d}:{minute_int:02d}"
+        except (ValueError, TypeError):
+            return f"每天 {hour}:{minute}"
+    elif trigger_type == "interval":
+        units = {
+            "weeks": "周",
+            "days": "天",
+            "hours": "小时",
+            "minutes": "分钟",
+            "seconds": "秒",
+        }
+        for unit, unit_name in units.items():
+            if value := config.get(unit):
+                return f"每 {value} {unit_name}"
+        return "未知间隔"
+    elif trigger_type == "date":
+        run_date = config.get("run_date", "N/A")
+        return f"特定时间 {run_date}"
+    else:
+        return f"未知规则: {trigger_type}"
+
+
 def _format_operation_result_card(
-    title: str, schedule_info: ScheduledJob, extra_info: list[str] | None = None
+    title: str, schedule_info: ScheduleInfo, extra_info: list[str] | None = None
 ) -> str:
     """
     生成一个标准的操作结果信息卡片。
 
     参数:
         title: 卡片的标题 (例如 "✅ 成功暂停定时任务!")
-        schedule_info: 相关的 ScheduledJob 对象
+        schedule_info: 相关的 ScheduleInfo 对象
         extra_info: (可选) 额外的补充信息行
     """
-    target_desc = format_target_info(
-        schedule_info.target_type, schedule_info.target_identifier
+    target_desc = (
+        f"群组 {schedule_info.group_id}"
+        if schedule_info.group_id
+        and schedule_info.group_id != scheduler_manager.ALL_GROUPS
+        else "所有群组"
+        if schedule_info.group_id == scheduler_manager.ALL_GROUPS
+        else "全局"
     )
 
     info_lines = [
@@ -71,7 +120,7 @@ def _format_operation_result_card(
         f"✓ 任务 ID: {schedule_info.id}",
         f"🖋 插件: {schedule_info.plugin_name}",
         f"🎯 目标: {target_desc}",
-        f"⏰ 时间: {_format_trigger_info(schedule_info)}",
+        f"⏰ 时间: {_format_trigger_for_card(schedule_info)}",
     ]
     if extra_info:
         info_lines.extend(extra_info)
@@ -79,31 +128,44 @@ def _format_operation_result_card(
     return "\n".join(info_lines)
 
 
-def format_pause_success(schedule_info: ScheduledJob) -> str:
+def format_pause_success(schedule_info: ScheduleInfo) -> str:
     """格式化暂停成功的消息"""
     return _format_operation_result_card("✅ 成功暂停定时任务!", schedule_info)
 
 
-def format_resume_success(schedule_info: ScheduledJob) -> str:
+def format_resume_success(schedule_info: ScheduleInfo) -> str:
     """格式化恢复成功的消息"""
     return _format_operation_result_card("▶️ 成功恢复定时任务!", schedule_info)
 
 
-def format_remove_success(schedule_info: ScheduledJob) -> str:
+def format_remove_success(schedule_info: ScheduleInfo) -> str:
     """格式化删除成功的消息"""
     return _format_operation_result_card("❌ 成功删除定时任务!", schedule_info)
 
 
-def format_trigger_success(schedule_info: ScheduledJob) -> str:
+def format_trigger_success(schedule_info: ScheduleInfo) -> str:
     """格式化手动触发成功的消息"""
     return _format_operation_result_card("🚀 成功手动触发定时任务!", schedule_info)
 
 
-def format_update_success(schedule_info: ScheduledJob) -> str:
+def format_update_success(schedule_info: ScheduleInfo) -> str:
     """格式化更新成功的消息"""
     return _format_operation_result_card("🔄️ 成功更新定时任务配置!", schedule_info)
 
 
+def _status_row_style(column: str, text: str) -> RowStyle:
+    """为状态列设置颜色"""
+    style = RowStyle()
+    if column == "状态":
+        if text == "启用":
+            style.font_color = "#67C23A"
+        elif text == "暂停":
+            style.font_color = "#F56C6C"
+        elif text == "运行中":
+            style.font_color = "#409EFF"
+    return style
+
+
 def _format_params(schedule_status: dict) -> str:
     """将任务参数格式化为人类可读的字符串"""
     if kwargs := schedule_status.get("job_kwargs"):
@@ -112,95 +174,68 @@ def _format_params(schedule_status: dict) -> str:
 
 
 async def format_schedule_list_as_image(
-    schedules: list[ScheduledJob], title: str, current_page: int, total_items: int
+    schedules: list[ScheduleInfo], title: str, current_page: int
 ):
     """将任务列表格式化为图片"""
-    page_size = 30
+    page_size = 15
+    total_items = len(schedules)
     total_pages = (total_items + page_size - 1) // page_size
+    start_index = (current_page - 1) * page_size
+    end_index = start_index + page_size
+    paginated_schedules = schedules[start_index:end_index]
 
-    if not schedules:
+    if not paginated_schedules:
         return "这一页没有内容了哦~"
 
-    schedule_ids = [s.id for s in schedules]
-    all_statuses_list = await scheduler_manager.get_schedules_status_bulk(schedule_ids)
-    all_statuses_map = {status["id"]: status for status in all_statuses_list}
+    status_tasks = [
+        scheduler_manager.get_schedule_status(s.id) for s in paginated_schedules
+    ]
+    all_statuses = await asyncio.gather(*status_tasks)
 
-    data_list = []
-    for schedule_db in schedules:
-        s = all_statuses_map.get(schedule_db.id)
-        if not s:
-            continue
+    def get_status_text(status_value):
+        if isinstance(status_value, bool):
+            return "启用" if status_value else "暂停"
+        return str(status_value)
 
-        status_value = s["is_enabled"]
-        if status_value == "运行中":
-            status_cell = StatusBadgeCell(text="运行中", status_type="info")
-        else:
-            is_enabled = status_value == "启用"
-            status_cell = StatusBadgeCell(
-                text="启用" if is_enabled else "暂停",
-                status_type="ok" if is_enabled else "error",
-            )
-
-        data_list.append(
-            [
-                TextCell(content=str(s["id"])),
-                TextCell(content=s["plugin_name"]),
-                TextCell(content=s.get("bot_id") or "N/A"),
-                TextCell(
-                    content=format_target_info(s["target_type"], s["target_identifier"])
-                ),
-                TextCell(content=s["next_run_time"]),
-                TextCell(content=_format_trigger_info(s)),
-                TextCell(content=_format_params(s)),
-                status_cell,
-            ]
-        )
+    data_list = [
+        [
+            s["id"],
+            s["plugin_name"],
+            s.get("bot_id") or "N/A",
+            s["group_id"] or "全局",
+            s["next_run_time"],
+            _format_trigger(s),
+            _format_params(s),
+            get_status_text(s["is_enabled"]),
+        ]
+        for s in all_statuses
+        if s
+    ]
 
     if not data_list:
         return "没有找到任何相关的定时任务。"
 
-    builder = TableBuilder(
-        title, f"第 {current_page}/{total_pages} 页，共 {total_items} 条任务"
+    return await ImageTemplate.table_page(
+        head_text=title,
+        tip_text=f"第 {current_page}/{total_pages} 页，共 {total_items} 条任务",
+        column_name=["ID", "插件", "Bot", "目标", "下次运行", "规则", "参数", "状态"],
+        data_list=data_list,
+        column_space=20,
+        text_style=_status_row_style,
     )
-    builder.set_headers(
-        ["ID", "插件", "Bot", "目标", "下次运行", "规则", "参数", "状态"]
-    ).add_rows(data_list)
-    return await ui.render(
-        builder.build(),
-        viewport={"width": 1400, "height": 10},
-        device_scale_factor=2,
-    )
-
-
-def format_target_info(target_type: str, target_identifier: str) -> str:
-    """格式化目标信息以供显示"""
-    if target_type == "GLOBAL":
-        return "全局"
-    elif target_type == "ALL_GROUPS":
-        return "所有群组"
-    elif target_type == "TAG":
-        return f"标签: {target_identifier}"
-    elif target_type == "GROUP":
-        return f"群: {target_identifier}"
-    elif target_type == "USER":
-        return f"用户: {target_identifier}"
-    else:
-        return f"{target_type}: {target_identifier}"
 
 
 def format_single_status_message(status: dict) -> str:
     """格式化单个任务状态为文本消息"""
-    target_info = format_target_info(status["target_type"], status["target_identifier"])
-    trigger_info = status.get("trigger_info_str", _format_trigger_info(status))
     info_lines = [
         f"📋 定时任务详细信息 (ID: {status['id']})",
         "--------------------",
         f"▫️ 插件: {status['plugin_name']}",
         f"▫️ Bot ID: {status.get('bot_id') or '默认'}",
-        f"▫️ 目标: {target_info}",
+        f"▫️ 目标: {status['group_id'] or '全局'}",
         f"▫️ 状态: {'✔️ 已启用' if status['is_enabled'] else '⏸️ 已暂停'}",
         f"▫️ 下次运行: {status['next_run_time']}",
-        f"▫️ 触发规则: {trigger_info}",
+        f"▫️ 触发规则: {_format_trigger(status)}",
         f"▫️ 任务参数: {_format_params(status)}",
     ]
     return "\n".join(info_lines)
@@ -225,12 +260,11 @@ async def format_plugins_list() -> str:
             and isinstance(params_model, type)
             and issubclass(params_model, BaseModel)
         ):
-            schema = model_json_schema(params_model)
-            properties = schema.get("properties", {})
-            if properties:
+            model_fields = getattr(params_model, "model_fields", None)
+            if model_fields:
                 param_info_str = "参数: " + ", ".join(
-                    f"{field_name}({prop.get('type', 'any')})"
-                    for field_name, prop in properties.items()
+                    f"{field_name}({_get_type_name(field_info.annotation)})"
+                    for field_name, field_info in model_fields.items()
                 )
         elif params_model:
             param_info_str = "⚠️ 参数模型配置错误"

zhenxun/builtin_plugins/shop/__init__.py

@@ -153,7 +153,7 @@ async def _(session: Uninfo, arparma: Arparma, nickname: str = UserName()):
         nickname,
         PlatformUtils.get_platform(session),
     ):
-        await MessageUtils.build_message(image).finish(reply_to=True)  # type: ignore
+        await MessageUtils.build_message(image.pic2bytes()).finish(reply_to=True)
     return await MessageUtils.build_message("你的道具为空捏...").send(reply_to=True)
 
 

zhenxun/builtin_plugins/shop/_data_source.py

@@ -1,5 +1,4 @@
 import asyncio
-from collections import defaultdict
 from collections.abc import Callable
 from datetime import datetime, timedelta
 import inspect
@@ -8,27 +7,26 @@ from types import MappingProxyType
 from typing import Any, Literal
 
 from nonebot.adapters import Bot, Event
+from nonebot.compat import model_dump
 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
 
-from zhenxun import ui
-from zhenxun.configs.config import BotConfig
 from zhenxun.models.friend_user import FriendUser
 from zhenxun.models.goods_info import GoodsInfo
 from zhenxun.models.group_member_info import GroupInfoUser
 from zhenxun.models.user_console import UserConsole
 from zhenxun.models.user_gold_log import UserGoldLog
 from zhenxun.models.user_props_log import UserPropsLog
-from zhenxun.services import avatar_service
 from zhenxun.services.log import logger
-from zhenxun.ui.models import ImageCell, TextCell
 from zhenxun.utils.enum import GoldHandle, PropHandle
+from zhenxun.utils.image_utils import BuildImage, ImageTemplate
 from zhenxun.utils.platform import PlatformUtils
-from zhenxun.utils.pydantic_compat import model_dump
 
-from .config import ICON_PATH, PLATFORM_PATH
+from .config import ICON_PATH, PLATFORM_PATH, base_config
+from .html_image import html_image
+from .normal_image import normal_image
 
 
 class Goods(BaseModel):
@@ -93,7 +91,9 @@ class ShopParam(BaseModel):
         return model_dump(self, **kwargs)
 
 
-async def gold_rank(session: Uninfo, group_id: str | None, num: int) -> bytes | str:
+async def gold_rank(
+    session: Uninfo, group_id: str | None, num: int
+) -> BuildImage | str:
     query = UserConsole
     if group_id:
         uid_list = await GroupInfoUser.filter(group_id=group_id).values_list(
@@ -124,20 +124,16 @@ async def gold_rank(session: Uninfo, group_id: str | None, num: int) -> bytes |
     data_list = []
     platform = PlatformUtils.get_platform(session)
     for i, user in enumerate(user_list):
-        avatar_path = await avatar_service.get_avatar_path(platform, user[0])
+        ava_bytes = await PlatformUtils.get_user_avatar(
+            user[0], platform, session.self_id
+        )
         data_list.append(
             [
-                TextCell(content=f"{i + 1}"),
-                ImageCell(
-                    src=avatar_path.as_uri() if avatar_path else "", shape="circle"
-                )
-                if avatar_path
-                else TextCell(content=""),
-                TextCell(content=uid2name.get(user[0]) or user[0]),
-                TextCell(content=str(user[1]), bold=True),
-                ImageCell(src=platform_path.resolve().as_uri())
-                if (platform_path := PLATFORM_PATH.get(platform))
-                else TextCell(content=""),
+                f"{i + 1}",
+                (ava_bytes, 30, 30) if platform == "qq" else "",
+                uid2name.get(user[0]),
+                user[1],
+                (PLATFORM_PATH.get(platform), 30, 30),
             ]
         )
     if group_id:
@@ -146,11 +142,7 @@ async def gold_rank(session: Uninfo, group_id: str | None, num: int) -> bytes |
     else:
         title = "金币全局排行"
         tip = f"你的排名在全局第 {index} 位哦!"
-    from zhenxun.ui.builders import TableBuilder
-
-    builder = TableBuilder(title, tip)
-    builder.set_headers(column_name).add_rows(data_list)
-    return await ui.render(builder.build())
+    return await ImageTemplate.table_page(title, tip, column_name, data_list)
 
 
 class ShopManage:
@@ -158,7 +150,9 @@ class ShopManage:
 
     @classmethod
     async def get_shop_image(cls) -> bytes:
-        return await prepare_shop_data()
+        if base_config.get("style") == "zhenxun":
+            return await html_image()
+        return await normal_image()
 
     @classmethod
     def __build_params(
@@ -367,7 +361,7 @@ class ShopManage:
         else:
             goods_info = await GoodsInfo.get_or_none(goods_name=goods_name)
         if not goods_info:
-            return "对应的道具不存在..."
+            return f"{goods_name} 不存在..."
         if goods_info.is_passive:
             return f"{goods_info.goods_name} 是被动道具, 无法使用..."
         goods = cls.uuid2goods.get(goods_info.uuid)
@@ -500,7 +494,7 @@ class ShopManage:
     @classmethod
     async def my_props(
         cls, user_id: str, name: str, platform: str | None = None
-    ) -> bytes | None:
+    ) -> BuildImage | None:
         """获取道具背包
 
         参数:
@@ -532,10 +526,10 @@ class ShopManage:
             if not prop:
                 continue
 
-            icon = None
+            icon = ""
             if prop.icon:
                 icon_path = ICON_PATH / prop.icon
-                icon = icon_path if icon_path.exists() else None
+                icon = (icon_path, 33, 33) if icon_path.exists() else ""
 
             table_rows.append(
                 [
@@ -551,11 +545,12 @@ class ShopManage:
             return None
 
         column_name = ["-", "使用ID", "名称", "数量", "简介"]
-        from zhenxun.ui.builders import TableBuilder
-
-        builder = TableBuilder(f"{name}的道具仓库", "通过 使用道具[ID/名称] 令道具生效")
-        builder.set_headers(column_name).add_rows(table_rows)
-        return await ui.render(builder.build())
+        return await ImageTemplate.table_page(
+            f"{name}的道具仓库",
+            "通过 使用道具[ID/名称] 令道具生效",
+            column_name,
+            table_rows,
+        )
 
     @classmethod
     async def my_cost(cls, user_id: str, platform: str | None = None) -> int:
@@ -570,62 +565,3 @@ class ShopManage:
         """
         user = await UserConsole.get_user(user_id, platform)
         return user.gold
-
-
-def get_limit_time(end_time: int) -> str | None:
-    now = int(time.time())
-    if now > end_time or end_time == 0:
-        return None
-    time_difference = datetime.fromtimestamp(end_time) - datetime.fromtimestamp(now)
-    total_seconds = time_difference.total_seconds()
-    hours = int(total_seconds // 3600)
-    minutes = int((total_seconds % 3600) // 60)
-    return f"{hours}:{minutes:02d}"
-
-
-def get_discount(price: int, discount: float) -> int | None:
-    return None if discount == 1.0 else int(price * discount)
-
-
-async def prepare_shop_data() -> bytes:
-    """准备商店数据并调用渲染服务"""
-    goods_list = (
-        await GoodsInfo.filter(
-            Q(goods_limit_time__gte=time.time()) | Q(goods_limit_time=0)
-        )
-        .annotate()
-        .order_by("id")
-        .all()
-    )
-
-    partition_dict: dict[str, list[dict]] = defaultdict(list)
-    for idx, goods in enumerate(goods_list):
-        partition_name = goods.partition or "默认分区"
-
-        icon_asset_path = None
-        if goods.icon and (ICON_PATH / goods.icon).exists():
-            icon_asset_path = f"image/shop_icon/{goods.icon}"
-
-        goods_item = {
-            "id": idx + 1,
-            "name": goods.goods_name,
-            "description": goods.goods_description,
-            "price": goods.goods_price,
-            "discount_price": get_discount(goods.goods_price, goods.goods_discount),
-            "limit_time": get_limit_time(goods.goods_limit_time),
-            "daily_limit": goods.daily_limit or "∞",
-            "icon_url": icon_asset_path,
-        }
-        partition_dict[partition_name].append(goods_item)
-
-    categories = [
-        {"partition_title": partition, "goods_list": items}
-        for partition, items in partition_dict.items()
-    ]
-
-    shop_data = {
-        "bot_nickname": BotConfig.self_nickname,
-        "categories": categories,
-    }
-
-    return await ui.render_template("pages/builtin/shop", data=shop_data)

zhenxun/builtin_plugins/shop/config.py

@@ -1,5 +1,5 @@
 from zhenxun.configs.config import Config
-from zhenxun.configs.path_config import IMAGE_PATH, THEMES_PATH
+from zhenxun.configs.path_config import IMAGE_PATH, TEMPLATE_PATH
 
 base_config = Config.get("shop")
 
@@ -17,4 +17,4 @@ PLATFORM_PATH = {
 
 LEFT_RIGHT_IMAGE = ["1.png", "2.png", "qq.png"]
 
-LEFT_RIGHT_PATH = THEMES_PATH / "default" / "assets" / "shop" / "img"
+LEFT_RIGHT_PATH = TEMPLATE_PATH / "shop" / "res" / "img"

zhenxun/builtin_plugins/shop/html_image.py

@@ -0,0 +1,89 @@
+from datetime import datetime
+import time
+
+from nonebot_plugin_htmlrender import template_to_pic
+from pydantic import BaseModel
+from tortoise.expressions import Q
+
+from zhenxun.configs.config import BotConfig
+from zhenxun.configs.path_config import TEMPLATE_PATH
+from zhenxun.models.goods_info import GoodsInfo
+from zhenxun.utils._build_image import BuildImage
+
+from .config import ICON_PATH
+
+
+class GoodsItem(BaseModel):
+    goods_list: list[dict]
+    """商品列表"""
+    partition: str
+    """分区名称"""
+
+
+def get_limit_time(end_time: int):
+    now = int(time.time())
+    if now > end_time:
+        return None
+    current_datetime = datetime.fromtimestamp(now)
+    end_datetime = datetime.fromtimestamp(end_time)
+    time_difference = end_datetime - current_datetime
+    total_seconds = time_difference.total_seconds()
+    hours = int(total_seconds // 3600)
+    minutes = int((total_seconds % 3600) // 60)
+    return f"{hours}:{minutes}"
+
+
+def get_discount(price: int, discount: float):
+    return None if discount == 1.0 else int(price * discount)
+
+
+async def html_image() -> bytes:
+    """构建图片"""
+    goods_list = (
+        await GoodsInfo.filter(
+            Q(goods_limit_time__gte=time.time()) | Q(goods_limit_time=0)
+        )
+        .annotate()
+        .order_by("id")
+        .all()
+    )
+    partition_dict: dict[str, list[dict]] = {}
+    for idx, goods in enumerate(goods_list):
+        if not goods.partition:
+            goods.partition = "默认分区"
+        if goods.partition not in partition_dict:
+            partition_dict[goods.partition] = []
+        icon = None
+        if goods.icon:
+            path = ICON_PATH / goods.icon
+            if path.exists():
+                icon = (
+                    "data:image/png;base64,"
+                    f"{BuildImage.open(ICON_PATH / goods.icon).pic2bs4()[9:]}"
+                )
+        partition_dict[goods.partition].append(
+            {
+                "id": idx + 1,
+                "price": goods.goods_price,
+                "discount_price": get_discount(goods.goods_price, goods.goods_discount),
+                "limit_time": get_limit_time(goods.goods_limit_time),
+                "daily_limit": goods.daily_limit or "∞",
+                "name": goods.goods_name,
+                "icon": icon,
+                "description": goods.goods_description,
+            }
+        )
+    data_list = [
+        GoodsItem(goods_list=value, partition=partition)
+        for partition, value in partition_dict.items()
+    ]
+    return await template_to_pic(
+        template_path=str((TEMPLATE_PATH / "shop").absolute()),
+        template_name="main.html",
+        templates={"name": BotConfig.self_nickname, "data_list": data_list},
+        pages={
+            "viewport": {"width": 850, "height": 1024},
+            "base_url": f"file://{TEMPLATE_PATH}",
+        },
+        wait=2,
+    )

zhenxun/builtin_plugins/shop/normal_image.py

@@ -0,0 +1,207 @@
+import time
+
+from tortoise.expressions import Q
+
+from zhenxun.configs.path_config import IMAGE_PATH
+from zhenxun.models.goods_info import GoodsInfo
+from zhenxun.utils._build_image import BuildImage
+from zhenxun.utils.image_utils import text2image
+
+from .config import ICON_PATH
+
+
+async def normal_image() -> bytes:
+    """制作商店图片
+
+    返回:
+        BuildImage: 商店图片
+    """
+    h = 10
+    goods_list = (
+        await GoodsInfo.filter(
+            Q(goods_limit_time__gte=time.time()) | Q(goods_limit_time=0)
+        )
+        .annotate()
+        .order_by("id")
+        .all()
+    )
+    # A = BuildImage(1100, h, color="#f9f6f2")
+    total_n = 0
+    image_list = []
+    for idx, goods in enumerate(goods_list):
+        name_image = BuildImage(
+            580, 40, font_size=25, color="#e67b6b", font="CJGaoDeGuo.otf"
+        )
+        await name_image.text(
+            (15, 0), f"{idx + 1}.{goods.goods_name}", center_type="height"
+        )
+        await name_image.line((380, -5, 280, 45), "#a29ad6", 5)
+        await name_image.text((390, 0), "售价：", center_type="height")
+        if goods.goods_discount != 1:
+            discount_price = int(goods.goods_discount * goods.goods_price)
+            old_price_image = await BuildImage.build_text_image(
+                str(goods.goods_price), font_color=(194, 194, 194), size=15
+            )
+            await old_price_image.line(
+                (
+                    0,
+                    int(old_price_image.height / 2),
+                    old_price_image.width + 1,
+                    int(old_price_image.height / 2),
+                ),
+                (0, 0, 0),
+            )
+            await name_image.paste(old_price_image, (440, 0))
+            await name_image.text((440, 15), str(discount_price), (255, 255, 255))
+        else:
+            await name_image.text(
+                (440, 0),
+                str(goods.goods_price),
+                (255, 255, 255),
+                center_type="height",
+            )
+        _tmp = await BuildImage.build_text_image(str(goods.goods_price), size=25)
+        await name_image.text(
+            (
+                440 + _tmp.width,
+                0,
+            ),
+            " 金币",
+            center_type="height",
+        )
+        des_image = None
+        font_img = BuildImage(600, 80, font_size=20, color="#a29ad6")
+        p = font_img.getsize("简介：")[0] + 20
+        if goods.goods_description:
+            des_list = goods.goods_description.split("\n")
+            desc = ""
+            for des in des_list:
+                if font_img.getsize(des)[0] > font_img.width - p - 20:
+                    msg = ""
+                    tmp = ""
+                    for i in range(len(des)):
+                        if font_img.getsize(tmp)[0] < font_img.width - p - 20:
+                            tmp += des[i]
+                        else:
+                            msg += tmp + "\n"
+                            tmp = des[i]
+                    desc += msg
+                    if tmp:
+                        desc += tmp
+                else:
+                    desc += des + "\n"
+            if desc[-1] == "\n":
+                desc = desc[:-1]
+            des_image = await text2image(desc, color="#a29ad6")
+        goods_image = BuildImage(
+            600,
+            (50 + des_image.height) if des_image else 50,
+            font_size=20,
+            color="#a29ad6",
+            font="CJGaoDeGuo.otf",
+        )
+        if des_image:
+            await goods_image.text((15, 50), "简介：")
+            await goods_image.paste(des_image, (p, 50))
+        await name_image.circle_corner(5)
+        await goods_image.paste(name_image, (0, 5), center_type="width")
+        await goods_image.circle_corner(20)
+        bk = BuildImage(
+            1180,
+            (50 + des_image.height) if des_image else 50,
+            font_size=15,
+            color="#f9f6f2",
+            font="CJGaoDeGuo.otf",
+        )
+        if goods.icon and (ICON_PATH / goods.icon).exists():
+            icon = BuildImage(70, 70, background=ICON_PATH / goods.icon)
+            await bk.paste(icon)
+        await bk.paste(goods_image, (70, 0))
+        n = 0
+        _w = 650
+        # 添加限时图标和时间
+        if goods.goods_limit_time > 0:
+            n += 140
+            _limit_time_logo = BuildImage(
+                40, 40, background=f"{IMAGE_PATH}/other/time.png"
+            )
+            await bk.paste(_limit_time_logo, (_w + 50, 0))
+            _time_img = await BuildImage.build_text_image("限时！", size=23)
+            await bk.paste(
+                _time_img,
+                (_w + 90, 10),
+            )
+            limit_time = time.strftime(
+                "%Y-%m-%d %H:%M", time.localtime(goods.goods_limit_time)
+            ).split()
+            y_m_d = limit_time[0]
+            _h_m = limit_time[1].split(":")
+            h_m = f"{_h_m[0]}时 {_h_m[1]}分"
+            await bk.text((_w + 55, 38), str(y_m_d))
+            await bk.text((_w + 65, 57), str(h_m))
+            _w += 140
+        if goods.goods_discount != 1:
+            n += 140
+            _discount_logo = BuildImage(
+                30, 30, background=f"{IMAGE_PATH}/other/discount.png"
+            )
+            await bk.paste(_discount_logo, (_w + 50, 10))
+            _tmp = await BuildImage.build_text_image("折扣！", size=23)
+            await bk.paste(_tmp, (_w + 90, 15))
+            _tmp = await BuildImage.build_text_image(
+                f"{10 * goods.goods_discount:.1f} 折",
+                size=30,
+                font_color=(85, 156, 75),
+            )
+            await bk.paste(_tmp, (_w + 50, 44))
+            _w += 140
+        if goods.daily_limit != 0:
+            n += 140
+            _daily_limit_logo = BuildImage(
+                35, 35, background=f"{IMAGE_PATH}/other/daily_limit.png"
+            )
+            await bk.paste(_daily_limit_logo, (_w + 50, 10))
+            _tmp = await BuildImage.build_text_image(
+                "限购！",
+                size=23,
+            )
+            await bk.paste(_tmp, (_w + 90, 20))
+            _tmp = await BuildImage.build_text_image(f"{goods.daily_limit}", size=30)
+            await bk.paste(_tmp, (_w + 72, 45))
+        total_n = max(total_n, n)
+        if n:
+            await bk.line((650, -1, 650 + n, -1), "#a29ad6", 5)
+            # await bk.aline((650, 80, 650 + n, 80), "#a29ad6", 5)
+
+        # 添加限时图标和时间
+        image_list.append(bk)
+        # await A.apaste(bk, (0, current_h), True)
+        # current_h += 90
+    current_h = 0
+    h = sum(img.height + 10 for img in image_list) or 400
+    A = BuildImage(1100, h, color="#f9f6f2")
+    for img in image_list:
+        await A.paste(img, (0, current_h))
+        current_h += img.height + 10
+    w = 950
+    if total_n:
+        w += total_n
+    h = A.height + 230 + 100
+    h = max(h, 1000)
+    shop_logo = BuildImage(100, 100, background=f"{IMAGE_PATH}/other/shop_text.png")
+    shop = BuildImage(w, h, font_size=20, color="#f9f6f2")
+    await shop.paste(A, (20, 230))
+    await shop.paste(shop_logo, (450, 30))
+    tip = "注【通过 购买道具 序号 或者 商品名称 购买】"
+    await shop.text(
+        (
+            int((1000 - shop.getsize(tip)[0]) / 2),
+            170,
+        ),
+        "注【通过 序号 或者 商品名称 购买】",
+    )
+    await shop.text(
+        (20, h - 100),
+        "神秘药水\t\t售价：9999999金币\n\t\t鬼知道会有什么效果~",
+    )
+    return shop.pic2bytes()

zhenxun/builtin_plugins/sign_in/__init__.py

@@ -84,6 +84,12 @@ __plugin_meta__ = PluginMetadata(
                 default_value=0.05,
                 type=float,
             ),
+            RegisterConfig(
+                key="IMAGE_STYLE",
+                value="zhenxun",
+                help="签到图片样式, [normal, zhenxun]",
+                default_value="zhenxun",
+            ),
         ],
         limits=[PluginCdBlock()],
     ).to_dict(),

zhenxun/builtin_plugins/sign_in/_data_source.py

@@ -6,16 +6,14 @@ import secrets
 from nonebot_plugin_uninfo import Uninfo
 import pytz
 
-from zhenxun import ui
 from zhenxun.configs.path_config import IMAGE_PATH
 from zhenxun.models.friend_user import FriendUser
 from zhenxun.models.group_member_info import GroupInfoUser
 from zhenxun.models.sign_log import SignLog
 from zhenxun.models.sign_user import SignUser
 from zhenxun.models.user_console import UserConsole
-from zhenxun.services.avatar_service import avatar_service
 from zhenxun.services.log import logger
-from zhenxun.ui.models import ImageCell, TextCell
+from zhenxun.utils.image_utils import BuildImage, ImageTemplate
 from zhenxun.utils.platform import PlatformUtils
 
 from ._random_event import random_event
@@ -35,7 +33,7 @@ class SignManage:
     @classmethod
     async def rank(
         cls, session: Uninfo, num: int, group_id: str | None = None
-    ) -> bytes | str:
+    ) -> BuildImage | str:  # sourcery skip: avoid-builtin-shadow
         """好感度排行
 
         参数:
@@ -44,7 +42,7 @@ class SignManage:
             group_id: 群组id
 
         返回:
-            bytes: 构造图片
+            BuildImage: 构造图片
         """
         query = SignUser
         if group_id:
@@ -80,23 +78,17 @@ class SignManage:
         data_list = []
         platform = PlatformUtils.get_platform(session)
         for i, user in enumerate(user_list):
-            avatar_path = await avatar_service.get_avatar_path(
-                platform=user[3] or "qq", identifier=user[0]
+            bytes = await PlatformUtils.get_user_avatar(
+                user[0], platform, session.self_id
             )
             data_list.append(
                 [
-                    TextCell(content=f"{i + 1}"),
-                    ImageCell(
-                        src=avatar_path.as_uri() if avatar_path else "", shape="circle"
-                    )
-                    if avatar_path
-                    else TextCell(content=""),
-                    TextCell(content=uid2name.get(user[0]) or user[0]),
-                    TextCell(content=str(user[1]), bold=True),
-                    TextCell(content=str(user[2])),
-                    ImageCell(src=platform_path.resolve().as_uri())
-                    if (platform_path := PLATFORM_PATH.get(platform))
-                    else TextCell(content=""),
+                    f"{i + 1}",
+                    (bytes, 30, 30) if user[3] == "qq" else "",
+                    uid2name.get(user[0]),
+                    user[1],
+                    user[2],
+                    (PLATFORM_PATH.get(user[3]), 30, 30),
                 ]
             )
         if group_id:
@@ -105,11 +97,7 @@ class SignManage:
         else:
             title = "好感度全局排行"
             tip = f"你的排名在全局第 {index} 位哦!"
-        from zhenxun.ui.builders import TableBuilder
-
-        builder = TableBuilder(title, tip)
-        builder.set_headers(column_name).add_rows(data_list)
-        return await ui.render(builder.build())
+        return await ImageTemplate.table_page(title, tip, column_name, data_list)
 
     @classmethod
     async def sign(
@@ -175,7 +163,7 @@ class SignManage:
         impression_added = (secrets.randbelow(99) + 1) / 100
         rand = random.random()
         add_probability = float(user.add_probability)
-        specify_probability = float(user.specify_probability)
+        specify_probability = user.specify_probability
         if rand + add_probability > 0.97 or rand < specify_probability:
             impression_added *= 2
         await SignUser.sign(user, impression_added, session.self_id, platform)

zhenxun/builtin_plugins/sign_in/config.py

@@ -1,6 +1,12 @@
 from zhenxun.configs.path_config import IMAGE_PATH
 
+SIGN_RESOURCE_PATH = IMAGE_PATH / "sign" / "sign_res"
 SIGN_TODAY_CARD_PATH = IMAGE_PATH / "sign" / "today_card"
+SIGN_BORDER_PATH = SIGN_RESOURCE_PATH / "border"
+SIGN_BACKGROUND_PATH = SIGN_RESOURCE_PATH / "background"
+
+SIGN_BORDER_PATH.mkdir(exist_ok=True, parents=True)
+SIGN_BACKGROUND_PATH.mkdir(exist_ok=True, parents=True)
 
 
 lik2relation = {

zhenxun/builtin_plugins/sign_in/utils.py

@@ -1,21 +1,28 @@
 from datetime import datetime
+from io import BytesIO
 import os
 from pathlib import Path
 import random
 
-import aiofiles
 import nonebot
 from nonebot.drivers import Driver
+from nonebot_plugin_htmlrender import template_to_pic
 from nonebot_plugin_uninfo import Uninfo
+import pytz
 
-from zhenxun import ui
 from zhenxun.configs.config import BotConfig, Config
+from zhenxun.configs.path_config import IMAGE_PATH, TEMPLATE_PATH
+from zhenxun.models.sign_log import SignLog
 from zhenxun.models.sign_user import SignUser
-from zhenxun.services import avatar_service
+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 (
+    SIGN_BACKGROUND_PATH,
+    SIGN_BORDER_PATH,
+    SIGN_RESOURCE_PATH,
     SIGN_TODAY_CARD_PATH,
     level2attitude,
     lik2level,
@@ -50,7 +57,9 @@ LG_MESSAGE = [
 
 @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)
+    # await generate_progress_bar_pic()
     clear_sign_data_pic()
 
 
@@ -79,54 +88,290 @@ async def get_card(
     返回:
         Path: 卡片路径
     """
+    await generate_progress_bar_pic()
     user_id = user.user_id
     date = datetime.now().date()
     _type = "view" if is_card_view else "sign"
     file_name = f"{user_id}_{_type}_{date}.png"
-    card_file = SIGN_TODAY_CARD_PATH / file_name
-
+    view_name = f"{user_id}_view_{date}.png"
+    card_file = Path(SIGN_TODAY_CARD_PATH) / file_name
     if card_file.exists():
-        return card_file
-
+        return IMAGE_PATH / "sign" / "today_card" / file_name
     if add_impression == -1:
-        view_name = f"{user_id}_view_{date}.png"
-        view_card_file = SIGN_TODAY_CARD_PATH / view_name
-        if view_card_file.exists():
-            return view_card_file
+        card_file = Path(SIGN_TODAY_CARD_PATH) / view_name
+        if card_file.exists():
+            return card_file
         is_card_view = True
-
-    return await _generate_html_card(
-        user, session, nickname, add_impression, gold, gift, is_double, is_card_view
+    return (
+        await _generate_html_card(
+            user, session, nickname, add_impression, gold, gift, is_double, is_card_view
+        )
+        if base_config.get("IMAGE_STYLE") == "zhenxun"
+        else await _generate_card(
+            user, session, nickname, add_impression, gold, gift, is_double, is_card_view
+        )
     )
 
 
-def get_level_and_next_impression(impression: float) -> tuple[int, int | float, int]:
+async def _generate_card(
+    user: SignUser,
+    session: Uninfo,
+    nickname: str,
+    add_impression: float,
+    gold: int | None,
+    gift: str,
+    is_double: bool = False,
+    is_card_view: bool = False,
+) -> Path:
+    """生成签到卡片
+
+    参数:
+        user: SignUser
+        session: Uninfo
+        nickname: 用户昵称
+        add_impression: 新增的好感度
+        gold: 金币
+        gift: 礼物
+        is_double: 是否触发双倍.
+        is_card_view: 是否展示好感度卡片.
+
+    返回:
+        Path: 卡片路径
+    """
+    ava_bk = BuildImage(140, 140, (255, 255, 255, 0))
+    ava_border = BuildImage(
+        140,
+        140,
+        background=SIGN_BORDER_PATH / "ava_border_01.png",
+    )
+    if session.user.avatar and (
+        byt := await AsyncHttpx.get_content(session.user.avatar)
+    ):
+        ava = BuildImage(107, 107, background=BytesIO(byt))
+    else:
+        ava = BuildImage(107, 107, (0, 0, 0))
+    await ava.circle()
+    await ava_bk.paste(ava, (19, 18))
+    await ava_bk.paste(ava_border, center_type="center")
+    impression = float(user.impression)
+    info_img = BuildImage(250, 150, color=(255, 255, 255, 0), font_size=15)
+    level, next_impression, previous_impression = get_level_and_next_impression(
+        impression
+    )
+    interpolation = next_impression - impression
+    await info_img.text((0, 0), f"· 好感度等级：{level} [{lik2relation[level]}]")
+    await info_img.text(
+        (0, 20), f"· {BotConfig.self_nickname}对你的态度：{level2attitude[level]}"
+    )
+    await info_img.text((0, 40), f"· 距离升级还差 {interpolation:.2f} 好感度")
+
+    bar_bk = BuildImage(220, 20, background=SIGN_RESOURCE_PATH / "bar_white.png")
+    bar = BuildImage(220, 20, background=SIGN_RESOURCE_PATH / "bar.png")
+    ratio = 1 - (next_impression - impression) / (next_impression - previous_impression)
+    if next_impression == 0:
+        ratio = 0
+    await bar.resize(width=int(bar.width * ratio) or 1, height=bar.height)
+    await bar_bk.paste(bar)
+    font_size = 20 if "好感度双倍加持卡" in gift else 30
+    gift_border = BuildImage(
+        270,
+        100,
+        background=SIGN_BORDER_PATH / "gift_border_02.png",
+        font_size=font_size,
+    )
+    await gift_border.text((0, 0), gift, center_type="center")
+
+    bk = BuildImage(
+        876,
+        424,
+        background=SIGN_BACKGROUND_PATH
+        / random.choice(os.listdir(SIGN_BACKGROUND_PATH)),
+        font_size=25,
+    )
+    A = BuildImage(876, 274, background=SIGN_RESOURCE_PATH / "white.png")
+    line = BuildImage(2, 180, color="black")
+    await A.transparent(2)
+    await A.paste(ava_bk, (25, 80))
+    await A.paste(line, (200, 70))
+    nickname_img = await BuildImage.build_text_image(
+        nickname, size=50, font_color=(255, 255, 255)
+    )
+    user_console = await user.user_console
+    if user_console and user_console.uid is not None:
+        uid = f"{user_console.uid}".rjust(12, "0")
+        uid = f"{uid[:4]} {uid[4:8]} {uid[8:]}"
+    else:
+        uid = "XXXX XXXX XXXX"
+    uid_img = await BuildImage.build_text_image(
+        f"UID: {uid}", size=30, font_color=(255, 255, 255)
+    )
+    image1 = await bk.build_text_image("Accumulative check-in for", bk.font, size=30)
+    image2 = await bk.build_text_image("days", bk.font, size=30)
+    sign_day_img = await BuildImage.build_text_image(
+        f"{user.sign_count}", size=40, font_color=(211, 64, 33)
+    )
+    tip_width = image1.width + image2.width + sign_day_img.width + 60
+    tip_height = max([image1.height, image2.height, sign_day_img.height])
+    tip_image = BuildImage(tip_width, tip_height, (255, 255, 255, 0))
+    await tip_image.paste(image1, (0, 7))
+    await tip_image.paste(sign_day_img, (image1.width + 7, 0))
+    await tip_image.paste(image2, (image1.width + sign_day_img.width + 15, 7))
+
+    lik_text1_img = await BuildImage.build_text_image("当前", size=20)
+    lik_text2_img = await BuildImage.build_text_image(
+        f"好感度：{user.impression:.2f}", size=30
+    )
+    watermark = await BuildImage.build_text_image(
+        f"{BotConfig.self_nickname}@{datetime.now().year}",
+        size=15,
+        font_color=(155, 155, 155),
+    )
+    today_data = BuildImage(300, 300, color=(255, 255, 255, 0), font_size=20)
+    if is_card_view:
+        today_sign_text_img = await BuildImage.build_text_image("", size=30)
+        value_list = (
+            await SignUser.annotate()
+            .order_by("-impression")
+            .values_list("user_id", flat=True)
+        )
+        index = value_list.index(user.user_id) + 1  # type: ignore
+        rank_img = await BuildImage.build_text_image(
+            f"* 好感度排名第 {index} 位", size=30
+        )
+        await A.paste(rank_img, ((A.width - rank_img.width - 32), 20))
+        last_log = (
+            await SignLog.filter(user_id=user.user_id).order_by("create_time").first()
+        )
+        last_date = "从未"
+        if last_log:
+            last_date = last_log.create_time.astimezone(
+                pytz.timezone("Asia/Shanghai")
+            ).date()
+        await today_data.text(
+            (0, 0),
+            f"上次签到日期：{last_date}",
+        )
+        await today_data.text((0, 25), f"总金币：{gold}")
+        default_setu_prob = (
+            Config.get_config("send_setu", "INITIAL_SETU_PROBABILITY") * 100  # type: ignore
+        )
+        setu_prob = (
+            default_setu_prob + float(user.impression) if user.impression < 100 else 100
+        )
+        await today_data.text(
+            (0, 50),
+            f"色图概率：{setu_prob:.2f}%",
+        )
+        await today_data.text((0, 75), f"开箱次数：{(20 + int(user.impression / 3))}")
+        _type = "view"
+    else:
+        await A.paste(gift_border, (570, 140))
+        today_sign_text_img = await BuildImage.build_text_image("今日签到", size=30)
+        if is_double:
+            await today_data.text((0, 0), f"好感度 + {add_impression / 2:.2f} × 2")
+        else:
+            await today_data.text((0, 0), f"好感度 + {add_impression:.2f}")
+        await today_data.text((0, 25), f"金币 + {gold}")
+        _type = "sign"
+    current_date = datetime.now()
+    current_datetime_str = current_date.strftime("%Y-%m-%d %a %H:%M:%S")
+    date = current_date.date()
+    date_img = await BuildImage.build_text_image(
+        f"时间：{current_datetime_str}", size=20
+    )
+    await bk.paste(nickname_img, (30, 15))
+    await bk.paste(uid_img, (30, 85))
+    await bk.paste(A, (0, 150))
+    await bk.paste(tip_image, (10, 167))
+    await bk.paste(date_img, (220, 370))
+    await bk.paste(lik_text1_img, (220, 240))
+    await bk.paste(lik_text2_img, (262, 234))
+    await bk.paste(bar_bk, (225, 275))
+    await bk.paste(info_img, (220, 305))
+    await bk.paste(today_sign_text_img, (550, 180))
+    await bk.paste(today_data, (580, 220))
+    await bk.paste(watermark, (15, 400))
+    await bk.save(SIGN_TODAY_CARD_PATH / f"{user.user_id}_{_type}_{date}.png")
+    return IMAGE_PATH / "sign" / "today_card" / f"{user.user_id}_{_type}_{date}.png"
+
+
+async def generate_progress_bar_pic():
+    """
+    初始化进度条图片
+    """
+    bar_white_file = SIGN_RESOURCE_PATH / "bar_white.png"
+    if bar_white_file.exists():
+        return
+
+    bg_2 = (254, 1, 254)
+    bg_1 = (0, 245, 246)
+
+    bk = BuildImage(1000, 50)
+    img_x = BuildImage(50, 50, color=bg_2)
+    await img_x.circle()
+    await img_x.crop((25, 0, 50, 50))
+    img_y = BuildImage(50, 50, color=bg_1)
+    await img_y.circle()
+    await img_y.crop((0, 0, 25, 50))
+    A = BuildImage(950, 50)
+    width, height = A.size
+
+    step_r = (bg_2[0] - bg_1[0]) / width
+    step_g = (bg_2[1] - bg_1[1]) / width
+    step_b = (bg_2[2] - bg_1[2]) / width
+
+    for y in range(width):
+        bg_r = round(bg_1[0] + step_r * y)
+        bg_g = round(bg_1[1] + step_g * y)
+        bg_b = round(bg_1[2] + step_b * y)
+        for x in range(height):
+            await A.point((y, x), fill=(bg_r, bg_g, bg_b))
+    await bk.paste(img_y, (0, 0))
+    await bk.paste(A, (25, 0))
+    await bk.paste(img_x, (975, 0))
+    await bk.save(SIGN_RESOURCE_PATH / "bar.png")
+
+    A = BuildImage(950, 50)
+    bk = BuildImage(1000, 50)
+    img_x = BuildImage(50, 50)
+    await img_x.circle()
+    await img_x.crop((25, 0, 50, 50))
+    img_y = BuildImage(50, 50)
+    await img_y.circle()
+    await img_y.crop((0, 0, 25, 50))
+    await bk.paste(img_y, (0, 0))
+    await bk.paste(A, (25, 0))
+    await bk.paste(img_x, (975, 0))
+    await bk.save(bar_white_file)
+
+
+def get_level_and_next_impression(impression: float) -> tuple[str, int | float, int]:
     """获取当前好感等级与下一等级的差距
 
     参数:
         impression: 好感度
 
     返回:
-        tuple[int, int, int]: 好感度等级，下一等级好感度要求，已达到的好感度要求
+        tuple[str, int, int]: 好感度等级，下一等级好感度要求，已达到的好感度要求
     """
 
     keys = list(lik2level.keys())
-    level_int, next_impression, previous_impression = (
-        int(lik2level[keys[-1]]),
+    level, next_impression, previous_impression = (
+        lik2level[keys[-1]],
         keys[-2],
         keys[-1],
     )
     for i in range(len(keys)):
         if impression >= keys[i]:
-            level_int, next_impression, previous_impression = (
-                int(lik2level[keys[i]]),
+            level, next_impression, previous_impression = (
+                lik2level[keys[i]],
                 keys[i - 1],
                 keys[i],
             )
             if i == 0:
                 next_impression = impression
             break
-    return level_int, next_impression, previous_impression
+    return level, next_impression, previous_impression
 
 
 def clear_sign_data_pic():
@@ -149,7 +394,7 @@ async def _generate_html_card(
     is_double: bool = False,
     is_card_view: bool = False,
 ) -> Path:
-    """使用渲染服务生成签到卡片
+    """生成签到卡片
 
     参数:
         user: SignUser
@@ -159,133 +404,79 @@ async def _generate_html_card(
         gold: 金币
         gift: 礼物
         is_double: 是否触发双倍.
-        is_card_view: 是否为卡片视图.
+        is_card_view: 是否展示好感度卡片.
 
     返回:
         Path: 卡片路径
     """
-    now = datetime.now()
-    date = now.date()
-    _type = "view" if is_card_view else "sign"
-    file_name = f"{user.user_id}_{_type}_{date}.png"
-    card_file = SIGN_TODAY_CARD_PATH / file_name
-
-    if card_file.exists():
-        return card_file
-
     impression = float(user.impression)
     user_console = await user.user_console
     if user_console and user_console.uid is not None:
         uid = f"{user_console.uid}".rjust(12, "0")
-        uid_formatted = f"{uid[:4]} {uid[4:8]} {uid[8:]}"
+        uid = f"{uid[:4]} {uid[4:8]} {uid[8:]}"
     else:
-        uid_formatted = "XXXX XXXX XXXX"
-
+        uid = "XXXX XXXX XXXX"
     level, next_impression, previous_impression = get_level_and_next_impression(
         impression
     )
-
-    attitude = f"对你的态度: {level2attitude.get(str(level), '未知')}"
-    interpolation_val = max(0, next_impression - impression)
-    interpolation = f"{interpolation_val:.2f}"
-
-    denominator = next_impression - previous_impression
-    progress = (
-        100.0
-        if denominator == 0
-        else min(100.0, ((impression - previous_impression) / denominator) * 100)
-    )
-
-    hour = now.hour
-    if 6 < hour < 10:
+    interpolation = next_impression - impression
+    message = f"{BotConfig.self_nickname}希望你开心！"
+    hour = datetime.now().hour
+    if hour > 6 and hour < 10:
         message = random.choice(MORNING_MESSAGE)
-    elif 0 <= hour < 6:
+    elif hour >= 0 and hour < 6:
         message = random.choice(LG_MESSAGE)
-    else:
-        message = f"{BotConfig.self_nickname}希望你开心！"
-    bot_message = f"{BotConfig.self_nickname}说: {message}"
-
-    temperature = random.randint(1, 40)
-    weather_icon_name = f"{random.randint(0, 11)}.png"
-    tag_icon_name = f"{random.randint(0, 5)}.png"
-
-    font_size = 45
-    if len(nickname) > 6:
-        font_size = 27
-
-    avatar_path = await avatar_service.get_avatar_path(
-        PlatformUtils.get_platform(session), user.user_id
+    _impression = f"{add_impression}(×2)" if is_double else add_impression
+    process = 1 - (next_impression - impression) / (
+        next_impression - previous_impression
     )
-    user_info = {
-        "nickname": nickname,
-        "uid_str": uid_formatted,
-        "avatar_url": avatar_path.as_uri() if avatar_path else "",
-        "sign_count": user.sign_count,
-        "font_size": font_size,
+    now = datetime.now()
+    data = {
+        "ava_url": PlatformUtils.get_user_avatar_url(
+            user.user_id, PlatformUtils.get_platform(session), session.self_id
+        ),
+        "name": nickname,
+        "uid": uid,
+        "sign_count": f"{user.sign_count}",
+        "message": f"{BotConfig.self_nickname}说: {message}",
+        "cur_impression": f"{impression:.2f}",
+        "impression": f"好感度+{_impression}",
+        "gold": f"金币+{gold}",
+        "gift": gift,
+        "level": f"{level} [{lik2relation[level]}]",
+        "attitude": f"对你的态度: {level2attitude[level]}",
+        "interpolation": f"{interpolation:.2f}",
+        "heart2": [1 for _ in range(int(level))],
+        "heart1": [1 for _ in range(len(lik2level) - int(level) - 1)],
+        "process": process * 100,
+        "date": str(now.replace(microsecond=0)),
+        "font_size": 45,
     }
-
-    favorability_info = {
-        "current": impression,
-        "level": level,
-        "level_text": f"{level} [{lik2relation.get(str(level), '未知')}]",
-        "heart2": [1 for _ in range(level)],
-        "heart1": [1 for _ in range(len(lik2level) - level - 1)],
-        "next_level_at": next_impression,
-        "previous_level_at": previous_impression,
-    }
-
-    reward_info = None
-    rank = None
-    total_gold = None
-
+    if len(nickname) > 6:
+        data["font_size"] = 27
+    _type = "sign"
     if is_card_view:
+        _type = "view"
         value_list = (
             await SignUser.annotate()
             .order_by("-impression")
             .values_list("user_id", flat=True)
         )
-        rank = value_list.index(user.user_id) + 1 if user.user_id in value_list else 0
-        total_gold = user_console.gold if user_console else 0
-
-        reward_info = {
-            "impression_added": 0,
-            "gold_added": 0,
-            "gift_received": "",
-            "is_double": False,
-        }
-
-    else:
-        reward_info = {
-            "impression_added": add_impression,
-            "gold_added": gold or 0,
-            "gift_received": gift,
-            "is_double": is_double,
-        }
-
-    page_info = {
-        "date_str": str(now.replace(microsecond=0)),
-        "weather_icon_name": weather_icon_name,
-        "temperature": temperature,
-        "tag_icon_name": tag_icon_name,
-    }
-
-    card_data = {
-        "is_card_view": is_card_view,
-        "user": user_info,
-        "favorability": favorability_info,
-        "reward": reward_info,
-        "page": page_info,
-        "bot_message": bot_message,
-        "attitude": attitude,
-        "interpolation": interpolation,
-        "progress": progress,
-        "rank": rank,
-        "total_gold": total_gold,
-    }
-
-    image_bytes = await ui.render_template("pages/builtin/sign", data=card_data)
-
-    async with aiofiles.open(card_file, "wb") as f:
-        await f.write(image_bytes)
-
-    return card_file
+        index = value_list.index(user.user_id) + 1  # type: ignore
+        data["impression"] = f"好感度排名第 {index} 位"
+        data["gold"] = f"总金币：{gold}"
+        data["gift"] = ""
+    pic = await template_to_pic(
+        template_path=str((TEMPLATE_PATH / "sign").absolute()),
+        template_name="main.html",
+        templates={"data": data},
+        pages={
+            "viewport": {"width": 465, "height": 926},
+            "base_url": f"file://{TEMPLATE_PATH}",
+        },
+        wait=2,
+    )
+    image = BuildImage.open(pic)
+    date = now.date()
+    await image.save(SIGN_TODAY_CARD_PATH / f"{user.user_id}_{_type}_{date}.png")
+    return IMAGE_PATH / "sign" / "today_card" / f"{user.user_id}_{_type}_{date}.png"

zhenxun/builtin_plugins/statistics/_data_source.py

@@ -7,6 +7,7 @@ from zhenxun.models.statistics import Statistics
 from zhenxun.utils.echart_utils import ChartUtils
 from zhenxun.utils.echart_utils.models import Barh
 from zhenxun.utils.enum import PluginType
+from zhenxun.utils.image_utils import BuildImage
 from zhenxun.utils.time_utils import TimeUtils
 
 
@@ -59,7 +60,7 @@ class StatisticsManage:
     @classmethod
     async def get_global_statistics(
         cls, plugin_name: str | None, day: int | None, title: str
-    ) -> bytes | str:
+    ) -> BuildImage | str:
         query = Statistics
         if plugin_name:
             query = query.filter(plugin_name=plugin_name)
@@ -113,7 +114,7 @@ class StatisticsManage:
         )
 
     @classmethod
-    async def __build_image(cls, data_list: list[tuple[str, int]], title: str) -> bytes:
+    async def __build_image(cls, data_list: list[tuple[str, int]], title: str):
         module2count = {x[0]: x[1] for x in data_list}
         plugin_info = await PluginInfo.filter(
             module__in=module2count.keys(),

zhenxun/builtin_plugins/superuser/broadcast/__init__.py

@@ -28,8 +28,7 @@ from nonebot_plugin_alconna.uniseg.segment import (
 )
 from nonebot_plugin_session import EventSession
 
-from zhenxun.configs.utils import PluginExtraData, RegisterConfig, Task
-from zhenxun.services.log import logger
+from zhenxun.configs.utils import PluginExtraData, Task
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.message import MessageUtils
 
@@ -46,52 +45,34 @@ __plugin_meta__ = PluginMetadata(
     name="广播",
     description="昭告天下！",
     usage="""
-    向所有群组或指定标签的群组发送广播消息。
+    广播 [消息内容]
+    - 直接发送消息到除当前群组外的所有群组
+    - 支持文本、图片、@、表情、视频等多种消息类型
+    - 示例：广播 你们好！
+    - 示例：广播 [图片] 新活动开始啦！
 
-**基础用法**
-- `广播 [消息内容]`：向所有群组发送广播。
-- `广播` (并引用一条消息)：将引用的消息作为内容进行广播。
+    广播 + 引用消息
+    - 将引用的消息作为广播内容发送
+    - 支持引用普通消息或合并转发消息
+    - 示例：(引用一条消息) 广播
 
-**高级定向广播**
-- `广播 -t <标签名> [消息内容]`：向指定标签下的所有群组广播。
-- `广播到 <标签名> [消息内容]`：与 `-t` 等效的快捷方式。
+    广播撤回
+    - 撤回最近一次由您触发的广播消息
+    - 仅能撤回短时间内的消息
+    - 示例：广播撤回
 
-**标签可以是静态的，也可以是动态的，例如：**
-- `广播到 核心群 通知：...`
-- `广播到 成员数>500的群 通知：...`
+    特性：
+    - 在群组中使用广播时，不会将消息发送到当前群组
+    - 在私聊中使用广播时，会发送到所有群组
 
-**其他命令**
-- `广播撤回` (别名: `recall`)：撤回最近一次发送的广播。
-
-特性：
-- 在群组中使用广播时，不会将消息发送到当前群组
-- 在私聊中使用广播时，会发送到所有群组
-
-别名：
-- bc (广播的简写)
-- recall (广播撤回的别名)
+    别名：
+    - bc (广播的简写)
+    - recall (广播撤回的别名)
     """.strip(),
     extra=PluginExtraData(
         author="HibiKier",
-        version="1.3",
+        version="1.2",
         plugin_type=PluginType.SUPERUSER,
-        configs=[
-            RegisterConfig(
-                module="_task",
-                key="DEFAULT_BROADCAST",
-                value=True,
-                help="被动 广播 进群默认开关状态",
-                default_value=True,
-                type=bool,
-            ),
-            RegisterConfig(
-                module="_task",
-                key="BROADCAST_CONCURRENCY_LIMIT",
-                value=10,
-                help="广播时的最大并发任务数，以避免API速率限制",
-                default_value=10,
-            ),
-        ],
         tasks=[Task(module="broadcast", name="广播")],
     ).to_dict(),
 )
@@ -122,9 +103,6 @@ _matcher = on_alconna(
     Alconna(
         "广播",
         Args["content?", AllParam],
-        alc.Option(
-            "-t|--tag", Args["tag_name_bc", str], help_text="向指定标签的群组广播"
-        ),
     ),
     aliases={"bc"},
     priority=1,
@@ -134,8 +112,6 @@ _matcher = on_alconna(
     use_origin=False,
 )
 
-_matcher.shortcut("广播到 {tag}", command="广播 -t {tag} {%*}")
-
 _recall_matcher = on_alconna(
     Alconna("广播撤回"),
     aliases={"recall"},
@@ -152,59 +128,23 @@ async def handle_broadcast(
     event: Event,
     session: EventSession,
     arp: alc.Arparma,
-    tag_name_match: alc.Match[str] = alc.AlconnaMatch("tag_name_bc"),
 ):
     broadcast_content_msg = await _extract_broadcast_content(bot, event, arp, session)
     if not broadcast_content_msg:
         return
 
-    tag_name_to_broadcast = None
-    force_send = False
-
-    if tag_name_match.available:
-        tag_name_to_broadcast = tag_name_match.result
-        force_send = True
-
-    mode_desc = "强制发送到标签" if force_send else "普通发送"
-    logger.debug(
-        f"广播模式: {mode_desc}, 标签名: {tag_name_to_broadcast}",
-        "广播",
-    )
-
-    target_groups_console, groups_to_actually_send = await get_broadcast_target_groups(
-        bot, session, tag_name_to_broadcast, force_send
-    )
-
-    if not target_groups_console:
-        if tag_name_to_broadcast:
-            await MessageUtils.build_message(
-                f"标签 '{tag_name_to_broadcast}' 中没有群组或标签不存在。"
-            ).send(reply_to=True)
-        return
-
-    if not groups_to_actually_send:
-        if not force_send and target_groups_console:
-            await MessageUtils.build_message(
-                "没有启用了广播功能的目标群组可供立即发送。"
-            ).send(reply_to=True)
+    target_groups, enabled_groups = await get_broadcast_target_groups(bot, session)
+    if not target_groups or not enabled_groups:
         return
 
     try:
         await send_broadcast_and_notify(
-            bot,
-            event,
-            broadcast_content_msg,
-            groups_to_actually_send,
-            target_groups_console,
-            session,
-            force_send,
+            bot, event, broadcast_content_msg, enabled_groups, target_groups, session
         )
     except Exception as e:
         error_msg = "发送广播失败"
         BroadcastManager.log_error(error_msg, e, session)
-        await bot.send_private_msg(
-            user_id=str(event.get_user_id()), message=f"{error_msg}。"
-        )
+        await MessageUtils.build_message(f"{error_msg}。").send(reply_to=True)
 
 
 @_recall_matcher.handle()
@@ -238,6 +178,5 @@ async def handle_broadcast_recall(
     except Exception as e:
         error_msg = "撤回广播消息失败"
         BroadcastManager.log_error(error_msg, e, session)
-        await bot.send_private_msg(
-            user_id=str(event.get_user_id()), message=f"{error_msg}。"
-        )
+        user_id = str(event.get_user_id())
+        await bot.send_private_msg(user_id=user_id, message=f"{error_msg}。")

zhenxun/builtin_plugins/superuser/broadcast/broadcast_manager.py

@@ -5,12 +5,11 @@ from typing import ClassVar
 
 from nonebot.adapters import Bot
 from nonebot.adapters.onebot.v11 import Bot as V11Bot
-from nonebot.exception import ActionFailed, AdapterException
+from nonebot.exception import ActionFailed
 from nonebot_plugin_alconna import UniMessage
 from nonebot_plugin_alconna.uniseg import Receipt, Reference
 from nonebot_plugin_session import EventSession
 
-from zhenxun.configs.config import Config
 from zhenxun.models.group_console import GroupConsole
 from zhenxun.services.log import logger
 from zhenxun.utils.common_utils import CommonUtils
@@ -19,8 +18,6 @@ from zhenxun.utils.platform import PlatformUtils
 from .models import BroadcastDetailResult, BroadcastResult
 from .utils import custom_nodes_to_v11_nodes, uni_message_to_v11_list_of_dicts
 
-BROADCAST_SEND_DELAY_RANGE = (1, 3)
-
 
 class BroadcastManager:
     """广播管理器"""
@@ -95,16 +92,8 @@ class BroadcastManager:
         logger.debug("清空上一次的广播消息ID记录", "广播", session=session)
         cls.clear_last_broadcast_msg_ids()
 
-        concurrency_limit = Config.get_config(
-            "_task",
-            "BROADCAST_CONCURRENCY_LIMIT",
-            10,
-        )
-
         all_groups, _ = await cls.get_all_groups(bot)
-        return await cls.send_to_specific_groups(
-            bot, message, all_groups, session, concurrency_limit=concurrency_limit
-        )
+        return await cls.send_to_specific_groups(bot, message, all_groups, session)
 
     @classmethod
     async def send_to_specific_groups(
@@ -113,17 +102,14 @@ class BroadcastManager:
         message: UniMessage,
         target_groups: list[GroupConsole],
         session_info: EventSession | str | None = None,
-        force_send: bool = False,
-        concurrency_limit: int = 10,
     ) -> BroadcastResult:
         """发送广播到指定群组"""
         log_session = session_info or bot.self_id
-        target_count = len(target_groups)
-        log_message = (
-            f"开始广播，目标 {target_count} 个群组 (并发数: {concurrency_limit})，"
-            f"Bot ID: {bot.self_id}, ForceSend: {force_send}"
+        logger.debug(
+            f"开始广播，目标 {len(target_groups)} 个群组，Bot ID: {bot.self_id}",
+            "广播",
+            session=log_session,
         )
-        logger.info(log_message, "广播", session=log_session)
 
         if not target_groups:
             logger.debug("目标群组列表为空，广播结束", "广播", session=log_session)
@@ -179,12 +165,7 @@ class BroadcastManager:
                 )
                 return 0, len(target_groups)
             success_count, error_count, skip_count = await cls._broadcast_forward(
-                bot,
-                log_session,
-                target_groups,
-                v11_nodes,
-                force_send,
-                concurrency_limit,
+                bot, log_session, target_groups, v11_nodes
             )
         else:
             if is_forward_broadcast:
@@ -194,12 +175,7 @@ class BroadcastManager:
                     session=log_session,
                 )
             success_count, error_count, skip_count = await cls._broadcast_normal(
-                bot,
-                log_session,
-                target_groups,
-                message,
-                force_send,
-                concurrency_limit,
+                bot, log_session, target_groups, message
             )
 
         total = len(target_groups)
@@ -311,16 +287,11 @@ class BroadcastManager:
             )
 
     @classmethod
-    async def _check_group_availability(
-        cls, bot: Bot, group: GroupConsole, force_send: bool = False
-    ) -> bool:
+    async def _check_group_availability(cls, bot: Bot, group: GroupConsole) -> bool:
         """检查群组是否可用"""
         if not group.group_id:
             return False
 
-        if force_send:
-            return True
-
         if await CommonUtils.task_is_block(bot, "broadcast", group.group_id):
             return False
 
@@ -333,69 +304,54 @@ class BroadcastManager:
         session_info: EventSession | str,
         group_list: list[GroupConsole],
         v11_nodes: list[dict],
-        force_send: bool = False,
-        concurrency_limit: int = 10,
     ) -> BroadcastDetailResult:
         """发送合并转发"""
-        semaphore = asyncio.Semaphore(concurrency_limit)
-        msg_id_lock = asyncio.Lock()
+        success_count = 0
+        error_count = 0
+        skip_count = 0
 
-        async def send_to_group(group: GroupConsole) -> GroupConsole:
+        for _, group in enumerate(group_list):
             group_key = group.group_id or group.channel_id
-            async with semaphore:
-                try:
-                    result = await bot.send_group_forward_msg(
-                        group_id=int(group.group_id), messages=v11_nodes
-                    )
-                    async with msg_id_lock:
-                        await cls._extract_message_id_from_result(
-                            result, group_key, session_info, "合并转发"
-                        )
-                    await asyncio.sleep(random.uniform(*BROADCAST_SEND_DELAY_RANGE))
-                    return group
-                except (ActionFailed, AdapterException) as ae:
-                    logger.error(
-                        f"发送失败(合并转发) to {group_key}: {ae}",
-                        "广播",
-                        session=session_info,
-                        e=ae,
-                    )
-                    raise
-                except Exception as e:
-                    logger.error(
-                        f"发送失败(合并转发) to {group_key}: {e}",
-                        "广播",
-                        session=session_info,
-                        e=e,
-                    )
-                    raise
 
-        tasks: list[asyncio.Task] = []
-        skipped_groups: list[GroupConsole] = []
-        for group in group_list:
-            if await cls._check_group_availability(bot, group, force_send):
-                tasks.append(asyncio.create_task(send_to_group(group)))
-            else:
-                skipped_groups.append(group)
+            if not await cls._check_group_availability(bot, group):
+                skip_count += 1
+                continue
 
-        if skipped_groups:
-            logger.info(
-                f"跳过 {len(skipped_groups)} 个不符合条件的群组",
-                "广播",
-                session=session_info,
-            )
+            try:
+                result = await bot.send_group_forward_msg(
+                    group_id=int(group.group_id), messages=v11_nodes
+                )
 
-        if not tasks:
-            return 0, 0, len(skipped_groups)
+                logger.debug(
+                    f"合并转发消息发送结果: {result}, 类型: {type(result)}",
+                    "广播",
+                    session=session_info,
+                )
 
-        results = await asyncio.gather(*tasks, return_exceptions=True)
+                await cls._extract_message_id_from_result(
+                    result, group_key, session_info, "合并转发"
+                )
 
-        success_count = sum(
-            1 for result in results if not isinstance(result, Exception)
-        )
-        error_count = len(results) - success_count
+                success_count += 1
+                await asyncio.sleep(random.randint(1, 3))
+            except ActionFailed as af_e:
+                error_count += 1
+                logger.error(
+                    f"发送失败(合并转发) to {group_key}: {af_e}",
+                    "广播",
+                    session=session_info,
+                    e=af_e,
+                )
+            except Exception as e:
+                error_count += 1
+                logger.error(
+                    f"发送失败(合并转发) to {group_key}: {e}",
+                    "广播",
+                    session=session_info,
+                    e=e,
+                )
 
-        return success_count, error_count, len(skipped_groups)
+        return success_count, error_count, skip_count
 
     @classmethod
     async def _broadcast_normal(
@@ -404,83 +360,58 @@ class BroadcastManager:
         session_info: EventSession | str,
         group_list: list[GroupConsole],
         message: UniMessage,
-        force_send: bool = False,
-        concurrency_limit: int = 10,
     ) -> BroadcastDetailResult:
         """发送普通消息"""
-        semaphore = asyncio.Semaphore(concurrency_limit)
-        msg_id_lock = asyncio.Lock()
+        success_count = 0
+        error_count = 0
+        skip_count = 0
 
-        async def send_to_group(group: GroupConsole) -> GroupConsole:
+        for _, group in enumerate(group_list):
             group_key = (
                 f"{group.group_id}:{group.channel_id}"
                 if group.channel_id
                 else str(group.group_id)
             )
-            target = PlatformUtils.get_target(
-                group_id=group.group_id, channel_id=group.channel_id
-            )
-            if not target:
-                logger.warning(
-                    "target为空",
+
+            if not await cls._check_group_availability(bot, group):
+                skip_count += 1
+                continue
+
+            try:
+                target = PlatformUtils.get_target(
+                    group_id=group.group_id, channel_id=group.channel_id
+                )
+
+                if target:
+                    receipt: Receipt = await message.send(target, bot=bot)
+
+                    logger.debug(
+                        f"广播消息发送结果: {receipt}, 类型: {type(receipt)}",
+                        "广播",
+                        session=session_info,
+                    )
+
+                    await cls._extract_message_id_from_result(
+                        receipt, group_key, session_info
+                    )
+
+                    success_count += 1
+                    await asyncio.sleep(random.randint(1, 3))
+                else:
+                    logger.warning(
+                        "target为空", "广播", session=session_info, target=group_key
+                    )
+                    skip_count += 1
+            except Exception as e:
+                error_count += 1
+                logger.error(
+                    f"发送失败(普通) to {group_key}: {e}",
                     "广播",
                     session=session_info,
-                    target=group_key,
+                    e=e,
                 )
-                raise ValueError(f"无法为群组 {group_key} 创建发送目标")
 
-            async with semaphore:
-                try:
-                    receipt: Receipt = await message.send(target, bot=bot)
-                    async with msg_id_lock:
-                        await cls._extract_message_id_from_result(
-                            receipt, group_key, session_info
-                        )
-                    await asyncio.sleep(random.uniform(*BROADCAST_SEND_DELAY_RANGE))
-                    return group
-                except (ActionFailed, AdapterException) as ae:
-                    logger.error(
-                        f"发送失败(普通) to {group_key}: {ae}",
-                        "广播",
-                        session=session_info,
-                        e=ae,
-                    )
-                    raise
-                except Exception as e:
-                    logger.error(
-                        f"发送失败(普通) to {group_key}: {e}",
-                        "广播",
-                        session=session_info,
-                        e=e,
-                    )
-                    raise
-
-        tasks: list[asyncio.Task] = []
-        skipped_groups: list[GroupConsole] = []
-        for group in group_list:
-            if await cls._check_group_availability(bot, group, force_send):
-                tasks.append(asyncio.create_task(send_to_group(group)))
-            else:
-                skipped_groups.append(group)
-
-        if skipped_groups:
-            logger.info(
-                f"跳过 {len(skipped_groups)} 个不符合条件的群组",
-                "广播",
-                session=session_info,
-            )
-
-        if not tasks:
-            return 0, 0, len(skipped_groups)
-
-        results = await asyncio.gather(*tasks, return_exceptions=True)
-
-        success_count = sum(
-            1 for result in results if not isinstance(result, Exception)
-        )
-        error_count = len(results) - success_count
-
-        return success_count, error_count, len(skipped_groups)
+        return success_count, error_count, skip_count
 
     @classmethod
     async def recall_last_broadcast(

zhenxun/builtin_plugins/superuser/broadcast/message_processor.py

@@ -21,11 +21,8 @@ from nonebot_plugin_alconna.uniseg.segment import (
 from nonebot_plugin_alconna.uniseg.tools import reply_fetch
 from nonebot_plugin_session import EventSession
 
-from zhenxun.models.group_console import GroupConsole
 from zhenxun.services.log import logger
-from zhenxun.services.tags import tag_manager as TagManager
 from zhenxun.utils.common_utils import CommonUtils
-from zhenxun.utils.http_utils import AsyncHttpx
 from zhenxun.utils.message import MessageUtils
 
 from .broadcast_manager import BroadcastManager
@@ -402,29 +399,22 @@ async def _process_v11_segment(
         elif target_qq:
             result.append(At(flag="user", target=target_qq))
     elif seg_type == "video":
-        if url := data_dict.get("url"):
-            try:
-                logger.debug(f"[D{depth}] 正在下载视频用于广播: {url}", "广播")
-                video_bytes = await AsyncHttpx.get_content(url)
-                video_seg = Video(raw=video_bytes)
-                logger.debug(
-                    f"[D{depth}] 视频下载成功, 大小: {len(video_bytes)} bytes",
-                    "广播",
-                )
-                result.append(video_seg)
-            except Exception as e:
-                logger.error(f"[D{depth}] 广播时下载视频失败: {url}", "广播", e=e)
-                result.append(Text(f"[视频下载失败: {url}]"))
-        elif file_val := data_dict.get("file"):
+        video_seg = None
+        if data_dict.get("url"):
+            video_seg = Video(url=data_dict["url"])
+        elif data_dict.get("file"):
+            file_val = data_dict["file"]
             if isinstance(file_val, str) and file_val.startswith("base64://"):
                 b64_data = file_val[9:]
                 raw_bytes = base64.b64decode(b64_data)
                 video_seg = Video(raw=raw_bytes)
-                result.append(video_seg)
             else:
                 video_seg = Video(path=file_val)
-                result.append(video_seg)
-        return result
+        if video_seg:
+            result.append(video_seg)
+            logger.debug(f"[Depth {depth}] 处理视频消息成功", "广播")
+        else:
+            logger.warning(f"[Depth {depth}] V11 视频 {index} 缺少URL/文件", "广播")
     elif seg_type == "forward":
         nested_forward_id = data_dict.get("id") or data_dict.get("resid")
         nested_forward_content = data_dict.get("content")
@@ -525,129 +515,70 @@ async def _extract_content_from_message(
 
 
 async def get_broadcast_target_groups(
-    bot: Bot,
-    session: EventSession,
-    tag_name: str | None = None,
-    force_send: bool = False,
+    bot: Bot, session: EventSession
 ) -> tuple[list, list]:
     """获取广播目标群组和启用了广播功能的群组"""
-    target_groups_console: list[GroupConsole] = []
+    target_groups = []
+    all_groups, _ = await BroadcastManager.get_all_groups(bot)
 
-    current_group_raw = getattr(session, "id2", None) or getattr(
-        session, "group_id", None
-    )
-    current_group_id = str(current_group_raw) if current_group_raw else None
+    current_group_id = None
+    if hasattr(session, "id2") and session.id2:
+        current_group_id = session.id2
 
-    logger.debug(f"当前群组ID: {current_group_id}", "广播")
-
-    if tag_name:
-        tagged_group_ids = await TagManager.resolve_tag_to_group_ids(tag_name, bot=bot)
-        if not tagged_group_ids:
-            return [], []
-
-        valid_groups = await GroupConsole.filter(group_id__in=tagged_group_ids)
-
-        if current_group_id:
-            target_groups_console = [
-                group
-                for group in valid_groups
-                if str(group.group_id) != current_group_id
-            ]
-            excluded_msg = (
-                f"，已排除当前群组({current_group_id})"
-                if any(
-                    str(group.group_id) == current_group_id for group in valid_groups
-                )
-                else ""
-            )
-            broadcast_msg = (
-                f"向标签 '{tag_name}' 中的 {len(target_groups_console)} 个群组广播 "
-                f"(ForceSend: {force_send}){excluded_msg}"
-            )
-            logger.info(broadcast_msg, "广播", session=session)
-        else:
-            target_groups_console = valid_groups
-            broadcast_msg = (
-                f"向标签 '{tag_name}' 中的 {len(target_groups_console)} 个群组广播 "
-                f"(ForceSend: {force_send})"
-            )
-            logger.info(broadcast_msg, "广播", session=session)
+    if current_group_id:
+        target_groups = [
+            group for group in all_groups if group.group_id != current_group_id
+        ]
+        logger.info(
+            f"向除当前群组({current_group_id})外的所有群组广播", "广播", session=session
+        )
     else:
-        all_groups, _ = await BroadcastManager.get_all_groups(bot)
+        target_groups = all_groups
+        logger.info("向所有群组广播", "广播", session=session)
 
-        if current_group_id:
-            target_groups_console = [
-                group for group in all_groups if str(group.group_id) != current_group_id
-            ]
-            logger.info(
-                (
-                    f"向除当前群组({current_group_id})外的所有群组广播 "
-                    f"(ForceSend: {force_send})"
-                ),
-                "广播",
-                session=session,
-            )
-        else:
-            target_groups_console = all_groups
-            logger.info(
-                f"向所有群组广播 (ForceSend: {force_send})", "广播", session=session
-            )
-
-    if not target_groups_console:
-        if not tag_name:
-            await MessageUtils.build_message("没有找到符合条件的广播目标群组。").send(
-                reply_to=True
-            )
+    if not target_groups:
+        await MessageUtils.build_message("没有找到符合条件的广播目标群组。").send(
+            reply_to=True
+        )
         return [], []
 
-    groups_to_actually_send = []
-    if force_send:
-        groups_to_actually_send = target_groups_console
-        logger.debug(
-            f"强制发送模式，将向 {len(groups_to_actually_send)} 个目标群组尝试发送。",
-            "广播",
-        )
-    else:
-        for group in target_groups_console:
-            if not await CommonUtils.task_is_block(bot, "broadcast", group.group_id):
-                groups_to_actually_send.append(group)
-        logger.debug(
-            f"普通发送模式，筛选后将向 {len(groups_to_actually_send)} "
-            f"个目标群组尝试发送",
-            "广播",
-        )
+    enabled_groups = []
+    for group in target_groups:
+        if not await CommonUtils.task_is_block(bot, "broadcast", group.group_id):
+            enabled_groups.append(group)
 
-    return target_groups_console, groups_to_actually_send
+    if not enabled_groups:
+        await MessageUtils.build_message(
+            "没有启用了广播功能的目标群组可供立即发送。"
+        ).send(reply_to=True)
+        return target_groups, []
+
+    return target_groups, enabled_groups
 
 
 async def send_broadcast_and_notify(
     bot: Bot,
     event: Event,
     message: UniMessage,
-    groups_to_send: list,
-    all_target_groups_for_stats: list,
+    enabled_groups: list,
+    target_groups: list,
     session: EventSession,
-    force_send: bool = False,
 ) -> None:
     """发送广播并通知结果"""
     BroadcastManager.clear_last_broadcast_msg_ids()
     count, error_count = await BroadcastManager.send_to_specific_groups(
-        bot, message, groups_to_send, session, force_send
+        bot, message, enabled_groups, session
     )
 
     result = f"成功广播 {count} 个群组"
     if error_count:
         result += f"\n发送失败 {error_count} 个群组"
-
-    effective_sent_count = len(groups_to_send)
-    total_considered_count = len(all_target_groups_for_stats)
-
-    result += f"\n有效: {effective_sent_count} / 总计目标: {total_considered_count}"
+    result += f"\n有效: {len(enabled_groups)} / 总计: {len(target_groups)}"
 
     user_id = str(event.get_user_id())
     await bot.send_private_msg(user_id=user_id, message=f"发送广播完成!\n{result}")
 
     BroadcastManager.log_info(
-        f"广播完成，有效/总计目标: {effective_sent_count}/{total_considered_count}",
+        f"广播完成，有效/总计: {len(enabled_groups)}/{len(target_groups)}",
         session,
     )

zhenxun/builtin_plugins/superuser/broadcast/utils.py

@@ -59,7 +59,7 @@ def uni_segment_to_v11_segment_dict(
                 logger.warning(f"无法处理 Video.raw 的类型: {type(raw_data)}", "广播")
         elif getattr(seg, "path", None):
             logger.warning(
-                f"在合并转发中使用了本地视频路径，可能无法发送: {seg.path}", "广播"
+                f"在合并转发中使用了本地视频路径，可能无法显示: {seg.path}", "广播"
             )
             return {"type": "video", "data": {"file": f"file:///{seg.path}"}}
         else: