Merge 849e5fdd68 into 6d829bcb02

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

.env.dev

@@ -0,0 +1,89 @@
+SUPERUSERS=[""]
+
+COMMAND_START=[""]
+
+SESSION_RUNNING_EXPRESSION="别急呀,小真寻要宕机了!QAQ"
+
+NICKNAME=["真寻", "小真寻", "绪山真寻", "小寻子"]
+
+SESSION_EXPIRE_TIMEOUT=00:00:30
+
+ALCONNA_USE_COMMAND_START=True
+
+# 全局图片统一使用bytes发送，当真寻与协议端不在同一服务器上时为True
+IMAGE_TO_BYTES = True
+
+# 回复消息时自称
+SELF_NICKNAME="小真寻"
+
+# 官bot appid:bot账号
+QBOT_ID_DATA = '{
+    
+}'
+
+# 数据库配置
+# 示例: "postgres://user:password@127.0.0.1:5432/database"
+# 示例: "mysql://user:password@127.0.0.1:3306/database"
+# 示例: "sqlite:data/db/zhenxun.db"   在data目录下建立db文件夹
+DB_URL = ""
+
+# NONE: 不使用缓存, MEMORY: 使用内存缓存, REDIS: 使用Redis缓存
+CACHE_MODE = NONE
+# REDIS配置，使用REDIS替换Cache内存缓存
+# REDIS地址
+# REDIS_HOST = "127.0.0.1"
+# REDIS端口
+# REDIS_PORT = 6379
+# REDIS密码
+# REDIS_PASSWORD = ""
+# REDIS过期时间
+# REDIS_EXPIRE = 600
+
+# 系统代理
+# SYSTEM_PROXY = "http://127.0.0.1:7890"
+
+PLATFORM_SUPERUSERS = '
+  {
+    "qq": [""],
+    "dodo": [""]
+  }
+'
+
+DRIVER=~fastapi+~httpx+~websockets
+
+
+# LOG_LEVEL = DEBUG
+# 服务器和端口
+HOST = 127.0.0.1
+PORT = 8080
+
+# kook adapter toekn
+# kaiheila_bots =[{"token": ""}]
+
+# # discode adapter
+# DISCORD_BOTS='
+# [
+#   {
+#     "token": "",
+#     "intent": {
+#       "guild_messages": true,
+#       "direct_messages": true
+#     },
+#     "application_commands": {"*": ["*"]}
+#   }
+# ]
+# '
+# DISCORD_PROXY=''
+
+# # dodo adapter
+# DODO_BOTS='
+# [
+#   {
+#     "client_id": "",
+#     "token": ""
+#   }
+# ]
+# '
+
+# application_commands的{"*": ["*"]}代表将全部应用命令注册为全局应用命令
+# {"admin": ["123", "456"]}则代表将admin命令注册为id是123、456服务器的局部命令，其余命令不注册

.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,15 @@ feedparser = "^6.0.11"
 imagehash = "^4.3.1"
 cn2an = "^0.5.22"
 dateparser = "^1.2.0"
-bilireq = ">=0.2.10"
+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"
 
 [tool.poetry.group.dev.dependencies]
@@ -62,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,15 @@ feedparser = "^6.0.11"
 imagehash = "^4.3.1"
 cn2an = "^0.5.22"
 dateparser = "^1.2.0"
-bilireq = ">=0.2.10"
+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"
 
 [tool.poetry.group.dev.dependencies]

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,14 +36,14 @@ feedparser = "^6.0.11"
 imagehash = "^4.3.1"
 cn2an = "^0.5.22"
 dateparser = "^1.2.0"
-bilireq = ">=0.2.10"
+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"
 
@@ -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,37 +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
-bilireq>=0.2.10
-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
-
-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

@@ -17,7 +17,7 @@ from zhenxun.models.user_console import UserConsole
 from zhenxun.services.log import logger
 from zhenxun.utils.decorator.shop import shop_register
 from zhenxun.utils.manager.priority_manager import PriorityLifecycle
-from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
+from zhenxun.utils.manager.resource_manager import ResourceManager
 from zhenxun.utils.platform import PlatformUtils
 
 driver: Driver = nonebot.get_driver()
@@ -85,8 +85,7 @@ from bag_users t1
 
 @PriorityLifecycle.on_startup(priority=5)
 async def _():
-    if not ZhenxunRepoManager.check_resources_exists():
-        await ZhenxunRepoManager.resources_update()
+    await ResourceManager.init_resources()
     """签到与用户的数据迁移"""
     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/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

@@ -16,6 +16,10 @@ from nonebot_plugin_uninfo import Uninfo
 from zhenxun.configs.utils import PluginExtraData
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
+from zhenxun.utils.manager.resource_manager import (
+    DownloadResourceException,
+    ResourceManager,
+)
 from zhenxun.utils.message import MessageUtils
 
 from ._data_source import UpdateManager
@@ -64,6 +68,7 @@ _matcher = on_alconna(
         Option("-f|--force", action=store_true, help_text="强制更新"),
         Option("-s", Args["source?", ["git", "ali"]], help_text="更新源"),
         Option("-z|--zip", action=store_true, help_text="下载zip文件"),
+        Option("-t", Args["update_type?", ["git", "download"]], help_text="更新方式"),
     ),
     priority=1,
     block=True,
@@ -81,55 +86,39 @@ async def _(
     force: Query[bool] = Query("force", False),
     source: Query[str] = Query("source", "ali"),
     zip: Query[bool] = Query("zip", False),
+    update_type: Query[str] = Query("update_type", "git"),
 ):
     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 ver_type.result 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(
+            result = await UpdateManager.update(
                 bot,
                 session.user.id,
-                ver_type_str,  # type: ignore
+                ver_type.result,
                 force.result,
-                source_str,  # type: ignore
+                source.result,
                 zip.result,
+                update_type.result,
             )
         except Exception as e:
             logger.error("版本更新失败...", "检查更新", session=session, e=e)
             await MessageUtils.build_message(f"更新版本失败...e: {e}").finish()
     elif ver_type.result == "webui":
-        if zip.result:
-            source_str = None
-        try:
-            result += await UpdateManager.update_webui(
-                source_str,  # type: ignore
-                "test",
-                True,
-            )
-        except Exception as e:
-            logger.error("WebUI更新失败...", "检查更新", session=session, e=e)
-            result += "\nWebUI更新错误..."
+        result = await UpdateManager.update_webui(zip.result, source.result)
     if resource.result or ver_type.result == "resource":
         try:
-            if zip.result:
-                source_str = None
-            result += await UpdateManager.update_resources(
-                source_str,  # type: ignore
-                "main",
-                force.result,
-            )
+            await ResourceManager.init_resources(True, zip.result, source.result)
+            result += "\n资源文件更新成功！"
+        except DownloadResourceException:
+            result += "\n资源更新下载失败..."
         except Exception as e:
             logger.error("资源更新下载失败...", "检查更新", session=session, e=e)
-            result += "\n资源更新错误..."
+            result += "\n资源更新未知错误..."
     if result:
         await MessageUtils.build_message(result.strip()).finish()
     await MessageUtils.build_message("更新版本失败...").finish()

zhenxun/builtin_plugins/auto_update/_data_source.py

@@ -1,207 +1,240 @@
-import asyncio
-from typing import Literal
+import os
+from pathlib import Path
+import shutil
+import tarfile
+import zipfile
 
 from nonebot.adapters import Bot
-from packaging.specifiers import SpecifierSet
-from packaging.version import InvalidVersion, Version
+from nonebot.utils import run_sync
 
+from zhenxun.configs.path_config import DATA_PATH
 from zhenxun.services.log import logger
+from zhenxun.utils.github_utils import GithubUtils
+from zhenxun.utils.github_utils.models import RepoInfo
 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.platform import PlatformUtils
-from zhenxun.utils.repo_utils import RepoFileManager
+from zhenxun.utils.repo_utils import AliyunRepoManager, GithubRepoManager
 
-LOG_COMMAND = "AutoUpdate"
+from .config import (
+    BACKUP_PATH,
+    BASE_PATH,
+    BASE_PATH_STRING,
+    COMMAND,
+    DEFAULT_GITHUB_URL,
+    DOWNLOAD_GZ_FILE,
+    DOWNLOAD_ZIP_FILE,
+    GIT_GITHUB_URL,
+    GIT_WEBUI_UI_URL,
+    PYPROJECT_FILE,
+    PYPROJECT_FILE_STRING,
+    PYPROJECT_LOCK_FILE,
+    PYPROJECT_LOCK_FILE_STRING,
+    RELEASE_URL,
+    REPLACE_FOLDERS,
+    REQ_TXT_FILE,
+    REQ_TXT_FILE_STRING,
+    TMP_PATH,
+    VERSION_FILE,
+)
+
+
+@run_sync
+def _file_handle(latest_version: str | None):
+    """文件移动操作
+
+    参数:
+        latest_version: 版本号
+    """
+    BACKUP_PATH.mkdir(exist_ok=True, parents=True)
+    logger.debug("开始解压文件压缩包...", COMMAND)
+    download_file = DOWNLOAD_GZ_FILE
+    if DOWNLOAD_GZ_FILE.exists():
+        tf = tarfile.open(DOWNLOAD_GZ_FILE)
+    else:
+        download_file = DOWNLOAD_ZIP_FILE
+        tf = zipfile.ZipFile(DOWNLOAD_ZIP_FILE)
+    tf.extractall(TMP_PATH)
+    logger.debug("解压文件压缩包完成...", COMMAND)
+    download_file_path = TMP_PATH / next(
+        x for x in os.listdir(TMP_PATH) if (TMP_PATH / x).is_dir()
+    )
+    _pyproject = download_file_path / PYPROJECT_FILE_STRING
+    _lock_file = download_file_path / PYPROJECT_LOCK_FILE_STRING
+    _req_file = download_file_path / REQ_TXT_FILE_STRING
+    extract_path = download_file_path / BASE_PATH_STRING
+    target_path = BASE_PATH
+    if PYPROJECT_FILE.exists():
+        logger.debug(f"移除备份文件: {PYPROJECT_FILE}", COMMAND)
+        shutil.move(PYPROJECT_FILE, BACKUP_PATH / PYPROJECT_FILE_STRING)
+    if PYPROJECT_LOCK_FILE.exists():
+        logger.debug(f"移除备份文件: {PYPROJECT_LOCK_FILE}", COMMAND)
+        shutil.move(PYPROJECT_LOCK_FILE, BACKUP_PATH / PYPROJECT_LOCK_FILE_STRING)
+    if REQ_TXT_FILE.exists():
+        logger.debug(f"移除备份文件: {REQ_TXT_FILE}", COMMAND)
+        shutil.move(REQ_TXT_FILE, BACKUP_PATH / REQ_TXT_FILE_STRING)
+    if _pyproject.exists():
+        logger.debug("移动文件: pyproject.toml", COMMAND)
+        shutil.move(_pyproject, PYPROJECT_FILE)
+    if _lock_file.exists():
+        logger.debug("移动文件: poetry.lock", COMMAND)
+        shutil.move(_lock_file, PYPROJECT_LOCK_FILE)
+    if _req_file.exists():
+        logger.debug("移动文件: requirements.txt", COMMAND)
+        shutil.move(_req_file, REQ_TXT_FILE)
+    for folder in REPLACE_FOLDERS:
+        """移动指定文件夹"""
+        _dir = BASE_PATH / folder
+        _backup_dir = BACKUP_PATH / folder
+        if _backup_dir.exists():
+            logger.debug(f"删除备份文件夹 {_backup_dir}", COMMAND)
+            shutil.rmtree(_backup_dir)
+        if _dir.exists():
+            logger.debug(f"移动旧文件夹 {_dir}", COMMAND)
+            shutil.move(_dir, _backup_dir)
+        else:
+            logger.warning(f"文件夹 {_dir} 不存在，跳过删除", COMMAND)
+    for folder in REPLACE_FOLDERS:
+        src_folder_path = extract_path / folder
+        dest_folder_path = target_path / folder
+        if src_folder_path.exists():
+            logger.debug(
+                f"移动文件夹: {src_folder_path} -> {dest_folder_path}", COMMAND
+            )
+            shutil.move(src_folder_path, dest_folder_path)
+        else:
+            logger.debug(f"源文件夹不存在: {src_folder_path}", COMMAND)
+    if tf:
+        tf.close()
+    if download_file.exists():
+        logger.debug(f"删除下载文件: {download_file}", COMMAND)
+        download_file.unlink()
+    if extract_path.exists():
+        logger.debug(f"删除解压文件夹: {extract_path}", COMMAND)
+        shutil.rmtree(extract_path)
+    if TMP_PATH.exists():
+        shutil.rmtree(TMP_PATH)
+    if latest_version:
+        with open(VERSION_FILE, "w", encoding="utf8") as f:
+            f.write(f"__version__: {latest_version}")
 
 
 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}
+    @classmethod
+    async def update_webui(cls, is_zip: bool, source: str) -> str:
+        from zhenxun.builtin_plugins.web_ui.public.data_source import (
+            update_webui_assets,
+        )
+
+        WEBUI_PATH = DATA_PATH / "web_ui" / "public"
+        BACKUP_PATH = DATA_PATH / "web_ui" / "backup_public"
+        GIT_WEBUI_PATH = DATA_PATH / "web_ui" / "git_web_ui"
+        if WEBUI_PATH.exists():
+            if BACKUP_PATH.exists():
+                logger.debug(f"删除旧的备份webui文件夹 {BACKUP_PATH}", COMMAND)
+                shutil.rmtree(BACKUP_PATH)
+            WEBUI_PATH.rename(BACKUP_PATH)
         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]
+            if is_zip:
+                await update_webui_assets()
+                logger.info("更新webui成功...", COMMAND)
+            else:
+                if source == "ali":
+                    result = await AliyunRepoManager.update(
+                        GIT_WEBUI_UI_URL, GIT_WEBUI_PATH, "dist", force=True
+                    )
+                else:
+                    result = await GithubRepoManager.update(
+                        GIT_WEBUI_UI_URL, GIT_WEBUI_PATH, "dist", force=True
+                    )
+                if not result.success:
+                    return f"Webui更新失败...错误: {result.error_message}"
+                shutil.rmtree(WEBUI_PATH, ignore_errors=True)
+                shutil.copytree(GIT_WEBUI_PATH / "dist", WEBUI_PATH)
+            if BACKUP_PATH.exists():
+                logger.debug(f"删除旧的webui文件夹 {BACKUP_PATH}", COMMAND)
+                shutil.rmtree(BACKUP_PATH)
+            return "Webui更新成功！"
         except Exception as e:
-            logger.warning(f"获取 {owner}/{repo}/{path} 的 commit 日期失败", e=e)
-        return "获取失败"
+            logger.error("更新webui失败...", COMMAND, e=e)
+            if BACKUP_PATH.exists():
+                logger.debug(f"恢复旧的webui文件夹 {BACKUP_PATH}", COMMAND)
+                BACKUP_PATH.rename(WEBUI_PATH)
+            raise e
 
     @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__"
-        )
-        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",
-        force: bool = False,
-    ):
-        """更新WebUI
-
-        参数:
-            source: 更新源
-            branch: 分支
-            force: 是否强制更新
+        """检查更新版本
 
         返回:
-            str: 返回消息
+            str: 更新信息
         """
-        if not source:
-            await ZhenxunRepoManager.webui_zip_update()
-            return "WebUI更新完成!"
-        result = await ZhenxunRepoManager.webui_git_update(
-            source,
-            branch=branch,
-            force=force,
+        cur_version = cls.__get_version()
+        data = await cls.__get_latest_data()
+        if not data:
+            return "检查更新获取版本失败..."
+        return (
+            "检测到当前版本更新\n"
+            f"当前版本：{cur_version}\n"
+            f"最新版本：{data.get('name')}\n"
+            f"创建日期：{data.get('created_at')}\n"
+            f"更新内容：\n{data.get('body')}"
         )
-        if not result.success:
-            logger.error(f"WebUI更新失败...错误: {result.error_message}", LOG_COMMAND)
-            return f"WebUI更新失败...错误: {result.error_message}"
-        return "WebUI更新完成!"
 
     @classmethod
-    async def update_resources(
-        cls,
-        source: Literal["git", "ali"] | None,
-        branch: str = "main",
-        force: bool = False,
-    ) -> str:
-        """更新资源
-
-        参数:
-            source: 更新源
-            branch: 分支
-            force: 是否强制更新
-
-        返回:
-            str: 返回消息
-        """
-        if not source:
-            await ZhenxunRepoManager.resources_zip_update()
-            return "真寻资源更新完成!"
-        result = await ZhenxunRepoManager.resources_git_update(
-            source,
-            branch=branch,
-            force=force,
+    async def __zip_update(cls, version_type: str):
+        logger.info("开始下载真寻最新版文件....", COMMAND)
+        cur_version = cls.__get_version()
+        url = None
+        new_version = None
+        repo_info = GithubUtils.parse_github_url(DEFAULT_GITHUB_URL)
+        if version_type in {"main"}:
+            repo_info.branch = version_type
+            new_version = await cls.__get_version_from_repo(repo_info)
+            if new_version:
+                new_version = new_version.split(":")[-1].strip()
+            url = await repo_info.get_archive_download_urls()
+        elif version_type == "release":
+            data = await cls.__get_latest_data()
+            if not data:
+                return "获取更新版本失败..."
+            new_version = data.get("name", "")
+            url = await repo_info.get_release_source_download_urls_tgz(new_version)
+        if not url:
+            return "获取版本下载链接失败..."
+        if TMP_PATH.exists():
+            logger.debug(f"删除临时文件夹 {TMP_PATH}", COMMAND)
+            shutil.rmtree(TMP_PATH)
+        logger.debug(
+            f"开始更新版本：{cur_version} -> {new_version} | 下载链接：{url}",
+            COMMAND,
         )
-        if not result.success:
-            logger.error(
-                f"真寻资源更新失败...错误: {result.error_message}", LOG_COMMAND
+        download_file = (
+            DOWNLOAD_GZ_FILE if version_type == "release" else DOWNLOAD_ZIP_FILE
+        )
+        if await AsyncHttpx.download_file(url, download_file, stream=True):
+            logger.debug("下载真寻最新版文件完成...", COMMAND)
+            await _file_handle(new_version)
+            result = "版本更新完成"
+            return (
+                f"{result}\n"
+                f"版本: {cur_version} -> {new_version}\n"
+                "请重新启动真寻以完成更新!"
             )
-            return f"真寻资源更新失败...错误: {result.error_message}"
-        return "真寻资源更新完成!"
+        else:
+            logger.debug("下载真寻最新版文件失败...", COMMAND)
+        return ""
 
     @classmethod
-    async def update_zhenxun(
+    async def update(
         cls,
         bot: Bot,
         user_id: str,
-        version_type: Literal["main", "release"],
+        version_type: str,
         force: bool,
-        source: Literal["git", "ali"],
+        source: str,
         zip: bool,
+        update_type: str,
     ) -> str:
         """更新操作
 
@@ -223,85 +256,34 @@ 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 = (
-                f"版本更新完成！\n版本: {cur_version} -> {new_version}\n"
-                "请重新启动真寻以完成更新!"
-            )
-        else:
-            result = await ZhenxunRepoManager.zhenxun_git_update(
-                source,
-                branch=version_type,
+            return await cls.__zip_update(version_type)
+        elif source == "git":
+            result = await GithubRepoManager.update(
+                GIT_GITHUB_URL,
+                Path(),
+                use_git=update_type == "git",
                 force=force,
             )
-            if not result.success:
-                logger.error(
-                    f"真寻版本更新失败...错误: {result.error_message}",
-                    LOG_COMMAND,
-                )
-                return f"版本更新失败...错误: {result.error_message}"
-            await PlatformUtils.send_superuser(
-                bot, "真寻更新完成，开始安装依赖...", user_id
+        else:
+            result = await AliyunRepoManager.update(
+                GIT_GITHUB_URL,
+                Path(),
+                force=force,
             )
-            await VirtualEnvPackageManager.install_requirement(
-                ZhenxunRepoConfig.REQUIREMENTS_FILE
-            )
-            result_message = (
-                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
+        if not result.success:
+            return f"版本更新失败...错误: {result.error_message}"
+        await PlatformUtils.send_superuser(
+            bot, "真寻更新完成，开始安装依赖...", user_id
+        )
+        await VirtualEnvPackageManager.install_requirement(REQ_TXT_FILE)
+        return (
+            f"版本更新完成！\n"
+            f"版本: {cur_version} -> {result.new_version}\n"
+            f"变更文件个数: {len(result.changed_files)}"
+            f"{'' if source == 'git' else '（阿里云更新不支持查看变更文件）'}\n"
+            "请重新启动真寻以完成更新!"
+        )
 
     @classmethod
     def __get_version(cls) -> str:
@@ -311,9 +293,44 @@ 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
+
+    @classmethod
+    async def __get_latest_data(cls) -> dict:
+        """获取最新版本信息
+
+        返回:
+            dict: 最新版本数据
+        """
+        for _ in range(3):
+            try:
+                res = await AsyncHttpx.get(RELEASE_URL)
+                if res.status_code == 200:
+                    return res.json()
+            except TimeoutError:
+                pass
+            except Exception as e:
+                logger.error("检查更新真寻获取版本失败", e=e)
+        return {}
+
+    @classmethod
+    async def __get_version_from_repo(cls, repo_info: RepoInfo) -> str:
+        """从指定分支获取版本号
+
+        参数:
+            branch: 分支名称
+
+        返回:
+            str: 版本号
+        """
+        version_url = await repo_info.get_raw_download_urls(path="__version__")
+        try:
+            res = await AsyncHttpx.get(version_url)
+            if res.status_code == 200:
+                return res.text.strip()
+        except Exception as e:
+            logger.error(f"获取 {repo_info.branch} 分支版本失败", e=e)
+        return "未知版本"

zhenxun/builtin_plugins/auto_update/config.py

@@ -0,0 +1,42 @@
+from pathlib import Path
+
+from zhenxun.configs.path_config import TEMP_PATH
+
+GIT_GITHUB_URL = "https://github.com/zhenxun-org/zhenxun_bot.git"
+
+DEFAULT_GITHUB_URL = "https://github.com/HibiKier/zhenxun_bot/tree/main"
+RELEASE_URL = "https://api.github.com/repos/HibiKier/zhenxun_bot/releases/latest"
+
+GIT_WEBUI_UI_URL = "https://github.com/HibiKier/zhenxun_bot_webui.git"
+
+VERSION_FILE_STRING = "__version__"
+VERSION_FILE = Path() / VERSION_FILE_STRING
+
+PYPROJECT_FILE_STRING = "pyproject.toml"
+PYPROJECT_FILE = Path() / PYPROJECT_FILE_STRING
+PYPROJECT_LOCK_FILE_STRING = "poetry.lock"
+PYPROJECT_LOCK_FILE = Path() / PYPROJECT_LOCK_FILE_STRING
+REQ_TXT_FILE_STRING = "requirements.txt"
+REQ_TXT_FILE = Path() / REQ_TXT_FILE_STRING
+
+BASE_PATH_STRING = "zhenxun"
+BASE_PATH = Path() / BASE_PATH_STRING
+
+TMP_PATH = TEMP_PATH / "auto_update"
+
+BACKUP_PATH = Path() / "backup"
+
+DOWNLOAD_GZ_FILE_STRING = "download_latest_file.tar.gz"
+DOWNLOAD_ZIP_FILE_STRING = "download_latest_file.zip"
+DOWNLOAD_GZ_FILE = TMP_PATH / DOWNLOAD_GZ_FILE_STRING
+DOWNLOAD_ZIP_FILE = TMP_PATH / DOWNLOAD_ZIP_FILE_STRING
+
+REPLACE_FOLDERS = [
+    "builtin_plugins",
+    "services",
+    "utils",
+    "models",
+    "configs",
+]
+
+COMMAND = "检查更新"

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
@@ -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/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(),
 )
@@ -78,18 +88,12 @@ _matcher = on_alconna(
         Option("-s|--superuser", action=store_true, help_text="超级用户帮助"),
         Option("-d|--detail", action=store_true, help_text="详细帮助"),
     ),
-    aliases={"help", "菜单"},
+    aliases={"help", "帮助", "菜单"},
     rule=to_me(),
     priority=1,
     block=True,
 )
 
-_matcher.shortcut(
-    r"帮助(?P<name>.*?)",
-    command="功能",
-    arguments=["{name}"],
-    prefix=True,
-)
 
 _matcher.shortcut(
     r"详细帮助",
@@ -109,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 (
@@ -143,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/hooks/auth_checker.py

@@ -150,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"
         )

zhenxun/builtin_plugins/hooks/call_hook.py

@@ -1,7 +1,6 @@
 from typing import Any
 
 from nonebot.adapters import Bot, Message
-from nonebot.adapters.onebot.v11 import MessageSegment
 
 from zhenxun.configs.config import Config
 from zhenxun.models.bot_message_store import BotMessageStore
@@ -41,35 +40,6 @@ def replace_message(message: Message) -> str:
     return result
 
 
-def format_message_for_log(message: Message) -> str:
-    """
-    将消息对象转换为适合日志记录的字符串，对base64等长内容进行摘要处理。
-    """
-    if not isinstance(message, Message):
-        return str(message)
-
-    log_parts = []
-    for seg in message:
-        seg: MessageSegment
-        if seg.type == "text":
-            log_parts.append(seg.data.get("text", ""))
-        elif seg.type in ("image", "record", "video"):
-            file_info = seg.data.get("file", "")
-            if isinstance(file_info, str) and file_info.startswith("base64://"):
-                b64_data = file_info[9:]
-                data_size_bytes = (len(b64_data) * 3) / 4 - b64_data.count("=", -2)
-                log_parts.append(
-                    f"[{seg.type}: base64, size={data_size_bytes / 1024:.2f}KB]"
-                )
-            else:
-                log_parts.append(f"[{seg.type}]")
-        elif seg.type == "at":
-            log_parts.append(f"[@{seg.data.get('qq', 'unknown')}]")
-        else:
-            log_parts.append(f"[{seg.type}]")
-    return "".join(log_parts)
-
-
 @Bot.on_called_api
 async def handle_api_result(
     bot: Bot, exception: Exception | None, api: str, data: dict[str, Any], result: Any
@@ -108,7 +78,7 @@ async def handle_api_result(
             else replace_message(message),
             platform=PlatformUtils.get_platform(bot),
         )
-        logger.debug(f"消息发送记录，message: {format_message_for_log(message)}")
+        logger.debug(f"消息发送记录，message: {message}")
     except Exception as e:
         logger.warning(
             f"消息发送记录发生错误...data: {data}, result: {result}",

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/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,7 +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.utils.common_utils import CommonUtils
 from zhenxun.utils.enum import EventLogType, PluginType
 from zhenxun.utils.platform import PlatformUtils
@@ -93,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 _(
@@ -114,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)
 

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,18 +221,20 @@ 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,
     ):
         """安装插件
 
@@ -269,39 +245,19 @@ class StoreManager:
             is_external: 是否是外部仓库
         """
         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
@@ -312,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)
@@ -354,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
@@ -435,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} 更新成功! 重启后生效"
@@ -457,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}
@@ -483,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)
@@ -535,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_admin/handlers.py

@@ -7,11 +7,10 @@ from nonebot.permission import SUPERUSER
 from nonebot_plugin_alconna import AlconnaMatch, Arparma, Match, Query
 from pydantic import BaseModel, ValidationError
 
-from zhenxun.models.scheduled_job import ScheduledJob
+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 zhenxun.utils.pydantic_compat import model_dump
 
 from . import presenters
 from .commands import (
@@ -76,9 +75,7 @@ async def handle_view(
         await schedule_cmd.finish("没有找到任何相关的定时任务。")
 
     img = await presenters.format_schedule_list_as_image(
-        schedules=schedules,
-        title=title,
-        current_page=page.result if page.available else 1,
+        schedules=schedules, title=title, current_page=page.result
     )
     await MessageUtils.build_message(img).send(reply_to=True)
 
@@ -152,10 +149,7 @@ async def handle_set(
 
     job_kwargs = {}
     if kwargs_str.available:
-        task_meta = scheduler_manager._registered_tasks.get(p_name)
-        if not task_meta:
-            await schedule_cmd.finish(f"插件 '{p_name}' 未注册。")
-
+        task_meta = scheduler_manager._registered_tasks[p_name]
         params_model = task_meta.get("model")
         if not (
             params_model
@@ -174,7 +168,11 @@ async def handle_set(
 
             validated_model = model_validate(raw_kwargs)
 
-            job_kwargs = model_dump(validated_model)
+            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(
@@ -222,7 +220,7 @@ async def handle_set(
 
 @schedule_cmd.assign("删除")
 async def handle_delete(targeter: ScheduleTargeter = GetTargeter("删除")):
-    schedules_to_remove: list[ScheduledJob] = await targeter._get_schedules()
+    schedules_to_remove: list[ScheduleInfo] = await targeter._get_schedules()
     if not schedules_to_remove:
         await schedule_cmd.finish("没有找到可删除的任务。")
 
@@ -241,7 +239,7 @@ async def handle_delete(targeter: ScheduleTargeter = GetTargeter("删除")):
 
 @schedule_cmd.assign("暂停")
 async def handle_pause(targeter: ScheduleTargeter = GetTargeter("暂停")):
-    schedules_to_pause: list[ScheduledJob] = await targeter._get_schedules()
+    schedules_to_pause: list[ScheduleInfo] = await targeter._get_schedules()
     if not schedules_to_pause:
         await schedule_cmd.finish("没有找到可暂停的任务。")
 
@@ -260,7 +258,7 @@ async def handle_pause(targeter: ScheduleTargeter = GetTargeter("暂停")):
 
 @schedule_cmd.assign("恢复")
 async def handle_resume(targeter: ScheduleTargeter = GetTargeter("恢复")):
-    schedules_to_resume: list[ScheduledJob] = await targeter._get_schedules()
+    schedules_to_resume: list[ScheduleInfo] = await targeter._get_schedules()
     if not schedules_to_resume:
         await schedule_cmd.finish("没有找到可恢复的任务。")
 

zhenxun/builtin_plugins/scheduler_admin/presenters.py

@@ -1,12 +1,8 @@
 import asyncio
-from typing import Any
 
-from zhenxun import ui
-from zhenxun.models.scheduled_job import ScheduledJob
+from zhenxun.models.schedule_info import ScheduleInfo
 from zhenxun.services.scheduler 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.utils._image_template import ImageTemplate, RowStyle
 
 
 def _get_type_name(annotation) -> str:
@@ -19,17 +15,10 @@ def _get_type_name(annotation) -> str:
         return str(annotation)
 
 
-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 _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}"
@@ -62,15 +51,59 @@ 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 = (
@@ -87,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)
@@ -95,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"):
@@ -128,7 +174,7 @@ def _format_params(schedule_status: dict) -> str:
 
 
 async def format_schedule_list_as_image(
-    schedules: list[ScheduledJob], title: str, current_page: int
+    schedules: list[ScheduleInfo], title: str, current_page: int
 ):
     """将任务列表格式化为图片"""
     page_size = 15
@@ -146,47 +192,36 @@ async def format_schedule_list_as_image(
     ]
     all_statuses = await asyncio.gather(*status_tasks)
 
-    data_list = []
-    for s in all_statuses:
-        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=s["group_id"] or "全局"),
-                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} 条任务"
-    )
-    builder.set_headers(
-        ["ID", "插件", "Bot", "目标", "下次运行", "规则", "参数", "状态"]
-    ).add_rows(data_list)
-    return await ui.render(
-        builder.build(),
-        viewport={"width": 1400, "height": 10},
-        device_scale_factor=2,
+    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,
     )
 
 
@@ -200,7 +235,7 @@ def format_single_status_message(status: dict) -> str:
         f"▫️ 目标: {status['group_id'] or '全局'}",
         f"▫️ 状态: {'✔️ 已启用' if status['is_enabled'] else '⏸️ 已暂停'}",
         f"▫️ 下次运行: {status['next_run_time']}",
-        f"▫️ 触发规则: {_format_trigger_info(status)}",
+        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(
@@ -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(

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/request_manage.py

@@ -17,7 +17,7 @@ from nonebot_plugin_alconna import (
     store_true,
 )
 from nonebot_plugin_alconna.uniseg.tools import reply_fetch
-from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import BotConfig
 from zhenxun.configs.path_config import IMAGE_PATH
@@ -33,14 +33,12 @@ from zhenxun.utils.utils import get_user_avatar
 usage = """
 查看请求
 清空请求
-同意请求 [id]
-拒绝请求 [id]
-忽略请求 [id]
-
-特别的，在引用消息时，可以不指定id
-/引用消息 同意请求
-/引用消息 拒绝请求
-/引用消息 忽略请求
+请求处理 -fa [id] / 同意好友请求 [id]      # 同意好友请求
+请求处理 -fr [id] / 拒绝好友请求 [id]      # 拒绝好友请求
+请求处理 -fi [id] / 忽略好友请求 [id]      # 忽略好友请求
+请求处理 -ga [id] / 同意群组请求 [id]      # 同意群聊请求
+请求处理 -gr [id] / 拒绝群组请求 [id]      # 拒绝群聊请求
+请求处理 -gi [id] / 忽略群组请求 [id]      # 忽略群聊请求
 """.strip()
 
 
@@ -59,11 +57,11 @@ __plugin_meta__ = PluginMetadata(
 _req_matcher = on_alconna(
     Alconna(
         "请求处理",
-        Args["handle", ["a", "r", "i"]]["id?", int],
+        Args["handle", ["-fa", "-fr", "-fi", "-ga", "-gr", "-gi"]]["id?", int],
         meta=CommandMeta(
-            description="请求处理",
+            description="好友/群组请求处理",
             usage=usage,
-            example="同意请求 20",
+            example="同意好友请求 20",
             compact=True,
         ),
     ),
@@ -110,9 +108,12 @@ _clear_matcher = on_alconna(
 )
 
 reg_arg_list = [
-    (r"同意请求\s*(?P<id>\d*)", ["a", "{id}"]),
-    (r"拒绝请求\s*(?P<id>\d*)", ["r", "{id}"]),
-    (r"忽略请求\s*(?P<id>\d*)", ["i", "{id}"]),
+    (r"同意好友请求\s*(?P<id>\d*)", ["-fa", "{id}"]),
+    (r"拒绝好友请求\s*(?P<id>\d*)", ["-fr", "{id}"]),
+    (r"忽略好友请求\s*(?P<id>\d*)", ["-fi", "{id}"]),
+    (r"同意群组请求\s*(?P<id>\d*)", ["-ga", "{id}"]),
+    (r"拒绝群组请求\s*(?P<id>\d*)", ["-gr", "{id}"]),
+    (r"忽略群组请求\s*(?P<id>\d*)", ["-gi", "{id}"]),
 ]
 
 for r in reg_arg_list:
@@ -128,7 +129,7 @@ for r in reg_arg_list:
 async def _(
     bot: Bot,
     event: Event,
-    session: Uninfo,
+    session: EventSession,
     handle: str,
     id: Match[int],
     arparma: Arparma,
@@ -152,7 +153,7 @@ async def _(
             ).finish(reply_to=True)
         handle_id = db_data.id
     req = None
-    handle_type = type_dict[handle]
+    handle_type = type_dict[handle[-1]]
     try:
         if handle_type == RequestHandleType.APPROVE:
             req = await FgRequest.approve(bot, handle_id)
@@ -186,7 +187,7 @@ async def _(
 
 @_read_matcher.handle()
 async def _(
-    session: Uninfo,
+    session: EventSession,
     arparma: Arparma,
     is_friend: Query[bool] = AlconnaQuery("friend.value", False),
     is_group: Query[bool] = AlconnaQuery("group.value", False),
@@ -282,7 +283,7 @@ async def _(
 
 @_clear_matcher.handle()
 async def _(
-    session: Uninfo,
+    session: EventSession,
     arparma: Arparma,
     is_friend: Query[bool] = AlconnaQuery("friend.value", False),
     is_group: Query[bool] = AlconnaQuery("group.value", False),

zhenxun/builtin_plugins/superuser/super_help/__init__.py

@@ -3,13 +3,17 @@ 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 .config import SUPERUSER_HELP_IMAGE
+from .normal_help import build_help
+from .zhenxun_help import build_html_help
+
 __plugin_meta__ = PluginMetadata(
     name="超级用户帮助",
     description="超级用户帮助",
@@ -20,18 +24,17 @@ __plugin_meta__ = PluginMetadata(
         author="HibiKier",
         version="0.1",
         plugin_type=PluginType.SUPERUSER,
+        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.SUPERUSER, PluginType.SUPER_AND_ADMIN],
-        page_title="超级用户帮助手册",
-    )
-
-
 _matcher = on_alconna(
     Alconna("超级用户帮助"),
     permission=SUPERUSER,
@@ -42,11 +45,15 @@ _matcher = on_alconna(
 
 @_matcher.handle()
 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 SUPERUSER_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(SUPERUSER_HELP_IMAGE).send()
     logger.info("查看超级用户帮助", arparma.header_result, session=session)

zhenxun/builtin_plugins/superuser/super_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
+
+SUPERUSER_HELP_IMAGE = IMAGE_PATH / "SUPERUSER_HELP.png"
+if SUPERUSER_HELP_IMAGE.exists():
+    SUPERUSER_HELP_IMAGE.unlink()
+
+
+class PluginData(BaseModel):
+    """
+    插件信息
+    """
+
+    plugin: PluginInfo
+    """插件信息"""
+    metadata: PluginMetadata
+    """元数据"""
+
+    class Config:
+        arbitrary_types_allowed = True

zhenxun/builtin_plugins/superuser/super_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 SUPERUSER_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(SUPERUSER_HELP_IMAGE)

zhenxun/builtin_plugins/superuser/super_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.SUPERUSER, 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/superuser/super_help/zhenxun_help.py

@@ -0,0 +1,60 @@
+from nonebot_plugin_htmlrender import template_to_pic
+
+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 .config import SUPERUSER_HELP_IMAGE
+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>".join([task.name for task in task_list]),
+        }
+    return None
+
+
+async def build_html_help():
+    """构建帮助图片"""
+    plugins = await get_plugins()
+    plugin_list = []
+    for data in plugins:
+        if data.metadata.extra:
+            if superuser_help := data.metadata.extra.get("superuser_help"):
+                data.metadata.usage += f"<br>以下为超级用户额外命令<br>{superuser_help}"
+        plugin_list.append(
+            {
+                "name": data.plugin.name,
+                "description": data.metadata.description.replace("\n", "<br>"),
+                "usage": data.metadata.usage.replace("\n", "<br>"),
+            }
+        )
+    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(SUPERUSER_HELP_IMAGE)

zhenxun/builtin_plugins/superuser/ui_manager.py

@@ -1,142 +0,0 @@
-from nonebot.permission import SUPERUSER
-from nonebot.plugin import PluginMetadata
-from nonebot.rule import to_me
-from nonebot_plugin_alconna import (
-    Alconna,
-    AlconnaMatch,
-    Args,
-    Arparma,
-    Match,
-    Subcommand,
-    on_alconna,
-)
-
-from zhenxun.configs.config import Config
-from zhenxun.configs.utils import PluginExtraData, RegisterConfig
-from zhenxun.services import renderer_service
-from zhenxun.services.log import logger
-from zhenxun.utils.enum import PluginType
-from zhenxun.utils.message import MessageUtils
-
-__plugin_meta__ = PluginMetadata(
-    name="UI管理",
-    description="管理UI、主题和渲染服务的相关配置",
-    usage="""
-    指令：
-        ui reload / 重载主题: 重新加载当前主题的配置和资源。
-        ui theme / 主题列表: 显示所有可用的主题，并高亮显示当前主题。
-        ui theme [主题名称] / 切换主题 [主题名称]: 将UI主题切换为指定主题。
-    """.strip(),
-    extra=PluginExtraData(
-        author="HibiKier",
-        version="0.1",
-        plugin_type=PluginType.SUPERUSER,
-        configs=[
-            RegisterConfig(
-                module="UI",
-                key="THEME",
-                value="default",
-                help="设置渲染服务使用的全局主题名称(对应 resources/themes/下的目录名)",
-                default_value="default",
-                type=str,
-            ),
-            RegisterConfig(
-                module="UI",
-                key="CACHE",
-                value=True,
-                help="是否为渲染服务生成的图片启用文件缓存",
-                default_value=True,
-                type=bool,
-            ),
-            RegisterConfig(
-                module="UI",
-                key="DEBUG_MODE",
-                value=False,
-                help="是否在日志中输出渲染组件的完整HTML源码，用于调试",
-                default_value=False,
-                type=bool,
-            ),
-        ],
-    ).to_dict(),
-)
-
-
-ui_matcher = on_alconna(
-    Alconna(
-        "ui",
-        Subcommand("reload", help_text="重载当前主题"),
-        Subcommand("theme", Args["theme_name?", str], help_text="查看或切换主题"),
-    ),
-    aliases={"主题管理"},
-    rule=to_me(),
-    permission=SUPERUSER,
-    priority=1,
-    block=True,
-)
-
-ui_matcher.shortcut("重载主题", command="ui reload")
-ui_matcher.shortcut("主题列表", command="ui theme")
-ui_matcher.shortcut("切换主题", command="ui theme", arguments=["{%0}"])
-
-
-@ui_matcher.assign("reload")
-async def handle_reload(arparma: Arparma):
-    theme_name = await renderer_service.reload_theme()
-    logger.info(
-        f"UI主题已重载为: {theme_name}", "UI管理器", session=arparma.header_result
-    )
-    await MessageUtils.build_message(f"UI主题已成功重载为 '{theme_name}'！").send(
-        reply_to=True
-    )
-
-
-@ui_matcher.assign("theme")
-async def handle_theme(
-    arparma: Arparma, theme_name_match: Match[str] = AlconnaMatch("theme_name")
-):
-    if theme_name_match.available:
-        new_theme_name = theme_name_match.result
-        try:
-            await renderer_service.switch_theme(new_theme_name)
-            logger.info(
-                f"UI主题已切换为: {new_theme_name}",
-                "UI管理器",
-                session=arparma.header_result,
-            )
-            await MessageUtils.build_message(
-                f"🎨 主题已成功切换为 '{new_theme_name}'！"
-            ).send(reply_to=True)
-        except FileNotFoundError as e:
-            logger.warning(
-                f"尝试切换到不存在的主题: {new_theme_name}",
-                "UI管理器",
-                session=arparma.header_result,
-            )
-            await MessageUtils.build_message(str(e)).send(reply_to=True)
-        except Exception as e:
-            logger.error(
-                f"切换主题时发生错误: {e}",
-                "UI管理器",
-                session=arparma.header_result,
-                e=e,
-            )
-            await MessageUtils.build_message(f"切换主题失败: {e}").send(reply_to=True)
-    else:
-        try:
-            available_themes = renderer_service.list_available_themes()
-            current_theme = Config.get_config("UI", "THEME", "default")
-
-            theme_list_str = "\n".join(
-                f"  - {theme}{'  <- 当前' if theme == current_theme else ''}"
-                for theme in sorted(available_themes)
-            )
-            response = f"🎨 可用主题列表:\n{theme_list_str}"
-            await MessageUtils.build_message(response).send(reply_to=True)
-        except Exception as e:
-            logger.error(
-                f"获取主题列表时发生错误: {e}",
-                "UI管理器",
-                session=arparma.header_result,
-                e=e,
-            )
-            await MessageUtils.build_message("获取主题列表失败。").send(reply_to=True)

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

@@ -16,7 +16,7 @@ from zhenxun.utils.platform import PlatformUtils
 
 from ....base_model import Result
 from ....config import QueryDateType
-from ....utils import authentication, get_system_status
+from ....utils import authentication, clear_help_image, get_system_status
 from .data_source import ApiDataSource
 from .model import (
     ActiveGroup,
@@ -234,6 +234,7 @@ async def _(param: BotManageUpdateParam):
         bot_data.block_plugins = CommonUtils.convert_module_format(param.block_plugins)
         bot_data.block_tasks = CommonUtils.convert_module_format(param.block_tasks)
         await bot_data.save(update_fields=["block_plugins", "block_tasks"])
+        clear_help_image()
         return Result.ok()
     except Exception as e:
         logger.error(f"{router.prefix}/update_bot_manage 调用错误", "WebUi", e=e)

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

@@ -7,7 +7,7 @@ from zhenxun.utils.enum import BlockType, PluginType
 from zhenxun.utils.manager.virtual_env_package_manager import VirtualEnvPackageManager
 
 from ....base_model import Result
-from ....utils import authentication
+from ....utils import authentication, clear_help_image
 from .data_source import ApiDataSource
 from .model import (
     BatchUpdatePlugins,
@@ -82,6 +82,7 @@ async def _() -> Result[PluginCount]:
 async def _(param: UpdatePlugin) -> Result:
     try:
         await ApiDataSource.update_plugin(param)
+        clear_help_image()
         return Result.ok(info="已经帮你写好啦!")
     except (ValueError, KeyError):
         return Result.fail("插件数据不存在...")
@@ -109,6 +110,7 @@ async def _(param: PluginSwitch) -> Result:
             db_plugin.block_type = None
             db_plugin.status = True
         await db_plugin.save()
+        clear_help_image()
         return Result.ok(info="成功改变了开关状态!")
     except Exception as e:
         logger.error(f"{router.prefix}/change_switch 调用错误", "WebUi", e=e)
@@ -175,6 +177,7 @@ async def _(
             updated_count=result_dict["updated_count"],
             errors=result_dict["errors"],
         )
+        clear_help_image()
         return Result.ok(result_model, "插件配置更新完成")
     except Exception as e:
         logger.error(f"{router.prefix}/plugins/batch_update 调用错误", "WebUi", e=e)
@@ -194,6 +197,7 @@ async def _(payload: RenameMenuTypePayload) -> Result[str]:
             old_name=payload.old_name, new_name=payload.new_name
         )
         if result.get("success"):
+            clear_help_image()
             return Result.ok(
                 info=result.get(
                     "info",

zhenxun/builtin_plugins/web_ui/config.py

@@ -8,6 +8,16 @@ if sys.version_info >= (3, 11):
 else:
     from strenum import StrEnum
 
+from zhenxun.configs.path_config import DATA_PATH, TEMP_PATH
+
+WEBUI_STRING = "web_ui"
+PUBLIC_STRING = "public"
+
+WEBUI_DATA_PATH = DATA_PATH / WEBUI_STRING
+PUBLIC_PATH = WEBUI_DATA_PATH / PUBLIC_STRING
+TMP_PATH = TEMP_PATH / WEBUI_STRING
+
+WEBUI_DIST_GITHUB_URL = "https://github.com/HibiKier/zhenxun_bot_webui/tree/dist"
 
 app = nonebot.get_app()
 

zhenxun/builtin_plugins/web_ui/public/__init__.py

@@ -3,38 +3,41 @@ from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
 
 from zhenxun.services.log import logger
-from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
+
+from ..config import PUBLIC_PATH
+from .data_source import COMMAND_NAME, update_webui_assets
 
 router = APIRouter()
 
 
 @router.get("/")
 async def index():
-    return FileResponse(ZhenxunRepoManager.config.WEBUI_PATH / "index.html")
+    return FileResponse(PUBLIC_PATH / "index.html")
 
 
 @router.get("/favicon.ico")
 async def favicon():
-    return FileResponse(ZhenxunRepoManager.config.WEBUI_PATH / "favicon.ico")
+    return FileResponse(PUBLIC_PATH / "favicon.ico")
+
+
+@router.get("/79edfa81f3308a9f.jfif")
+async def _():
+    return FileResponse(PUBLIC_PATH / "79edfa81f3308a9f.jfif")
 
 
 async def init_public(app: FastAPI):
     try:
-        if not ZhenxunRepoManager.check_webui_exists():
-            await ZhenxunRepoManager.webui_update(branch="test")
-        folders = [
-            x.name for x in ZhenxunRepoManager.config.WEBUI_PATH.iterdir() if x.is_dir()
-        ]
+        if not PUBLIC_PATH.exists():
+            folders = await update_webui_assets()
+        else:
+            folders = [x.name for x in PUBLIC_PATH.iterdir() if x.is_dir()]
         app.include_router(router)
         for pathname in folders:
             logger.debug(f"挂载文件夹: {pathname}")
             app.mount(
                 f"/{pathname}",
-                StaticFiles(
-                    directory=ZhenxunRepoManager.config.WEBUI_PATH / pathname,
-                    check_dir=True,
-                ),
+                StaticFiles(directory=PUBLIC_PATH / pathname, check_dir=True),
                 name=f"public_{pathname}",
             )
     except Exception as e:
-        logger.error("初始化 WebUI资源 失败", "WebUI", e=e)
+        logger.error("初始化 WebUI资源 失败", COMMAND_NAME, e=e)

zhenxun/builtin_plugins/web_ui/public/data_source.py

@@ -0,0 +1,44 @@
+from pathlib import Path
+import shutil
+import zipfile
+
+from nonebot.utils import run_sync
+
+from zhenxun.services.log import logger
+from zhenxun.utils.github_utils import GithubUtils
+from zhenxun.utils.http_utils import AsyncHttpx
+
+from ..config import PUBLIC_PATH, TMP_PATH, WEBUI_DIST_GITHUB_URL
+
+COMMAND_NAME = "WebUI资源管理"
+
+
+async def update_webui_assets():
+    webui_assets_path = TMP_PATH / "webui_assets.zip"
+    download_url = await GithubUtils.parse_github_url(
+        WEBUI_DIST_GITHUB_URL
+    ).get_archive_download_urls()
+    logger.info("开始下载 webui_assets 资源...", COMMAND_NAME)
+    if await AsyncHttpx.download_file(
+        download_url, webui_assets_path, follow_redirects=True
+    ):
+        logger.info("下载 webui_assets 成功...", COMMAND_NAME)
+        return await _file_handle(webui_assets_path)
+    raise Exception("下载 webui_assets 失败", COMMAND_NAME)
+
+
+@run_sync
+def _file_handle(webui_assets_path: Path):
+    logger.debug("开始解压 webui_assets...", COMMAND_NAME)
+    if webui_assets_path.exists():
+        tf = zipfile.ZipFile(webui_assets_path)
+        tf.extractall(TMP_PATH)
+        logger.debug("解压 webui_assets 成功...", COMMAND_NAME)
+    else:
+        raise Exception("解压 webui_assets 失败，文件不存在...", COMMAND_NAME)
+    download_file_path = next(f for f in TMP_PATH.iterdir() if f.is_dir())
+    shutil.rmtree(PUBLIC_PATH, ignore_errors=True)
+    shutil.copytree(download_file_path / "dist", PUBLIC_PATH, dirs_exist_ok=True)
+    logger.debug("复制 webui_assets 成功...", COMMAND_NAME)
+    shutil.rmtree(TMP_PATH, ignore_errors=True)
+    return [x.name for x in PUBLIC_PATH.iterdir() if x.is_dir()]

zhenxun/builtin_plugins/web_ui/utils.py

@@ -12,7 +12,7 @@ import psutil
 import ujson as json
 
 from zhenxun.configs.config import Config
-from zhenxun.configs.path_config import DATA_PATH
+from zhenxun.configs.path_config import DATA_PATH, IMAGE_PATH
 
 from .base_model import SystemFolderSize, SystemStatus, User
 
@@ -68,6 +68,22 @@ def validate_path(path_str: str | None) -> tuple[Path | None, str | None]:
         return None, f"路径验证失败: {e!s}"
 
 
+GROUP_HELP_PATH = DATA_PATH / "group_help"
+SIMPLE_HELP_IMAGE = IMAGE_PATH / "SIMPLE_HELP.png"
+SIMPLE_DETAIL_HELP_IMAGE = IMAGE_PATH / "SIMPLE_DETAIL_HELP.png"
+
+
+def clear_help_image():
+    """清理帮助图片"""
+    if SIMPLE_HELP_IMAGE.exists():
+        SIMPLE_HELP_IMAGE.unlink()
+    if SIMPLE_DETAIL_HELP_IMAGE.exists():
+        SIMPLE_DETAIL_HELP_IMAGE.unlink()
+    for file in GROUP_HELP_PATH.iterdir():
+        if file.is_file():
+            file.unlink()
+
+
 def get_user(uname: str) -> User | None:
     """获取账号密码
 

zhenxun/configs/config.py

@@ -13,7 +13,7 @@ class BotSetting(BaseModel):
     """回复时NICKNAME"""
     system_proxy: str | None = None
     """系统代理"""
-    db_url: str = ""
+    db_url: str = "sqlite:data/zhenxun.db"
     """数据库链接, 默认值为sqlite:data/zhenxun.db"""
     platform_superusers: dict[str, list[str]] = Field(default_factory=dict)
     """平台超级用户"""

zhenxun/configs/path_config.py

@@ -15,9 +15,7 @@ DATA_PATH = Path() / "data"
 # 临时数据路径
 TEMP_PATH = Path() / "resources" / "temp"
 # 网页模板路径
-THEMES_PATH = Path() / "resources" / "themes"
-# [新增] UI渲染服务的统一缓存路径
-UI_CACHE_PATH = TEMP_PATH / "ui_cache"
+TEMPLATE_PATH = Path() / "resources" / "template"
 
 
 IMAGE_PATH.mkdir(parents=True, exist_ok=True)
@@ -27,4 +25,3 @@ LOG_PATH.mkdir(parents=True, exist_ok=True)
 FONT_PATH.mkdir(parents=True, exist_ok=True)
 DATA_PATH.mkdir(parents=True, exist_ok=True)
 TEMP_PATH.mkdir(parents=True, exist_ok=True)
-UI_CACHE_PATH.mkdir(parents=True, exist_ok=True)

zhenxun/configs/utils/__init__.py

@@ -1,21 +1,16 @@
 from collections.abc import Callable
 import copy
 from pathlib import Path
-from typing import Any, TypeVar
+from typing import Any, TypeVar, get_args, get_origin
 
 import cattrs
-from pydantic import BaseModel, Field
+from nonebot.compat import model_dump
+from pydantic import VERSION, BaseModel, Field
 from ruamel.yaml import YAML
 from ruamel.yaml.scanner import ScannerError
 
 from zhenxun.configs.path_config import DATA_PATH
 from zhenxun.services.log import logger
-from zhenxun.utils.pydantic_compat import (
-    _dump_pydantic_obj,
-    _is_pydantic_type,
-    model_dump,
-    parse_as,
-)
 
 from .models import (
     AICallableParam,
@@ -44,6 +39,46 @@ class NoSuchConfig(Exception):
     pass
 
 
+def _dump_pydantic_obj(obj: Any) -> Any:
+    """
+    递归地将一个对象内部的 Pydantic BaseModel 实例转换为字典。
+    支持单个实例、实例列表、实例字典等情况。
+    """
+    if isinstance(obj, BaseModel):
+        return model_dump(obj)
+    if isinstance(obj, list):
+        return [_dump_pydantic_obj(item) for item in obj]
+    if isinstance(obj, dict):
+        return {key: _dump_pydantic_obj(value) for key, value in obj.items()}
+    return obj
+
+
+def _is_pydantic_type(t: Any) -> bool:
+    """
+    递归检查一个类型注解是否与 Pydantic BaseModel 相关。
+    """
+    if t is None:
+        return False
+    origin = get_origin(t)
+    if origin:
+        return any(_is_pydantic_type(arg) for arg in get_args(t))
+    return isinstance(t, type) and issubclass(t, BaseModel)
+
+
+def parse_as(type_: type[T], obj: Any) -> T:
+    """
+    一个兼容 Pydantic V1 的 parse_obj_as 和V2的TypeAdapter.validate_python 的辅助函数。
+    """
+    if VERSION.startswith("1"):
+        from pydantic import parse_obj_as
+
+        return parse_obj_as(type_, obj)
+    else:
+        from pydantic import TypeAdapter  # type: ignore
+
+        return TypeAdapter(type_).validate_python(obj)
+
+
 class ConfigGroup(BaseModel):
     """
     配置组
@@ -159,11 +194,16 @@ class ConfigsManager:
         """
         result = dict(original_data)
 
+        # 遍历新数据的键
         for key, value in new_data.items():
+            # 如果键不在原数据中，添加它
             if key not in original_data:
                 result[key] = value
+            # 如果两边都是字典，递归处理
             elif isinstance(value, dict) and isinstance(original_data[key], dict):
                 result[key] = self._merge_dicts(value, original_data[key])
+            # 如果键已存在，保留原值，不覆盖
+            # (不做任何操作，保持原值)
 
         return result
 
@@ -177,11 +217,15 @@ class ConfigsManager:
         返回:
             标准化后的值
         """
+        # 处理BaseModel
         processed_value = _dump_pydantic_obj(value)
 
+        # 如果处理后的值是字典，且原始值也存在
         if isinstance(processed_value, dict) and original_value is not None:
+            # 处理原始值
             processed_original = _dump_pydantic_obj(original_value)
 
+            # 如果原始值也是字典，合并它们
             if isinstance(processed_original, dict):
                 return self._merge_dicts(processed_value, processed_original)
 
@@ -219,10 +263,12 @@ class ConfigsManager:
         if not module or not key:
             raise ValueError("add_plugin_config: module和key不能为为空")
 
+        # 获取现有配置值（如果存在）
         existing_value = None
         if module in self._data and (config := self._data[module].configs.get(key)):
             existing_value = config.value
 
+        # 标准化值和默认值
         processed_value = self._normalize_config_data(value, existing_value)
         processed_default_value = self._normalize_config_data(default_value)
 
@@ -302,6 +348,7 @@ class ConfigsManager:
         if value_to_process is None:
             return default
 
+        # 1. 最高优先级：自定义的参数解析器
         if config.arg_parser:
             try:
                 return config.arg_parser(value_to_process)

zhenxun/configs/utils/models.py

@@ -2,10 +2,10 @@ from collections.abc import Callable
 from datetime import datetime
 from typing import Any, Literal
 
+from nonebot.compat import model_dump
 from pydantic import BaseModel, Field
 
 from zhenxun.utils.enum import BlockType, LimitWatchType, PluginLimitType, PluginType
-from zhenxun.utils.pydantic_compat import model_dump
 
 __all__ = [
     "AICallableParam",

zhenxun/models/ban_console.py

@@ -4,7 +4,6 @@ from typing_extensions import Self
 
 from tortoise import fields
 
-from zhenxun.services.data_access import DataAccess
 from zhenxun.services.db_context import Model
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import CacheType, DbLockType
@@ -58,15 +57,14 @@ class BanConsole(Model):
         """
         if not user_id and not group_id:
             raise UserAndGroupIsNone()
-        dao = DataAccess(cls)
         if user_id:
             return (
-                await dao.safe_get_or_none(user_id=user_id, group_id=group_id)
+                await cls.safe_get_or_none(user_id=user_id, group_id=group_id)
                 if group_id
-                else await dao.safe_get_or_none(user_id=user_id, group_id__isnull=True)
+                else await cls.safe_get_or_none(user_id=user_id, group_id__isnull=True)
             )
         else:
-            return await dao.safe_get_or_none(user_id="", group_id=group_id)
+            return await cls.safe_get_or_none(user_id="", group_id=group_id)
 
     @classmethod
     async def check_ban_level(
@@ -112,7 +110,7 @@ class BanConsole(Model):
                 return -1
             _time = time.time() - (user.ban_time + user.duration)
             if _time < 0:
-                return int(abs(_time))
+                return int(time.time() - user.ban_time - user.duration)
             await user.delete()
         return 0
 

zhenxun/models/fg_request.py

@@ -128,14 +128,12 @@ class FgRequest(Model):
                 await bot.set_friend_add_request(
                     flag=req.flag, approve=handle_type == RequestHandleType.APPROVE
                 )
-                if (
-                    handle_type == RequestHandleType.APPROVE
-                    and BotProfileManager.is_auto_send_profile()
-                ):
-                    if file_path := await BotProfileManager.build_bot_profile_image(
+                if BotProfileManager.is_auto_send_profile():
+                    file_path = await BotProfileManager.build_bot_profile_image(
                         bot.self_id
-                    ):
-                        await asyncio.sleep(1)
+                    )
+                    if file_path:
+                        await asyncio.sleep(2)
                         await PlatformUtils.send_message(
                             bot,
                             req.user_id,

zhenxun/models/group_console.py

@@ -7,7 +7,6 @@ from tortoise.backends.base.client import BaseDBAsyncClient
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.task_info import TaskInfo
 from zhenxun.services.cache import CacheRoot
-from zhenxun.services.data_access import DataAccess
 from zhenxun.services.db_context import Model
 from zhenxun.utils.enum import CacheType, DbLockType, PluginType
 
@@ -255,14 +254,13 @@ class GroupConsole(Model):
         返回:
             Self: GroupConsole
         """
-        dao = DataAccess(cls)
         if channel_id:
-            return await dao.safe_get_or_none(
+            return await cls.safe_get_or_none(
                 group_id=group_id,
                 channel_id=channel_id,
                 clean_duplicates=clean_duplicates,
             )
-        return await dao.safe_get_or_none(
+        return await cls.safe_get_or_none(
             group_id=group_id,
             channel_id__isnull=True,
             clean_duplicates=clean_duplicates,

zhenxun/models/plugin_info.py

@@ -77,7 +77,7 @@ class PluginInfo(Model):
         返回:
             Self | None: 插件
         """
-        if not kwargs.get("plugin_type") and filter_parent:
+        if filter_parent:
             return await cls.get_or_none(
                 load_status=load_status, plugin_type__not=PluginType.PARENT, **kwargs
             )
@@ -96,7 +96,7 @@ class PluginInfo(Model):
         返回:
             list[Self]: 插件列表
         """
-        if not kwargs.get("plugin_type") and filter_parent:
+        if filter_parent:
             return await cls.filter(
                 load_status=load_status, plugin_type__not=PluginType.PARENT, **kwargs
             ).all()

zhenxun/models/schedule_info.py

@@ -3,7 +3,7 @@ from tortoise import fields
 from zhenxun.services.db_context import Model
 
 
-class ScheduledJob(Model):
+class ScheduleInfo(Model):
     id = fields.IntField(pk=True, generated=True, auto_increment=True)
     """自增id"""
     bot_id = fields.CharField(
@@ -34,5 +34,5 @@ class ScheduledJob(Model):
     """创建时间"""
 
     class Meta:  # pyright: ignore [reportIncompatibleVariableOverride]
-        table = "scheduled_jobs"
+        table = "schedule_info"
         table_description = "通用定时任务表"