Update update_info.json

Update README.md
2026-09-30 09:10:01 +08:00 · 2022-01-05 23:07:03 +08:00 · 2022-01-05 22:57:29 +08:00 · 2022-01-05 22:57:08 +08:00
946 changed files with 13392 additions and 31414 deletions
@@ -1,23 +0,0 @@
---
-name: Issue template
-about: " issue template's purpose here."
-title: ''
-labels: ''
-assignees: ''
-
---
-
-### 系统版本：Ubuntu 20.04
-### 真寻版本：0.1.5.3
-
-### 错误截图
-
-[img]
-
-### 日志截图
-
-[img]
-
-### 错误说明
-
-发生了xx错误...
@@ -1,9 +0,0 @@
-### 系统版本：Ubuntu 20.04
-### 真寻版本：0.1.5.3
-
-### 错误截图
-
-[img]
-
-### 错误说明
-发生了xx错误...
@@ -138,28 +138,10 @@ dmypy.json
 # Cython debug symbols
 cython_debug/

-demo.py
 test.py
-server_ip.py
+server.py
 member_activity_handle.py
 Yu-Gi-Oh/
+search_image/
+black_word/
 csgo/
-fantasy_card/
-data/
-log/
-backup/
-extensive_plugin/
-test/
-bot.py
-data/
-.env
-.env.dev
-/resources/text/
-/resources/image/
-!/resources/template/
-configs/config.py
-configs/config.yaml
-./.env
-./.env.dev
-plugins/csgo_server/
-plugins/activity/
@@ -13,18 +13,11 @@

 如果该项目的图片等等侵犯猫豆腐老师权益请联系我删除！  

-是新手！希望有个地方讨论绪山真寻Bot，或者有问题或建议，可以发送issues或加入[ <strong>[是真寻酱哒(萌新版)](https://jq.qq.com/?_wv=1027&k=u8PgBkMZ) </strong>]
-
-[//]: # (是老手！讨论插件开发，nonebot2开发，可以加入[ <strong>[真寻酱的技术群]&#40;https://jq.qq.com/?_wv=1027&k=u8PgBkMZ&#41; </strong>])
+如果希望有个地方讨论绪山真寻Bot，或者有问题或建议，可以发送issues或加入[ <strong>[是真寻酱哒](https://jq.qq.com/?_wv=1027&k=u8PgBkMZ) </strong>]

 ## 声明
 此项目仅用于学习交流，请勿用于非法用途

-# Nonebot2
-<img style="height: 200px;width: 200px;" src="https://camo.githubusercontent.com/0ef71e86056da694c540790aa4a4e314396884d6c4fdb95362a7538b27a1b034/68747470733a2f2f76322e6e6f6e65626f742e6465762f6c6f676f2e706e67">
-
-非常 [ **[NICE](https://github.com/nonebot/nonebot2)** ] 的OneBot框架
-
 ## 未完成的文档

 # [传送门](https://hibikier.github.io/zhenxun_bot/)
@@ -32,28 +25,20 @@
 ## 真寻的帮助
 请对真寻说: '真寻帮助' or '管理员帮助' or '超级用户帮助' or '真寻帮助 指令'

-## 普通帮助图片
-![x](https://raw.githubusercontent.com/HibiKier/zhenxun_bot/main/docs_image/help.png)
-
-## HTML版帮助图片
-![x](https://raw.githubusercontent.com/HibiKier/zhenxun_bot/main/docs_image/html_help.png)
-
-## Web UI
-[zhenxun_bot_webui](https://github.com/HibiKier/zhenxun_bot_webui)
-
-## 一键安装脚本
-[zhenxun_bot-deploy](https://github.com/AkashiCoin/zhenxun_bot-deploy)
-
 ## 提供符合真寻标准的插件仓库

 [AkashiCoin/nonebot_plugins_zhenxun_bot](https://github.com/AkashiCoin/nonebot_plugins_zhenxun_bot)

 ## 来点优点？
-
+一.作为bot：
  * 实现了许多功能，且提供了大量功能管理命令
+  * __..... 更多详细请通过`传送门`查看文档！__
+
+二.作为框架？：
  * 通过Config配置项将所有插件配置统计保存至config.yaml，利于统一用户修改
  * 方便增删插件，原生nonebot2 matcher，不需要额外修改，仅仅通过简单的配置属性就可以生成`帮助图片`和`帮助信息`
  * 提供了cd，阻塞，每日次数等限制，仅仅通过简单的属性就可以生成一个限制，例如：`__plugin_cd_limit__`
+  * 基本完善的权限管理
  * __..... 更多详细请通过`传送门`查看文档！__


@@ -83,8 +68,6 @@
 - [x] 原神资源查询  (借鉴[Genshin_Impact_bot](https://github.com/H-K-Y/Genshin_Impact_bot)插件)
 - [x] 原神便笺查询
 - [x] 原神玩家查询
- [x] 原神树脂提醒
- [x] 原神签到/自动签到
 - [x] 金币红包
 - [x] 微博热搜
 - [x] B站主播/UP/番剧订阅
@@ -119,7 +102,7 @@
 - [x] 获取b站视频封面
 - [x] 通过PID获取图片
 - [x] 功能统计可视化
- [x] 词云
+
 - [x] 关于

 ### 已实现的管理员功能
@@ -133,7 +116,7 @@
 - [x] 移动图片  （同上）
 - [x] 删除图片  （同上）
 - [x] 群内B站订阅
- [x] 词条设置
+- [x] 群词条
 - [x] 休息吧/醒来

 ### 已实现的超级用户功能
@@ -165,7 +148,6 @@
 - [x] 清理临时数据
 - [x] 增删群认证
 - [x] 同意/拒绝好友/群聊请求
- [x] 配置重载

 #### 超级用户的被动技能
 - [x] 邀请入群提醒(别人邀请真寻入群)
@@ -190,7 +172,6 @@
 - [x] 群管理员监控，自动为新晋管理员增加权限，为失去群管理员的用户删除权限
 - [x] 群权限系统
 - [x] 定时更新权限
- [x] 自动配置重载
 </details>

 ## 详细配置请前往文档，以下为最简部署和配置，如果你有基础并学习过nonebot2的话
@@ -203,7 +184,7 @@
 # 配置gocq

 在 https://github.com/Mrs4s/go-cqhttp 下载Releases最新版本，运行后选择反向代理，
-  后将gocq的配置文件config.yml中的universal改为universal: ws://127.0.0.1:8080/onebot/v11/ws
+  后将gocq的配置文件config.yml中的universal改为universal: ws://127.0.0.1:8080/cqhttp/ws

 # 获取代码
 git clone https://github.com/HibiKier/zhenxun_bot.git
@@ -212,14 +193,12 @@ git clone https://github.com/HibiKier/zhenxun_bot.git
 cd zhenxun_bot

 # 安装依赖
-pip install poetry      # 安装 poetry
-poetry install          # 安装依赖
+pip install -r requirements.txt

 # 进行基础配置
 ####请查看 配置 部分####

 # 开始运行
-poetry shell            # 进入虚拟环境
 python bot.py
 ```

@@ -239,320 +218,68 @@ python bot.py
 ```


-## 使用Docker
-__Docker 单机版（仅真寻Bot）__  
-**点击下方的 GitHub 徽标查看教程**  
-[![Github](https://shields.io/badge/GITHUB-Sakuracio-4476AF?logo=github&style=for-the-badge)](https://github.com/Sakuracio/zhenxun_bot_docker)  
-[![DOCKER](https://shields.io/badge/docker-hibikier/zhenxun_bot-4476AF?logo=docker&style=for-the-badge)](https://hub.docker.com/r/hibikier/zhenxun_bot)  
-__Docker 全量版（包含 真寻Bot PostgreSQL数据库 go-cqhttp webui等）__  
-[![Github](https://shields.io/badge/GITHUB-SinKy--Yan-4476AF?logo=github&style=for-the-badge)](https://github.com/SinKy-Yan/zhenxunbot-docker)  
-[![DOCKER](https://shields.io/badge/docker-jyishit/zhenxun_bot-4476AF?logo=docker&style=for-the-badge)](https://hub.docker.com/r/jyishit/zhenxun_bot)  
-**点击上方的 GitHub 徽标查看教程**  
-PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能无法正常启动全量版容器**
-
-## [爱发电](https://afdian.net/@HibiKier)
-<details>
-<summary>爱发电 以及 感谢投喂 </summary>
-<img width="365px" height="450px" src="https://user-images.githubusercontent.com/45528451/175059389-cfeb8174-fa07-4939-80ab-a039087a50f6.png">
-
-### 感谢名单
-(可以告诉我你的 __github__ 地址，我偷偷换掉0v|)  
-
-[阿奎](https://afdian.net/u/da41f72845d511ed930d52540025c377)  
-[醉梦尘逸](https://afdian.net/u/bc11d2683cd011ed99b552540025c377)  
-[Abc](https://afdian.net/u/870dc10a3cd311ed828852540025c377)  
-[本喵无敌哒](https://afdian.net/u/dffaa9005bc911ebb69b52540025c377)  
-[椎名冬羽](https://afdian.net/u/ca1ebd64395e11ed81b452540025c377)  
-[kaito](https://afdian.net/u/a055e20a498811eab1f052540025c377)  
-[笑柒XIAO_Q7](https://afdian.net/u/4696db5c529111ec84ea52540025c377)  
-[请问一份爱多少钱](https://afdian.net/u/f57ef6602dbd11ed977f52540025c377)  
-[咸鱼鱼鱼鱼](https://afdian.net/u/8e39b9a400e011ed9f4a52540025c377)  
-[Kafka](https://afdian.net/u/41d66798ef6911ecbc5952540025c377)  
-[墨然](https://afdian.net/u/8aa5874a644d11eb8a6752540025c377)
-[爱发电用户_T9e4](https://afdian.net/u/2ad1bb82f3a711eca22852540025c377)  
-[笑柒XIAO_Q7](https://afdian.net/u/4696db5c529111ec84ea52540025c377)  
-[noahzark](https://afdian.net/a/noahzark)  
-[腊条](https://afdian.net/u/f739c4d69eca11eba94b52540025c377)  
-[ze roller](https://afdian.net/u/0e599e96257211ed805152540025c377)  
-[爱发电用户_4jrf](https://afdian.net/u/6b2cdcc817c611ed949152540025c377)  
-[爱发电用户_TBsd](https://afdian.net/u/db638b60217911ed9efd52540025c377)  
-[烟寒若雨](https://afdian.net/u/067bd2161eec11eda62b52540025c377)  
-[ln](https://afdian.net/u/b51914ba1c6611ed8a4e52540025c377)  
-[爱发电用户_b9S4](https://afdian.net/u/3d8f30581a2911edba6d52540025c377)  
-[爱发电用户_c58s](https://afdian.net/u/a6ad8dda195e11ed9a4152540025c377)  
-[爱发电用户_eNr9](https://afdian.net/u/05fdb41c0c9a11ed814952540025c377)   
-[MangataAkihi](https://github.com/Sakuracio)   
-[炀](https://afdian.net/u/69b76e9ec77b11ec874f52540025c377)   
-[爱发电用户_Bc6j](https://afdian.net/u/8546be24f44111eca64052540025c377)  
-[大魔王](https://github.com/xipesoy)   
-[CopilotLaLaLa](https://github.com/CopilotLaLaLa)  
-[嘿小欧](https://afdian.net/u/daa4bec4f24911ec82e552540025c377)   
-[回忆的秋千](https://afdian.net/u/e315d9c6f14f11ecbeef52540025c377)  
-[十年くん](https://github.com/shinianj)
-[哇](https://afdian.net/u/9b266244f23911eca19052540025c377)  
-[yajiwa](https://github.com/yajiwa)  
-[爆金币](https://afdian.net/u/0d78879ef23711ecb22452540025c377)  
-
-
-</details>


 ## 更新

-### 2022/12/27 \[v0.1.6.6]
-
-* 添加权限检查依赖注入
-
-### 2022/12/26
-
-* 优化`gamedraw`插件
-* 提供全局被动控制
-* 群被动状态改为图片
-* 修复epic获取到的简介不是中文的bug [@pull/1221](https://github.com/HibiKier/zhenxun_bot/pull/1221)
-
-## 2022/12/24
-
-* 修复群管理员权限检测会阻挡超级用户权限
-
-### 2022/12/23
-
-* 优化`管理员帮助`，`超级用户帮助`图片
-* 重新移植`gamedraw`
-* 修复pil帮助私聊时无法生成
-
-### 2022/12/17
-
-* 修复查看插件仓库当已安装插件版本不一致时出错
-
-### 2022/12/15
-
-* 修复自定义群欢迎消息无法使用
-
-### 2022/12/13
-
-* 修复.unban
-
-### 2022/12/12
-
-* 修改HTML帮助禁用提示文本错误
-* 修复HTML帮助私聊无法生成
-
-### 2022/12/11
-
-* 词条问题支持真寻的昵称开头与at真寻开头并优化回复
-* 帮助新增HTML生成（新布局），添加配置`TYPE`切换
-* 更正私聊时功能管理回复错误
-* 修复加入新群聊时初始化功能开关错误
-* 添加单例注解
-* 添加统计表
-
-### 2022/12/10
-
-* 重写帮助，删除 `详细帮助` 命令
-
-### 2022/12/4
-
-* 优化管理代码
-
-### 2022/11/28
-
-* 修复web_ui群组无法获取
-* 修复web_ui修改插件数据时cmd格式错误
-
-### 2022/11/28
-
-* :bug: Fix a bug in open_cases to get vanilla knives' prices [@pull/1188](https://github.com/HibiKier/zhenxun_bot/pull/1188)
-
-### 2022/11/24
-
-* 修复管理员插件加载路径错误
-
-### 2022/11/23
-
-* 修复webui插件无法获取修改
-
-### 2022/11/22
-
-* fix switch_rule [@pull/1185](https://github.com/HibiKier/zhenxun_bot/pull/1185)
-
-### 2022/11/21  \[v0.1.6.5]
-
-* 优化manager, hook代码
-* 修复pid搜图 [@pull/1180](https://github.com/HibiKier/zhenxun_bot/pull/1180)
-
-### 2022/11/19
-
-* 修改优化帮助图片生成逻辑
-
-### 2022/11/18
-
-* poetry添加适配器依赖，更新支持py3.10 [@pull/1176](https://github.com/HibiKier/zhenxun_bot/pull/1176)
-
-### 2022/11/13
-
-* 更新天气api
-* 使用道具可以附带额外信息供函数使用
-* 限制帮助图片最小宽度
-
-### 2022/11/12
-
-* 更新yiqing插件数据显示 [@pull/1168](https://github.com/HibiKier/zhenxun_bot/pull/1168)
-
-### 2022/11/11
-
-* fix: B站直播订阅的相关问题 [@pull/1158](https://github.com/HibiKier/zhenxun_bot/pull/1158)
-
-### 2022/10/30
-
-* 商店简介动态行数，根据文字长度自动换行
-
-### 2022/10/28
-
-* 为exec指令进行了SELECT语句适配,添加了查看所有表指令 [@pull/1155](https://github.com/HibiKier/zhenxun_bot/pull/1155)
-* 修复复读 [@pull/1154](https://github.com/HibiKier/zhenxun_bot/pull/1154)
-
-### 2022/10/23
-
-* 复读修改回图片下载
-
-### 2022/10/22
-
-* 更新依赖注入
-
-### 2022/10/16 \[v0.1.6.4]
-
-* 修改商店道具icon可以为空
-
-### 2022/10/15
-
-* nonebot2版本更新为rc1
-* 我的道具改为图片形式
-* 商品添加图标与是否为被动道具（被动道具无法被主动使用）
-* 商品添加使用前方法和使用后方法（类似hook），使用方法具体查看文档或签到商品文件中注册的例子
-* 新增用户使用道具，花费金币(包括插件)及用途记录
-* 更细致的金币使用依赖注入
-* 更多的依赖注入（包含图片获取等等..
-* 修复我的道具仅有被动或主动道具时图片显示错误
-* 色图插件p站反向代理失效 [@pull/1139](https://github.com/HibiKier/zhenxun_bot/pull/1139)
-
-### 2022/10/9
-
-* 修复碧蓝档案角色获取问题，换源 [@pull/1124](https://github.com/HibiKier/zhenxun_bot/pull/1124)
-
-### 2022/10/7
-
-* 修复 B 站请求返回 -401 错误 [@pull/1119](https://github.com/HibiKier/zhenxun_bot/pull/1119)
-* 关闭功能与被动时不再区分大小写，同名时仅被动关闭操作生效
-
-### 2022/9/30
-
-* 修改重置开箱的使用权限 [@pull/1118](https://github.com/HibiKier/zhenxun_bot/pull/1118)
-
-### 2022/9/27
-
-*  更新b站转发解析 [@pull/1117](https://github.com/HibiKier/zhenxun_bot/pull/1117)
-
-### 2022/9/24
-
-* 修复b站订阅 [@pull/1112](https://github.com/HibiKier/zhenxun_bot/pull/1112)
-* fix: 重载赛马娘卡池失败 [@pull/1114](https://github.com/HibiKier/zhenxun_bot/pull/1114)
-
-### 2022/9/19
-
-* 更换bilibili_sub获取用户昵称用的API&尝试修了一下get_video() [@pull/1097](https://github.com/HibiKier/zhenxun_bot/pull/1097)
-* 修复csgo每日开箱可以多开一次
-
-### 2022/9/18
-
-* 修复 bilireq 版本过低导致 B 站视频解析错误 [@pull/1090](https://github.com/HibiKier/zhenxun_bot/pull/1096)
-
-### 2022/9/16
-
-* fix: bilibili_sub, azur_draw_card [@pull/1090](https://github.com/HibiKier/zhenxun_bot/pull/1090)
-* 修复原神资源查询查询完毕后图片存储错误
-* b站订阅发送 与 b站订阅 使用相同开关，即：关闭b站订阅
-
-### 2022/9/10
-
-* 自定义群欢迎消息参数不完全时提示报错
-* 修改bt插件的url地址 [@pull/1067](https://github.com/HibiKier/zhenxun_bot/pull/1067)
-
-### 2022/9/8
-
-* 添加插件数据初始化判断
-
-### 2022/9/4
-
-* 旧词条提供图片迁移（需要重新获取old_model文件，并将数据库中user_qq为0的数据删除）
-
-### 2022/9/3
-
-* 原神玩家查询增加须弥地区 [@pull/1053](https://github.com/HibiKier/zhenxun_bot/pull/1053)
-* av号覆盖全面，且修复av号链接 [@pull/1033](https://github.com/HibiKier/zhenxun_bot/pull/1033)
-* 修复词条含有CQ回答的模糊匹配无法被解析
-* 禁言检测图片在内存中获取图片hash
-* B站订阅在群里中任意群管理员可以统一管理（原来为管理员1无法删除管理员2的订阅）
-* 修复原神资源查询地图api数据变更导致更新的地图不完全
-
-### 2022/8/27
-
-* 修复签到积分双倍后，日志记录获得积分变4倍问题 [@pull/1044](https://github.com/HibiKier/zhenxun_bot/pull/1044)
-
-### 2022/8/26
-
-* 修复群管理员无法添加词条
-* 修复词条关键词"问"前空格问题
-
-### 2022/8/23
-
-* 修了下模糊匹配 issue#1026 [@pull/1026](https://github.com/HibiKier/zhenxun_bot/pull/1026)
-
-### 2022/8/22
-
-* 修复首次安装时词条旧表出错（因为根本就没有这张表！）
-* 取消配置替换定时任务，统一存储
-* 对米游社cookie进行判断，整合米游社签到信息 [@pull/1014](https://github.com/HibiKier/zhenxun_bot/pull/1014)
-* 修正尘歌壶和质变仪图片获取地址 [@pull/1010](https://github.com/HibiKier/zhenxun_bot/pull/1010)
-* 修复词库问答 **很多** 问题[@pull/1012](https://github.com/HibiKier/zhenxun_bot/pull/1012)
-
-### 2022/8/21 \[v0.1.6.3]
-
-* 重构群词条，改为词库Plus，增加 精准|模糊|正则 问题匹配，问题与回答均支持at，image，face，超级用户额外提供 全局|私聊 词库设置，数据迁移目前只提供了问题和回答都是纯文本的词条
-* 修复b站转发解析av号无法解析
-* B站订阅直播订阅支持短号
-* 开箱提供重置开箱命令，重置今日所有开箱数据（重置次数，并不会删除今日已开箱记录）
-* 提供全局字典GDict，通过from utils.utils import GDict导入
-* 适配omega 13w张图的数据结构表（建议删表重导）
-* 除首次启动外将配置替换加入单次定时任务，加快启动速度
-* fix: WordBank.check() [@pull/1008](https://github.com/HibiKier/zhenxun_bot/pull/1008)
-* 改进插件 `我有一个朋友`，避免触发过于频繁 [@pull/1001](https://github.com/HibiKier/zhenxun_bot/pull/1001)
-* 原神便笺新增洞天宝钱和参量质变仪提示 [@pull/1005](https://github.com/HibiKier/zhenxun_bot/pull/1005)
-* 新增米游社签到功能，自动领取（白嫖）米游币 [@pull/991](https://github.com/HibiKier/zhenxun_bot/pull/991)
-
-### 2022/8/14
-
-* 修复epic未获取到时间时出错
-* 修复订阅主播时动态获取的id是直播间id
-
-### 2022/8/8
-
-* 修复赛马娘重载卡池失败的问题 [@pull/969](https://github.com/HibiKier/zhenxun_bot/pull/969)
-
-### 2022/8/3
-
-* 修复 bili动态链接在投稿视频时URL和分割线连在一起 [@pull/951](https://github.com/HibiKier/zhenxun_bot/pull/961)
-* 更新 Epic 免费游戏商城链接拼接规则 [@pull/957](https://github.com/HibiKier/zhenxun_bot/pull/957)
-
-### 2022/8/6
-
-* 修复了原神自动签到返回invalid request的问题，新增查看我的cookie命令 [@pull/971](https://github.com/HibiKier/zhenxun_bot/pull/971)
+### 2021/1/5 \[v0.0.8.0]
+
+* 提供金币消费hook，可在plugins2settings.yaml中配置该功能需要消费的金币
+* 商店插件将作为内置插件移动至basic_plugins
+* 商店插件通过export提供了方法，不需要修改商店插件代码添加商品数据和生效方法
+* 修改了hook插件顺序，主要以auth_hook为主
+* 修改商店图片样式
+* 取消每次启动更新城市列表（首次除外），采用定时更新，加快bot启动速度
+* 取消每次启动时截取今日素材，采用调用时截取保存，加快bot启动速度
+* 更新色图时当图片404时会删除并替换
+* 疫情消息回复改为图片
+* 修复商店折扣和限时时间无法生效
+* 修复原神玩家查询尘歌壶缺少图片
+
+### 2021/12/26
+
+* 修复群词条问题 空格 会被录入导致不断回复
+* 修复米游社app替换api导致无法正常查询
+
+### 2021/12/24
+
+* 支持国际疫情数据查询 [@pull/99](https://github.com/HibiKier/zhenxun_bot/pull/99)
+
+### 2021/12/20
+
+* 只有发布小于存储时间的新动态/视频的时候才获取并推送 [@pull/96](https://github.com/HibiKier/zhenxun_bot/pull/96)
+
+### 2021/12/16 \[v0.0.7.0]
+
+* 提供了真寻群聊功能总开关和对应默认配置项，命令：休息吧 醒来
+* 新增原神玩家查询，原神便笺查询
+* 群功能管理提供全部开启/关闭命令：开启/关闭全部功能
+* 提供主要数据自动备份，且提供自定义配置项
+* 提供命令：关于，用于介绍Bot之类的
+* 新增命令exec，用于执行sql语句
+* 签到提供参数 "all"，用于签到所有群聊
+* Ban提醒提供cd
+* 本地图库提供配置项SHOW_ID，用于设置发送图片时是否显示id
+* 色图和PIX提供配置项SHOW_INFO，用于设置发送图片时是否显示图片信息
+* 所有被动技能提供了进群默认状态配置项
+* 修复添加权限第二种添加形式无法正确添加正确的权限
+* 修复签到获取好感度卡时金币不会增加
+* 修复当红包数量不合法时依旧扣除金币
+* 修复金币红包再次使用塞红包时无法正确退回上次未开完的金币
+* 修复 滴滴滴- 只包含图片时不会发送至管理员
+* 修复添加权限等级错误
+* 修复群词条以bot名称为开头时无法正确触发
+* 修改了权限插件加载顺序防止小概率优先加载权限插件引起报错
+* 本地图库新图库会统一建立在resource/img/image_management文件夹下，如果该文件夹内未找到图库，会从上级目录查找（即：resource/img/）

 <br>

 __..... 更多更新信息请查看文档__

+
 ## Todo
- [x] web管理
+- [ ] docker容器
+- [ ] web管理

 ## 感谢
 [botuniverse / onebot](https://github.com/botuniverse/onebot) ：超棒的机器人协议  
@@ -566,5 +293,5 @@ __..... 更多更新信息请查看文档__
 [H-K-Y / Genshin_Impact_bot](https://github.com/H-K-Y/Genshin_Impact_bot) ：原神bot，这是一个基于nonebot和HoshinoBot的原神娱乐及信息查询插件  
 [NothAmor / nonebot2_luxun_says](https://github.com/NothAmor/nonebot2_luxun_says) ：基于nonebot2机器人框架的鲁迅说插件  
 [Kyomotoi / AnimeThesaurus](https://github.com/Kyomotoi/AnimeThesaurus) ：一个~~特二刺螈~~（文爱）的适用于任何bot的词库  
-[Ailitonia / omega-miya](https://github.com/Ailitonia/omega-miya) ：基于nonebot2的qq机器人  
-[KimigaiiWuyi / GenshinUID](https://github.com/KimigaiiWuyi/GenshinUID) ：一个基于HoshinoBot/NoneBot2的原神UID查询插件
+[Ailitonia / omega-miya](https://github.com/Ailitonia/omega-miya) ：基于nonebot2的qq机器人
+[KimigaiiWuyi / GenshinUID]("https://github.com/KimigaiiWuyi/GenshinUID") ：一个基于HoshinoBot/NoneBot2的原神UID查询插件
@@ -1 +1 @@
-__version__: v0.1.6.6
+__version__: v0.0.8.0
@@ -1,5 +1,3 @@
-from pathlib import Path
-
 from configs.config import Config
 import nonebot

@@ -29,4 +27,4 @@ Config.add_plugin_config(
    default_value=5
 )

-nonebot.load_plugins(str(Path(__file__).parent.resolve()))
+nonebot.load_plugins("basic_plugins/admin_bot_manage")
@@ -1,6 +1,7 @@
 from nonebot import on_notice
 from services.log import logger
-from nonebot.adapters.onebot.v11 import GroupAdminNoticeEvent
+from nonebot.adapters.cqhttp import Bot, GroupAdminNoticeEvent
+from nonebot.typing import T_State
 from models.level_user import LevelUser
 from models.group_member_info import GroupInfoUser
 from configs.config import Config
@@ -15,7 +16,7 @@ admin_notice = on_notice(priority=5)


@admin_notice.handle()
-async def _(event: GroupAdminNoticeEvent):
+async def _(bot: Bot, event: GroupAdminNoticeEvent, state: T_State):
    try:
        nickname = (
            await GroupInfoUser.get_member_info(event.user_id, event.group_id)
@@ -1,13 +1,11 @@
-from typing import List
-
 from nonebot import on_command
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
-from nonebot.params import CommandArg
-from ._data_source import custom_group_welcome
-from nonebot.adapters.onebot.v11.permission import GROUP
+from utils.utils import get_message_text, get_message_imgs
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
+from .data_source import custom_group_welcome
+from nonebot.adapters.cqhttp.permission import GROUP
 from configs.config import Config
 from services.log import logger
-from utils.depends import ImageList


 __zx_plugin_name__ = "自定义进群欢迎消息 [Admin]"
@@ -37,13 +35,14 @@ custom_welcome = on_command(


@custom_welcome.handle()
-async def _(event: GroupMessageEvent, arg: Message = CommandArg(), img: List[str] = ImageList()):
-    msg = arg.extract_plain_text().strip()
-    if not msg and not img:
-        await custom_welcome.finish(__plugin_usage__)
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    try:
+        msg = get_message_text(event.json())
+        imgs = get_message_imgs(event.json())
+        if not msg and not imgs:
+            await custom_welcome.finish(__plugin_usage__)
        await custom_welcome.send(
-            await custom_group_welcome(msg, img, event.user_id, event.group_id),
+            await custom_group_welcome(msg, imgs, event.user_id, event.group_id),
            at_sender=True,
        )
        logger.info(f"USER {event.user_id} GROUP {event.group_id} 自定义群欢迎消息：{msg}")
@@ -1,384 +1,319 @@
-from typing import List
-from nonebot.adapters.onebot.v11.message import MessageSegment
-from services.log import logger
-from configs.path_config import DATA_PATH, IMAGE_PATH
-from utils.message_builder import image
-from utils.utils import get_bot, get_matchers
-from pathlib import Path
-from models.group_member_info import GroupInfoUser
-from datetime import datetime
-from services.db_context import db
-from models.level_user import LevelUser
-from configs.config import Config
-from utils.manager import group_manager, plugins2settings_manager, plugins_manager
-from utils.image_utils import BuildImage
-from utils.http_utils import AsyncHttpx
-import asyncio
-import time
-import os
-import ujson as json
-
-
-custom_welcome_msg_json = (
-    Path() / "data" / "custom_welcome_msg" / "custom_welcome_msg.json"
-)
-
-ICON_PATH = IMAGE_PATH / 'other'
-
-
-async def group_current_status(group_id: int) -> str:
-    """
-    说明:
-        获取当前群聊所有通知的开关
-    参数:
-        :param group_id: 群号
-    """
-    _data = group_manager.get_task_data()
-    image_list = []
-    for i, task in enumerate(_data):
-        name = _data[task]
-        name_image = BuildImage(0, 0, plain_text=f"{i+1}.{name}", font_size=20)
-        bk = BuildImage(name_image.w + 200, name_image.h + 20, color=(103, 177, 109), font_size=15)
-        await bk.apaste(name_image, (10, 0), True, "by_height")
-        a_icon = BuildImage(40, 40, background=ICON_PATH / "btn_false.png")
-        if group_manager.check_group_task_status(group_id, task):
-            a_icon = BuildImage(40, 40, background=ICON_PATH / "btn_true.png")
-        b_icon = BuildImage(40, 40, background=ICON_PATH / "btn_false.png")
-        if group_manager.check_task_super_status(task):
-            b_icon = BuildImage(40, 40, background=ICON_PATH / "btn_true.png")
-        await bk.atext((name_image.w + 20, 10), "状态")
-        await bk.apaste(a_icon, (name_image.w + 50, 0), True)
-        await bk.atext((name_image.w + 100, 10), "全局")
-        await bk.apaste(b_icon, (name_image.w + 130, 0), True)
-        image_list.append(bk)
-    w = max([x.w for x in image_list])
-    h = sum([x.h + 10 for x in image_list])
-    A = BuildImage(w + 20, h + 70, font_size=30, color=(119, 97, 177))
-    await A.atext((15, 20), "群被动状态")
-    curr_h = 75
-    for img in image_list:
-        # await img.acircle_corner()
-        await A.apaste(img, (0, curr_h), True)
-        curr_h += img.h + 10
-    return A.pic2bs4()
-
-
-async def custom_group_welcome(
-    msg: str, img_list: List[str], user_id: int, group_id: int
-) -> str:
-    """
-    说明:
-        替换群欢迎消息
-    参数:
-        :param msg: 欢迎消息文本
-        :param img_list: 欢迎消息图片，只取第一张
-        :param user_id: 用户id，用于log记录
-        :param group_id: 群号
-    """
-    img_result = ""
-    result = ""
-    img = img_list[0] if img_list else ""
-    if (DATA_PATH / f"custom_welcome_msg/{group_id}.jpg").exists():
-        (DATA_PATH / f"custom_welcome_msg/{group_id}.jpg").unlink()
-    data = {}
-    if not custom_welcome_msg_json.exists():
-        custom_welcome_msg_json.parent.mkdir(parents=True, exist_ok=True)
-    else:
-        try:
-            data = json.load(open(custom_welcome_msg_json, "r"))
-        except FileNotFoundError:
-            pass
-    try:
-        if msg:
-            data[str(group_id)] = str(msg)
-            json.dump(
-                data, open(custom_welcome_msg_json, "w"), indent=4, ensure_ascii=False
-            )
-            logger.info(f"USER {user_id} GROUP {group_id} 更换群欢迎消息 {msg}")
-            result += msg
-        if img:
-            await AsyncHttpx.download_file(
-                img, DATA_PATH / "custom_welcome_msg" / f"{group_id}.jpg"
-            )
-            img_result = image(DATA_PATH / "custom_welcome_msg" / f"{group_id}.jpg")
-            logger.info(f"USER {user_id} GROUP {group_id} 更换群欢迎消息图片")
-    except Exception as e:
-        logger.error(f"GROUP {group_id} 替换群消息失败 e:{e}")
-        return "替换群消息失败.."
-    return f"替换群欢迎消息成功：\n{result}" + img_result
-
-
-task_data = None
-
-
-def change_global_task_status(cmd: str) -> str:
-    """
-    说明:
-        修改全局被动任务状态
-    参数:
-        :param cmd: 功能名称
-    """
-    global task_data
-    if not task_data:
-        task_data = group_manager.get_task_data()
-    status = cmd[:2]
-    _cmd = cmd[4:]
-    if '全部被动' in cmd:
-        for task in task_data:
-            if status == "开启":
-                group_manager.open_global_task(task)
-            else:
-                group_manager.close_global_task(task)
-        group_manager.save()
-        return f"已 {status} 全局全部被动技能！"
-    else:
-        modules = [x for x in task_data if task_data[x].lower() == _cmd.lower()]
-        if not modules:
-            return '未查询到该被动任务'
-        if status == "开启":
-            group_manager.open_global_task(modules[0])
-        else:
-            group_manager.close_global_task(modules[0])
-        group_manager.save()
-        return f"已 {status} 全局{_cmd}"
-
-
-async def change_group_switch(cmd: str, group_id: int, is_super: bool = False) -> str:
-    """
-    说明:
-        修改群功能状态
-    参数:
-        :param cmd: 功能名称
-        :param group_id: 群号
-        :param is_super: 是否位超级用户，超级用户用于私聊开关功能状态
-    """
-    global task_data
-    if not task_data:
-        task_data = group_manager.get_task_data()
-    group_help_file = DATA_PATH / "group_help" / f"{group_id}.png"
-    status = cmd[:2]
-    cmd = cmd[2:]
-    type_ = "plugin"
-    modules = plugins2settings_manager.get_plugin_module(cmd, True)
-    if cmd == "全部被动":
-        for task in task_data:
-            if status == "开启":
-                if not group_manager.check_group_task_status(group_id, task):
-                    group_manager.open_group_task(group_id, task)
-            else:
-                if group_manager.check_group_task_status(group_id, task):
-                    group_manager.close_group_task(group_id, task)
-        if group_help_file.exists():
-            group_help_file.unlink()
-        return f"已 {status} 全部被动技能！"
-    if cmd == "全部功能":
-        for f in plugins2settings_manager.get_data():
-            if status == "开启":
-                group_manager.unblock_plugin(f, group_id, False)
-            else:
-                group_manager.block_plugin(f, group_id, False)
-        group_manager.save()
-        if group_help_file.exists():
-            group_help_file.unlink()
-        return f"已 {status} 全部功能！"
-    if cmd.lower() in [task_data[x].lower() for x in task_data.keys()]:
-        type_ = "task"
-        modules = [x for x in task_data.keys() if task_data[x].lower() == cmd.lower()]
-    for module in modules:
-        if is_super:
-            module = f"{module}:super"
-        if status == "开启":
-            if type_ == "task":
-                if group_manager.check_group_task_status(group_id, module):
-                    return f"被动 {task_data[module]} 正处于开启状态！不要重复开启."
-                group_manager.open_group_task(group_id, module)
-            else:
-                if group_manager.get_plugin_status(module, group_id):
-                    return f"功能 {cmd} 正处于开启状态！不要重复开启."
-                group_manager.unblock_plugin(module, group_id)
-        else:
-            if type_ == "task":
-                if not group_manager.check_group_task_status(group_id, module):
-                    return f"被动 {task_data[module]} 正处于关闭状态！不要重复关闭."
-                group_manager.close_group_task(group_id, module)
-            else:
-                if not group_manager.get_plugin_status(module, group_id):
-                    return f"功能 {cmd} 正处于关闭状态！不要重复关闭."
-                group_manager.block_plugin(module, group_id)
-    if group_help_file.exists():
-        group_help_file.unlink()
-    if is_super:
-        for file in os.listdir(DATA_PATH / "group_help"):
-            file = DATA_PATH / "group_help" / file
-            file.unlink()
-    else:
-        _help_image = DATA_PATH / "group_help" / f"{group_id}.png"
-        if _help_image.exists():
-            _help_image.unlink()
-    return f"{status} {cmd} 功能！"
-
-
-def set_plugin_status(cmd: str, block_type: str = "all"):
-    """
-    说明:
-        设置插件功能状态（超级用户使用）
-    参数:
-        :param cmd: 功能名称
-        :param block_type: 限制类型, 'all': 私聊+群里, 'private': 私聊, 'group': 群聊
-    """
-    status = cmd[:2]
-    cmd = cmd[2:]
-    module = plugins2settings_manager.get_plugin_module(cmd)
-    if status == "开启":
-        plugins_manager.unblock_plugin(module)
-    else:
-        plugins_manager.block_plugin(module, block_type=block_type)
-    for file in os.listdir(DATA_PATH / "group_help"):
-        file = DATA_PATH / "group_help" / file
-        file.unlink()
-
-
-async def get_plugin_status():
-    """
-    说明:
-        获取功能状态
-    """
-    return await asyncio.get_event_loop().run_in_executor(None, _get_plugin_status)
-
-
-def _get_plugin_status() -> MessageSegment:
-    """
-    说明:
-        合成功能状态图片
-    """
-    rst = "\t功能\n"
-    flag_str = "状态".rjust(4) + "\n"
-    tmp_name = []
-    for matcher in get_matchers():
-        if matcher.plugin_name not in tmp_name:
-            tmp_name.append(matcher.plugin_name)
-            module = matcher.plugin_name
-            flag = plugins_manager.get_plugin_block_type(module)
-            flag = flag.upper() + " CLOSE" if flag else "OPEN"
-            try:
-                plugin_name = plugins_manager.get(module).plugin_name
-                if (
-                    "[Hidden]" in plugin_name
-                    or "[Admin]" in plugin_name
-                    or "[Superuser]" in plugin_name
-                ):
-                    continue
-                rst += f"{plugin_name}"
-            except KeyError:
-                rst += f"{module}"
-            if plugins_manager.get(module).error:
-                rst += "[ERROR]"
-            rst += "\n"
-            flag_str += f"{flag}\n"
-    height = len(rst.split("\n")) * 24
-    a = BuildImage(250, height, font_size=20)
-    a.text((10, 10), rst)
-    b = BuildImage(200, height, font_size=20)
-    b.text((10, 10), flag_str)
-    A = BuildImage(500, height)
-    A.paste(a)
-    A.paste(b, (270, 0))
-    return image(b64=A.pic2bs4())
-
-
-async def update_member_info(group_id: int, remind_superuser: bool = False) -> bool:
-    """
-    说明:
-        更新群成员信息
-    参数:
-        :param group_id: 群号
-        :param remind_superuser: 失败信息提醒超级用户
-    """
-    bot = get_bot()
-    _group_user_list = await bot.get_group_member_list(group_id=group_id)
-    _error_member_list = []
-    _exist_member_list = []
-    # try:
-    for user_info in _group_user_list:
-        nickname = user_info["card"] or user_info["nickname"]
-        async with db.transaction():
-            # 更新权限
-            if user_info["role"] in [
-                "owner",
-                "admin",
-            ] and not await LevelUser.is_group_flag(user_info["user_id"], group_id):
-                await LevelUser.set_level(
-                    user_info["user_id"],
-                    user_info["group_id"],
-                    Config.get_config("admin_bot_manage", "ADMIN_DEFAULT_AUTH"),
-                )
-            if str(user_info["user_id"]) in bot.config.superusers:
-                await LevelUser.set_level(
-                    user_info["user_id"], user_info["group_id"], 9
-                )
-            user = await GroupInfoUser.get_member_info(
-                user_info["user_id"], user_info["group_id"]
-            )
-            if user:
-                if user.user_name != nickname:
-                    await user.update(user_name=nickname).apply()
-                    logger.info(
-                        f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新群昵称成功"
-                    )
-                _exist_member_list.append(int(user_info["user_id"]))
-                continue
-            join_time = datetime.strptime(
-                time.strftime(
-                    "%Y-%m-%d %H:%M:%S", time.localtime(user_info["join_time"])
-                ),
-                "%Y-%m-%d %H:%M:%S",
-            )
-            if await GroupInfoUser.add_member_info(
-                user_info["user_id"],
-                user_info["group_id"],
-                nickname,
-                join_time,
-            ):
-                _exist_member_list.append(int(user_info["user_id"]))
-                logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新成功")
-            else:
-                _error_member_list.append(
-                    f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新失败\n"
-                )
-    _del_member_list = list(
-        set(_exist_member_list).difference(
-            set(await GroupInfoUser.get_group_member_id_list(group_id))
-        )
-    )
-    if _del_member_list:
-        for del_user in _del_member_list:
-            if await GroupInfoUser.delete_member_info(del_user, group_id):
-                logger.info(f"退群用户{del_user} 所属{group_id} 已删除")
-            else:
-                logger.info(f"退群用户{del_user} 所属{group_id} 删除失败")
-    if _error_member_list and remind_superuser:
-        result = ""
-        for error_user in _error_member_list:
-            result += error_user
-        await bot.send_private_msg(
-            user_id=int(list(bot.config.superusers)[0]), message=result[:-1]
-        )
-    return True
-
-
-def set_group_bot_status(group_id: int, status: bool) -> str:
-    """
-    说明:
-        设置群聊bot开关状态
-    参数:
-        :param group_id: 群号
-        :param status: 状态
-    """
-    if status:
-        if group_manager.check_group_bot_status(group_id):
-            return "我还醒着呢！"
-        group_manager.turn_on_group_bot_status(group_id)
-        return "呜..醒来了..."
-    else:
-        group_manager.shutdown_group_bot_status(group_id)
-        return "那我先睡觉了..."
+from typing import List
+from nonebot.adapters.cqhttp.message import MessageSegment
+from services.log import logger
+from configs.path_config import DATA_PATH
+from utils.message_builder import image
+from utils.utils import get_local_proxy, get_bot
+from pathlib import Path
+from models.group_member_info import GroupInfoUser
+from datetime import datetime
+from services.db_context import db
+from models.level_user import LevelUser
+from configs.config import Config
+from utils.manager import group_manager, plugins2settings_manager, plugins_manager
+from utils.image_utils import BuildImage
+from utils.http_utils import AsyncHttpx
+import asyncio
+import time
+import os
+
+try:
+    import ujson as json
+except ModuleNotFoundError:
+    import json
+
+
+async def group_current_status(group_id: int) -> str:
+    """
+    获取当前所有通知的开关
+    :param group_id: 群号
+    """
+    rst = "[被动技能 状态]\n"
+    _data = group_manager.get_task_data()
+    for task in _data.keys():
+        rst += f'{_data[task]}: {"√" if await group_manager.check_group_task_status(group_id, task) else "×"}\n'
+    return rst.strip()
+
+
+custom_welcome_msg_json = (
+    Path() / "data" / "custom_welcome_msg" / "custom_welcome_msg.json"
+)
+
+
+async def custom_group_welcome(
+    msg: str, imgs: List[str], user_id: int, group_id: int
+) -> str:
+    """
+    替换群欢迎消息
+    :param msg: 欢迎消息文本
+    :param imgs: 欢迎消息图片，只取第一张
+    :param user_id: 用户id，用于log记录
+    :param group_id: 群号
+    """
+    img_result = ""
+    img = imgs[0] if imgs else ""
+    result = ""
+    if os.path.exists(DATA_PATH + f"custom_welcome_msg/{group_id}.jpg"):
+        os.remove(DATA_PATH + f"custom_welcome_msg/{group_id}.jpg")
+    if not custom_welcome_msg_json.exists():
+        custom_welcome_msg_json.parent.mkdir(parents=True, exist_ok=True)
+        data = {}
+    else:
+        try:
+            data = json.load(open(custom_welcome_msg_json, "r"))
+        except FileNotFoundError:
+            data = {}
+    try:
+        if msg:
+            data[str(group_id)] = str(msg)
+            json.dump(
+                data, open(custom_welcome_msg_json, "w"), indent=4, ensure_ascii=False
+            )
+            logger.info(f"USER {user_id} GROUP {group_id} 更换群欢迎消息 {msg}")
+            result += msg
+        if img:
+            await AsyncHttpx.download_file(
+                img, DATA_PATH + f"custom_welcome_msg/{group_id}.jpg"
+            )
+            img_result = image(abspath=DATA_PATH + f"custom_welcome_msg/{group_id}.jpg")
+            logger.info(f"USER {user_id} GROUP {group_id} 更换群欢迎消息图片")
+    except Exception as e:
+        logger.error(f"GROUP {group_id} 替换群消息失败 e:{e}")
+        return "替换群消息失败.."
+    return f"替换群欢迎消息成功：\n{result}" + img_result
+
+
+task_data = None
+
+
+async def change_group_switch(cmd: str, group_id: int, is_super: bool = False):
+    global task_data
+    """
+    修改群功能状态
+    :param cmd: 功能名称
+    :param group_id: 群号
+    :param is_super: 是否位超级用户，超级用户用于私聊开关功能状态
+    """
+    if not task_data:
+        task_data = group_manager.get_task_data()
+    group_help_file = Path(DATA_PATH) / "group_help" / f"{group_id}.png"
+    status = cmd[:2]
+    cmd = cmd[2:]
+    type_ = "plugin"
+    modules = plugins2settings_manager.get_plugin_module(cmd, True)
+    if cmd == "全部被动":
+        for task in task_data:
+            if status == "开启":
+                if not await group_manager.check_group_task_status(group_id, task):
+                    await group_manager.open_group_task(group_id, task)
+            else:
+                if await group_manager.check_group_task_status(group_id, task):
+                    await group_manager.close_group_task(group_id, task)
+        if group_help_file.exists():
+            group_help_file.unlink()
+        return f"已 {status} 全部被动技能！"
+    if cmd == "全部功能":
+        for f in plugins2settings_manager.get_data():
+            if status == "开启":
+                group_manager.unblock_plugin(f, group_id)
+            else:
+                group_manager.block_plugin(f, group_id)
+        return f"已 {status} 全部功能！"
+    if cmd in [task_data[x] for x in task_data.keys()]:
+        type_ = "task"
+        modules = [x for x in task_data.keys() if task_data[x] == cmd]
+    for module in modules:
+        if is_super:
+            module = f"{module}:super"
+        if status == "开启":
+            if type_ == "task":
+                if await group_manager.check_group_task_status(group_id, module):
+                    return f"被动 {task_data[module]} 正处于开启状态！不要重复开启."
+                await group_manager.open_group_task(group_id, module)
+            else:
+                if group_manager.get_plugin_status(module, group_id):
+                    return f"功能 {cmd} 正处于开启状态！不要重复开启."
+                group_manager.unblock_plugin(module, group_id)
+        else:
+            if type_ == "task":
+                if not await group_manager.check_group_task_status(group_id, module):
+                    return f"被动 {task_data[module]} 正处于关闭状态！不要重复关闭."
+                await group_manager.close_group_task(group_id, module)
+            else:
+                if not group_manager.get_plugin_status(module, group_id):
+                    return f"功能 {cmd} 正处于关闭状态！不要重复关闭."
+                group_manager.block_plugin(module, group_id)
+    if group_help_file.exists():
+        group_help_file.unlink()
+    if is_super:
+        for file in os.listdir(Path(DATA_PATH) / "group_help"):
+            file = Path(DATA_PATH) / "group_help" / file
+            file.unlink()
+    else:
+        _help_image = Path(DATA_PATH) / "group_help" / f"{group_id}.png"
+        if _help_image.exists():
+            _help_image.unlink()
+    return f"{status} {cmd} 功能！"
+
+
+def set_plugin_status(cmd: str, block_type: str = "all"):
+    """
+    设置插件功能状态（超级用户使用）
+    :param cmd: 功能名称
+    :param block_type: 限制类型, 'all': 私聊+群里, 'private': 私聊, 'group': 群聊
+    """
+    status = cmd[:2]
+    cmd = cmd[2:]
+    module = plugins2settings_manager.get_plugin_module(cmd)
+    if status == "开启":
+        plugins_manager.unblock_plugin(module)
+    else:
+        plugins_manager.block_plugin(module, block_type=block_type)
+    for file in os.listdir(Path(DATA_PATH) / "group_help"):
+        file = Path(DATA_PATH) / "group_help" / file
+        file.unlink()
+
+
+async def get_plugin_status():
+    """
+    获取功能状态
+    """
+    return await asyncio.get_event_loop().run_in_executor(None, _get_plugin_status)
+
+
+def _get_plugin_status() -> MessageSegment:
+    """
+    合成功能状态图片
+    """
+    rst = "\t功能\n"
+    flag_str = "状态".rjust(4) + "\n"
+    for module in plugins_manager.get_data():
+        flag = plugins_manager.get_plugin_block_type(module)
+        flag = flag.upper() + " CLOSE" if flag else "OPEN"
+        try:
+            plugin_name = plugins_manager.get(module)["plugin_name"]
+            if (
+                "[Hidden]" in plugin_name
+                or "[Admin]" in plugin_name
+                or "[Superuser]" in plugin_name
+            ):
+                continue
+            rst += f"{plugin_name}"
+        except KeyError:
+            rst += f"{module}"
+        if plugins_manager.get(module)["error"]:
+            rst += "[ERROR]"
+        rst += "\n"
+        flag_str += f"{flag}\n"
+    height = len(rst.split("\n")) * 24
+    a = BuildImage(250, height, font_size=20)
+    a.text((10, 10), rst)
+    b = BuildImage(200, height, font_size=20)
+    b.text((10, 10), flag_str)
+    A = BuildImage(500, height)
+    A.paste(a)
+    A.paste(b, (270, 0))
+    return image(b64=A.pic2bs4())
+
+
+async def update_member_info(group_id: int, remind_superuser: bool = False) -> bool:
+    """
+    更新群成员信息
+    :param group_id: 群号
+    :param remind_superuser: 失败信息提醒超级用户
+    """
+    bot = get_bot()
+    _group_user_list = await bot.get_group_member_list(group_id=group_id)
+    _error_member_list = []
+    _exist_member_list = []
+    # try:
+    for user_info in _group_user_list:
+        if user_info["card"] == "":
+            nickname = user_info["nickname"]
+        else:
+            nickname = user_info["card"]
+        async with db.transaction():
+            # 更新权限
+            if (
+                user_info["role"]
+                in [
+                    "owner",
+                    "admin",
+                ]
+                and not await LevelUser.is_group_flag(user_info["user_id"], group_id)
+            ):
+                await LevelUser.set_level(
+                    user_info["user_id"],
+                    user_info["group_id"],
+                    Config.get_config("admin_bot_manage", "ADMIN_DEFAULT_AUTH"),
+                )
+            if str(user_info["user_id"]) in bot.config.superusers:
+                await LevelUser.set_level(
+                    user_info["user_id"], user_info["group_id"], 9
+                )
+            user = await GroupInfoUser.get_member_info(
+                user_info["user_id"], user_info["group_id"]
+            )
+            if user:
+                if user.user_name != nickname:
+                    await user.update(user_name=nickname).apply()
+                    logger.info(
+                        f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新群昵称成功"
+                    )
+                _exist_member_list.append(int(user_info["user_id"]))
+                continue
+            join_time = datetime.strptime(
+                time.strftime(
+                    "%Y-%m-%d %H:%M:%S", time.localtime(user_info["join_time"])
+                ),
+                "%Y-%m-%d %H:%M:%S",
+            )
+            if await GroupInfoUser.add_member_info(
+                user_info["user_id"],
+                user_info["group_id"],
+                nickname,
+                join_time,
+            ):
+                _exist_member_list.append(int(user_info["user_id"]))
+                logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新成功")
+            else:
+                _error_member_list.append(
+                    f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新失败\n"
+                )
+    _del_member_list = list(
+        set(_exist_member_list).difference(
+            set(await GroupInfoUser.get_group_member_id_list(group_id))
+        )
+    )
+    if _del_member_list:
+        for del_user in _del_member_list:
+            if await GroupInfoUser.delete_member_info(del_user, group_id):
+                logger.info(f"退群用户{del_user} 所属{group_id} 已删除")
+            else:
+                logger.info(f"退群用户{del_user} 所属{group_id} 删除失败")
+    if _error_member_list and remind_superuser:
+        result = ""
+        for error_user in _error_member_list:
+            result += error_user
+        await bot.send_private_msg(
+            user_id=int(list(bot.config.superusers)[0]), message=result[:-1]
+        )
+    return True
+
+
+def set_group_bot_status(group_id: int, status: bool) -> str:
+    """
+    设置群聊bot开关状态
+    :param group_id: 群号
+    :param status: 状态
+    """
+    if status:
+        if group_manager.check_group_bot_status(group_id):
+            return "我还醒着呢！"
+        group_manager.turn_on_group_bot_status(group_id)
+        return "呜..醒来了..."
+    else:
+        group_manager.shutdown_group_bot_status(group_id)
+        # for x in group_manager.get_task_data():
+        #     group_manager.close_group_task(group_id, x)
+        return "那我先睡觉了..."
@@ -1,50 +1,39 @@
-from nonebot.adapters.onebot.v11 import Event
+from nonebot.adapters.cqhttp import Bot, Event
+from nonebot.typing import T_State
 from utils.manager import group_manager, plugins2settings_manager
 from utils.utils import get_message_text
 from services.log import logger
-import time

 cmd = []

-v = time.time()

-
-def switch_rule(event: Event) -> bool:
+def switch_rule(bot: Bot, event: Event, state: T_State) -> bool:
    """
-    说明:
-        检测文本是否是关闭功能命令
-    参数:
-        :param event: pass
+    检测文本是否是关闭功能命令
+    :param bot: pass
+    :param event: pass
+    :param state: pass
    """
-    global cmd, v
+    global cmd
    try:
-        if not cmd or time.time() - v > 60 * 60:
+        if not cmd:
            cmd = ["关闭全部被动", "开启全部被动", "开启全部功能", "关闭全部功能"]
            _data = group_manager.get_task_data()
            for key in _data:
                cmd.append(f"开启{_data[key]}")
                cmd.append(f"关闭{_data[key]}")
-                cmd.append(f"开启被动{_data[key]}")
-                cmd.append(f"关闭被动{_data[key]}")
                cmd.append(f"开启 {_data[key]}")
                cmd.append(f"关闭 {_data[key]}")
            _data = plugins2settings_manager.get_data()
-            for key in _data.keys():
+            for key in _data:
                try:
-                    if isinstance(_data[key].cmd, list):
-                        for x in _data[key].cmd:
-                            cmd.append(f"开启{x}")
-                            cmd.append(f"关闭{x}")
-                            cmd.append(f"开启 {x}")
-                            cmd.append(f"关闭 {x}")
-                    else:
-                        cmd.append(f"开启{key}")
-                        cmd.append(f"关闭{key}")
-                        cmd.append(f"开启 {key}")
-                        cmd.append(f"关闭 {key}")
+                    for x in _data[key]["cmd"]:
+                        cmd.append(f"开启{x}")
+                        cmd.append(f"关闭{x}")
+                        cmd.append(f"开启 {x}")
+                        cmd.append(f"关闭 {x}")
                except KeyError:
                    pass
-            v = time.time()
        msg = get_message_text(event.json()).split()
        msg = msg[0] if msg else ""
        return msg in cmd
@@ -1,21 +1,19 @@
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageEvent, GROUP, PrivateMessageEvent
 from nonebot import on_command, on_message, on_regex
-from nonebot.params import RegexGroup
-
-from utils.message_builder import image
-from ._data_source import (
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, MessageEvent, GROUP
+from .data_source import (
    change_group_switch,
    set_plugin_status,
    get_plugin_status,
    group_current_status,
-    set_group_bot_status, change_global_task_status
+    set_group_bot_status
 )
 from services.log import logger
 from configs.config import NICKNAME, Config
 from utils.utils import get_message_text, is_number
 from nonebot.permission import SUPERUSER
-from typing import Tuple, Any
 from .rule import switch_rule
+import re


 __zx_plugin_name__ = "群功能开关 [Admin]"
@@ -33,12 +31,11 @@ usage：
 """.strip()
 __plugin_superuser_usage__ = """
 usage:
-    （私聊）功能总开关与指定群禁用
+    功能总开关与指定群禁用
    指令：
        功能状态
        开启/关闭[功能] [group]
        开启/关闭[功能] ['private'/'group']
-        开启被动/关闭被动[被动名称]     # 全局被动控制
 """.strip()
 __plugin_des__ = "群内功能开关"
 __plugin_cmd__ = [
@@ -68,7 +65,7 @@ group_status = on_regex("^(休息吧|醒来)$", permission=GROUP, priority=5, bl


@switch_rule_matcher.handle()
-async def _(bot: Bot, event: MessageEvent):
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    _cmd = get_message_text(event.json()).split()[0]
    if isinstance(event, GroupMessageEvent):
        await switch_rule_matcher.send(await change_group_switch(_cmd, event.group_id))
@@ -77,12 +74,10 @@ async def _(bot: Bot, event: MessageEvent):
        if str(event.user_id) in bot.config.superusers:
            block_type = " ".join(get_message_text(event.json()).split()[1:])
            block_type = block_type if block_type else "a"
-            if ("关闭被动" in _cmd or "开启被动" in _cmd) and isinstance(event, PrivateMessageEvent):
-                await switch_rule_matcher.send(change_global_task_status(_cmd))
-            elif is_number(block_type):
+            if is_number(block_type):
                if not int(block_type) in [
                    g["group_id"]
-                    for g in await bot.get_group_list()
+                    for g in await bot.get_group_list(self_id=int(bot.self_id))
                ]:
                    await switch_rule_matcher.finish(f"{NICKNAME}未加入群聊：{block_type}")
                await change_group_switch(_cmd, int(block_type), True)
@@ -90,7 +85,7 @@ async def _(bot: Bot, event: MessageEvent):
                    "group_name"
                ]
                await switch_rule_matcher.send(
-                    f"已{_cmd[:2]}群聊 {group_name}({block_type}) 的 {_cmd[2:]} 功能"
+                    f"已禁用群聊 {group_name}({block_type}) 的 {_cmd[2:]} 功能"
                )
            elif block_type in ["all", "private", "group", "a", "p", "g"]:
                block_type = "all" if block_type == "a" else block_type
@@ -109,21 +104,22 @@ async def _(bot: Bot, event: MessageEvent):


@plugins_status.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    await plugins_status.send(await get_plugin_status())


@group_task_status.handle()
-async def _(event: GroupMessageEvent):
-    await group_task_status.send(image(b64=await group_current_status(event.group_id)))
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+    await group_task_status.send(await group_current_status(event.group_id))


@group_status.handle()
-async def _(event: GroupMessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()):
-    cmd = reg_group[0]
-    if cmd == "休息吧":
-        msg = set_group_bot_status(event.group_id, False)
-    else:
-        msg = set_group_bot_status(event.group_id, True)
-    await group_status.send(msg)
-    logger.info(f"USER {event.user_id} GROUP {event.group_id} 使用总开关命令：{cmd}")
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+    r = re.search("^(休息吧|醒来)$", get_message_text(event.json()))
+    if r:
+        if r.group(1) == "休息吧":
+            msg = set_group_bot_status(event.group_id, False)
+        else:
+            msg = set_group_bot_status(event.group_id, True)
+        await group_status.send(msg)
+        logger.info(f"USER {event.user_id} GROUP {event.group_id} 使用总开关命令：{r.group(1)}")
@@ -1,5 +1,5 @@
 from utils.utils import scheduler, get_bot
-from ._data_source import update_member_info
+from .data_source import update_member_info
 from services.log import logger
 from models.group_info import GroupInfo
 from asyncpg.exceptions import ConnectionDoesNotExistError, UndefinedColumnError
@@ -1,7 +1,7 @@
 from nonebot import on_command, on_notice
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, GROUP, GroupIncreaseNoticeEvent
-from ._data_source import update_member_info
-
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, GROUP, GroupIncreaseNoticeEvent
+from .data_source import update_member_info

 __zx_plugin_name__ = "更新群组成员列表 [Admin]"
 __plugin_usage__ = """
@@ -25,7 +25,7 @@ refresh_member_group = on_command(


@refresh_member_group.handle()
-async def _(event: GroupMessageEvent):
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    if await update_member_info(event.group_id):
        await refresh_member_group.finish("更新群员信息成功！", at_sender=True)
    else:
@@ -36,6 +36,6 @@ group_increase_handle = on_notice(priority=1, block=False)


@group_increase_handle.handle()
-async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
+async def _(bot: Bot, event: GroupIncreaseNoticeEvent, state: dict):
    if event.user_id == int(bot.self_id):
        await update_member_info(event.group_id)
@@ -1,9 +1,9 @@
 from nonebot import on_command
 from nonebot.typing import T_State
 from nonebot.adapters import Bot
-from nonebot.adapters.onebot.v11 import GroupMessageEvent
+from nonebot.adapters.cqhttp import GroupMessageEvent
 from utils.message_builder import image
-from .data_source import create_help_image, ADMIN_HELP_IMAGE
+from .data_source import create_help_image, admin_help_image


 __zx_plugin_name__ = '管理帮助 [Admin]'
@@ -16,12 +16,12 @@ __plugin_settings__ = {

 admin_help = on_command("管理员帮助", aliases={"管理帮助"}, priority=5, block=True)

-if ADMIN_HELP_IMAGE.exists():
-    ADMIN_HELP_IMAGE.unlink()
+if admin_help_image.exists():
+    admin_help_image.unlink()


@admin_help.handle()
 async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
-    if not ADMIN_HELP_IMAGE.exists():
+    if not admin_help_image.exists():
        await create_help_image()
-    await admin_help.send(image(ADMIN_HELP_IMAGE))
+    await admin_help.send(image('admin_help_img.png'))
@@ -1,87 +1,94 @@
-import nonebot
+from utils.image_utils import BuildImage
 from configs.path_config import IMAGE_PATH
-from nonebot import Driver
 from services.log import logger
-from utils.image_template import help_template
-from utils.image_utils import (BuildImage, build_sort_image, group_image,
-                               text2image)
-from utils.manager import group_manager, plugin_data_manager
-from utils.manager.models import PluginType
+from utils.utils import get_matchers
+from utils.manager import group_manager
+from nonebot.adapters.cqhttp import Bot
+from pathlib import Path
+from nonebot import Driver
+import asyncio
+import nonebot
+

 driver: Driver = nonebot.get_driver()

-background = IMAGE_PATH / "background" / "0.png"
+background = Path(IMAGE_PATH) / "background" / "0.png"

-ADMIN_HELP_IMAGE = IMAGE_PATH / "admin_help_img.png"
+admin_help_image = Path(IMAGE_PATH) / 'admin_help_img.png'


@driver.on_bot_connect
-async def init_task():
+async def init_task(bot: Bot = None):
    if not group_manager.get_task_data():
-        group_manager.load_task()
-        logger.info(f"已成功加载 {len(group_manager.get_task_data())} 个被动技能.")
+        await group_manager.init_group_task()
+        logger.info(f'已成功加载 {len(group_manager.get_task_data())} 个被动技能.')


 async def create_help_image():
    """
    创建管理员帮助图片
    """
-    await _create_help_image()
+    await asyncio.get_event_loop().run_in_executor(
+        None, _create_help_image
+    )


-async def _create_help_image():
+def _create_help_image():
    """
    创建管理员帮助图片
    """
-    if ADMIN_HELP_IMAGE.exists():
-        return
-    plugin_data_ = plugin_data_manager.get_data()
-    image_list = []
-    task_list = []
-    for plugin_data in [plugin_data_[x] for x in plugin_data_]:
+    _matchers = get_matchers()
+    _plugin_name_list = []
+    width = 0
+    _plugin_level = {}
+    for matcher in _matchers:
+        _plugin = nonebot.plugin.get_plugin(matcher.module)
+        _module = _plugin.module
        try:
-            usage = None
-            if plugin_data.plugin_type == PluginType.ADMIN and plugin_data.usage:
-                usage = await text2image(
-                    plugin_data.usage, padding=5, color=(204, 196, 151)
-                )
-            if usage:
-                await usage.acircle_corner()
-                level = 5
-                if plugin_data.plugin_setting:
-                    level = plugin_data.plugin_setting.level or level
-                image = await help_template(plugin_data.name + f"[{level}]", usage)
-                image_list.append(image)
-            if plugin_data.task:
-                for x in plugin_data.task.keys():
-                    task_list.append(plugin_data.task[x])
-        except Exception as e:
-            logger.warning(
-                f"获取群管理员插件 {plugin_data.model}: {plugin_data.name} 设置失败... {type(e)}：{e}"
-            )
-    task_str = "\n".join(task_list)
-    task_str = "通过 开启/关闭 来控制群被动\n----------\n" + task_str
-    task_image = await text2image(task_str, padding=5, color=(204, 196, 151))
-    task_image = await help_template("被动任务", task_image)
-    image_list.append(task_image)
-    image_group, _ = group_image(image_list)
-    A = await build_sort_image(image_group, color="#f9f6f2", padding_top=180)
-    await A.apaste(
-        BuildImage(0, 0, font="CJGaoDeGuo.otf", plain_text="群管理员帮助", font_size=50),
-        (50, 30),
-        True,
-    )
-    await A.apaste(
-        BuildImage(
-            0,
-            0,
-            font="CJGaoDeGuo.otf",
-            plain_text="注: ‘*’ 代表可有多个相同参数 ‘?’ 代表可省略该参数",
-            font_size=30,
-            font_color="red",
-        ),
-        (50, 90),
-        True,
-    )
-    await A.asave(ADMIN_HELP_IMAGE)
-    logger.info(f"已成功加载 {len(image_list)} 条管理员命令")
+            plugin_name = _module.__getattribute__("__zx_plugin_name__")
+        except AttributeError:
+            continue
+        try:
+            if (
+                "[admin]" in plugin_name.lower()
+                and plugin_name not in _plugin_name_list
+                and plugin_name != "管理帮助 [Admin]"
+            ):
+                _plugin_name_list.append(plugin_name)
+                plugin_settings = _module.__getattribute__("__plugin_settings__")
+                plugin_des = _module.__getattribute__("__plugin_des__")
+                plugin_cmd = _module.__getattribute__("__plugin_cmd__")
+                plugin_cmd = [x for x in plugin_cmd if "[_superuser]" not in x]
+                admin_level = int(plugin_settings["admin_level"])
+                if _plugin_level.get(admin_level):
+                    _plugin_level[admin_level].append(
+                        f"[{admin_level}] {plugin_des} -> " + " / ".join(plugin_cmd)
+                    )
+                else:
+                    _plugin_level[admin_level] = [
+                        f"[{admin_level}] {plugin_des} -> " + " / ".join(plugin_cmd)
+                    ]
+                x = len(f"[{admin_level}] {plugin_des} -> " + " / ".join(plugin_cmd)) * 23
+                width = width if width > x else x
+        except AttributeError:
+            logger.warning(f"获取管理插件 {matcher.module}: {plugin_name} 设置失败...")
+    help_str = "*  注: ‘*’ 代表可有多个相同参数 ‘?’ 代表可省略该参数  *\n\n" \
+               "[权限等级] 管理员帮助：\n\n"
+    x = list(_plugin_level.keys())
+    x.sort()
+    for level in x:
+        for help_ in _plugin_level[level]:
+            help_str += f"\t{help_}\n\n"
+    help_str += '-----[被动技能开关]-----\n\n'
+    task_data = group_manager.get_task_data()
+    for i, x in enumerate(task_data.keys()):
+        help_str += f'{i+1}.开启/关闭{task_data[x]}\n\n'
+    height = len(help_str.split("\n")) * 33
+    A = BuildImage(width, height, font_size=24)
+    _background = BuildImage(width, height, background=background)
+    A.text((150, 110), help_str)
+    A.paste(_background, alpha=True)
+    A.save(admin_help_image)
+    logger.info(f'已成功加载 {len(_plugin_name_list)} 条管理员命令')
+
+
@@ -4,8 +4,9 @@ from nonebot import on_message
 from services.log import logger
 from models.group_info import GroupInfo
 from models.friend_user import FriendUser
-from nonebot.adapters.onebot.v11 import ActionFailed
+from nonebot.adapters.cqhttp.exception import ActionFailed
 from configs.config import NICKNAME, Config
+from utils.manager import group_manager
 from pathlib import Path
 import shutil

@@ -41,7 +42,7 @@ Config.add_plugin_config(
 )


-cx = on_message(priority=9999, block=False, rule=lambda: False)
+cx = on_message(priority=9, block=False)


 # 早上好
@@ -56,11 +57,12 @@ async def _():
        gl = await bot.get_group_list()
        gl = [g["group_id"] for g in gl]
        for g in gl:
-            result = image("zao.jpg", "zhenxun")
-            try:
-                await bot.send_group_msg(group_id=g, message="[[_task|zwa]]早上好" + result)
-            except ActionFailed:
-                logger.warning(f"{g} 发送早安失败")
+            if await group_manager.check_group_task_status(g, 'zwa'):
+                result = image("zao.jpg", "zhenxun")
+                try:
+                    await bot.send_group_msg(group_id=g, message="早上好" + result)
+                except ActionFailed:
+                    logger.warning(f"{g} 群被禁言中，无法发送早安")
    except Exception as e:
        logger.error(f"早晚安错误 e:{e}")

@@ -77,13 +79,14 @@ async def _():
        gl = await bot.get_group_list()
        gl = [g["group_id"] for g in gl]
        for g in gl:
-            result = image("sleep.jpg", "zhenxun")
-            try:
-                await bot.send_group_msg(
-                    group_id=g, message=f"[[_task|zwa]]{NICKNAME}要睡觉了，你们也要早点睡呀" + result
-                )
-            except ActionFailed:
-                logger.warning(f"{g} 发送晚安失败")
+            if await group_manager.check_group_task_status(g, 'zwa'):
+                result = image("sleep.jpg", "zhenxun")
+                try:
+                    await bot.send_group_msg(
+                        group_id=g, message=f"{NICKNAME}要睡觉了，你们也要早点睡呀" + result
+                    )
+                except ActionFailed:
+                    logger.warning(f"{g} 群被禁言中，无法发送晚安")
    except Exception as e:
        logger.error(f"早晚安错误 e:{e}")

@@ -106,7 +109,6 @@ async def _():
                group_info["group_name"],
                group_info["max_member_count"],
                group_info["member_count"],
-                1
            )
            logger.info(f"自动更新群组 {g} 信息成功")
    except Exception as e:
@@ -1,18 +1,14 @@
-from typing import Tuple, List
-
-from configs.config import NICKNAME, Config
+from nonebot import on_command
 from models.ban_user import BanUser
 from models.level_user import LevelUser
-from nonebot import on_command
-from nonebot.adapters.onebot.v11 import (Bot, GroupMessageEvent, Message,
-                                         MessageEvent, PrivateMessageEvent)
-from nonebot.params import Command, CommandArg
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot
+from nonebot.adapters.cqhttp import GroupMessageEvent, PrivateMessageEvent, MessageEvent
+from utils.utils import get_message_at, get_message_text, is_number
+from configs.config import NICKNAME, Config
 from nonebot.permission import SUPERUSER
 from services.log import logger
-from utils.depends import AtList
-from utils.utils import get_message_at, is_number

-from .data_source import a_ban, parse_ban_time

 __zx_plugin_name__ = "封禁Ban用户 [Admin]"
 __plugin_usage__ = """
@@ -37,19 +33,19 @@ usage：
        示例：b了 1234567
        示例：.ban 12345567
 """.strip()
-__plugin_des__ = "你被逮捕了！丢进小黑屋！"
-__plugin_cmd__ = [".ban [at] ?[小时] ?[分钟]", ".unban [at]", "b了 [at] [_superuser]"]
+__plugin_des__ = '你被逮捕了！丢进小黑屋！'
+__plugin_cmd__ = ['.ban [at] ?[小时] ?[分钟]', '.unban [at]', 'b了 [at] [_superuser]']
 __plugin_version__ = 0.1
-__plugin_author__ = "HibiKier"
+__plugin_author__ = 'HibiKier'
 __plugin_settings__ = {
    "admin_level": Config.get_config("ban", "BAN_LEVEL"),
-    "cmd": [".ban", ".unban", "ban", "unban"],
+    "cmd": ['.ban', '.unban', 'ban', 'unban']
 }
 __plugin_configs__ = {
    "BAN_LEVEL [LEVEL]": {
        "value": 5,
        "help": "ban/unban所需要的管理员权限等级",
-        "default_value": 5,
+        "default_value": 5
    }
 }

@@ -61,44 +57,66 @@ ban = on_command(
    block=True,
 )

-super_ban = on_command("b了", permission=SUPERUSER, priority=5, block=True)
+super_ban = on_command('b了', permission=SUPERUSER, priority=5, block=True)


@ban.handle()
-async def _(
-    bot: Bot,
-    event: GroupMessageEvent,
-    cmd: Tuple[str, ...] = Command(),
-    arg: Message = CommandArg(),
-    qq: List[int] = AtList()
-):
-    cmd = cmd[0]
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    result = ""
+    qq = get_message_at(event.json())
    if qq:
        qq = qq[0]
        user_name = await bot.get_group_member_info(group_id=event.group_id, user_id=qq)
-        user_name = user_name["card"] or user_name["nickname"]
-        msg = arg.extract_plain_text().strip()
-        time = parse_ban_time(msg)
-        if isinstance(time, str):
-            await ban.finish(time, at_sender=True)
-        if cmd in [".ban", "/ban"]:
+        user_name = user_name['card'] if user_name['card'] else user_name['nickname']
+        msg = get_message_text(event.json())
+        if msg:
+            msg = msg.split()
+            if len(msg) == 2:
+                if not is_number(msg[0].strip()) or not is_number(msg[1].strip()):
+                    await ban.finish("参数必须是数字！", at_sender=True)
+                time = int(msg[0]) * 60 * 60 + int(msg[1]) * 60
+            else:
+                if not is_number(msg[0].strip()):
+                    await ban.finish("参数必须是数字！", at_sender=True)
+                time = int(msg[0]) * 60 * 60
+        else:
+            time = -1
+        if state["_prefix"]["raw_command"] in [".ban", "/ban"]:
            if (
-                await LevelUser.get_user_level(event.user_id, event.group_id)
-                <= await LevelUser.get_user_level(qq, event.group_id)
-                and str(event.user_id) not in bot.config.superusers
+                    await LevelUser.get_user_level(event.user_id, event.group_id)
+                    <= await LevelUser.get_user_level(qq, event.group_id)
+                    and str(event.user_id) not in bot.config.superusers
            ):
                await ban.finish(
                    f"您的权限等级比对方低或相等, {NICKNAME}不能为您使用此功能!",
                    at_sender=True,
                )
-            result = await a_ban(qq, time, user_name, event)
+            if await BanUser.ban(
+                    qq, await LevelUser.get_user_level(event.user_id, event.group_id), time
+            ):
+                logger.info(
+                    f"USER {event.user_id} GROUP {event.group_id} 将 USER {qq} 封禁 时长 {time/60} 分钟"
+                )
+                result = f"已经将 {user_name} 加入{NICKNAME}的黑名单了！"
+                if time != -1:
+                    result += f"将在 {time/60} 分钟后解封"
+            else:
+                time = await BanUser.check_ban_time(qq)
+                if is_number(time):
+                    time = abs(int(time))
+                    if time < 60:
+                        time = str(time) + " 秒"
+                    else:
+                        time = str(int(time / 60)) + " 分钟"
+                else:
+                    time += " 分钟"
+                result = f"{user_name} 已在黑名单！预计 {time}后解封"
        else:
            if (
-                await BanUser.check_ban_level(
-                    qq, await LevelUser.get_user_level(event.user_id, event.group_id)
-                )
-                and str(event.user_id) not in bot.config.superusers
+                    await BanUser.check_ban_level(
+                        qq, await LevelUser.get_user_level(event.user_id, event.group_id)
+                    )
+                    and str(event.user_id) not in bot.config.superusers
            ):
                await ban.finish(
                    f"ban掉 {user_name} 的管理员权限比您高，无法进行unban", at_sender=True
@@ -112,61 +130,78 @@ async def _(
                result = f"{user_name} 不在黑名单！"
    else:
        await ban.finish("艾特人了吗？？", at_sender=True)
-    await ban.send(result, at_sender=True)
+    await ban.finish(result, at_sender=True)


@ban.handle()
-async def _(
-    bot: Bot,
-    event: PrivateMessageEvent,
-    cmd: Tuple[str, ...] = Command(),
-    arg: Message = CommandArg(),
-):
-    cmd = cmd[0]
-    msg = arg.extract_plain_text().strip()
-    if msg:
-        if str(event.user_id) in bot.config.superusers:
-            msg_splt = msg.split()
-            if is_number(msg_splt[0]):
-                qq = int(msg_splt[0])
-                msg = msg_splt[1:]
-                if cmd in [".ban", "/ban"]:
-                    time = parse_ban_time(" ".join(msg))
-                    if isinstance(time, str):
-                        await ban.finish(time)
-                    result = await a_ban(qq, time, str(qq), event, 9)
-                else:
-                    if await BanUser.unban(qq):
-                        logger.info(f"USER {event.user_id} 将 USER {qq} 解禁")
-                        result = f"已经把 {qq} 从黑名单中删除了！"
+async def _(bot: Bot, event: PrivateMessageEvent, state: T_State):
+    if str(event.user_id) in bot.config.superusers:
+        msg = get_message_text(event.json())
+        msg = msg.split()
+        if is_number(msg[0]):
+            qq = int(msg[0])
+            if state["_prefix"]["raw_command"] in [".ban", "/ban"]:
+                hour = 0
+                minute = 0
+                if len(msg) > 1 and is_number(msg[1]):
+                    hour = int(msg[1])
+                if len(msg) > 2 and is_number(msg[2]):
+                    minute = int(msg[2])
+                time = hour * 60 * 60 + minute * 60
+                time = time if time else -1
+                if await BanUser.ban(
+                    qq, 9, time
+                ):
+                    logger.info(
+                        f"USER {event.user_id} 将 USER {qq} 封禁 时长 {time/60} 分钟"
+                    )
+                    result = f"已经将 {qq} 加入{NICKNAME}的黑名单了！"
+                    if time != -1:
+                        result += f"将在 {time/60} 分钟后解封"
                    else:
-                        result = f"{qq} 不在黑名单！"
-                await ban.send(result)
+                        result += f"将在 ∞ 分钟后解封"
+                    await ban.send(result)
+                else:
+                    time = await BanUser.check_ban_time(qq)
+                    if is_number(time):
+                        time = abs(int(time))
+                        if time < 60:
+                            time = str(time) + " 秒"
+                        else:
+                            time = str(int(time / 60)) + " 分钟"
+                    else:
+                        time += " 分钟"
+                    await ban.send(f"{qq} 已在黑名单！预计 {time}后解封")
            else:
-                await ban.finish(
-                    "qq号必须是数字！\n格式：.ban [qq] [hour]? [minute]?", at_sender=True
-                )
+                if await BanUser.unban(qq):
+                    logger.info(
+                        f"USER {event.user_id} 将 USER {qq} 解禁"
+                    )
+                    result = f"已经把 {qq} 从黑名单中删除了！"
+                else:
+                    result = f"{qq} 不在黑名单！"
+                await ban.send(result)
+        else:
+            await ban.finish('qq号必须是数字！\n格式：.ban [qq] [hour]? [minute]?', at_sender=True)


@super_ban.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    user_name = ""
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    if isinstance(event, GroupMessageEvent):
        qq = get_message_at(event.json())
-        if qq:
-            qq = qq[0]
-            user = await bot.get_group_member_info(group_id=event.group_id, user_id=qq)
-            user_name = user["card"] or user["nickname"]
    else:
-        qq = arg.extract_plain_text().strip()
+        qq = get_message_text(event.json())
        if not is_number(qq):
            await super_ban.finish("对象qq必须为纯数字...")
-        qq = int(qq)
-        user_name = qq
+        qq = [qq]
    if qq:
+        qq = qq[0]
+        user = await bot.get_group_member_info(group_id=event.group_id, user_id=qq)
+        user_name = user['card'] if user['card'] else user['nickname']
        if not await BanUser.ban(qq, 10, 99999999):
            await BanUser.unban(qq)
            await BanUser.ban(qq, 10, 99999999)
        await ban.send(f"已将 {user_name} 拉入黑名单！")
    else:
-        await super_ban.send("需要添加被super ban的对象，可以使用at或者指定qq..")
+        await super_ban.send('需要艾特被super ban的对象..')
+
@@ -1,62 +0,0 @@
-from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent
-from configs.config import NICKNAME
-from models.level_user import LevelUser
-from utils.utils import is_number
-from models.ban_user import BanUser
-from services.log import logger
-from typing import Union
-
-
-def parse_ban_time(msg: str) -> Union[int, str]:
-    """
-    解析ban时长
-    :param msg: 文本消息
-    """
-    if not msg:
-        return -1
-    msg = msg.split()
-    if len(msg) == 1:
-        if not is_number(msg[0].strip()):
-            return "参数必须是数字！"
-        return int(msg[0]) * 60 * 60
-    else:
-        if not is_number(msg[0].strip()) or not is_number(msg[1].strip()):
-            return "参数必须是数字！"
-        return int(msg[0]) * 60 * 60 + int(msg[1]) * 60
-
-
-async def a_ban(
-    qq: int, time: int, user_name: str, event: MessageEvent, ban_level: int = None
-) -> str:
-    """
-    ban
-    :param qq: qq
-    :param time: ban时长
-    :param user_name: ban用户昵称
-    :param event: event
-    :param ban_level: ban级别
-    """
-    if isinstance(event, GroupMessageEvent):
-        ban_level = await LevelUser.get_user_level(event.user_id, event.group_id)
-    if await BanUser.ban(qq, ban_level, time):
-        logger.info(
-            f"USER {event.user_id} GROUP"
-            f" {event.group_id if isinstance(event, GroupMessageEvent) else ''} 将 USER {qq} 封禁 时长 {time / 60} 分钟"
-        )
-        result = f"已经将 {user_name} 加入{NICKNAME}的黑名单了！"
-        if time != -1:
-            result += f"将在 {time / 60} 分钟后解封"
-        else:
-            result += f"将在 ∞ 分钟后解封"
-    else:
-        time = await BanUser.check_ban_time(qq)
-        if is_number(time):
-            time = abs(int(time))
-            if time < 60:
-                time = str(time) + " 秒"
-            else:
-                time = str(int(time / 60)) + " 分钟"
-        else:
-            time += " 分钟"
-        result = f"{user_name} 已在黑名单！预计 {time}后解封"
-    return result
@@ -1,14 +1,13 @@
-from nonebot.adapters.onebot.v11 import Bot, Message, MessageEvent
 from nonebot import on_command
+from nonebot.typing import T_State
+from nonebot.adapters import Bot, Event
 from nonebot.permission import SUPERUSER
-from nonebot.params import CommandArg
-from utils.utils import get_message_img
+import asyncio
+from utils.utils import get_message_text, get_message_imgs
 from services.log import logger
 from utils.message_builder import image
 from utils.manager import group_manager
 from configs.config import Config
-import asyncio
-

 __zx_plugin_name__ = "广播 [Superuser]"
 __plugin_usage__ = """
@@ -34,16 +33,18 @@ broadcast = on_command("广播-", priority=1, permission=SUPERUSER, block=True)


@broadcast.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
-    img_list = get_message_img(event.json())
+async def _(bot: Bot, event: Event, state: T_State):
+    msg = get_message_text(event.json())
+    imgs = get_message_imgs(event.json())
    rst = ""
-    for img in img_list:
+    for img in imgs:
        rst += image(img)
+    sid = bot.self_id
+    gl = await bot.get_group_list(self_id=sid)
    gl = [
        g["group_id"]
-        for g in await bot.get_group_list()
-        if group_manager.check_group_task_status(g["group_id"], "broadcast")
+        for g in gl
+        if await group_manager.check_group_task_status(g["group_id"], "broadcast")
    ]
    g_cnt = len(gl)
    cnt = 0
@@ -55,7 +56,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
            await broadcast.send(f"已播报至 {int(cnt / g_cnt * 100)}% 的群聊")
            x += 0.25
        try:
-            await bot.send_group_msg(group_id=g, message=msg + rst)
+            await bot.send_group_msg(self_id=sid, group_id=g, message=msg + rst)
            logger.info(f"GROUP {g} 投递广播成功")
        except Exception as e:
            logger.error(f"GROUP {g} 投递广播失败：{type(e)}")
@@ -1,4 +0,0 @@
-import nonebot
-from pathlib import Path
-
-nonebot.load_plugins(str(Path(__file__).parent.resolve()))
@@ -1,6 +0,0 @@
-from nonebot.adapters.onebot.v11 import Event, MessageEvent
-from configs.config import Config
-
-
-def rule(event: Event) -> bool:
-    return Config.get_config("chat_history", "FLAG") and isinstance(event, MessageEvent)
@@ -1,39 +0,0 @@
-from configs.config import Config
-from models.chat_history import ChatHistory
-from nonebot import on_message
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageEvent
-from utils.depends import PlaintText
-
-from ._rule import rule
-
-__zx_plugin_name__ = "消息存储 [Hidden]"
-__plugin_version__ = 0.1
-__plugin_author__ = "HibiKier"
-
-
-Config.add_plugin_config(
-    "chat_history", "FLAG", True, help_="是否开启消息自从存储", name="消息存储", default_value=True
-)
-
-
-chat_history = on_message(rule=rule, priority=1, block=False)
-
-
-@chat_history.handle()
-async def _(event: MessageEvent, msg: str = PlaintText()):
-    if isinstance(event, GroupMessageEvent):
-        await ChatHistory.add_chat_msg(
-            event.user_id, event.group_id, str(event.get_message()), msg
-        )
-    else:
-        await ChatHistory.add_chat_msg(event.user_id, None, str(event.get_message()), msg)
-
-
-# @test.handle()
-# async def _(event: MessageEvent):
-#     print(await ChatHistory.get_user_msg(event.user_id, "private"))
-#     print(await ChatHistory.get_user_msg_count(event.user_id, "private"))
-#     print(await ChatHistory.get_user_msg(event.user_id, "group"))
-#     print(await ChatHistory.get_user_msg_count(event.user_id, "group"))
-#     print(await ChatHistory.get_group_msg(event.group_id))
-#     print(await ChatHistory.get_group_msg_count(event.group_id))
@@ -1,114 +0,0 @@
-from datetime import datetime, timedelta
-
-import pytz
-from models.chat_history import ChatHistory
-from models.group_member_info import GroupInfoUser
-from nonebot import on_regex
-from nonebot.adapters.onebot.v11 import GroupMessageEvent
-from nonebot.params import RegexGroup
-from utils.image_utils import BuildImage, text2image
-from utils.utils import is_number
-from utils.message_builder import image
-from typing import Tuple, Any
-
-
-__zx_plugin_name__ = "消息统计"
-__plugin_usage__ = """
-usage：
-    发言记录统计
-    regex：(周|月|日)?消息排行(des|DES)?(n=[0-9]{1,2})?
-    指令：
-        消息统计?(des)?(n=?)
-        周消息统计?(des)?(n=?)
-        月消息统计?(des)?(n=?)
-        日消息统计?(des)?(n=?)
-    示例：
-        消息统计
-        消息统计des
-        消息统计DESn=15
-        消息统计n=15
-""".strip()
-__plugin_des__ = "发言消息排行"
-__plugin_cmd__ = [
-    "消息统计",
-    "周消息统计",
-    "月消息统计",
-    "日消息统计"
-]
-__plugin_type__ = ("数据统计", 1)
-__plugin_version__ = 0.1
-__plugin_author__ = "HibiKier"
-__plugin_settings__ = {
-    "level": 5,
-    "cmd": ["消息统计"],
-}
-
-
-msg_handler = on_regex(r"^(周|月|日)?消息统计(des|DES)?(n=[0-9]{1,2})?$", priority=5, block=True)
-
-
-@msg_handler.handle()
-async def _(event: GroupMessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()):
-    gid = event.group_id
-    date_scope = None
-    date, order, num = reg_group
-    num = num.split("=")[-1] if num else 10
-    if num and is_number(num) and 10 < int(num) < 50:
-        num = int(num)
-    time_now = datetime.now()
-    zero_today = time_now - timedelta(hours=time_now.hour, minutes=time_now.minute, seconds=time_now.second)
-    if date in ["日"]:
-        date_scope = (zero_today, time_now)
-    elif date in ["周"]:
-        date_scope = (time_now - timedelta(days=7), time_now)
-    elif date in ["月"]:
-        date_scope = (time_now - timedelta(days=30), time_now)
-    if rank_data := await ChatHistory.get_group_msg_rank(
-        gid, num, order or "DESC", date_scope
-    ):
-        name = "昵称：\n\n"
-        num_str = "发言次数：\n\n"
-        idx = 1
-        for uid, num in rank_data:
-            try:
-                user_name = (await GroupInfoUser.get_member_info(uid, gid)).user_name
-            except AttributeError:
-                user_name = uid
-            name += f"\t{idx}.{user_name} \n\n"
-            num_str += f"\t{num}\n\n"
-            idx += 1
-        name_img = await text2image(name.strip(), padding=10, color="#f9f6f2")
-        num_img = await text2image(num_str.strip(), padding=10, color="#f9f6f2")
-        if not date_scope:
-            if date_scope := await ChatHistory.get_group_first_msg_datetime(gid):
-                date_scope = date_scope.astimezone(
-                    pytz.timezone("Asia/Shanghai")
-                ).replace(microsecond=0)
-            else:
-                date_scope = time_now.replace(microsecond=0)
-            date_str = f"日期：{date_scope} - 至今"
-        else:
-            date_str = f"日期：{date_scope[0].replace(microsecond=0)} - {date_scope[1].replace(microsecond=0)}"
-        date_w = BuildImage(0, 0, font_size=15).getsize(date_str)[0]
-        img_w = date_w if date_w > name_img.w + num_img.w else name_img.w + num_img.w
-        A = BuildImage(
-            img_w + 15,
-            num_img.h + 30,
-            color="#f9f6f2",
-            font="CJGaoDeGuo.otf",
-            font_size=15,
-        )
-        await A.atext((10, 10), date_str)
-        await A.apaste(name_img, (0, 30))
-        await A.apaste(num_img, (name_img.w, 30))
-        await msg_handler.send(image(b64=A.pic2bs4()))
-
-
-# @test.handle()
-# async def _(event: MessageEvent):
-#     print(await ChatHistory.get_user_msg(event.user_id, "private"))
-#     print(await ChatHistory.get_user_msg_count(event.user_id, "private"))
-#     print(await ChatHistory.get_user_msg(event.user_id, "group"))
-#     print(await ChatHistory.get_user_msg_count(event.user_id, "group"))
-#     print(await ChatHistory.get_group_msg(event.group_id))
-#     print(await ChatHistory.get_group_msg_count(event.group_id))
@@ -1,16 +1,15 @@
 from nonebot import on_notice, on_request
 from configs.path_config import IMAGE_PATH, DATA_PATH
-from models.level_user import LevelUser
 from utils.message_builder import image
 from models.group_member_info import GroupInfoUser
 from datetime import datetime
 from services.log import logger
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.cqhttp import (
    Bot,
-    ActionFailed,
    GroupIncreaseNoticeEvent,
    GroupDecreaseNoticeEvent,
 )
+from nonebot.adapters.cqhttp.exception import ActionFailed
 from utils.manager import group_manager, plugins2settings_manager, requests_manager
 from configs.config import NICKNAME
 from models.group_info import GroupInfo
@@ -19,7 +18,11 @@ from configs.config import Config
 from pathlib import Path
 import random
 import os
-import ujson as json
+
+try:
+    import ujson as json
+except ModuleNotFoundError:
+    import json


 __zx_plugin_name__ = "群事件处理 [Hidden]"
@@ -63,7 +66,7 @@ add_group = on_request(priority=1, block=False)


@group_increase_handle.handle()
-async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
+async def _(bot: Bot, event: GroupIncreaseNoticeEvent, state: dict):
    if event.user_id == int(bot.self_id):
        group = await GroupInfo.get_group_info(event.group_id)
        # 群聊不存在或被强制拉群，退出该群
@@ -88,28 +91,11 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
                    message=f"触发强制入群保护，退出群聊 {event.group_id} 失败..",
                )
        # 默认群功能开关
-        elif event.group_id not in group_manager.get_data().group_manager.keys():
+        elif event.group_id not in group_manager["group_manager"].keys():
            data = plugins2settings_manager.get_data()
            for plugin in data.keys():
-                if not data[plugin].default_status:
+                if not data[plugin]["default_status"]:
                    group_manager.block_plugin(plugin, event.group_id)
-            # 即刻刷新权限
-            for user_info in await bot.get_group_member_list(group_id=event.group_id):
-                if user_info["role"] in [
-                    "owner",
-                    "admin",
-                ] and not await LevelUser.is_group_flag(
-                    user_info["user_id"], event.group_id
-                ):
-                    await LevelUser.set_level(
-                        user_info["user_id"],
-                        user_info["group_id"],
-                        Config.get_config("admin_bot_manage", "ADMIN_DEFAULT_AUTH"),
-                    )
-                if str(user_info["user_id"]) in bot.config.superusers:
-                    await LevelUser.set_level(
-                        user_info["user_id"], user_info["group_id"], 9
-                    )
    else:
        join_time = datetime.now()
        user_info = await bot.get_group_member_info(
@@ -126,7 +112,9 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
            logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新失败")

        # 群欢迎消息
-        if _flmt.check(event.group_id):
+        if await group_manager.check_group_task_status(
+            event.group_id, "group_welcome"
+        ) and _flmt.check(event.group_id):
            _flmt.start_cd(event.group_id)
            msg = ""
            img = ""
@@ -141,23 +129,23 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
                    if msg.find("[at]") != -1:
                        msg = msg.replace("[at]", "")
                        at_flag = True
-            if (DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg").exists():
-                img = image(DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg")
+            if os.path.exists(DATA_PATH + f"custom_welcome_msg/{event.group_id}.jpg"):
+                img = image(
+                    abspath=DATA_PATH + f"custom_welcome_msg/{event.group_id}.jpg"
+                )
            if msg or img:
-                msg = msg.strip() + img
-                msg = "\n" + msg if at_flag else msg
                await group_increase_handle.send(
-                    "[[_task|group_welcome]]" + msg, at_sender=at_flag
+                    "\n" + msg.strip() + img, at_sender=at_flag
                )
            else:
                await group_increase_handle.send(
-                    "[[_task|group_welcome]]新人快跑啊！！本群现状↓（快使用自定义！）"
-                    + image(random.choice(os.listdir(IMAGE_PATH / "qxz")), "qxz")
+                    "新人快跑啊！！本群现状↓（快使用自定义！）"
+                    + image(random.choice(os.listdir(IMAGE_PATH + "qxz/")), "qxz")
                )


@group_decrease_handle.handle()
-async def _(bot: Bot, event: GroupDecreaseNoticeEvent):
+async def _(bot: Bot, event: GroupDecreaseNoticeEvent, state: dict):
    # 被踢出群
    if event.sub_type == "kick_me":
        group_id = event.group_id
@@ -192,16 +180,21 @@ async def _(bot: Bot, event: GroupDecreaseNoticeEvent):
        logger.info(f"用户{user_name}, qq={event.user_id} 所属{event.group_id} 删除成功")
    else:
        logger.info(f"用户{user_name}, qq={event.user_id} 所属{event.group_id} 删除失败")
-    rst = ""
-    if event.sub_type == "leave":
-        rst = f"{user_name}离开了我们..."
-    if event.sub_type == "kick":
-        operator = await bot.get_group_member_info(
-            user_id=event.operator_id, group_id=event.group_id
-        )
-        operator_name = operator["card"] if operator["card"] else operator["nickname"]
-        rst = f"{user_name} 被 {operator_name} 送走了."
-    try:
-        await group_decrease_handle.send(f"[[_task|refund_group_remind]]{rst}")
-    except ActionFailed:
-        return
+    if await group_manager.check_group_task_status(
+        event.group_id, "refund_group_remind"
+    ):
+        rst = ""
+        if event.sub_type == "leave":
+            rst = f"{user_name}离开了我们..."
+        if event.sub_type == "kick":
+            operator = await bot.get_group_member_info(
+                user_id=event.operator_id, group_id=event.group_id
+            )
+            operator_name = (
+                operator["card"] if operator["card"] else operator["nickname"]
+            )
+            rst = f"{user_name} 被 {operator_name} 送走了."
+        try:
+            await group_decrease_handle.send(f"{rst}")
+        except ActionFailed:
+            return
@@ -1,36 +1,51 @@
 from nonebot import on_command
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.cqhttp import (
    Bot,
    MessageEvent,
-    GroupMessageEvent,
-    Message
+    GroupMessageEvent
 )
-from nonebot.params import CommandArg
+from nonebot.typing import T_State
 from nonebot.rule import to_me
 from configs.path_config import IMAGE_PATH, DATA_PATH
 from utils.message_builder import image
-from ._data_source import create_help_img, get_plugin_help
-from ._utils import GROUP_HELP_PATH
+from .data_source import create_help_img, get_plugin_help
+from utils.utils import get_message_text
+from pathlib import Path
 import os


 __zx_plugin_name__ = "帮助"

-__plugin_configs__ = {
-    "TYPE": {"value": "normal", "help": "帮助图片样式 ['normal', 'HTML']", "default_value": "normal"}
-}
-
-simple_help_image = IMAGE_PATH / "simple_help.png"
+group_help_path = Path(DATA_PATH) / "group_help"
+help_image = Path(IMAGE_PATH) / "help.png"
+simple_help_image = Path(IMAGE_PATH) / "simple_help.png"
+if help_image.exists():
+    help_image.unlink()
 if simple_help_image.exists():
    simple_help_image.unlink()
+group_help_path.mkdir(exist_ok=True, parents=True)
+for x in os.listdir(group_help_path):
+    group_help_image = group_help_path / x
+    group_help_image.unlink()

-
+_help = on_command("详细功能", rule=to_me(), aliases={"详细帮助"}, priority=1, block=True)
 simple_help = on_command("功能", rule=to_me(), aliases={"help", "帮助"}, priority=1, block=True)


+@_help.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    if not help_image.exists():
+        if help_image.exists():
+            help_image.unlink()
+        if simple_help_image.exists():
+            simple_help_image.unlink()
+        await create_help_img(None, help_image, simple_help_image)
+    await _help.finish(image("help.png"))
+
+
@simple_help.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = get_message_text(event.json())
    is_super = False
    if msg:
        if '-super' in msg:
@@ -39,18 +54,20 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
            msg = msg.replace('-super', '').strip()
        msg = get_plugin_help(msg, is_super)
        if msg:
-            await simple_help.send(image(b64=msg))
+            await _help.send(image(b64=msg))
        else:
-            await simple_help.send("没有此功能的帮助信息...")
+            await _help.send("没有此功能的帮助信息...")
    else:
        if isinstance(event, GroupMessageEvent):
-            _image_path = GROUP_HELP_PATH / f"{event.group_id}.png"
+            _image_path = group_help_path / f"{event.group_id}.png"
            if not _image_path.exists():
-                await create_help_img(event.group_id)
+                await create_help_img(event.group_id, help_image, _image_path)
            await simple_help.send(image(_image_path))
        else:
            if not simple_help_image.exists():
+                if help_image.exists():
+                    help_image.unlink()
                if simple_help_image.exists():
                    simple_help_image.unlink()
-                await create_help_img(None)
-            await simple_help.finish(image("simple_help.png"))
+                await create_help_img(None, help_image, simple_help_image)
+            await _help.finish(image("simple_help.png"))
@@ -1,14 +0,0 @@
-from typing import Optional, List, Any, Union, Dict
-from pydantic import BaseModel
-
-
-class Item(BaseModel):
-    plugin_name: str
-    sta: int
-
-
-class PluginList(BaseModel):
-    plugin_type: str
-    icon: str
-    logo: str
-    items: List[Item]
@@ -1,71 +0,0 @@
-
-from ._utils import HelpImageBuild
-from utils.image_utils import BuildImage
-from configs.path_config import IMAGE_PATH
-from utils.manager import (
-    plugins2settings_manager,
-    admin_manager,
-)
-from typing import Optional
-import nonebot
-
-
-random_bk_path = IMAGE_PATH / "background" / "help" / "simple_help"
-
-background = IMAGE_PATH / "background" / "0.png"
-
-
-async def create_help_img(group_id: Optional[int]):
-    """
-    说明:
-        生成帮助图片
-    参数:
-        :param group_id: 群号
-    """
-    await HelpImageBuild().build_image(group_id)
-
-
-def get_plugin_help(msg: str, is_super: bool = False) -> Optional[str]:
-    """
-    说明:
-        获取功能的帮助信息
-    参数:
-        :param msg: 功能cmd
-        :param is_super: 是否为超级用户
-    """
-    module = plugins2settings_manager.get_plugin_module(
-        msg
-    ) or admin_manager.get_plugin_module(msg)
-    if module:
-        try:
-            plugin = nonebot.plugin.get_plugin(module)
-            metadata = plugin.metadata
-            if plugin:
-                if is_super:
-                    result = plugin.module.__getattribute__(
-                        "__plugin_superuser_usage__"
-                    )
-                else:
-                    result = (
-                        metadata.usage
-                        if metadata
-                        else plugin.module.__getattribute__("__plugin_usage__")
-                    )
-                if result:
-                    width = 0
-                    for x in result.split("\n"):
-                        _width = len(x) * 24
-                        width = width if width > _width else _width
-                    height = len(result.split("\n")) * 45
-                    A = BuildImage(width, height, font_size=24)
-                    bk = BuildImage(
-                        width,
-                        height,
-                        background=IMAGE_PATH / "background" / "1.png",
-                    )
-                    A.paste(bk, alpha=True)
-                    A.text((int(width * 0.048), int(height * 0.21)), result)
-                    return A.pic2bs4()
-        except AttributeError:
-            pass
-    return None
@@ -1,256 +0,0 @@
-import os
-import random
-from typing import Dict, List, Optional
-
-from configs.config import Config
-from configs.path_config import DATA_PATH, IMAGE_PATH, TEMPLATE_PATH
-from utils.decorator import Singleton
-from utils.image_utils import BuildImage, build_sort_image, group_image
-from utils.manager import group_manager, plugin_data_manager
-from utils.manager.models import PluginData, PluginType
-
-from ._config import Item
-
-GROUP_HELP_PATH = DATA_PATH / "group_help"
-GROUP_HELP_PATH.mkdir(exist_ok=True, parents=True)
-for x in os.listdir(GROUP_HELP_PATH):
-    group_help_image = GROUP_HELP_PATH / x
-    group_help_image.unlink()
-
-BACKGROUND_PATH = IMAGE_PATH / "background" / "help" / "simple_help"
-
-LOGO_PATH = TEMPLATE_PATH / "menu" / "res" / "logo"
-
-
-@Singleton
-class HelpImageBuild:
-    def __init__(self):
-        self._data: Dict[str, PluginData] = plugin_data_manager.get_data()
-        self._sort_data: Dict[str, List[PluginData]] = {}
-        self._image_list = []
-        self.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 sort_type(self):
-        """
-        说明:
-            对插件按照菜单类型分类
-        """
-        if not self._sort_data.keys():
-            for key in self._data.keys():
-                plugin_data = self._data[key]
-                if plugin_data.plugin_type == PluginType.NORMAL:
-                    if not self._sort_data.get(plugin_data.menu_type[0]):
-                        self._sort_data[plugin_data.menu_type[0]] = []
-                    self._sort_data[plugin_data.menu_type[0]].append(self._data[key])
-
-    async def build_image(self, group_id: Optional[int]):
-        if group_id:
-            help_image = GROUP_HELP_PATH / f"{group_id}.png"
-        else:
-            help_image = IMAGE_PATH / f"simple_help.png"
-        build_type = Config.get_config("help", "TYPE")
-        if build_type == "HTML":
-            byt = await self.build_html_image(group_id)
-            with open(help_image, "wb") as f:
-                f.write(byt)
-        else:
-            img = await self.build_pil_image(group_id)
-            img.save(help_image)
-
-    async def build_html_image(self, group_id: Optional[int]) -> bytes:
-        from nonebot_plugin_htmlrender import template_to_pic
-        self.sort_type()
-        classify = {}
-        for menu in self._sort_data:
-            for plugin in self._sort_data[menu]:
-                sta = 0
-                if not plugin.plugin_status.status:
-                    if group_id and plugin.plugin_status.block_type in ["all", "group"]:
-                        sta = 2
-                    if not group_id and plugin.plugin_status.block_type in [
-                        "all",
-                        "private",
-                    ]:
-                        sta = 2
-                if group_id and not group_manager.get_plugin_super_status(
-                    plugin.model, group_id
-                ):
-                    sta = 2
-                if group_id and not group_manager.get_plugin_status(
-                    plugin.model, group_id
-                ):
-                    sta = 1
-                if classify.get(menu):
-                    classify[menu].append(Item(plugin_name=plugin.name, sta=sta))
-                else:
-                    classify[menu] = [Item(plugin_name=plugin.name, sta=sta)]
-        max_len = 0
-        flag_index = -1
-        max_data = None
-        plugin_list = []
-        for index, plu in enumerate(classify.keys()):
-            if plu in self.icon2str.keys():
-                icon = self.icon2str[plu]
-            else:
-                icon = "fa fa-pencil-square-o"
-            logo = LOGO_PATH / random.choice(os.listdir(LOGO_PATH))
-            data = {
-                "name": plu if plu != "normal" else "功能",
-                "items": classify[plu],
-                "icon": icon,
-                "logo": str(logo.absolute()),
-            }
-            if len(classify[plu]) > max_len:
-                max_len = len(classify[plu])
-                flag_index = index
-                max_data = data
-            plugin_list.append(data)
-        del plugin_list[flag_index]
-        plugin_list.insert(0, max_data)
-        pic = 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": 975},
-                "base_url": f"file://{TEMPLATE_PATH}",
-            },
-            wait=2,
-        )
-        return pic
-
-    async def build_pil_image(self, group_id: Optional[int]) -> BuildImage:
-        """
-        说明:
-            构造帮助图片
-        参数:
-            :param group_id: 群号
-        """
-        self._image_list = []
-        self.sort_type()
-        font_size = 24
-        build_type = Config.get_config("help", "TYPE")
-        _image = BuildImage(0, 0, plain_text="1", font_size=font_size)
-        for idx, menu_type in enumerate(self._sort_data.keys()):
-            plugin_list = self._sort_data[menu_type]
-            wh_list = [_image.getsize(x.name) for x in plugin_list]
-            wh_list.append(_image.getsize(menu_type))
-            # sum_height = sum([x[1] for x in wh_list])
-            if build_type == "VV":
-                sum_height = 50 * len(plugin_list) + 10
-            else:
-                sum_height = (font_size + 6) * len(plugin_list) + 10
-            max_width = max([x[0] for x in wh_list]) + 20
-            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]
-            B = BuildImage(
-                max_width + 40,
-                sum_height,
-                font_size=font_size,
-                color="white" if not idx % 2 else "black",
-            )
-            curr_h = 10
-            for i, plugin_data in enumerate(plugin_list):
-                text_color = (255, 255, 255) if idx % 2 else (0, 0, 0)
-                if group_id and not group_manager.get_plugin_status(
-                    plugin_data.model, group_id
-                ):
-                    text_color = (252, 75, 13)
-                pos = None
-                # 禁用状态划线
-                if (
-                    not plugin_data.plugin_status.status
-                    and plugin_data.plugin_status.block_type in ["group", "all"]
-                ) or (group_id and not group_manager.get_plugin_super_status(
-                    plugin_data.model, group_id
-                )):
-                    w = curr_h + int(B.getsize(plugin_data.name)[1] / 2) + 2
-                    pos = (
-                        7,
-                        w,
-                        B.getsize(plugin_data.name)[0] + 35,
-                        w,
-                    )
-                if build_type == "VV":
-                    name_image = await self.build_name_image(
-                        max_width,
-                        plugin_data.name,
-                        "black" if not idx % 2 else "white",
-                        text_color,
-                        pos,
-                    )
-                    await B.apaste(
-                        name_image, (0, curr_h), True, center_type="by_width"
-                    )
-                    curr_h += name_image.h + 5
-                else:
-                    await B.atext(
-                        (10, curr_h), f"{i + 1}.{plugin_data.name}", text_color
-                    )
-                    if pos:
-                        await B.aline(pos, (236, 66, 7), 3)
-                    curr_h += font_size + 5
-            if menu_type == "normal":
-                menu_type = "功能"
-            await bk.atext((0, 14), menu_type, center_type="by_width")
-            await bk.apaste(B, (0, 50))
-            await bk.atransparent(2)
-            # await bk.acircle_corner(point_list=['lt', 'rt'])
-            self._image_list.append(bk)
-        image_group, h = group_image(self._image_list)
-        B = await build_sort_image(
-            image_group,
-            h,
-            background_path=BACKGROUND_PATH,
-            background_handle=lambda image: image.filter("GaussianBlur", 5),
-        )
-        w = 10
-        h = 10
-        for msg in [
-            "目前支持的功能列表:",
-            "可以通过 ‘帮助[功能名称]’ 来获取对应功能的使用方法",
-            "或者使用 ‘详细帮助’ 来获取所有功能方法",
-        ]:
-            text = BuildImage(
-                0,
-                0,
-                plain_text=msg,
-                font_size=24,
-                font="HYWenHei-85W.ttf",
-            )
-            B.paste(text, (w, h), True)
-            h += 50
-            if msg == "目前支持的功能列表:":
-                w += 50
-        await B.apaste(
-            BuildImage(
-                0,
-                0,
-                plain_text="注: 红字代表功能被群管理员禁用，红线代表功能正在维护",
-                font_size=24,
-                font="HYWenHei-85W.ttf",
-                font_color=(231, 74, 57),
-            ),
-            (300, 10),
-            True,
-        )
-        return B
@@ -0,0 +1,367 @@
+from utils.image_utils import BuildImage
+from configs.path_config import IMAGE_PATH
+from utils.manager import (
+    plugins2settings_manager,
+    admin_manager,
+    plugins_manager,
+    group_manager,
+)
+from typing import Optional
+from services.log import logger
+from pathlib import Path
+from utils.utils import get_matchers
+import random
+import asyncio
+import nonebot
+import os
+
+
+random_bk_path = Path(IMAGE_PATH) / "background" / "help" / "simple_help"
+
+background = Path(IMAGE_PATH) / "background" / "0.png"
+
+
+async def create_help_img(
+    group_id: Optional[int], help_image: Path, simple_help_image: Path
+):
+    """
+    生成帮助图片
+    :param group_id: 群号
+    :param help_image: 图片路径
+    :param simple_help_image: 简易帮助图片路径
+    """
+    return await asyncio.get_event_loop().run_in_executor(
+        None, _create_help_img, group_id, help_image, simple_help_image
+    )
+
+
+def _create_help_img(
+    group_id: Optional[int], help_image: Path, simple_help_image: Path
+):
+    """
+    生成帮助图片
+    :param group_id: 群号
+    :param help_image: 图片路径
+    :param simple_help_image: 简易帮助图片路径
+    """
+    _matchers = get_matchers()
+    width = 0
+    matchers_data = {}
+    _des_tmp = {}
+    _plugin_name_tmp = []
+    _tmp = []
+    tmp_img = BuildImage(0, 0, plain_text="1", font_size=24)
+    font_height = tmp_img.h
+    # 插件分类
+    for matcher in _matchers:
+        plugin_name = None
+        _plugin = nonebot.plugin.get_plugin(matcher.module)
+        _module = _plugin.module
+        try:
+            plugin_name = _module.__getattribute__("__zx_plugin_name__")
+            try:
+                plugin_des = _module.__getattribute__("__plugin_des__")
+            except AttributeError:
+                plugin_des = "_"
+            if (
+                "[hidden]" in plugin_name.lower()
+                or "[admin]" in plugin_name.lower()
+                or "[superuser]" in plugin_name.lower()
+                or plugin_name in _plugin_name_tmp
+                or plugin_name == "帮助"
+            ):
+                continue
+            plugin_type = ("normal",)
+            text_type = 0
+            if plugins2settings_manager.get(
+                matcher.module
+            ) and plugins2settings_manager[matcher.module].get("plugin_type"):
+                plugin_type = tuple(
+                    plugins2settings_manager.get_plugin_data(matcher.module)[
+                        "plugin_type"
+                    ]
+                )
+            else:
+                try:
+                    plugin_type = _module.__getattribute__("__plugin_type__")
+                except AttributeError:
+                    pass
+            if len(plugin_type) > 1:
+                try:
+                    text_type = int(plugin_type[1])
+                except ValueError as e:
+                    logger.warning(f"生成列向帮助排列失败 {plugin_name}: {type(e)}: {e}")
+                plugin_type = plugin_type[0]
+            else:
+                plugin_type = plugin_type[0]
+            try:
+                plugin_cmd = _module.__getattribute__("__plugin_cmd__")
+                plugin_cmd = [x for x in plugin_cmd if "[_superuser]" not in x]
+            except AttributeError:
+                plugin_cmd = []
+            if plugin_type not in matchers_data.keys():
+                matchers_data[plugin_type] = {}
+            if plugin_des in _des_tmp.keys():
+                try:
+                    matchers_data[plugin_type][_des_tmp[plugin_des]]["cmd"] = (
+                        matchers_data[plugin_type][_des_tmp[plugin_des]]["cmd"]
+                        + plugin_cmd
+                    )
+                except KeyError as e:
+                    logger.warning(f"{type(e)}: {e}")
+            else:
+                matchers_data[plugin_type][plugin_name] = {
+                    "module": matcher.module,
+                    "des": plugin_des,
+                    "cmd": plugin_cmd,
+                    "text_type": text_type,
+                }
+            try:
+                if text_type == 0:
+                    x = tmp_img.getsize(
+                        f'{plugin_name}: {matchers_data[plugin_type][plugin_name]["des"]} ->'
+                        + " / ".join(matchers_data[plugin_type][plugin_name]["cmd"])
+                    )[0]
+                    width = width if width > x else x
+            except KeyError:
+                pass
+            if plugin_des not in _des_tmp:
+                _des_tmp[plugin_des] = plugin_name
+        except AttributeError as e:
+            if plugin_name not in _plugin_name_tmp:
+                logger.warning(f"获取功能 {matcher.module}: {plugin_name} 设置失败...e：{e}")
+        if plugin_name not in _plugin_name_tmp:
+            _plugin_name_tmp.append(plugin_name)
+    help_img_list = []
+    simple_help_img_list = []
+    types = list(matchers_data.keys())
+    types.sort()
+    ix = 0
+    # 详细帮助
+    for type_ in types:
+        keys = list(matchers_data[type_].keys())
+        keys.sort()
+        help_str = f"{type_ if type_ != 'normal' else '功能'}:\n\n"
+        simple_help_str = f"{type_ if type_ != 'normal' else '功能'}:\n\n"
+        for i, k in enumerate(keys):
+            # 禁用flag
+            flag = True
+            if plugins_manager.get_plugin_status(
+                matchers_data[type_][k]["module"], "all"
+            ):
+                flag = False
+            if group_id:
+                flag = flag and plugins_manager.get_plugin_status(
+                    matchers_data[type_][k]["module"], "group"
+                )
+            simple_help_str += (
+                f"{i+1}.{k}<|_|~|>"
+                f"{group_manager.get_plugin_status(matchers_data[type_][k]['module'], group_id) if group_id else '_'}|"
+                f"{flag}\n"
+            )
+            if matchers_data[type_][k]["text_type"] == 1:
+                _x = tmp_img.getsize(
+                    f"{i+1}".rjust(5)
+                    + f'.{k}: {matchers_data[type_][k]["des"]} {"->" if matchers_data[type_][k]["cmd"] else ""} '
+                )[0]
+                _str = (
+                    f"{i+1}".rjust(5)
+                    + f'.{k}: {matchers_data[type_][k]["des"]} {"->" if matchers_data[type_][k]["cmd"] else ""} '
+                )
+                _str += matchers_data[type_][k]["cmd"][0] + "\n"
+                for c in matchers_data[type_][k]["cmd"][1:]:
+                    _str += "".rjust(int(_x * 0.125) + 1) + f"{c}\n"
+                help_str += _str
+            else:
+                help_str += (
+                    f"{i+1}".rjust(5)
+                    + f'.{k}: {matchers_data[type_][k]["des"]} {"->" if matchers_data[type_][k]["cmd"] else ""} '
+                    + " / ".join(matchers_data[type_][k]["cmd"])
+                    + "\n"
+                )
+        height = len(help_str.split("\n")) * (font_height + 5)
+        simple_height = len(simple_help_str.split("\n")) * (font_height + 5)
+        A = BuildImage(
+            width + 150, height, font_size=24, color="white" if not ix % 2 else "black"
+        )
+        A.text((10, 10), help_str, (255, 255, 255) if ix % 2 else (0, 0, 0))
+        # 生成各个分类的插件简易帮助图片
+        simple_width = 0
+        for x in [
+            tmp_img.getsize(x.split("<|_|~|>")[0])[0]
+            for x in simple_help_str.split("\n")
+        ]:
+            simple_width = simple_width if simple_width > x else x
+        bk = BuildImage(simple_width + 20, simple_height, font_size=24, color="#6495ED")
+        B = BuildImage(
+            simple_width + 20,
+            simple_height,
+            font_size=24,
+            color="white" if not ix % 2 else "black",
+        )
+        # 切分，判断插件开关状态
+        _s_height = 10
+        for _s in simple_help_str.split("\n"):
+            text_color = (255, 255, 255) if ix % 2 else (0, 0, 0)
+            _line_flag = False
+            if "<|_|~|>" in _s:
+                _x = _s.split("<|_|~|>")
+                _flag_sp = _x[-1].split("|")
+                if group_id:
+                    if _flag_sp[0].lower() != "true":
+                        text_color = (252, 75, 13)
+                if _flag_sp[1].lower() == "true":
+                    _line_flag = True
+                _s = _x[0]
+            B.text((10, _s_height), _s, text_color)
+            if _line_flag:
+                B.line(
+                    (
+                        7,
+                        _s_height + int(B.getsize(_s)[1] / 2) + 2,
+                        B.getsize(_s)[0] + 11,
+                        _s_height + int(B.getsize(_s)[1] / 2) + 2,
+                    ),
+                    (236, 66, 7),
+                    3,
+                )
+            _s_height += B.getsize("1")[1] + 5
+        # B.text((10, 10), simple_help_str, (255, 255, 255) if ix % 2 else (0, 0, 0))
+        bk.paste(B, center_type="center")
+        bk.transparent(2)
+        ix += 1
+        help_img_list.append(A)
+        simple_help_img_list.append(bk)
+    height = 0
+    for img in help_img_list:
+        height += img.h
+    if not group_id:
+        A = BuildImage(width + 150, height + 50, font_size=24)
+        A.text(
+            (10, 10), '*  注: ‘*’ 代表可有多个相同参数 ‘?’ 代表可省略该参数  *\n\n" "功能名: 功能简介 -> 指令\n\n'
+        )
+        current_height = 50
+        for img in help_img_list:
+            A.paste(img, (0, current_height))
+            current_height += img.h
+        A.save(help_image)
+    # 详细帮助生成完毕
+    # 简易帮助图片合成
+    height = 0
+    width = 0
+    for img in simple_help_img_list:
+        if img.h > height:
+            height = img.h
+        width += img.w + 10
+    B = BuildImage(width + 100, height + 250, font_size=24)
+    width, _ = get_max_width_or_paste(simple_help_img_list, B)
+    bk = None
+    random_bk = os.listdir(random_bk_path)
+    if random_bk:
+        bk = random.choice(random_bk)
+    x = max(width + 50, height + 250)
+    B = BuildImage(
+        x,
+        x,
+        font_size=24,
+        color="#FFEFD5",
+        background=random_bk_path / bk,
+    )
+    B.filter("GaussianBlur", 10)
+    _, B = get_max_width_or_paste(simple_help_img_list, B, True)
+    w = 10
+    h = 10
+    for msg in ["目前支持的功能列表:", "可以通过 ‘帮助[功能名称]’ 来获取对应功能的使用方法", "或者使用 ‘详细帮助’ 来获取所有功能方法"]:
+        text = BuildImage(
+            0,
+            0,
+            plain_text=msg,
+            font_size=24,
+            font="yuanshen.ttf",
+        )
+        B.paste(text, (w, h), True)
+        h += 50
+        if msg == "目前支持的功能列表:":
+            w += 50
+    B.paste(
+        BuildImage(
+            0,
+            0,
+            plain_text="注: 红字代表功能被群管理员禁用，红线代表功能正在维护",
+            font_size=24,
+            font="yuanshen.ttf",
+            font_color=(231, 74, 57)
+        ),
+        (300, 10),
+        True,
+    )
+    B.save(simple_help_image)
+
+
+def get_max_width_or_paste(
+    simple_help_img_list: list, B: BuildImage = None, is_paste: bool = False
+) -> "int, BuildImage":
+    """
+    获取最大宽度，或直接贴图
+    :param simple_help_img_list: 简单帮助图片列表
+    :param B: 背景图
+    :param is_paste: 是否直接贴图
+    """
+    current_width = 50
+    current_height = 180
+    max_width = simple_help_img_list[0].w
+    for i in range(len(simple_help_img_list)):
+        try:
+            if is_paste and B:
+                B.paste(simple_help_img_list[i], (current_width, current_height), True)
+            current_height += simple_help_img_list[i].h + 40
+            if current_height + simple_help_img_list[i + 1].h > B.h - 10:
+                current_height = 180
+                current_width += max_width + 30
+                max_width = 0
+            elif simple_help_img_list[i].w > max_width:
+                max_width = simple_help_img_list[i].w
+        except IndexError:
+            pass
+    if current_width > simple_help_img_list[0].w + 50:
+        current_width += simple_help_img_list[-1].w
+    return current_width, B
+
+
+def get_plugin_help(msg: str, is_super: bool = False) -> Optional[str]:
+    """
+    获取功能的帮助信息
+    :param msg: 功能cmd
+    :param is_super: 是否为超级用户
+    """
+    module = plugins2settings_manager.get_plugin_module(msg)
+    if not module:
+        module = admin_manager.get_plugin_module(msg)
+    if module:
+        try:
+            plugin = nonebot.plugin.get_plugin(module)
+            if plugin:
+                if is_super:
+                    result = plugin.module.__getattribute__(
+                        "__plugin_superuser_usage__"
+                    )
+                else:
+                    result = plugin.module.__getattribute__("__plugin_usage__")
+                if result:
+                    width = 0
+                    for x in result.split("\n"):
+                        _width = len(x) * 24
+                        width = width if width > _width else _width
+                    height = len(result.split("\n")) * 45
+                    A = BuildImage(width, height, font_size=24)
+                    bk = BuildImage(
+                        width,
+                        height,
+                        background=Path(IMAGE_PATH) / "background" / "1.png",
+                    )
+                    A.paste(bk, alpha=True)
+                    A.text((int(width * 0.048), int(height * 0.21)), result)
+                    return A.pic2bs4()
+        except AttributeError:
+            pass
+    return None
@@ -1,511 +0,0 @@
-from typing import Optional
-
-import nonebot
-from nonebot.adapters.onebot.v11 import (
-    GroupMessageEvent,
-    PrivateMessageEvent,
-    Bot,
-    Event,
-    MessageEvent,
-    Message,
-    PokeNotifyEvent,
-)
-from nonebot.exception import ActionFailed, IgnoredException
-from nonebot.internal.matcher import Matcher
-
-from models.bag_user import BagUser
-from models.ban_user import BanUser
-from models.friend_user import FriendUser
-from models.group_member_info import GroupInfoUser
-from models.level_user import LevelUser
-from models.user_shop_gold_log import UserShopGoldLog
-from utils.decorator import Singleton
-from utils.manager import (
-    plugins2block_manager,
-    StaticData,
-    plugins2settings_manager,
-    group_manager,
-    admin_manager,
-    plugins_manager,
-    plugins2cd_manager,
-    plugins2count_manager,
-)
-from utils.message_builder import at
-from utils.utils import FreqLimiter
-from configs.config import Config
-import time
-
-ignore_rst_module = ["ai", "poke", "dialogue"]
-
-other_limit_plugins = ["poke"]
-
-
-class StatusMessageManager(StaticData):
-    def __init__(self):
-        super().__init__(None)
-
-    def add(self, id_: int):
-        self._data[id_] = time.time()
-
-    def delete(self, id_: int):
-        if self._data.get(id_):
-            del self._data[id_]
-
-    def check(self, id_: int, t: int = 30) -> bool:
-        if self._data.get(id_):
-            if time.time() - self._data[id_] > t:
-                del self._data[id_]
-                return True
-            return False
-        return True
-
-
-status_message_manager = StatusMessageManager()
-
-
-def set_block_limit_false(event, module):
-    """
-    设置用户block为false
-    :param event: event
-    :param module: 插件模块
-    """
-    if plugins2block_manager.check_plugin_block_status(module):
-        plugin_block_data = plugins2block_manager.get_plugin_block_data(module)
-        check_type = plugin_block_data.check_type
-        limit_type = plugin_block_data.limit_type
-        if not (
-            (isinstance(event, GroupMessageEvent) and check_type == "private")
-            or (isinstance(event, PrivateMessageEvent) and check_type == "group")
-        ):
-            block_type_ = event.user_id
-            if limit_type == "group" and isinstance(event, GroupMessageEvent):
-                block_type_ = event.group_id
-            plugins2block_manager.set_false(block_type_, module)
-
-
-async def send_msg(msg: str, bot: Bot, event: MessageEvent):
-    """
-    说明:
-        发送信息
-    参数:
-        :param msg: pass
-        :param bot: pass
-        :param event: pass
-    """
-    if "[uname]" in msg:
-        uname = event.sender.card or event.sender.nickname
-        msg = msg.replace("[uname]", uname)
-    if "[nickname]" in msg:
-        if isinstance(event, GroupMessageEvent):
-            nickname = await GroupInfoUser.get_group_member_nickname(
-                event.user_id, event.group_id
-            )
-        else:
-            nickname = await FriendUser.get_friend_nickname(event.user_id)
-        msg = msg.replace("[nickname]", nickname)
-    if "[at]" in msg and isinstance(event, GroupMessageEvent):
-        msg = msg.replace("[at]", str(at(event.user_id)))
-    try:
-        if isinstance(event, GroupMessageEvent):
-            status_message_manager.add(event.group_id)
-            await bot.send_group_msg(group_id=event.group_id, message=Message(msg))
-        else:
-            status_message_manager.add(event.user_id)
-            await bot.send_private_msg(user_id=event.user_id, message=Message(msg))
-    except ActionFailed:
-        pass
-
-
-class IsSuperuserException(Exception):
-    pass
-
-
-@Singleton
-class AuthChecker:
-    """
-    权限检查
-    """
-
-    def __init__(self):
-        self._flmt = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
-        self._flmt_g = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
-        self._flmt_s = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
-        self._flmt_c = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
-
-    async def auth(self, matcher: Matcher, bot: Bot, event: Event):
-        """
-        说明:
-            权限检查
-        参数:
-            :param matcher: matcher
-            :param bot: bot
-            :param event: event
-        """
-        try:
-            plugin_name = matcher.plugin_name
-            cost_gold = await self.auth_cost(plugin_name, bot, event)
-            if str(event.user_id) not in bot.config.superusers:
-                await self.auth_basic(plugin_name, bot, event)
-                self.auth_group(plugin_name, bot, event)
-                await self.auth_admin(plugin_name, matcher, bot, event)
-                await self.auth_plugin(plugin_name, matcher, bot, event)
-                await self.auth_limit(plugin_name, bot, event)
-                if cost_gold:
-                    await BagUser.spend_gold(event.user_id, event.group_id, cost_gold)
-        except IsSuperuserException:
-            return
-
-    async def auth_limit(self, plugin_name: str, bot: Bot, event: Event):
-        """
-        说明:
-            插件限制
-        参数:
-            :param plugin_name: 模块名
-            :param bot: bot
-            :param event: event
-        """
-        if plugins2cd_manager.check_plugin_cd_status(plugin_name):
-            plugin_cd_data = plugins2cd_manager.get_plugin_cd_data(plugin_name)
-            check_type = plugin_cd_data.check_type
-            limit_type = plugin_cd_data.limit_type
-            msg = plugin_cd_data.rst
-            if (
-                (isinstance(event, PrivateMessageEvent) and check_type == "private")
-                or (isinstance(event, GroupMessageEvent) and check_type == "group")
-                or plugins2cd_manager.get_plugin_data(plugin_name).check_type == "all"
-            ):
-                cd_type_ = event.user_id
-                if limit_type == "group" and isinstance(event, GroupMessageEvent):
-                    cd_type_ = event.group_id
-                if not plugins2cd_manager.check(plugin_name, cd_type_):
-                    if msg:
-                        await send_msg(msg, bot, event)
-                    raise IgnoredException(f"{plugin_name} 正在cd中...")
-                else:
-                    plugins2cd_manager.start_cd(plugin_name, cd_type_)
-        # Block
-        if plugins2block_manager.check_plugin_block_status(plugin_name):
-            plugin_block_data = plugins2block_manager.get_plugin_block_data(plugin_name)
-            check_type = plugin_block_data.check_type
-            limit_type = plugin_block_data.limit_type
-            msg = plugin_block_data.rst
-            if (
-                (isinstance(event, PrivateMessageEvent) and check_type == "private")
-                or (isinstance(event, GroupMessageEvent) and check_type == "group")
-                or check_type == "all"
-            ):
-                block_type_ = event.user_id
-                if limit_type == "group" and isinstance(event, GroupMessageEvent):
-                    block_type_ = event.group_id
-                if plugins2block_manager.check(block_type_, plugin_name):
-                    if msg:
-                        await send_msg(msg, bot, event)
-                    raise IgnoredException(f"{event.user_id}正在调用{plugin_name}....")
-                else:
-                    plugins2block_manager.set_true(block_type_, plugin_name)
-        # Count
-        if (
-            plugins2count_manager.check_plugin_count_status(plugin_name)
-            and event.user_id not in bot.config.superusers
-        ):
-            plugin_count_data = plugins2count_manager.get_plugin_count_data(plugin_name)
-            limit_type = plugin_count_data.limit_type
-            msg = plugin_count_data.rst
-            count_type_ = event.user_id
-            if limit_type == "group" and isinstance(event, GroupMessageEvent):
-                count_type_ = event.group_id
-            if not plugins2count_manager.check(plugin_name, count_type_):
-                if msg:
-                    await send_msg(msg, bot, event)
-                raise IgnoredException(f"{plugin_name} count次数限制...")
-            else:
-                plugins2count_manager.increase(plugin_name, count_type_)
-
-    async def auth_plugin(self, plugin_name: str, matcher: Matcher, bot: Bot, event: Event):
-        """
-        说明:
-            插件状态
-        参数:
-            :param plugin_name: 模块名
-            :param matcher: matcher
-            :param bot: bot
-            :param event: event
-        """
-        if plugin_name in plugins2settings_manager.keys() and matcher.priority not in [
-            1,
-            999,
-        ]:
-            # 戳一戳单独判断
-            if (
-                isinstance(event, GroupMessageEvent)
-                or isinstance(event, PokeNotifyEvent)
-                or matcher.plugin_name in other_limit_plugins
-            ):
-                if status_message_manager.get(event.group_id) is None:
-                    status_message_manager.delete(event.group_id)
-                if plugins2settings_manager[
-                    plugin_name
-                ].level > group_manager.get_group_level(event.group_id):
-                    try:
-                        if (
-                            self._flmt_g.check(event.user_id)
-                            and plugin_name not in ignore_rst_module
-                        ):
-                            self._flmt_g.start_cd(event.user_id)
-                            await bot.send_group_msg(
-                                group_id=event.group_id, message="群权限不足..."
-                            )
-                    except ActionFailed:
-                        pass
-                    if event.is_tome():
-                        status_message_manager.add(event.group_id)
-                    set_block_limit_false(event, plugin_name)
-                    raise IgnoredException("群权限不足")
-                # 插件状态
-                if not group_manager.get_plugin_status(plugin_name, event.group_id):
-                    try:
-                        if plugin_name not in ignore_rst_module and self._flmt_s.check(
-                            event.group_id
-                        ):
-                            self._flmt_s.start_cd(event.group_id)
-                            await bot.send_group_msg(
-                                group_id=event.group_id, message="该群未开启此功能.."
-                            )
-                    except ActionFailed:
-                        pass
-                    if event.is_tome():
-                        status_message_manager.add(event.group_id)
-                    set_block_limit_false(event, plugin_name)
-                    raise IgnoredException("未开启此功能...")
-                # 管理员禁用
-                if not group_manager.get_plugin_status(
-                    f"{plugin_name}:super", event.group_id
-                ):
-                    try:
-                        if (
-                            self._flmt_s.check(event.group_id)
-                            and plugin_name not in ignore_rst_module
-                        ):
-                            self._flmt_s.start_cd(event.group_id)
-                            await bot.send_group_msg(
-                                group_id=event.group_id, message="管理员禁用了此群该功能..."
-                            )
-                    except ActionFailed:
-                        pass
-                    if event.is_tome():
-                        status_message_manager.add(event.group_id)
-                    set_block_limit_false(event, plugin_name)
-                    raise IgnoredException("管理员禁用了此群该功能...")
-                # 群聊禁用
-                if not plugins_manager.get_plugin_status(
-                    plugin_name, block_type="group"
-                ):
-                    try:
-                        if (
-                            self._flmt_c.check(event.group_id)
-                            and plugin_name not in ignore_rst_module
-                        ):
-                            self._flmt_c.start_cd(event.group_id)
-                            await bot.send_group_msg(
-                                group_id=event.group_id, message="该功能在群聊中已被禁用..."
-                            )
-                    except ActionFailed:
-                        pass
-                    if event.is_tome():
-                        status_message_manager.add(event.group_id)
-                    set_block_limit_false(event, plugin_name)
-                    raise IgnoredException("该插件在群聊中已被禁用...")
-            else:
-                # 私聊禁用
-                if not plugins_manager.get_plugin_status(
-                    plugin_name, block_type="private"
-                ):
-                    try:
-                        if self._flmt_c.check(event.user_id):
-                            self._flmt_c.start_cd(event.user_id)
-                            await bot.send_private_msg(
-                                user_id=event.user_id, message="该功能在私聊中已被禁用..."
-                            )
-                    except ActionFailed:
-                        pass
-                    if event.is_tome():
-                        status_message_manager.add(event.user_id)
-                    set_block_limit_false(event, plugin_name)
-                    raise IgnoredException("该插件在私聊中已被禁用...")
-            # 维护
-            if not plugins_manager.get_plugin_status(plugin_name, block_type="all"):
-                if isinstance(
-                    event, GroupMessageEvent
-                ) and group_manager.check_group_is_white(event.group_id):
-                    raise IsSuperuserException()
-                try:
-                    if isinstance(event, GroupMessageEvent):
-                        if (
-                            self._flmt_c.check(event.group_id)
-                            and plugin_name not in ignore_rst_module
-                        ):
-                            self._flmt_c.start_cd(event.group_id)
-                            await bot.send_group_msg(
-                                group_id=event.group_id, message="此功能正在维护..."
-                            )
-                    else:
-                        await bot.send_private_msg(
-                            user_id=event.user_id, message="此功能正在维护..."
-                        )
-                except ActionFailed:
-                    pass
-                if event.is_tome():
-                    id_ = (
-                        event.group_id
-                        if isinstance(event, GroupMessageEvent)
-                        else event.user_id
-                    )
-                    status_message_manager.add(id_)
-                set_block_limit_false(event, plugin_name)
-                raise IgnoredException("此功能正在维护...")
-
-    async def auth_admin(self, plugin_name: str, matcher: Matcher, bot: Bot, event: Event):
-        """
-        说明:
-            管理员命令 个人权限
-        参数:
-            :param plugin_name: 模块名
-            :param matcher: matcher
-            :param bot: bot
-            :param event: event
-        """
-        if plugin_name in admin_manager.keys() and matcher.priority not in [1, 999]:
-            if isinstance(event, GroupMessageEvent):
-                # 个人权限
-                if (
-                    not await LevelUser.check_level(
-                        event.user_id,
-                        event.group_id,
-                        admin_manager.get_plugin_level(plugin_name),
-                    )
-                    and admin_manager.get_plugin_level(plugin_name) > 0
-                ):
-                    try:
-                        if self._flmt.check(event.user_id):
-                            self._flmt.start_cd(event.user_id)
-                            await bot.send_group_msg(
-                                group_id=event.group_id,
-                                message=f"{at(event.user_id)}你的权限不足喔，该功能需要的权限等级："
-                                f"{admin_manager.get_plugin_level(plugin_name)}",
-                            )
-                    except ActionFailed:
-                        pass
-                    set_block_limit_false(event, plugin_name)
-                    if event.is_tome():
-                        status_message_manager.add(event.group_id)
-                    raise IgnoredException("权限不足")
-            else:
-                if not await LevelUser.check_level(
-                    event.user_id, 0, admin_manager.get_plugin_level(plugin_name)
-                ):
-                    try:
-                        await bot.send_private_msg(
-                            user_id=event.user_id,
-                            message=f"你的权限不足喔，该功能需要的权限等级：{admin_manager.get_plugin_level(plugin_name)}",
-                        )
-                    except ActionFailed:
-                        pass
-                    set_block_limit_false(event, plugin_name)
-                    if event.is_tome():
-                        status_message_manager.add(event.user_id)
-                    raise IgnoredException("权限不足")
-
-    def auth_group(self, plugin_name: str, bot: Bot, event: Event):
-        """
-        说明:
-            群黑名单检测 群总开关检测
-        参数:
-            :param plugin_name: 模块名
-            :param bot: bot
-            :param event: event
-        """
-        if isinstance(event, GroupMessageEvent) or plugin_name in other_limit_plugins:
-            try:
-                if (
-                    group_manager.get_group_level(event.group_id) < 0
-                    and str(event.user_id) not in bot.config.superusers
-                ):
-                    raise IgnoredException("群黑名单")
-                if not group_manager.check_group_bot_status(event.group_id):
-                    try:
-                        if str(event.get_message()) != "醒来":
-                            raise IgnoredException("功能总开关关闭状态")
-                    except ValueError:
-                        raise IgnoredException("功能总开关关闭状态")
-            except AttributeError:
-                pass
-
-    async def auth_basic(self, plugin_name: str, bot: Bot, event: Event):
-        """
-        说明:
-            检测是否满足超级用户权限，是否被ban等
-        参数:
-            :param plugin_name: 模块名
-            :param bot: bot
-            :param event: event
-        """
-        try:
-            if (
-                (
-                    not isinstance(event, MessageEvent)
-                    and plugin_name not in other_limit_plugins
-                )
-                or await BanUser.is_ban(event.user_id)
-                and str(event.user_id) not in bot.config.superusers
-            ) or (
-                str(event.user_id) in bot.config.superusers
-                and plugins2settings_manager.get_plugin_data(plugin_name)
-                and not plugins2settings_manager.get_plugin_data(
-                    plugin_name
-                ).limit_superuser
-            ):
-                raise IsSuperuserException()
-            _plugin = nonebot.plugin.get_plugin(plugin_name)
-            _module = _plugin.module
-            _plugin_name = _module.__getattribute__("__zx_plugin_name__")
-            if (
-                "[superuser]" in _plugin_name.lower()
-                and str(event.user_id) in bot.config.superusers
-            ):
-                raise IsSuperuserException()
-        except AttributeError:
-            pass
-
-    async def auth_cost(self, plugin_name: str, bot: Bot, event: Event) -> int:
-        """
-        说明:
-            检测是否满足金币条件
-        参数:
-            :param plugin_name: 模块名
-            :param bot: bot
-            :param event: event
-        """
-        cost_gold = 0
-        if isinstance(event, GroupMessageEvent) and (
-            psm := plugins2settings_manager.get_plugin_data(plugin_name)
-        ):
-            if psm.cost_gold > 0:
-                if (
-                    await BagUser.get_gold(event.user_id, event.group_id)
-                    < psm.cost_gold
-                ):
-                    await send_msg(f"金币不足..该功能需要{psm.cost_gold}金币..", bot, event)
-                    raise IgnoredException(f"{plugin_name} 金币限制...")
-                # 当插件不阻塞超级用户时，超级用户提前扣除金币
-                if (
-                    str(event.user_id) in bot.config.superusers
-                    and not psm.limit_superuser
-                ):
-                    await BagUser.spend_gold(
-                        event.user_id, event.group_id, psm.cost_gold
-                    )
-                await UserShopGoldLog.add_shop_log(
-                    event.user_id, event.group_id, 2, plugin_name, psm.cost_gold, 1
-                )
-                cost_gold = psm.cost_gold
-        return cost_gold
@@ -1,36 +1,406 @@
+from nonebot.matcher import Matcher
+from nonebot.message import run_preprocessor, run_postprocessor, IgnoredException
+from nonebot.adapters.cqhttp.exception import ActionFailed
+from models.friend_user import FriendUser
+from models.group_member_info import GroupInfoUser
+from models.bag_user import BagUser
+from utils.manager import (
+    plugins2settings_manager,
+    admin_manager,
+    group_manager,
+    plugins_manager,
+    plugins2cd_manager,
+    plugins2block_manager,
+    plugins2count_manager
+)
+from .utils import set_block_limit_false, status_message_manager
+from nonebot.typing import T_State
 from typing import Optional
-
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.cqhttp import (
    Bot,
    MessageEvent,
-    Event,
+    GroupMessageEvent,
+    PokeNotifyEvent,
+    PrivateMessageEvent,
+    Message,
+    Event
 )
-from nonebot.matcher import Matcher
-from nonebot.message import run_preprocessor, run_postprocessor
-from nonebot.typing import T_State
+from configs.config import Config
+from models.ban_user import BanUser
+from utils.utils import FreqLimiter
+from utils.message_builder import at
+from models.level_user import LevelUser
+import nonebot

-from ._utils import (
-    set_block_limit_false,
-    AuthChecker,
-)
+_flmt = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
+_flmt_g = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
+_flmt_s = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
+_flmt_c = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
+
+ignore_rst_module = ["ai", "poke", "dialogue"]


-# # 权限检测
+# 权限检测
@run_preprocessor
-async def _(matcher: Matcher, bot: Bot, event: Event):
-    await AuthChecker().auth(matcher, bot, event)
+async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
+    module = matcher.module
+    plugins2info_dict = plugins2settings_manager.get_data()
+    # 功能的金币检测 #######################################
+    # 功能的金币检测 #######################################
+    # 功能的金币检测 #######################################
+    cost_gold = 0
+    if isinstance(event, GroupMessageEvent) and plugins2settings_manager.get_plugin_data(module).get('cost_gold'):
+        cost_gold = plugins2settings_manager.get_plugin_data(module).get('cost_gold')
+        if await BagUser.get_gold(event.user_id, event.group_id) < cost_gold:
+            await send_msg(f"金币不足..该功能需要{cost_gold}金币..", bot, event)
+            raise IgnoredException(f"{module} 金币限制...")
+        # 当插件不阻塞超级用户时，超级用户提前扣除金币
+        if str(event.user_id) in bot.config.superusers and not plugins2info_dict[module]["limit_superuser"]:
+            await BagUser.spend_gold(event.user_id, event.group_id, cost_gold)
+    try:
+        if (
+                (not isinstance(event, MessageEvent) and module != "poke")
+                or await BanUser.is_ban(event.user_id)
+                and str(event.user_id) not in bot.config.superusers
+        ) or (
+                str(event.user_id) in bot.config.superusers
+                and plugins2info_dict.get(module)
+                and not plugins2info_dict[module]["limit_superuser"]
+        ):
+            return
+    except AttributeError:
+        pass
+    # 超级用户命令
+    try:
+        _plugin = nonebot.plugin.get_plugin(module)
+        _module = _plugin.module
+        plugin_name = _module.__getattribute__("__zx_plugin_name__")
+        if (
+                "[superuser]" in plugin_name.lower()
+                and str(event.user_id) in bot.config.superusers
+        ):
+            return
+    except AttributeError:
+        pass
+    # 群黑名单检测 群总开关检测
+    if isinstance(event, GroupMessageEvent) or matcher.module == "poke":
+        try:
+            if group_manager.get_group_level(event.group_id) < 0:
+                raise IgnoredException("群黑名单")
+            if not group_manager.check_group_bot_status(event.group_id):
+                try:
+                    if str(event.get_message()) != "醒来":
+                        raise IgnoredException("功能总开关关闭状态")
+                except ValueError:
+                    raise IgnoredException("功能总开关关闭状态")
+        except AttributeError:
+            pass
+    if module in admin_manager.keys() and matcher.priority not in [1, 9]:
+        if isinstance(event, GroupMessageEvent):
+            # 个人权限
+            if (
+                    not await LevelUser.check_level(
+                        event.user_id,
+                        event.group_id,
+                        admin_manager.get_plugin_level(module),
+                    )
+                    and admin_manager.get_plugin_level(module) > 0
+            ):
+                try:
+                    if _flmt.check(event.user_id):
+                        _flmt.start_cd(event.user_id)
+                        await bot.send_group_msg(
+                            group_id=event.group_id,
+                            message=f"{at(event.user_id)}你的权限不足喔，该功能需要的权限等级："
+                                    f"{admin_manager.get_plugin_level(module)}",
+                        )
+                except ActionFailed:
+                    pass
+                set_block_limit_false(event, module)
+                if event.is_tome():
+                    status_message_manager.add(event.group_id)
+                raise IgnoredException("权限不足")
+        else:
+            if not await LevelUser.check_level(
+                    event.user_id, 0, admin_manager.get_plugin_level(module)
+            ):
+                try:
+                    await bot.send_private_msg(
+                        user_id=event.user_id,
+                        message=f"你的权限不足喔，该功能需要的权限等级：{admin_manager.get_plugin_level(module)}",
+                    )
+                except ActionFailed:
+                    pass
+                set_block_limit_false(event, module)
+                if event.is_tome():
+                    status_message_manager.add(event.user_id)
+                raise IgnoredException("权限不足")
+    if module in plugins2info_dict.keys() and matcher.priority not in [1, 9]:
+        # 戳一戳单独判断
+        if isinstance(event, GroupMessageEvent) or (
+                isinstance(event, PokeNotifyEvent) and event.group_id
+        ):
+            if status_message_manager.get(event.group_id) is None:
+                status_message_manager.delete(event.group_id)
+            if plugins2info_dict[module]["level"] > group_manager.get_group_level(
+                    event.group_id
+            ):
+                try:
+                    if _flmt_g.check(event.user_id) and module not in ignore_rst_module:
+                        _flmt_g.start_cd(event.user_id)
+                        await bot.send_group_msg(
+                            group_id=event.group_id, message="群权限不足..."
+                        )
+                except ActionFailed:
+                    pass
+                if event.is_tome():
+                    status_message_manager.add(event.group_id)
+                set_block_limit_false(event, module)
+                raise IgnoredException("群权限不足")
+            # 插件状态
+            if not group_manager.get_plugin_status(module, event.group_id):
+                try:
+                    if module not in ignore_rst_module and _flmt_s.check(
+                            event.group_id
+                    ):
+                        _flmt_s.start_cd(event.group_id)
+                        await bot.send_group_msg(
+                            group_id=event.group_id, message="该群未开启此功能.."
+                        )
+                except ActionFailed:
+                    pass
+                if event.is_tome():
+                    status_message_manager.add(event.group_id)
+                set_block_limit_false(event, module)
+                raise IgnoredException("未开启此功能...")
+            # 管理员禁用
+            if not group_manager.get_plugin_status(f"{module}:super", event.group_id):
+                try:
+                    if (
+                            _flmt_s.check(event.group_id)
+                            and module not in ignore_rst_module
+                    ):
+                        _flmt_s.start_cd(event.group_id)
+                        await bot.send_group_msg(
+                            group_id=event.group_id, message="管理员禁用了此群该功能..."
+                        )
+                except ActionFailed:
+                    pass
+                if event.is_tome():
+                    status_message_manager.add(event.group_id)
+                set_block_limit_false(event, module)
+                raise IgnoredException("管理员禁用了此群该功能...")
+            # 群聊禁用
+            if not plugins_manager.get_plugin_status(module, block_type="group"):
+                try:
+                    if (
+                            _flmt_c.check(event.group_id)
+                            and module not in ignore_rst_module
+                    ):
+                        _flmt_c.start_cd(event.group_id)
+                        await bot.send_group_msg(
+                            group_id=event.group_id, message="该功能在群聊中已被禁用..."
+                        )
+                except ActionFailed:
+                    pass
+                if event.is_tome():
+                    status_message_manager.add(event.group_id)
+                set_block_limit_false(event, module)
+                raise IgnoredException("该插件在群聊中已被禁用...")
+        else:
+            # 私聊禁用
+            if not plugins_manager.get_plugin_status(module, block_type="private"):
+                try:
+                    if _flmt_c.check(event.user_id):
+                        _flmt_c.start_cd(event.user_id)
+                        await bot.send_private_msg(
+                            user_id=event.user_id, message="该功能在私聊中已被禁用..."
+                        )
+                except ActionFailed:
+                    pass
+                if event.is_tome():
+                    status_message_manager.add(event.user_id)
+                set_block_limit_false(event, module)
+                raise IgnoredException("该插件在私聊中已被禁用...")
+        # 维护
+        if not plugins_manager.get_plugin_status(module, block_type="all"):
+            if isinstance(
+                    event, GroupMessageEvent
+            ) and group_manager.check_group_is_white(event.group_id):
+                return
+            try:
+                if isinstance(event, GroupMessageEvent):
+                    if (
+                            _flmt_c.check(event.group_id)
+                            and module not in ignore_rst_module
+                    ):
+                        _flmt_c.start_cd(event.group_id)
+                        await bot.send_group_msg(
+                            group_id=event.group_id, message="此功能正在维护..."
+                        )
+                else:
+                    await bot.send_private_msg(
+                        user_id=event.user_id, message="此功能正在维护..."
+                    )
+            except ActionFailed:
+                pass
+            if event.is_tome():
+                id_ = (
+                    event.group_id
+                    if isinstance(event, GroupMessageEvent)
+                    else event.user_id
+                )
+                status_message_manager.add(id_)
+            set_block_limit_false(event, module)
+            raise IgnoredException("此功能正在维护...")
+
+    # 以下为限制检测 #######################################################
+    # 以下为限制检测 #######################################################
+    # 以下为限制检测 #######################################################
+    # 以下为限制检测 #######################################################
+    # 以下为限制检测 #######################################################
+    # 以下为限制检测 #######################################################
+
+    # Cd
+    if plugins2cd_manager.check_plugin_cd_status(module):
+        plugin_cd_data = plugins2cd_manager.get_plugin_cd_data(module)
+        check_type = plugin_cd_data["check_type"]
+        limit_type = plugin_cd_data["limit_type"]
+        rst = plugin_cd_data["rst"]
+        if (
+                (isinstance(event, PrivateMessageEvent) and check_type == "private")
+                or (isinstance(event, GroupMessageEvent) and check_type == "group")
+                or plugins2cd_manager.get_plugin_data(module).get("check_type") == "all"
+        ):
+            cd_type_ = event.user_id
+            if limit_type == "group" and isinstance(event, GroupMessageEvent):
+                cd_type_ = event.group_id
+            if not plugins2cd_manager.check(module, cd_type_):
+                if rst:
+                    rst = await init_rst(rst, event)
+                    await send_msg(rst, bot, event)
+                raise IgnoredException(f"{module} 正在cd中...")
+            else:
+                plugins2cd_manager.start_cd(module, cd_type_)
+    module = matcher.module
+    if (
+            isinstance(event, GroupMessageEvent)
+            and status_message_manager.get(event.group_id) is None
+    ):
+        status_message_manager.delete(event.group_id)
+    # Cd
+    if plugins2cd_manager.check_plugin_cd_status(module):
+        plugin_cd_data = plugins2cd_manager.get_plugin_cd_data(module)
+        check_type = plugin_cd_data["check_type"]
+        limit_type = plugin_cd_data["limit_type"]
+        rst = plugin_cd_data["rst"]
+        if (
+                (isinstance(event, PrivateMessageEvent) and check_type == "private")
+                or (isinstance(event, GroupMessageEvent) and check_type == "group")
+                or plugins2cd_manager.get_plugin_data(module).get("check_type") == "all"
+        ):
+            cd_type_ = event.user_id
+            if limit_type == "group" and isinstance(event, GroupMessageEvent):
+                cd_type_ = event.group_id
+            if not plugins2cd_manager.check(module, cd_type_):
+                if rst:
+                    rst = await init_rst(rst, event)
+                    await send_msg(rst, bot, event)
+                raise IgnoredException(f"{module} 正在cd中...")
+            else:
+                plugins2cd_manager.start_cd(module, cd_type_)
+    # Block
+    if plugins2block_manager.check_plugin_block_status(module):
+        plugin_block_data = plugins2block_manager.get_plugin_block_data(module)
+        check_type = plugin_block_data["check_type"]
+        limit_type = plugin_block_data["limit_type"]
+        rst = plugin_block_data["rst"]
+        if (
+                (isinstance(event, PrivateMessageEvent) and check_type == "private")
+                or (isinstance(event, GroupMessageEvent) and check_type == "group")
+                or check_type == "all"
+        ):
+            block_type_ = event.user_id
+            if limit_type == "group" and isinstance(event, GroupMessageEvent):
+                block_type_ = event.group_id
+            if plugins2block_manager.check(block_type_, module):
+                if rst:
+                    rst = await init_rst(rst, event)
+                    await send_msg(rst, bot, event)
+                raise IgnoredException(f"{event.user_id}正在调用{module}....")
+            else:
+                plugins2block_manager.set_true(block_type_, module)
+    # Count
+    if (
+            plugins2count_manager.check_plugin_count_status(module)
+            and event.user_id not in bot.config.superusers
+    ):
+        plugin_count_data = plugins2count_manager.get_plugin_count_data(module)
+        limit_type = plugin_count_data["limit_type"]
+        rst = plugin_count_data["rst"]
+        count_type_ = event.user_id
+        if limit_type == "group" and isinstance(event, GroupMessageEvent):
+            count_type_ = event.group_id
+        if not plugins2count_manager.check(module, count_type_):
+            if rst:
+                rst = await init_rst(rst, event)
+                await send_msg(rst, bot, event)
+            raise IgnoredException(f"{module} count次数限制...")
+        else:
+            plugins2count_manager.increase(module, count_type_)
+    # 功能花费的金币 #######################################
+    # 功能花费的金币 #######################################
+    if cost_gold:
+        await BagUser.spend_gold(event.user_id, event.group_id, cost_gold)
+
+
+async def send_msg(rst: str, bot: Bot, event: MessageEvent):
+    """
+    发送信息
+    :param rst: pass
+    :param bot: pass
+    :param event: pass
+    """
+    rst = await init_rst(rst, event)
+    try:
+        if isinstance(event, GroupMessageEvent):
+            status_message_manager.add(event.group_id)
+            await bot.send_group_msg(group_id=event.group_id, message=Message(rst))
+        else:
+            status_message_manager.add(event.user_id)
+            await bot.send_private_msg(user_id=event.user_id, message=Message(rst))
+    except ActionFailed:
+        pass


 # 解除命令block阻塞
@run_postprocessor
 async def _(
-        matcher: Matcher,
-        exception: Optional[Exception],
-        bot: Bot,
-        event: Event,
-        state: T_State,
+    matcher: Matcher,
+    exception: Optional[Exception],
+    bot: Bot,
+    event: Event,
+    state: T_State,
 ):
-    if not isinstance(event, MessageEvent) and matcher.plugin_name != "poke":
+    if not isinstance(event, MessageEvent) and matcher.module != "poke":
        return
-    module = matcher.plugin_name
+    module = matcher.module
    set_block_limit_false(event, module)
+
+
+async def init_rst(rst: str, event: MessageEvent):
+    if "[uname]" in rst:
+        uname = event.sender.card if event.sender.card else event.sender.nickname
+        rst = rst.replace("[uname]", uname)
+    if "[nickname]" in rst:
+        if isinstance(event, GroupMessageEvent):
+            nickname = await GroupInfoUser.get_group_member_nickname(
+                event.user_id, event.group_id
+            )
+        else:
+            nickname = await FriendUser.get_friend_nickname(event.user_id)
+        rst = rst.replace("[nickname]", nickname)
+    if "[at]" in rst and isinstance(event, GroupMessageEvent):
+        rst = rst.replace("[at]", str(at(event.user_id)))
+    return rst
+
@@ -1,19 +1,16 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, IgnoredException
+from nonebot.adapters.cqhttp.exception import ActionFailed
 from nonebot.typing import T_State
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.cqhttp import (
    Bot,
-    Event,
    MessageEvent,
-    ActionFailed,
-    PokeNotifyEvent,
    GroupMessageEvent,
 )
 from configs.config import Config
 from models.ban_user import BanUser
 from utils.utils import is_number, static_flmt, FreqLimiter
 from utils.message_builder import at
-from ._utils import ignore_rst_module, other_limit_plugins


 Config.add_plugin_config(
@@ -28,22 +25,18 @@ _flmt = FreqLimiter(300)

 # 检查是否被ban
@run_preprocessor
-async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State):
-    if hasattr(event, "user_id") and (
-        (
-            (isinstance(event, MessageEvent) or isinstance(event, PokeNotifyEvent))
-            and matcher.priority not in [1, 999]
-        )
-        or matcher.plugin_name in other_limit_plugins
-    ):
-        try:
-            if (
-                await BanUser.is_super_ban(event.user_id)
-                and str(event.user_id) not in bot.config.superusers
-            ):
-                raise IgnoredException("用户处于超级黑名单中")
-        except AttributeError:
-            pass
+async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
+    try:
+        if (
+            await BanUser.is_super_ban(event.user_id)
+            and str(event.user_id) not in bot.config.superusers
+        ):
+            raise IgnoredException("用户处于超级黑名单中")
+    except AttributeError:
+        pass
+    if not isinstance(event, MessageEvent):
+        return
+    if matcher.type == "message" and matcher.priority not in [1, 9]:
        if (
            await BanUser.is_ban(event.user_id)
            and str(event.user_id) not in bot.config.superusers
@@ -61,14 +54,10 @@ async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State):
                if not static_flmt.check(event.user_id):
                    raise IgnoredException("用户处于黑名单中")
                static_flmt.start_cd(event.user_id)
-                if matcher.priority != 999:
+                if matcher.priority != 9:
                    try:
                        ban_result = Config.get_config("hook", "BAN_RESULT")
-                        if (
-                            ban_result
-                            and _flmt.check(event.user_id)
-                            and matcher.plugin_name not in ignore_rst_module
-                        ):
+                        if ban_result and _flmt.check(event.user_id):
                            _flmt.start_cd(event.user_id)
                            await bot.send_group_msg(
                                group_id=event.group_id,
@@ -82,10 +71,10 @@ async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State):
                if not static_flmt.check(event.user_id):
                    raise IgnoredException("用户处于黑名单中")
                static_flmt.start_cd(event.user_id)
-                if matcher.priority != 999:
+                if matcher.priority != 9:
                    try:
                        ban_result = Config.get_config("hook", "BAN_RESULT")
-                        if ban_result and matcher.plugin_name not in ignore_rst_module:
+                        if ban_result:
                            await bot.send_private_msg(
                                user_id=event.user_id,
                                message=at(event.user_id)
@@ -94,4 +83,4 @@ async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State):
                            )
                    except ActionFailed:
                        pass
-            raise IgnoredException("用户处于黑名单中")
+            raise IgnoredException("用户处于黑名单中")
@@ -1,9 +1,9 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, IgnoredException
+from nonebot.adapters.cqhttp.exception import ActionFailed
 from nonebot.typing import T_State
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.cqhttp import (
    Bot,
-    ActionFailed,
    MessageEvent,
    GroupMessageEvent,
 )
@@ -25,7 +25,7 @@ _blmt = BanCheckLimiter(
 async def _(matcher: Matcher, bot: Bot, event: GroupMessageEvent, state: T_State):
    if not isinstance(event, MessageEvent):
        return
-    if matcher.type == "message" and matcher.priority not in [1, 999]:
+    if matcher.type == "message" and matcher.priority not in [1, 9]:
        if state["_prefix"]["raw_command"]:
            if _blmt.check(f'{event.user_id}{state["_prefix"]["raw_command"]}'):
                if await BanUser.ban(
@@ -1,8 +1,8 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, IgnoredException
 from nonebot.typing import T_State
-from ._utils import status_message_manager
-from nonebot.adapters.onebot.v11 import (
+from .utils import status_message_manager
+from nonebot.adapters.cqhttp import (
    Bot,
    MessageEvent,
    PrivateMessageEvent,
@@ -24,7 +24,7 @@ async def _(matcher: Matcher, bot: Bot, event: PrivateMessageEvent, state: T_Sta
 async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
    if not isinstance(event, MessageEvent):
        return
-    if matcher.type == "message" and matcher.plugin_name == "ai":
+    if matcher.type == "message" and matcher.module == "ai":
        if (
            isinstance(event, GroupMessageEvent)
            and not status_message_manager.check(event.group_id)
@@ -35,9 +35,7 @@ async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
            isinstance(event, PrivateMessageEvent)
            and not status_message_manager.check(event.user_id)
        ):
+            print(status_message_manager)
            status_message_manager.delete(event.user_id)
            raise IgnoredException("有命令就别说话了")

-
-
-
@@ -1,56 +0,0 @@
-from nonebot.exception import MockApiException
-from nonebot.adapters.onebot.v11 import Bot, Message
-from utils.manager import group_manager
-from services.log import logger
-from typing import Dict, Any
-import re
-
-
-@Bot.on_calling_api
-async def _(bot: Bot, api: str, data: Dict[str, Any]):
-    r = None
-    task = None
-    group_id = None
-    try:
-        if (
-            (
-                (api == "send_msg" and data.get("message_type") == "group")
-                or api == "send_group_msg"
-            )
-            and (
-                (
-                    r := re.search(
-                        "^\[\[_task\|(.*)]]",
-                        data["message"].strip()
-                        if isinstance(data["message"], str)
-                        else str(data["message"]["text"]).strip(),
-                    )
-                )
-                or (
-                    r := re.search(
-                        "^&#91;&#91;_task\|(.*)&#93;&#93;",
-                        data["message"].strip()
-                        if isinstance(data["message"], str)
-                        else str(data["message"]["text"]).strip(),
-                    )
-                )
-            )
-            and r.group(1) in group_manager.get_task_data().keys()
-        ):
-            task = r.group(1)
-            group_id = data["group_id"]
-    except Exception as e:
-        logger.error(f"TaskHook ERROR {type(e)}：{e}")
-    else:
-        if task and group_id:
-            if (
-                group_manager.get_group_level(group_id) < 0
-                or not group_manager.check_task_status(task, group_id)
-            ):
-                raise MockApiException(f"被动技能 {task} 处于关闭状态...")
-            else:
-                msg = str(data["message"]).strip()
-                msg = msg.replace(f"&#91;&#91;_task|{task}&#93;&#93;", "").replace(
-                    f"[[_task|{task}]]", ""
-                )
-                data["message"] = Message(msg)
@@ -0,0 +1,48 @@
+from nonebot.adapters.cqhttp import GroupMessageEvent, PrivateMessageEvent
+from utils.manager import plugins2block_manager, StaticData
+import time
+
+
+class StatusMessageManager(StaticData):
+
+    def __init__(self):
+        super().__init__(None)
+
+    def add(self, id_: int):
+        self._data[id_] = time.time()
+
+    def delete(self, id_: int):
+        if self._data.get(id_):
+            del self._data[id_]
+
+    def check(self, id_: int, t: int = 30) -> bool:
+        if self._data.get(id_):
+            if time.time() - self._data[id_] > t:
+                del self._data[id_]
+                return True
+            return False
+        return True
+
+
+status_message_manager = StatusMessageManager()
+
+
+def set_block_limit_false(event, module):
+    """
+    设置用户block为false
+    :param event: event
+    :param module: 插件模块
+    """
+    if plugins2block_manager.check_plugin_block_status(module):
+        plugin_block_data = plugins2block_manager.get_plugin_block_data(module)
+        check_type = plugin_block_data["check_type"]
+        limit_type = plugin_block_data["limit_type"]
+        if not (
+            (isinstance(event, GroupMessageEvent) and check_type == "private")
+            or (isinstance(event, PrivateMessageEvent) and check_type == "group")
+        ):
+            block_type_ = event.user_id
+            if limit_type == "group" and isinstance(event, GroupMessageEvent):
+                block_type_ = event.group_id
+            plugins2block_manager.set_false(block_type_, module)
+
@@ -2,7 +2,7 @@ from nonebot.matcher import Matcher
 from nonebot.message import run_postprocessor
 from typing import Optional
 from nonebot.typing import T_State
-from nonebot.adapters.onebot.v11 import Bot, Event
+from nonebot.adapters.cqhttp import Bot, Event
 from utils.manager import withdraw_message_manager
 import asyncio

@@ -25,4 +25,4 @@ async def _(

 async def _withdraw_message(bot: Bot, id_: int, time: int):
    await asyncio.sleep(time)
-    await bot.delete_msg(message_id=id_)
+    await bot.delete_msg(message_id=id_, self_id=int(bot.self_id))
@@ -1,11 +1,9 @@
-from configs.path_config import DATA_PATH
 from .init_group_manager import init_group_manager, group_manager
 from .init_plugins_config import init_plugins_config
 from .init_plugins_data import init_plugins_data, plugins_manager
 from .init_none_plugin_count_manager import init_none_plugin_count_manager
 from .init_plugins_resources import init_plugins_resources
 from .init_plugins_settings import init_plugins_settings
-from .init_plugin_info import init_plugin_info
 from .init_plugins_limit import (
    init_plugins_block_limit,
    init_plugins_count_limit,
@@ -13,8 +11,11 @@ from .init_plugins_limit import (
 )
 from .init import init
 from .check_plugin_status import check_plugin_status
-from nonebot.adapters.onebot.v11 import Bot
+from utils.manager import admin_manager
+from nonebot.adapters.cqhttp import Bot
+from configs.path_config import DATA_PATH
 from services.log import logger
+from pathlib import Path
 from nonebot import Driver
 import nonebot

@@ -28,26 +29,27 @@ driver: Driver = nonebot.get_driver()


@driver.on_startup
-async def _():
+def _():
    """
    初始化数据
    """
-    config_file = DATA_PATH / "configs" / "plugins2config.yaml"
-    _flag = not config_file.exists()
+    _flag = False
+    config_file = Path(DATA_PATH) / "configs" / "plugins2config.yaml"
+    if not config_file.exists():
+        _flag = True
    init()
-    init_plugin_info()
-    init_plugins_settings()
-    init_plugins_cd_limit()
-    init_plugins_block_limit()
-    init_plugins_count_limit()
-    init_plugins_data()
-    init_plugins_config()
+    init_plugins_settings(DATA_PATH)
+    init_plugins_cd_limit(DATA_PATH)
+    init_plugins_block_limit(DATA_PATH)
+    init_plugins_count_limit(DATA_PATH)
+    init_plugins_data(DATA_PATH)
+    init_plugins_config(DATA_PATH)
    init_plugins_resources()
    init_none_plugin_count_manager()
-    # x = group_manager.get_super_old_data()
-    # if x:
-    #     for key in x.keys():
-    #         plugins_manager.block_plugin(key, block_type=x[key])
+    x = group_manager.get_super_old_data()
+    if x:
+        for key in x.keys():
+            plugins_manager.block_plugin(key, block_type=x[key])
    if _flag:
        raise Exception("首次运行，已在configs目录下生成配置文件config.yaml，修改后重启即可...")
    logger.info("初始化数据完成...")
@@ -55,5 +57,5 @@ async def _():

@driver.on_bot_connect
 async def _(bot: Bot):
-    # await init_group_manager()
+    await init_group_manager()
    await check_plugin_status(bot)
@@ -1,18 +1,18 @@
 from utils.manager import plugins_manager
-from nonebot.adapters.onebot.v11 import Bot
+from nonebot.adapters.cqhttp import Bot


 async def check_plugin_status(bot: Bot):
    """
    遍历查看插件加载情况
    """
-    msg = ""
+    rst = ""
    for plugin in plugins_manager.keys():
        data = plugins_manager.get(plugin)
-        if data.error:
-            msg += f'{plugin}:{data.plugin_name}\n'
-    if msg and bot.config.superusers:
-        msg = "以下插件加载失败..\n" + msg
+        if data.get("error") or data.get("error") is None:
+            rst += f'{plugin}:{data["plugin_name"]}\n'
+    if rst:
+        rst = "以下插件加载失败..\n" + rst
        await bot.send_private_msg(
-            user_id=int(list(bot.config.superusers)[0]), message=msg.strip()
+            user_id=int(list(bot.config.superusers)[0]), message=rst[:-1]
        )
@@ -5,6 +5,7 @@ from utils.manager import (
    plugins2settings_manager,
    plugins2block_manager,
    plugins_manager,
+    resources_manager
 )
 from services.log import logger
 from utils.utils import get_matchers
@@ -19,44 +20,26 @@ def init_none_plugin_count_manager():
    """
    清除已删除插件数据
    """
-    modules = [x.plugin_name for x in get_matchers(True)]
-    plugins_manager_list = list(plugins_manager.keys())
-    for module in plugins_manager_list:
-        try:
-            if module not in modules or none_plugin_count_manager.check(module):
-                try:
-                    plugin_name = plugins_manager.get(module).plugin_name
-                except (AttributeError, KeyError):
-                    plugin_name = ""
-                if none_plugin_count_manager.check(module):
-                    try:
-                        plugins2settings_manager.delete(module)
-                        plugins2count_manager.delete(module)
-                        plugins2cd_manager.delete(module)
-                        plugins2block_manager.delete(module)
-                        plugins_manager.delete(module)
-                        plugins_manager.save()
-                        # resources_manager.remove_resource(module)
-                        none_plugin_count_manager.delete(module)
-                        logger.info(f"{module}:{plugin_name} 插件疑似已删除，清除对应插件数据...")
-                    except Exception as e:
-                        logger.exception(
-                            f"{module}:{plugin_name} 插件疑似已删除，清除对应插件数据失败...{type(e)}：{e}"
-                        )
-                else:
-                    none_plugin_count_manager.add_count(module)
-                    logger.info(
-                        f"{module}:{plugin_name} 插件疑似已删除，"
-                        f"加载{none_plugin_count_manager._max_count}次失败后将清除对应插件数据，"
-                        f"当前次数：{none_plugin_count_manager.get(module)}"
-                    )
-            else:
-                none_plugin_count_manager.reset(module)
-        except Exception as e:
-            logger.error(f"清除插件数据错误 {type(e)}：{e}")
-    plugins2settings_manager.save()
-    plugins2count_manager.save()
-    plugins2cd_manager.save()
-    plugins2block_manager.save()
-    plugins_manager.save()
-    none_plugin_count_manager.save()
+    modules = [x.module for x in get_matchers()]
+    for module in none_plugin_count_manager.keys():
+        if module not in modules:
+            none_plugin_count_manager.add_count(module)
+        else:
+            none_plugin_count_manager.reset(module)
+        if none_plugin_count_manager.check(module):
+            try:
+                plugin_name = plugins_manager.get(module)["plugin_name"]
+            except (AttributeError, KeyError):
+                plugin_name = ""
+            try:
+                plugins2settings_manager.delete(module)
+                plugins2count_manager.delete(module)
+                plugins2cd_manager.delete(module)
+                plugins2block_manager.delete(module)
+                plugins_manager.delete(module)
+                resources_manager.remove_resource(module)
+                logger.info(f"{module}:{plugin_name} 插件疑似已删除，清除对应插件数据...")
+            except Exception as e:
+                logger.error(
+                    f"{module}:{plugin_name} 插件疑似已删除，清除对应插件数据失败...{type(e)}：{e}"
+                )
@@ -1,124 +0,0 @@
-import random
-from types import ModuleType
-from typing import Any
-
-from configs.config import Config
-from services import logger
-from utils.manager import (plugin_data_manager, plugins2block_manager,
-                           plugins2cd_manager, plugins2count_manager,
-                           plugins2settings_manager, plugins_manager)
-from utils.manager.models import (Plugin, PluginBlock, PluginCd, PluginCount,
-                                  PluginData, PluginSetting, PluginType)
-from utils.utils import get_matchers
-
-
-def get_attr(module: ModuleType, name: str, default: Any = None) -> Any:
-    """
-    说明:
-        获取属性
-    参数:
-        :param module: module
-        :param name: name
-        :param default: default
-    """
-    return getattr(module, name) if hasattr(module, name) else default
-
-
-def init_plugin_info():
-
-    for matcher in [x for x in get_matchers(True) if x.plugin]:
-        try:
-            plugin = matcher.plugin
-            metadata = plugin.metadata
-            extra = metadata.extra if metadata else {}
-            if hasattr(plugin, "module"):
-                module = plugin.module
-                plugin_model = matcher.plugin_name
-                plugin_name = (
-                    metadata.name
-                    if metadata and metadata.name
-                    else get_attr(module, "__zx_plugin_name__", matcher.plugin_name)
-                )
-                if not plugin_name:
-                    logger.warning(f"配置文件 模块：{plugin_model} 获取 plugin_name 失败...")
-                    continue
-                if "[Admin]" in plugin_name:
-                    plugin_type = PluginType.ADMIN
-                    plugin_name = plugin_name.replace("[Admin]", "").strip()
-                elif "[Hidden]" in plugin_name:
-                    plugin_type = PluginType.HIDDEN
-                    plugin_name = plugin_name.replace("[Hidden]", "").strip()
-                elif "[Superuser]" in plugin_name:
-                    plugin_type = PluginType.SUPERUSER
-                    plugin_name = plugin_name.replace("[Superuser]", "").strip()
-                else:
-                    plugin_type = PluginType.NORMAL
-                plugin_usage = (
-                    metadata.usage
-                    if metadata and metadata.usage
-                    else get_attr(module, "__plugin_usage__")
-                )
-                plugin_des = (
-                    metadata.description
-                    if metadata and metadata.description
-                    else get_attr(module, "__plugin_des__")
-                )
-                menu_type = get_attr(module, "__plugin_type__") or ("normal",)
-                plugin_setting = get_attr(module, "__plugin_settings__")
-                if plugin_setting:
-                    plugin_setting = PluginSetting(**plugin_setting)
-                    plugin_setting.plugin_type = menu_type
-                plugin_superuser_usage = get_attr(module, "__plugin_super_usage__")
-                plugin_task = get_attr(module, "__plugin_task__")
-                plugin_version = extra.get("__plugin_version__") or get_attr(
-                    module, "__plugin_version__"
-                )
-                plugin_author = extra.get("__plugin_author__") or get_attr(
-                    module, "__plugin_author__"
-                )
-                plugin_cd = get_attr(module, "__plugin_cd_limit__")
-                if plugin_cd:
-                    plugin_cd = PluginCd(**plugin_cd)
-                plugin_block = get_attr(module, "__plugin_block_limit__")
-                if plugin_block:
-                    plugin_block = PluginBlock(**plugin_block)
-                plugin_count = get_attr(module, "__plugin_count_limit__")
-                if plugin_count:
-                    plugin_count = PluginCount(**plugin_count)
-                plugin_resources = get_attr(module, "__plugin_resources__")
-                plugin_configs = get_attr(module, "__plugin_configs__")
-                if settings := plugins2settings_manager.get(plugin_model):
-                    plugin_setting = settings
-                if plugin_cd_limit := plugins2cd_manager.get(plugin_model):
-                    plugin_cd = plugin_cd_limit
-                if plugin_block_limit := plugins2block_manager.get(plugin_model):
-                    plugin_block = plugin_block_limit
-                if plugin_count_limit := plugins2count_manager.get(plugin_model):
-                    plugin_count = plugin_count_limit
-                if plugin_cfg := Config.get(plugin_model):
-                    plugin_configs = plugin_cfg
-                plugin_status = plugins_manager.get(plugin_model)
-                if not plugin_status:
-                    plugin_status = Plugin(plugin_name=plugin_model)
-                plugin_status.author = plugin_author
-                plugin_status.version = plugin_version
-                plugin_data = PluginData(
-                    model=plugin_model,
-                    name=plugin_name.strip(),
-                    plugin_type=plugin_type,
-                    usage=plugin_usage,
-                    superuser_usage=plugin_superuser_usage,
-                    des=plugin_des,
-                    task=plugin_task,
-                    menu_type=menu_type,
-                    plugin_setting=plugin_setting,
-                    plugin_cd=plugin_cd,
-                    plugin_block=plugin_block,
-                    plugin_count=plugin_count,
-                    plugin_resources=plugin_resources,
-                    plugin_configs=plugin_configs,
-                    plugin_status=plugin_status,
-                )
-                plugin_data_manager.add_plugin_info(plugin_data)
-        except Exception as e:
-            logger.error(f"构造插件数据失败 {matcher.plugin_name} - {type(e)}：{e}")
@@ -1,72 +1,79 @@
 from pathlib import Path
 from ruamel.yaml import round_trip_load, round_trip_dump, YAML
-from utils.manager import admin_manager, plugins_manager, plugin_data_manager
+from utils.manager import admin_manager, plugins_manager
 from configs.config import Config
 from services.log import logger
-from utils.text_utils import prompt2cn
 from utils.utils import get_matchers
-from configs.path_config import DATA_PATH
 from ruamel import yaml
+import nonebot


 _yaml = YAML(typ="safe")


-def init_plugins_config():
+def init_plugins_config(data_path):
    """
    初始化插件数据配置
    """
-    plugins2config_file = DATA_PATH / "configs" / "plugins2config.yaml"
-    _data = Config.get_data()
-    # 优先使用 metadata 数据
-    for matcher in get_matchers(True):
-        if plugin_data := plugin_data_manager.get(matcher.plugin_name):
-            # 插件配置版本更新或为Version为None或不在存储配置内，当使用metadata时，必定更新
-            if plugin_data.plugin_configs and (
-                isinstance(plugin_data.plugin_status.version, str)
-                or (
-                    plugin_data.plugin_status.version is None
-                    or (
-                        _data.get(matcher.plugin_name)
-                        and _data[matcher.plugin_name].keys()
-                        != plugin_data.plugin_configs.keys()
-                    )
-                    or plugin_data.plugin_status.version
-                    > plugins_manager.get(matcher.plugin_name).version
-                    or matcher.plugin_name not in _data.keys()
-                )
-            ):
-                plugin_configs = plugin_data.plugin_configs
-                for key in plugin_configs:
-                    if isinstance(plugin_data.plugin_configs[key], dict):
-                        Config.add_plugin_config(
-                            matcher.plugin_name,
-                            key,
-                            plugin_configs[key].get("value"),
-                            help_=plugin_configs[key].get("help"),
-                            default_value=plugin_configs[key].get("default_value"),
-                            _override=True,
-                        )
-                    else:
-                        Config.add_plugin_config(
-                            matcher.plugin_name, key, plugin_configs[key]
-                        )
-            elif plugin_configs := _data.get(matcher.plugin_name):
-                for key in plugin_configs:
+    plugins2config_file = Path(data_path) / "configs" / "plugins2config.yaml"
+    plugins2config_file.parent.mkdir(parents=True, exist_ok=True)
+    _data = {}
+    if plugins2config_file.exists():
+        _data = _yaml.load(open(plugins2config_file, "r", encoding="utf8"))
+    _matchers = get_matchers()
+    for matcher in _matchers:
+        _plugin = nonebot.plugin.get_plugin(matcher.module)
+        try:
+            _module = _plugin.module
+        except AttributeError:
+            continue
+        try:
+            plugin_version = _module.__getattribute__("__plugin_version__")
+        except AttributeError:
+            plugin_version = None
+        try:
+            plugin_configs = _module.__getattribute__("__plugin_configs__")
+        except AttributeError:
+            continue
+        # 插件配置版本更新或为Version为None或不在存储配置内
+        if (
+            plugin_version is None
+            or (
+                _data.get(matcher.module)
+                and _data[matcher.module].keys() != plugin_configs.keys()
+            )
+            or plugin_version > plugins_manager.get(matcher.module)["version"]
+            or matcher.module not in _data.keys()
+        ):
+            for key in plugin_configs:
+                if isinstance(plugin_configs[key], dict):
                    Config.add_plugin_config(
-                        matcher.plugin_name,
+                        matcher.module,
                        key,
-                        plugin_configs[key]["value"],
-                        help_=plugin_configs[key]["help"],
-                        default_value=plugin_configs[key]["default_value"],
+                        plugin_configs[key].get("value"),
+                        help_=plugin_configs[key].get("help"),
+                        default_value=plugin_configs[key].get("default_value"),
                        _override=True,
                    )
+                else:
+                    Config.add_plugin_config(matcher.module, key, plugin_configs[key])
+        else:
+            plugin_configs = _data[matcher.module]
+            for key in plugin_configs:
+                Config.add_plugin_config(
+                    matcher.module,
+                    key,
+                    plugin_configs[key]["value"],
+                    help_=plugin_configs[key]["help"],
+                    default_value=plugin_configs[key]["default_value"],
+                    _override=True,
+                )
    if not Config.is_empty():
        Config.save()
        _data = round_trip_load(open(plugins2config_file, encoding="utf8"))
        for plugin in _data.keys():
            try:
-                plugin_name = plugins_manager.get(plugin).plugin_name
+                plugin_name = plugins_manager.get(plugin)["plugin_name"]
            except (AttributeError, TypeError):
                plugin_name = plugin
            _data[plugin].yaml_set_start_comment(plugin_name, indent=2)
@@ -78,82 +85,66 @@ def init_plugins_config():
            round_trip_dump(
                _data, wf, indent=2, Dumper=yaml.RoundTripDumper, allow_unicode=True
            )
-    _replace_config()
-
-
-def _replace_config():
-    """
-    说明:
-        定时任务加载的配置读取替换
-    """
-    # 再开始读取用户配置
-    user_config_file = Path() / "configs" / "config.yaml"
-    _data = {}
-    _tmp_data = {}
-    if user_config_file.exists():
-        with open(user_config_file, "r", encoding="utf8") as f:
-            _data = _yaml.load(f)
-    # 数据替换
-    for plugin in Config.keys():
-        _tmp_data[plugin] = {}
-        for k in Config[plugin].keys():
-            try:
+        # 再开始读取用户配置
+        user_config_file = Path() / "configs" / "config.yaml"
+        _data = {}
+        _tmp_data = {}
+        if user_config_file.exists():
+            with open(user_config_file, "r", encoding="utf8") as f:
+                _data = _yaml.load(f)
+        # 数据替换
+        for plugin in Config.keys():
+            _tmp_data[plugin] = {}
+            for k in Config[plugin].keys():
                if _data.get(plugin) and k in _data[plugin].keys():
                    Config.set_config(plugin, k, _data[plugin][k])
                    if level2module := Config.get_level2module(plugin, k):
-                        try:
-                            admin_manager.set_admin_level(
-                                level2module, _data[plugin][k]
-                            )
-                        except KeyError:
-                            logger.warning(
-                                f"{level2module} 设置权限等级失败：{_data[plugin][k]}"
-                            )
+                        admin_manager.set_admin_level(level2module, _data[plugin][k])
                _tmp_data[plugin][k] = Config.get_config(plugin, k)
-            except AttributeError as e:
-                raise AttributeError(
-                    f"{e}\n" + prompt2cn("可能为config.yaml配置文件填写不规范", 46)
+        Config.save()
+        temp_file = Path() / "configs" / "temp_config.yaml"
+        try:
+            with open(temp_file, "w", encoding="utf8") as wf:
+                yaml.dump(
+                    _tmp_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True
                )
-    Config.save()
-    temp_file = Path() / "configs" / "temp_config.yaml"
-    try:
-        with open(temp_file, "w", encoding="utf8") as wf:
-            yaml.dump(_tmp_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
-        with open(temp_file, "r", encoding="utf8") as rf:
-            _data = round_trip_load(rf)
-        # 添加注释
-        for plugin in _data.keys():
-            rst = ""
-            plugin_name = None
-            try:
-                plugin_data = Config.get(plugin)
-                for x in list(Config.get(plugin).keys()):
-                    try:
-                        _x = plugin_data[x].get("name")
-                        if _x:
-                            plugin_name = _x
-                    except AttributeError:
-                        pass
-            except (KeyError, AttributeError):
+            with open(temp_file, "r", encoding="utf8") as rf:
+                _data = round_trip_load(rf)
+            # 添加注释
+            for plugin in _data.keys():
+                rst = ""
                plugin_name = None
-            if not plugin_name:
                try:
-                    plugin_name = plugins_manager.get(plugin).plugin_name
-                except (AttributeError, TypeError):
-                    plugin_name = plugin
-            plugin_name = (
-                plugin_name.replace("[Hidden]", "")
-                .replace("[Superuser]", "")
-                .replace("[Admin]", "")
-                .strip()
-            )
-            rst += plugin_name + "\n"
-            for k in _data[plugin].keys():
-                rst += f'{k}: {Config[plugin][k]["help"]}' + "\n"
-            _data[plugin].yaml_set_start_comment(rst[:-1], indent=2)
-        with open(Path() / "configs" / "config.yaml", "w", encoding="utf8") as wf:
-            round_trip_dump(_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
-    except Exception as e:
-        logger.error(f"生成简易配置注释错误 {type(e)}：{e}")
-    if temp_file.exists():
-        temp_file.unlink()
+                    plugin_data = Config.get(plugin)
+                    for x in list(Config.get(plugin).keys()):
+                        try:
+                            _x = plugin_data[x].get("name")
+                            if _x:
+                                plugin_name = _x
+                        except AttributeError:
+                            pass
+                except (KeyError, AttributeError):
+                    plugin_name = None
+                if not plugin_name:
+                    try:
+                        plugin_name = plugins_manager.get(plugin)["plugin_name"]
+                    except (AttributeError, TypeError):
+                        plugin_name = plugin
+                plugin_name = (
+                    plugin_name.replace("[Hidden]", "")
+                    .replace("[Superuser]", "")
+                    .replace("[Admin]", "")
+                    .strip()
+                )
+                rst += plugin_name + "\n"
+                for k in _data[plugin].keys():
+                    rst += f'{k}: {Config[plugin][k]["help"]}' + "\n"
+                _data[plugin].yaml_set_start_comment(rst[:-1], indent=2)
+            with open(Path() / "configs" / "config.yaml", "w", encoding="utf8") as wf:
+                round_trip_dump(
+                    _data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True
+                )
+        except Exception as e:
+            logger.error(f"生成简易配置注释错误 {type(e)}：{e}")
+        if temp_file.exists():
+            temp_file.unlink()
@@ -1,8 +1,8 @@
-
+from pathlib import Path
 from ruamel.yaml import YAML
-from utils.manager import plugins_manager, plugin_data_manager
+from utils.manager import plugins_manager
 from utils.utils import get_matchers
-from services.log import logger
+import nonebot

 try:
    import ujson as json
@@ -13,45 +13,70 @@ except ModuleNotFoundError:
 _yaml = YAML(typ="safe")


-def init_plugins_data():
+def init_plugins_data(data_path):
    """
    初始化插件数据信息
    """
-    for matcher in get_matchers(True):
-        _plugin = matcher.plugin
-        if not _plugin:
-            continue
+    plugin2data_file = Path(data_path) / "manager" / "plugin_manager.json"
+    plugin2data_file.parent.mkdir(parents=True, exist_ok=True)
+    _data = {}
+    if plugin2data_file.exists():
+        _data = json.load(open(plugin2data_file, "r", encoding="utf8"))
+    _matchers = get_matchers()
+    for matcher in _matchers:
+        _plugin = nonebot.plugin.get_plugin(matcher.module)
        try:
            _module = _plugin.module
        except AttributeError:
-            if matcher.plugin_name not in plugins_manager.keys():
+            if matcher.module not in _data.keys():
                plugins_manager.add_plugin_data(
-                    matcher.plugin_name, matcher.plugin_name, error=True
+                    matcher.module, matcher.module, error=True
                )
            else:
-                plugins_manager[matcher.plugin_name].error = True
+                plugins_manager.set_module_data(matcher.module, "error", True)
+                plugin_data = plugins_manager.get(matcher.module)
+                if plugin_data:
+                    plugins_manager.set_module_data(
+                        matcher.module, "version", plugin_data.get("version")
+                    )
        else:
-            if plugin_data := plugin_data_manager.get(matcher.plugin_name):
-                try:
-                    plugin_version = plugin_data.plugin_status.version
-                    plugin_name = plugin_data.name
-                    plugin_author = plugin_data.plugin_status.author
-                    if matcher.plugin_name in plugins_manager.keys():
-                        plugins_manager[matcher.plugin_name].error = False
-                    if matcher.plugin_name not in plugins_manager.keys():
-                        plugins_manager.add_plugin_data(
-                            matcher.plugin_name,
-                            plugin_name=plugin_name,
-                            author=plugin_author,
-                            version=plugin_version,
-                        )
-                    elif isinstance(plugin_version, str) or plugins_manager[matcher.plugin_name].version is None or (
-                        plugin_version is not None
-                        and plugin_version > float(plugins_manager[matcher.plugin_name].version)
-                    ):
-                        plugins_manager[matcher.plugin_name].plugin_name = plugin_name
-                        plugins_manager[matcher.plugin_name].author = plugin_author
-                        plugins_manager[matcher.plugin_name].version = plugin_version
-                except Exception as e:
-                    logger.error(f"插件数据 {matcher.plugin_name} 加载发生错误 {type(e)}：{e}")
+            try:
+                plugin_version = _module.__getattribute__("__plugin_version__")
+            except AttributeError:
+                plugin_version = None
+            try:
+                plugin_name = _module.__getattribute__("__zx_plugin_name__")
+            except AttributeError:
+                plugin_name = matcher.module
+            try:
+                plugin_author = _module.__getattribute__("__plugin_author__")
+            except AttributeError:
+                plugin_author = None
+            if matcher.module in plugins_manager.keys():
+                plugins_manager.set_module_data(matcher.module, "error", False)
+            if matcher.module not in plugins_manager.keys():
+                plugins_manager.add_plugin_data(
+                    matcher.module,
+                    plugin_name=plugin_name,
+                    author=plugin_author,
+                    version=plugin_version,
+                )
+            elif plugins_manager[matcher.module]["version"] is None or (
+                plugin_version is not None
+                and plugin_version > plugins_manager[matcher.module]["version"]
+            ):
+                plugins_manager.set_module_data(
+                    matcher.module, "plugin_name", plugin_name
+                )
+                plugins_manager.set_module_data(matcher.module, "author", plugin_author)
+                plugins_manager.set_module_data(
+                    matcher.module, "version", plugin_version
+                )
+            if matcher.module in _data.keys():
+                plugins_manager.set_module_data(
+                    matcher.module, "error", _data[matcher.module]["error"]
+                )
+                plugins_manager.set_module_data(
+                    matcher.module, "plugin_name", _data[matcher.module]["plugin_name"]
+                )
    plugins_manager.save()
@@ -1,64 +1,157 @@
+from pathlib import Path
+from ruamel.yaml import round_trip_load, round_trip_dump, YAML
 from utils.manager import (
    plugins2cd_manager,
    plugins2block_manager,
    plugins2count_manager,
-    plugin_data_manager,
 )
 from utils.utils import get_matchers
-from configs.path_config import DATA_PATH
+from ruamel import yaml
+import nonebot


-def init_plugins_cd_limit():
+_yaml = YAML(typ="safe")
+
+
+def init_plugins_cd_limit(data_path):
    """
    加载 cd 限制
    """
-    plugins2cd_file = DATA_PATH / "configs" / "plugins2cd.yaml"
+    plugins2cd_file = Path(data_path) / "configs" / "plugins2cd.yaml"
    plugins2cd_file.parent.mkdir(exist_ok=True, parents=True)
-    for matcher in get_matchers(True):
-        if not plugins2cd_manager.get_plugin_cd_data(matcher.plugin_name) and (
-            plugin_data := plugin_data_manager.get(matcher.plugin_name)
-        ):
-            if plugin_data.plugin_cd:
+    _data = {}
+    _matchers = get_matchers()
+    for matcher in _matchers:
+        if not plugins2cd_manager.get_plugin_cd_data(matcher.module):
+            _plugin = nonebot.plugin.get_plugin(matcher.module)
+            try:
+                _module = _plugin.module
+                plugin_cd_limit = _module.__getattribute__("__plugin_cd_limit__")
                plugins2cd_manager.add_cd_limit(
-                    matcher.plugin_name, plugin_data.plugin_cd
+                    matcher.module, data_dict=plugin_cd_limit
                )
+            except AttributeError:
+                pass
    if not plugins2cd_manager.keys():
-        plugins2cd_manager.add_cd_limit("这是一个示例")
-    plugins2cd_manager.save()
+        plugins2cd_manager.add_cd_limit(
+            "这是一个示例"
+        )
+    _tmp_data = {"PluginCdLimit": plugins2cd_manager.get_data()}
+    with open(plugins2cd_file, "w", encoding="utf8") as wf:
+        yaml.dump(_tmp_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
+    _data = round_trip_load(open(plugins2cd_file, encoding="utf8"))
+    _data["PluginCdLimit"].yaml_set_start_comment(
+        """# 需要cd的功能
+# 自定义的功能需要cd也可以在此配置
+# key：模块名称
+# cd：cd 时长（秒）
+# status：此限制的开关状态
+# check_type：'private'/'group'/'all'，限制私聊/群聊/全部
+# limit_type：监听对象，以user_id或group_id作为键来限制，'user'：用户id，'group'：群id
+#                                     示例：'user'：用户N秒内触发1次，'group'：群N秒内触发1次
+# rst：回复的话，可以添加[at]，[uname]，[nickname]来对应艾特，用户群名称，昵称系统昵称
+# rst 为 "" 或 None 时则不回复
+# rst示例："[uname]你冲的太快了，[nickname]先生，请稍后再冲[at]"
+# rst回复："老色批你冲的太快了，欧尼酱先生，请稍后再冲@老色批"
+#      用户昵称↑     昵称系统的昵称↑          艾特用户↑""",
+        indent=2,
+    )
+    with open(plugins2cd_file, "w", encoding="utf8") as wf:
+        round_trip_dump(_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
    plugins2cd_manager.reload_cd_limit()


-def init_plugins_block_limit():
+def init_plugins_block_limit(data_path):
    """
    加载阻塞限制
    """
-    for matcher in get_matchers(True):
-        if not plugins2block_manager.get_plugin_block_data(matcher.plugin_name) and (
-            plugin_data := plugin_data_manager.get(matcher.plugin_name)
-        ):
-            if plugin_data.plugin_block:
+    plugins2block_file = Path(data_path) / "configs" / "plugins2block.yaml"
+    plugins2block_file.parent.mkdir(exist_ok=True, parents=True)
+    _data = {}
+    _matchers = get_matchers()
+    for matcher in _matchers:
+        if not plugins2block_manager.get_plugin_block_data(matcher.module):
+            _plugin = nonebot.plugin.get_plugin(matcher.module)
+            try:
+                _module = _plugin.module
+                plugin_block_limit = _module.__getattribute__("__plugin_block_limit__")
                plugins2block_manager.add_block_limit(
-                    matcher.plugin_name, plugin_data.plugin_block
+                    matcher.module, data_dict=plugin_block_limit
                )
+            except AttributeError:
+                pass
    if not plugins2block_manager.keys():
-        plugins2block_manager.add_block_limit("这是一个示例")
-    plugins2block_manager.save()
+        plugins2block_manager.add_block_limit(
+            "这是一个示例"
+        )
+    _tmp_data = {"PluginBlockLimit": plugins2block_manager.get_data()}
+    with open(plugins2block_file, "w", encoding="utf8") as wf:
+        yaml.dump(_tmp_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
+    _data = round_trip_load(open(plugins2block_file, encoding="utf8"))
+    _data["PluginBlockLimit"].yaml_set_start_comment(
+        """# 用户调用阻塞
+# 即 当用户调用此功能还未结束时
+# 用发送消息阻止用户重复调用此命令直到该命令结束
+# key：模块名称
+# status：此限制的开关状态
+# check_type：'private'/'group'/'all'，限制私聊/群聊/全部
+# limit_type：监听对象，以user_id或group_id作为键来限制，'user'：用户id，'group'：群id
+#                                     示例：'user'：阻塞用户，'group'：阻塞群聊
+# rst：回复的话，可以添加[at]，[uname]，[nickname]来对应艾特，用户群名称，昵称系统昵称
+# rst 为 "" 或 None 时则不回复
+# rst示例："[uname]你冲的太快了，[nickname]先生，请稍后再冲[at]"
+# rst回复："老色批你冲的太快了，欧尼酱先生，请稍后再冲@老色批"
+#      用户昵称↑     昵称系统的昵称↑          艾特用户↑""",
+        indent=2,
+    )
+    with open(plugins2block_file, "w", encoding="utf8") as wf:
+        round_trip_dump(_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
    plugins2block_manager.reload_block_limit()


-def init_plugins_count_limit():
+def init_plugins_count_limit(data_path):
    """
    加载次数限制
    """
-    for matcher in get_matchers(True):
-        if not plugins2count_manager.get_plugin_count_data(matcher.plugin_name) and (
-            plugin_data := plugin_data_manager.get(matcher.plugin_name)
-        ):
-            if plugin_data.plugin_count:
+    plugins2count_file = Path(data_path) / "configs" / "plugins2count.yaml"
+    plugins2count_file.parent.mkdir(exist_ok=True, parents=True)
+    _data = {}
+    _matchers = get_matchers()
+    for matcher in _matchers:
+        if not plugins2count_manager.get_plugin_count_data(matcher.module):
+            _plugin = nonebot.plugin.get_plugin(matcher.module)
+            try:
+                _module = _plugin.module
+                plugin_count_limit = _module.__getattribute__("__plugin_count_limit__")
                plugins2count_manager.add_count_limit(
-                    matcher.plugin_name, plugin_data.plugin_count
+                    matcher.module, data_dict=plugin_count_limit
                )
+            except AttributeError:
+                pass
    if not plugins2count_manager.keys():
-        plugins2count_manager.add_count_limit("这是一个示例")
-    plugins2count_manager.save()
+        plugins2count_manager.add_count_limit(
+            "这是一个示例"
+        )
+    _tmp_data = {"PluginCountLimit": plugins2count_manager.get_data()}
+    with open(plugins2count_file, "w", encoding="utf8") as wf:
+        yaml.dump(_tmp_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
+    _data = round_trip_load(open(plugins2count_file, encoding="utf8"))
+    _data["PluginCountLimit"].yaml_set_start_comment(
+        """# 命令每日次数限制
+# 即 用户/群聊 每日可调用命令的次数 [数据内存存储，重启将会重置]
+# 每日调用直到 00:00 刷新
+# key：模块名称
+# max_count: 每日调用上限
+# status：此限制的开关状态
+# limit_type：监听对象，以user_id或group_id作为键来限制，'user'：用户id，'group'：群id
+#                                     示例：'user'：用户上限，'group'：群聊上限
+# rst：回复的话，可以添加[at]，[uname]，[nickname]来对应艾特，用户群名称，昵称系统昵称
+# rst 为 "" 或 None 时则不回复
+# rst示例："[uname]你冲的太快了，[nickname]先生，请稍后再冲[at]"
+# rst回复："老色批你冲的太快了，欧尼酱先生，请稍后再冲@老色批"
+#      用户昵称↑     昵称系统的昵称↑          艾特用户↑""",
+        indent=2,
+    )
+    with open(plugins2count_file, "w", encoding="utf8") as wf:
+        round_trip_dump(_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
    plugins2count_manager.reload_count_limit()
@@ -1,25 +1,43 @@
-from utils.manager import resources_manager, plugin_data_manager
+from utils.manager import resources_manager
 from utils.utils import get_matchers
 from services.log import logger
 from pathlib import Path
+import nonebot


 def init_plugins_resources():
    """
    资源文件路径的移动
    """
-    for matcher in get_matchers(True):
-        if plugin_data := plugin_data_manager.get(matcher.plugin_name):
+    _tmp = []
+    for matcher in get_matchers():
+        if matcher.module not in _tmp:
+            _tmp.append(matcher.module)
+            _plugin = nonebot.plugin.get_plugin(matcher.module)
            try:
-                _module = matcher.plugin.module
+                _module = _plugin.module
            except AttributeError:
-                logger.warning(f"插件 {matcher.plugin_name} 加载失败...，资源控制未加载...")
+                logger.warning(f"插件 {matcher.module} 加载失败...，资源控制未加载...")
            else:
-                if resources := plugin_data.plugin_resources:
+                try:
+                    resources = _module.__getattribute__("__plugin_resources__")
+                except AttributeError:
+                    pass
+                else:
                    path = Path(_module.__getattribute__("__file__")).parent
                    for resource in resources.keys():
-                        resources_manager.add_resource(
-                            matcher.plugin_name, path / resource, resources[resource]
-                        )
+                        resources_manager.add_resource(matcher.module, (path / resource).absolute(), resources[resource])
    resources_manager.save()
    resources_manager.start_move()
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1,42 +1,128 @@
-from utils.manager import plugins2settings_manager, admin_manager, plugin_data_manager
+from pathlib import Path
+from ruamel.yaml import round_trip_load, round_trip_dump, YAML
+from utils.manager import plugins2settings_manager, admin_manager
 from services.log import logger
-from utils.manager.models import PluginType
 from utils.utils import get_matchers
+from ruamel import yaml
 import nonebot


-def init_plugins_settings():
+_yaml = YAML(typ="safe")
+
+
+def init_plugins_settings(data_path: str):
    """
    初始化插件设置，从插件中获取 __zx_plugin_name__，__plugin_cmd__，__plugin_settings__
    """
+    plugins2settings_file = Path(data_path) / "configs" / "plugins2settings.yaml"
+    plugins2settings_file.parent.mkdir(exist_ok=True, parents=True)
+    _matchers = get_matchers()
+    _tmp_module = {}
+    _tmp = []
    for x in plugins2settings_manager.keys():
        try:
            _plugin = nonebot.plugin.get_plugin(x)
            _module = _plugin.module
-            _module.__getattribute__("__zx_plugin_name__")
+            plugin_name = _module.__getattribute__("__zx_plugin_name__")
+            _tmp_module[x] = plugin_name
        except (KeyError, AttributeError) as e:
            logger.warning(f"配置文件 模块：{x} 获取 plugin_name 失败...{e}")
-    for matcher in get_matchers(True):
-        try:
-            if matcher.plugin_name not in plugins2settings_manager.keys():
-                _plugin = matcher.plugin
+            _tmp_module[x] = ""
+    for matcher in _matchers:
+        if matcher.module not in plugins2settings_manager.keys():
+            _plugin = nonebot.plugin.get_plugin(matcher.module)
+            try:
+                _module = _plugin.module
+            except AttributeError:
+                logger.warning(f"插件 {matcher.module} 加载失败...，插件控制未加载.")
+            else:
                try:
-                    _module = _plugin.module
+                    plugin_name = _module.__getattribute__("__zx_plugin_name__")
+                    if "[admin]" in plugin_name.lower():
+                        try:
+                            admin_settings = _module.__getattribute__(
+                                "__plugin_settings__"
+                            )
+                            level = admin_settings["admin_level"]
+                            cmd = admin_settings.get("cmd")
+                        except (AttributeError, KeyError):
+                            level = 5
+                            cmd = None
+                        if level is None:
+                            level = 5
+                        admin_manager.add_admin_plugin_settings(
+                            matcher.module, cmd, level
+                        )
+                    if (
+                        "[hidden]" in plugin_name.lower()
+                        or "[admin]" in plugin_name.lower()
+                        or "[superuser]" in plugin_name.lower()
+                        or matcher.module in plugins2settings_manager.keys()
+                    ):
+                        continue
                except AttributeError:
-                    logger.warning(f"插件 {matcher.plugin_name} 加载失败...，插件控制未加载.")
+                    if matcher.module not in _tmp:
+                        logger.warning(
+                            f"获取插件 {matcher.module} __zx_plugin_name__ 失败...，插件控制未加载."
+                        )
                else:
-                    if plugin_data := plugin_data_manager.get(matcher.plugin_name):
-                        if plugin_settings := plugin_data.plugin_setting:
-                            # 管理员命令
-                            if plugin_data.plugin_type == PluginType.ADMIN:
-                                admin_manager.add_admin_plugin_settings(
-                                    matcher.plugin_name, plugin_settings.cmd, plugin_settings.level
+                    try:
+                        _tmp_module[matcher.module] = plugin_name
+                        plugin_settings = _module.__getattribute__(
+                            "__plugin_settings__"
+                        )
+                        if plugin_settings.get('cost_gold') is None:
+                            plugin_settings['cost_gold'] = 0
+                        if (
+                            plugin_settings["cmd"] is not None
+                            and plugin_name not in plugin_settings["cmd"]
+                        ):
+                            plugin_settings["cmd"].append(plugin_name)
+                        if plugins2settings_manager.get(
+                            matcher.module
+                        ) and plugins2settings_manager[matcher.module].get(
+                            "plugin_type"
+                        ):
+                            plugin_type = tuple(
+                                plugins2settings_manager.get_plugin_data(
+                                    matcher.module
+                                )["plugin_type"]
+                            )
+                        else:
+                            try:
+                                plugin_type = _module.__getattribute__(
+                                    "__plugin_type__"
                                )
-                            else:
-                                plugins2settings_manager.add_plugin_settings(
-                                    matcher.plugin_name, plugin_settings
-                                )
-        except Exception as e:
-            logger.error(f'{matcher.plugin_name} 初始化 plugin_settings 发生错误 {type(e)}：{e}')
-    plugins2settings_manager.save()
+                            except AttributeError:
+                                plugin_type = ("normal",)
+                        if plugin_settings and matcher.module:
+                            plugins2settings_manager.add_plugin_settings(
+                                matcher.module,
+                                plugin_type=plugin_type,
+                                **plugin_settings,
+                            )
+                    except AttributeError:
+                        pass
+        _tmp.append(matcher.module)
+    _tmp_data = {"PluginSettings": plugins2settings_manager.get_data()}
+    with open(plugins2settings_file, "w", encoding="utf8") as wf:
+        yaml.dump(_tmp_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
+    _data = round_trip_load(open(plugins2settings_file, encoding="utf8"))
+    _data["PluginSettings"].yaml_set_start_comment(
+        """# 模块与对应命令和对应群权限
+# 用于生成帮助图片 和 开关功能
+# key：模块名称
+# level：需要的群等级
+# default_status：加入群时功能的默认开关状态
+# limit_superuser: 功能状态是否限制超级用户
+# cmd: 关闭[cmd] 都会触发命令 关闭对应功能，cmd列表第一个词为统计的功能名称
+# plugin_type: 帮助类别 示例：('原神相关',) 或 ('原神相关', 1)，1代表帮助命令列向排列，否则为横向排列""",
+        indent=2,
+    )
+    for plugin in _data["PluginSettings"].keys():
+        _data["PluginSettings"][plugin].yaml_set_start_comment(
+            f"{plugin}：{_tmp_module[plugin]}", indent=2
+        )
+    with open(plugins2settings_file, "w", encoding="utf8") as wf:
+        round_trip_dump(_data, wf, Dumper=yaml.RoundTripDumper, allow_unicode=True)
    logger.info(f"已成功加载 {len(plugins2settings_manager.get_data())} 个非限制插件.")
@@ -1,7 +1,6 @@
 from nonebot import on_request, on_message
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.cqhttp import (
    Bot,
-    ActionFailed,
    FriendRequestEvent,
    GroupRequestEvent,
    MessageEvent,
@@ -9,6 +8,7 @@ from nonebot.adapters.onebot.v11 import (
 from models.friend_user import FriendUser
 from datetime import datetime
 from configs.config import NICKNAME, Config
+from nonebot.adapters.cqhttp.exception import ActionFailed
 from utils.manager import requests_manager
 from models.group_info import GroupInfo
 from utils.utils import scheduler
@@ -25,13 +25,13 @@ __plugin_configs__ = {

 friend_req = on_request(priority=5, block=True)
 group_req = on_request(priority=5, block=True)
-x = on_message(priority=999, block=False, rule=lambda: False)
+x = on_message(priority=9, block=False)

 exists_data = {"private": {}, "group": {}}


@friend_req.handle()
-async def _(bot: Bot, event: FriendRequestEvent):
+async def _(bot: Bot, event: FriendRequestEvent, state: dict):
    global exists_data
    if exists_data["private"].get(event.user_id):
        if time.time() - exists_data["private"][event.user_id] < 60 * 5:
@@ -66,7 +66,7 @@ async def _(bot: Bot, event: FriendRequestEvent):


@group_req.handle()
-async def _(bot: Bot, event: GroupRequestEvent):
+async def _(bot: Bot, event: GroupRequestEvent, state: dict):
    global exists_data
    if event.sub_type == "invite":
        if str(event.user_id) in bot.config.superusers:
@@ -125,7 +125,7 @@ async def _(bot: Bot, event: GroupRequestEvent):


@x.handle()
-async def _(event: MessageEvent):
+async def _(bot: Bot, event: MessageEvent, state: dict):
    await asyncio.sleep(0.1)
    r = re.search(r'groupcode="(.*?)"', str(event.get_message()))
    if r:
@@ -1,14 +1,15 @@
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, PrivateMessageEvent, Message, MessageEvent
 from nonebot import on_command
 from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, PrivateMessageEvent
 from nonebot.rule import to_me
+from utils.utils import get_message_text
 from models.group_member_info import GroupInfoUser
 from models.friend_user import FriendUser
+import random
 from models.ban_user import BanUser
 from services.log import logger
 from configs.config import NICKNAME, Config
-from nonebot.params import CommandArg
-import random
+

 __zx_plugin_name__ = "昵称系统"
 __plugin_usage__ = f"""
@@ -22,15 +23,9 @@ __plugin_des__ = "区区昵称，才不想叫呢！"
 __plugin_cmd__ = ["以后叫我 [昵称]", f"{NICKNAME}我是谁"]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
-__plugin_settings__ = {
-    "level": 5,
-    "default_status": True,
-    "limit_superuser": False,
-    "cmd": ["昵称", "昵称系统"],
-}
 __plugin_configs__ = {
    "BLACK_WORD": {
-        "value": ["爸", "爹", "爷", "父亲"],
+        "value": ["爸", "爹", "爷"],
        "help": "昵称所屏蔽的关键词，会被替换为 *",
        "default_value": None
    }
@@ -53,8 +48,8 @@ cancel_nickname = on_command("取消昵称", rule=to_me(), priority=5, block=Tru


@nickname.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+    msg = get_message_text(event.json())
    if not msg:
        await nickname.finish("叫你空白？叫你虚空？叫你无名？？", at_sender=True)
    if len(msg) > 10:
@@ -63,9 +58,8 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
        await nickname.finish("笨蛋！休想占用我的名字！#", at_sender=True)
    _tmp = ""
    black_word = Config.get_config("nickname", "BLACK_WORD")
-    if black_word:
-        for x in msg:
-            _tmp += "*" if x in black_word else x
+    for x in msg:
+        _tmp += "*" if x in black_word else x
    msg = _tmp
    if isinstance(event, GroupMessageEvent):
        if await GroupInfoUser.set_group_member_nickname(
@@ -80,7 +74,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
                        f"好啦好啦，我知道啦，{msg}，以后就这么叫你吧",
                        f"嗯嗯，{NICKNAME}记住你的昵称了哦，{msg}",
                        f"好突然，突然要叫你昵称什么的...{msg}..",
-                        f"{NICKNAME}会好好记住{msg}的，放心吧",
+                        f"{NICKNAME}会好好记住的{msg}的，放心吧",
                        f"好..好.，那窝以后就叫你{msg}了.",
                    ]
                )
@@ -97,7 +91,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
                        f"好啦好啦，我知道啦，{msg}，以后就这么叫你吧",
                        f"嗯嗯，{NICKNAME}记住你的昵称了哦，{msg}",
                        f"好突然，突然要叫你昵称什么的...{msg}..",
-                        f"{NICKNAME}会好好记住{msg}的，放心吧",
+                        f"{NICKNAME}会好好记住的{msg}的，放心吧",
                        f"好..好.，那窝以后就叫你{msg}了.",
                    ]
                )
@@ -109,7 +103,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):


@my_nickname.handle()
-async def _(event: GroupMessageEvent):
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    try:
        nickname_ = await GroupInfoUser.get_group_member_nickname(
            event.user_id, event.group_id
@@ -130,7 +124,7 @@ async def _(event: GroupMessageEvent):
            )
        )
    else:
-        nickname_ = event.sender.card or event.sender.nickname
+        nickname_ = event.sender.card if event.sender.card else event.sender.nickname
        await my_nickname.send(
            random.choice(
                ["没..没有昵称嘛，{}", "啊，你是{}啊，我想叫你的昵称！", "是{}啊，有什么事吗？", "你是{}？"]
@@ -164,7 +158,7 @@ async def _(bot: Bot, event: PrivateMessageEvent, state: T_State):


@cancel_nickname.handle()
-async def _(event: GroupMessageEvent):
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    nickname_ = await GroupInfoUser.get_group_member_nickname(
        event.user_id, event.group_id
    )
@@ -187,7 +181,7 @@ async def _(event: GroupMessageEvent):


@cancel_nickname.handle()
-async def _(event: PrivateMessageEvent):
+async def _(bot: Bot, event: PrivateMessageEvent, state: T_State):
    nickname_ = await FriendUser.get_friend_nickname(event.user_id)
    if nickname_:
        await cancel_nickname.send(
@@ -1,68 +0,0 @@
-from nonebot import on_command, on_regex
-
-from .data_source import show_plugin_repo, install_plugin, uninstall_plugin, download_json
-from services.log import logger
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
-from nonebot.params import CommandArg
-
-from utils.message_builder import image
-from nonebot.permission import SUPERUSER
-
-
-__zx_plugin_name__ = "插件商店 [Superuser]"
-__plugin_usage__ = """
-usage：
-    下载安装插件
-    指令：
-        查看插件仓库
-        更新插件仓库
-        安装插件 [name/id] （重新安装等同于更新）
-        卸载插件 [name/id]
-""".strip()
-__plugin_des__ = "从真寻适配仓库中下载插件"
-__plugin_cmd__ = ["查看插件仓库", "更新插件仓库", "安装插件 [name/id]", "卸载插件 [name/id]"]
-__plugin_version__ = 0.1
-__plugin_author__ = "HibiKier"
-
-show_repo = on_regex("^查看插件仓库$", priority=1, block=True, permission=SUPERUSER)
-
-update_repo = on_regex("^更新插件仓库$", priority=1, block=True, permission=SUPERUSER)
-
-install_plugin_matcher = on_command("安装插件", priority=1, block=True, permission=SUPERUSER)
-
-uninstall_plugin_matcher = on_command("卸载插件", priority=1, block=True, permission=SUPERUSER)
-
-
-@install_plugin_matcher.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    arg = arg.extract_plain_text().strip()
-    msg = await install_plugin(arg)
-    await install_plugin_matcher.send(msg)
-
-
-@uninstall_plugin_matcher.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    arg = arg.extract_plain_text().strip()
-    msg = await uninstall_plugin(arg)
-    await install_plugin_matcher.send(msg)
-
-
-@update_repo.handle()
-async def _(bot: Bot, event: MessageEvent):
-    code = await download_json()
-    if code == 200:
-        await update_repo.finish("更新插件仓库信息成功！")
-    await update_repo.send("更新插件仓库信息失败！")
-    
-
-@show_repo.handle()
-async def _(bot: Bot, event: MessageEvent):
-    msg = await show_plugin_repo()
-    if isinstance(msg, int):
-        await show_repo.finish("文件下载失败或解压失败..")
-    await show_repo.send(image(b64=msg))
-    logger.info(
-        f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-        f" 查看插件仓库"
-    )
-
@@ -1,199 +0,0 @@
-import os
-import shutil
-import zipfile
-from pathlib import Path
-from typing import Union, Tuple
-from utils.manager import plugins_manager
-
-import ujson as json
-
-from services import logger
-from utils.http_utils import AsyncHttpx
-from configs.path_config import TEMP_PATH, DATA_PATH
-from utils.image_utils import text2image, BuildImage
-from utils.utils import is_number
-
-path = DATA_PATH / "plugin_shop"
-if not path.exists():
-    path.mkdir(parents=True, exist_ok=True)
-
-repo_json_url = "https://github.com/zhenxun-org/nonebot_plugins_zhenxun_bot/archive/refs/heads/index.zip"
-repo_zip_path = TEMP_PATH / "plugin_repo_json.zip"
-plugin_json = path / "zhenxun_plugins.json"
-
-extensive_plugin_path = Path() / "extensive_plugin"
-
-path = DATA_PATH / "plugin_shop"
-if not path.exists():
-    path.mkdir(parents=True, exist_ok=True)
-if not extensive_plugin_path.exists():
-    extensive_plugin_path.mkdir(parents=True, exist_ok=True)
-
-data = {}
-
-
-async def install_plugin(name: str) -> str:
-    """
-    安装插件
-    :param name: 插件名或下标
-    """
-    try:
-        if is_number(name):
-            name, code = await get_plugin_name(int(name))
-            if code != 200:
-                return name
-        plugin_url = data[name]["download_url"]
-        url = (await AsyncHttpx.get(plugin_url)).headers.get("Location")
-        zip_file = TEMP_PATH / f"{name}.zip"
-        if zip_file.exists():
-            zip_file.unlink()
-        if await AsyncHttpx.download_file(url, zip_file):
-            logger.debug("开始解压插件压缩包...")
-            # 解压
-            zf = zipfile.ZipFile(zip_file, "r")
-            extract_path = TEMP_PATH / f"{name}"
-            if extract_path.exists():
-                shutil.rmtree(extract_path.absolute(), ignore_errors=True)
-            extract_path.mkdir(exist_ok=True, parents=True)
-            for file in zf.namelist():
-                zf.extract(file, extract_path)
-            zf.close()
-            logger.debug("解压插件压缩包完成...")
-            logger.debug("开始移动插件文件夹...")
-            if (extensive_plugin_path / f"{name}").exists():
-                logger.debug("extensive_plugin目录下文件夹已存在，删除该目录插件文件夹...")
-                shutil.rmtree(
-                    (extensive_plugin_path / f"{name}").absolute(), ignore_errors=True
-                )
-            extract_path.rename(extensive_plugin_path / f"{name}")
-            tmp = ""
-            if "pyproject.toml" in os.listdir(extensive_plugin_path / f"{name}"):
-                tmp = "检测到该插件含有额外依赖，当前安装无法保证依赖完全安装成功。"
-                os.system(
-                    f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'pyproject.toml').absolute()}"
-                )
-            elif "requirements.txt" in os.listdir(extensive_plugin_path / f"{name}"):
-                tmp = "检测到该插件含有额外依赖，当前安装无法保证依赖完全安装成功。"
-                os.system(
-                    f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'requirements.txt').absolute()}"
-                )
-            with open(extensive_plugin_path / f"{name}" / "plugin_info.json", "w") as f:
-                json.dump(data[name], f, ensure_ascii=False, indent=4)
-            logger.debug("移动插件文件夹完成...")
-            logger.info(f"成功安装插件 {name} 成功！\n{tmp}")
-        return f"成功安装插件 {name}，请重启真寻！"
-    except Exception as e:
-        logger.error(f"安装插件 {name} 失败 {type(e)}：{e}")
-        return f"安装插件 {name} 失败 {type(e)}：{e}"
-
-
-async def uninstall_plugin(name: str) -> str:
-    """
-    删除插件
-    :param name: 插件名或下标
-    """
-    try:
-        if is_number(name):
-            name, code = await get_plugin_name(int(name))
-            if code != 200:
-                return name
-        if name not in os.listdir(extensive_plugin_path):
-            return f"未安装 {name} 插件！"
-        shutil.rmtree((extensive_plugin_path / name).absolute(), ignore_errors=True)
-        logger.info(f"插件 {name} 删除成功！")
-        return f"插件 {name} 删除成功！"
-    except Exception as e:
-        logger.error(f"删除插件 {name} 失败 {type(e)}：{e}")
-        return f"删除插件 {name} 失败 {type(e)}：{e}"
-
-
-async def show_plugin_repo() -> Union[int, str]:
-    """
-    获取插件仓库数据并格式化
-    """
-    if not plugin_json.exists():
-        code = await download_json()
-        if code != 200:
-            return code
-    plugin_info = json.load(open(plugin_json, "r", encoding="utf8"))
-    plugins_data = plugins_manager.get_data()
-    load_plugin_list = plugins_data.keys()
-    image_list = []
-    w, h = 0, 0
-    line_height = 10
-    for i, key in enumerate(plugin_info.keys()):
-        data[key] = {
-            "名称": plugin_info[key]["plugin_name"],
-            "模块": key,
-            "作者": plugin_info[key]["author"],
-            "版本": plugin_info[key]["version"],
-            "简介": plugin_info[key]["introduction"],
-            "download_url": plugin_info[key]["download_url"],
-            "github_url": plugin_info[key]["github_url"],
-        }
-        status = ""
-        version = ""
-        if key in load_plugin_list:
-            status = "<f font_color=#1a7e30>[已安装]</f>"
-            version = f"<f font_color=#1a7e30>[{plugins_data[key].version}]</f>"
-        s = (
-            f'id：{i+1}\n名称：{plugin_info[key]["plugin_name"]}'
-            f' \t\t{status}\n'
-            f"模块：{key}\n"
-            f'作者：{plugin_info[key]["author"]}\n'
-            f'版本：{plugin_info[key]["version"]} \t\t{version}\n'
-            f'简介：{plugin_info[key]["introduction"]}\n'
-            f"-------------------"
-        )
-        img = await text2image(s, font_size=20, color="#f9f6f2")
-        w = w if w > img.w else img.w
-        h += img.h + line_height
-        image_list.append(img)
-    A = BuildImage(w + 50, h + 50, color="#f9f6f2")
-    cur_h = 25
-    for img in image_list:
-        await A.apaste(img, (25, cur_h))
-        cur_h += img.h + line_height
-    return A.pic2bs4()
-
-
-async def download_json() -> int:
-    """
-    下载插件库json文件
-    """
-    try:
-        url = (await AsyncHttpx.get(repo_json_url)).headers.get("Location")
-        if repo_zip_path.exists():
-            repo_zip_path.unlink()
-        if await AsyncHttpx.download_file(url, repo_zip_path):
-            zf = zipfile.ZipFile(repo_zip_path, "r")
-            extract_path = path / "temp"
-            for file in zf.namelist():
-                zf.extract(file, extract_path)
-            zf.close()
-            if plugin_json.exists():
-                plugin_json.unlink()
-            (
-                extract_path
-                / "nonebot_plugins_zhenxun_bot-index"
-                / "zhenxun_plugins.json"
-            ).rename(plugin_json)
-            shutil.rmtree(extract_path.absolute(), ignore_errors=True)
-            return 200
-    except Exception as e:
-        logger.error(f"下载插件库压缩包失败或解压失败 {type(e)}：{e}")
-    return 999
-
-
-async def get_plugin_name(name: int) -> Tuple[str, int]:
-    """
-    通过下标获取插件名
-    :param name: 下标
-    """
-    name = int(name)
-    if not data:
-        await show_plugin_repo()
-    if name < 1 or name > len(data.keys()):
-        return "下标超过上下限！", 999
-    name = list(data.keys())[name - 1]
-    return name, 200
@@ -1,22 +1,14 @@
-import random
-
-from asyncpg.exceptions import (
-    DuplicateColumnError,
-    UndefinedColumnError,
-    PostgresSyntaxError,
-)
 from nonebot import Driver
 from services.db_context import db
+from asyncpg.exceptions import DuplicateColumnError
 from models.group_info import GroupInfo
-from models.bag_user import BagUser
-from nonebot.adapters.onebot.v11 import Bot
+from nonebot.adapters.cqhttp import Bot
 from services.log import logger
 from configs.path_config import TEXT_PATH
 from asyncio.exceptions import TimeoutError
-from typing import List
 from utils.http_utils import AsyncHttpx
-from utils.utils import GDict
 from utils.utils import scheduler
+from pathlib import Path
 import nonebot

 try:
@@ -34,7 +26,7 @@ async def update_city():
    部分插件需要中国省份城市
    这里直接更新，避免插件内代码重复
    """
-    china_city = TEXT_PATH / "china_city.json"
+    china_city = Path(TEXT_PATH) / "china_city.json"
    data = {}
    if not china_city.exists():
        try:
@@ -69,90 +61,15 @@ async def _():
    """
    数据库表结构变换
    """
-    _flag = []
    sql_str = [
-        (
-            "ALTER TABLE group_info ADD group_flag Integer NOT NULL DEFAULT 0;",
-            "group_info",
-        ),  # group_info表添加一个group_flag
-        (
-            "ALTER TABLE bag_users rename belonging_group To group_id;",
-            "bag_users",
-        ),  # 将 bag_users 的 belonging_group 改为 group_id
-        (
-            "ALTER TABLE group_info_users rename belonging_group To group_id;",
-            "group_info_users",
-        ),
-        (
-            "ALTER TABLE sign_group_users rename belonging_group To group_id;",
-            "sign_group_users",
-        ),
-        (
-            "ALTER TABLE open_cases_users rename belonging_group To group_id;",
-            "open_cases_users",
-        ),
-        (
-            "ALTER TABLE bag_users ADD property json NOT NULL DEFAULT '{}';",
-            "bag_users",
-        ),  # bag_users 新增字段 property 替代 props
-        (
-            "ALTER TABLE genshin ADD auto_sign_time timestamp with time zone;",
-            "genshin"
-        ),  # 新增原神自动签到字段
-        (
-            "ALTER TABLE genshin ADD resin_remind boolean DEFAULT False;",
-            "genshin"
-        ),  # 新增原神自动签到字段
-        (
-            "ALTER TABLE genshin ADD resin_recovery_time timestamp with time zone;",
-            "genshin"
-        ),  # 新增原神自动签到字段
-        (
-            "ALTER TABLE genshin ADD bind_group Integer;",
-            "genshin"
-        ),  # 新增原神群号绑定字段
-        (
-            "ALTER TABLE genshin ADD login_ticket VARCHAR(255) DEFAULT '';",
-            "genshin"
-        ),  # 新增米游社login_ticket绑定字段
-        (
-            "ALTER TABLE genshin ADD stuid VARCHAR(255) DEFAULT '';",
-            "genshin"
-        ),  # 新增米游社stuid绑定字段
-        (
-            "ALTER TABLE genshin ADD stoken VARCHAR(255) DEFAULT '';",
-            "genshin"
-        ),  # 新增米游社stoken绑定字段
-        (
-            "ALTER TABLE chat_history ADD plain_text Text;",
-            "chat_history"
-        ),  # 新增纯文本
-        (
-            "ALTER TABLE goods_info ADD daily_limit Integer DEFAULT 0;",
-            "goods_info"
-        ),  # 新增纯文本
-        (
-            "ALTER TABLE goods_info ADD daily_purchase_limit Json DEFAULT '{}';",
-            "goods_info"
-        ),  # 新增纯文本
+        "ALTER TABLE group_info ADD group_flag Integer NOT NULL DEFAULT 0;"  # group_info表添加一个group_flag
    ]
-    for sql in sql_str + GDict.get('run_sql', []):
+    for sql in sql_str:
        try:
-            if isinstance(sql, str):
-                flag = f'{random.randint(1, 10000)}'
-            else:
-                flag = sql[1]
-                sql = sql[0]
            query = db.text(sql)
            await db.first(query)
-            logger.info(f"完成sql操作：{sql}")
-            _flag.append(flag)
-        except (DuplicateColumnError, UndefinedColumnError):
+        except DuplicateColumnError:
            pass
-        except PostgresSyntaxError:
-            logger.error(f"语法错误：执行sql失败：{sql}")
-    # bag_user 将文本转为字典格式
-    await __database_script(_flag)


@driver.on_bot_connect
@@ -188,26 +105,6 @@ async def _(bot: Bot):
                logger.info(f"移除不存在的群聊信息：{group_id}")


-async def __database_script(_flag: List[str]):
-    # bag_user 将文本转为字典格式
-    if "bag_users" in _flag:
-        for x in await BagUser.get_all_users():
-            props = {}
-            if x.props:
-                for prop in [p for p in x.props.split(",") if p]:
-                    if props.get(prop):
-                        props[prop] += 1
-                    else:
-                        props[prop] = 1
-                logger.info(
-                    f"__database_script USER {x.user_qq} GROUP {x.group_id} 更新数据 {props}"
-                )
-            await x.update(
-                property=props,
-                props="",
-            ).apply()
-
-
 # 自动更新城市列表
@scheduler.scheduled_job(
    "cron",
@@ -1,9 +1,5 @@
-from configs.config import Config
-from nonebot import Driver
-from utils.decorator.shop import shop_register
 import nonebot
-
-driver: Driver = nonebot.get_driver()
+from configs.config import Config


 Config.add_plugin_config(
@@ -16,8 +12,3 @@ Config.add_plugin_config(


 nonebot.load_plugins("basic_plugins/shop")
-
-
-@driver.on_bot_connect
-async def _():
-    await shop_register.load_register()
@@ -1,15 +1,12 @@
 from nonebot import on_command
-
-from models.user_shop_gold_log import UserShopGoldLog
 from services.log import logger
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
-from nonebot.params import CommandArg
-from utils.utils import is_number
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
+from nonebot.typing import T_State
+from utils.utils import get_message_text, is_number
 from models.bag_user import BagUser
 from services.db_context import db
-from nonebot.adapters.onebot.v11.permission import GROUP
+from nonebot.adapters.cqhttp.permission import GROUP
 from models.goods_info import GoodsInfo
-import time


 __zx_plugin_name__ = "商店 - 购买道具"
@@ -23,7 +20,7 @@ usage：
 """.strip()
 __plugin_des__ = "商店 - 购买道具"
 __plugin_cmd__ = ["购买 [序号或名称] ?[数量=1]"]
-__plugin_type__ = ("商店",)
+__plugin_type__ = ('商店',)
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 __plugin_settings__ = {
@@ -32,40 +29,36 @@ __plugin_settings__ = {
    "limit_superuser": False,
    "cmd": ["商店", "购买道具"],
 }
-__plugin_cd_limit__ = {"cd": 3}


 buy = on_command("购买", aliases={"购买道具"}, priority=5, block=True, permission=GROUP)


@buy.handle()
-async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    goods = None
-    if arg.extract_plain_text().strip() in ["神秘药水"]:
+    if get_message_text(event.json()) in ["神秘药水"]:
        await buy.finish("你们看看就好啦，这是不可能卖给你们的~", at_sender=True)
-    goods_list = [
-        x
-        for x in await GoodsInfo.get_all_goods()
-        if x.goods_limit_time > time.time() or x.goods_limit_time == 0
-    ]
-    goods_name_list = [x.goods_name for x in goods_list]
-    msg = arg.extract_plain_text().strip().split()
+    goods_lst = await GoodsInfo.get_all_goods()
+    goods_name_lst = [x.goods_name for x in goods_lst]
+    msg = get_message_text(event.json()).split()
    num = 1
    if len(msg) > 1:
        if is_number(msg[1]) and int(msg[1]) > 0:
            num = int(msg[1])
        else:
            await buy.finish("购买的数量要是数字且大于0！", at_sender=True)
+    # print(msg, num)
    if is_number(msg[0]):
        msg = int(msg[0])
-        if msg > len(goods_name_list) or msg < 1:
+        if msg > len(goods_lst) or msg < 1:
            await buy.finish("请输入正确的商品id！", at_sender=True)
-        goods = goods_list[msg - 1]
+        goods = goods_lst[msg - 1]
    else:
-        if msg[0] in goods_name_list:
-            for i in range(len(goods_name_list)):
-                if msg[0] == goods_name_list[i]:
-                    goods = goods_list[i]
+        if msg[0] in goods_name_lst:
+            for i in range(len(goods_name_lst)):
+                if msg[0] == goods_name_lst[i]:
+                    goods = goods_lst[i]
                    break
            else:
                await buy.finish("请输入正确的商品名称！")
@@ -76,15 +69,7 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
            await BagUser.get_gold(event.user_id, event.group_id)
        ) < goods.goods_price * num * goods.goods_discount:
            await buy.finish("您的金币好像不太够哦", at_sender=True)
-        flag, n = await GoodsInfo.check_user_daily_purchase(
-            goods, event.user_id, event.group_id, num
-        )
-        if flag:
-            await buy.finish(f"该次购买将超过每日次数限制，目前该道具还可以购买{n}次哦", at_sender=True)
-        if await BagUser.buy_property(event.user_id, event.group_id, goods, num):
-            await GoodsInfo.add_user_daily_purchase(
-                goods, event.user_id, event.group_id, num
-            )
+        if await BagUser.buy_props(event.user_id, event.group_id, goods, num):
            await buy.send(
                f"花费 {goods.goods_price * num * goods.goods_discount} 金币购买 {goods.goods_name} ×{num} 成功！",
                at_sender=True,
@@ -93,14 +78,6 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
                f"USER {event.user_id} GROUP {event.group_id} "
                f"花费 {goods.goods_price*num} 金币购买 {goods.goods_name} ×{num} 成功！"
            )
-            await UserShopGoldLog.add_shop_log(
-                event.user_id,
-                event.group_id,
-                0,
-                goods.goods_name,
-                num,
-                goods.goods_price * num * goods.goods_discount,
-            )
        else:
            await buy.send(f"{goods.goods_name} 购买失败！", at_sender=True)
            logger.info(
@@ -1,12 +1,11 @@
 from nonebot import on_command
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message, ActionFailed
-from nonebot.params import CommandArg
-from nonebot.adapters.onebot.v11.permission import GROUP
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp.permission import GROUP
 from utils.data_utils import init_rank
 from models.bag_user import BagUser
-from utils.image_utils import text2image
 from utils.message_builder import image
-from utils.utils import is_number
+from utils.utils import get_message_text, is_number

 __zx_plugin_name__ = "商店 - 我的金币"
 __plugin_usage__ = """
@@ -34,17 +33,13 @@ gold_rank = on_command("金币排行", priority=5, block=True, permission=GROUP)


@my_gold.handle()
-async def _(event: GroupMessageEvent):
-    msg = await BagUser.get_user_total_gold(event.user_id, event.group_id)
-    try:
-        await my_gold.send(msg)
-    except ActionFailed:
-        await my_gold.send(image(b64=(await text2image(msg, color="#f9f6f2", padding=10)).pic2bs4()))
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+    await my_gold.finish(await BagUser.get_my_total_gold(event.user_id, event.group_id))


@gold_rank.handle()
-async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
-    num = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+    num = get_message_text(event.json())
    if is_number(num) and 51 > int(num) > 10:
        num = int(num)
    else:
@@ -1,11 +1,9 @@
 from nonebot import on_command
-
-from utils.message_builder import image
-from ._data_source import create_bag_image
 from services.log import logger
-from nonebot.adapters.onebot.v11 import GroupMessageEvent
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
+from nonebot.typing import T_State
 from models.bag_user import BagUser
-from nonebot.adapters.onebot.v11.permission import GROUP
+from nonebot.adapters.cqhttp.permission import GROUP


 __zx_plugin_name__ = "商店 - 我的道具"
@@ -32,14 +30,23 @@ my_props = on_command("我的道具", priority=5, block=True, permission=GROUP)


@my_props.handle()
-async def _(event: GroupMessageEvent):
-    props = await BagUser.get_property(event.user_id, event.group_id)
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+    props = await BagUser.get_props(event.user_id, event.group_id)
    if props:
-        await my_props.send(image(b64=await create_bag_image(props)))
-        # rst = ""
-        # for i, p in enumerate(props.keys()):
-        #     rst += f"{i+1}.{p}\t×{props[p]}\n"
-        # await my_props.send("\n" + rst[:-1], at_sender=True)
+        pname_list = []
+        pnum_list = []
+        rst = ""
+        props = props[:-1].split(",")
+        for p in props:
+            if p != "":
+                if p in pname_list:
+                    pnum_list[pname_list.index(p)] += 1
+                else:
+                    pname_list.append(p)
+                    pnum_list.append(1)
+        for i in range(len(pname_list)):
+            rst += f"{i+1}.{pname_list[i]}\t×{pnum_list[i]}\n"
+        await my_props.send("\n" + rst[:-1], at_sender=True)
        logger.info(f"USER {event.user_id} GROUP {event.group_id} 查看我的道具")
    else:
        await my_props.finish("您的背包里没有任何的道具噢~", at_sender=True)
@@ -1,121 +0,0 @@
-from typing import Dict, List, Optional
-
-from models.bag_user import BagUser
-from models.goods_info import GoodsInfo
-from utils.image_utils import BuildImage
-from configs.path_config import IMAGE_PATH
-
-
-icon_path = IMAGE_PATH / "shop_icon"
-
-
-async def create_bag_image(props: Dict[str, int]):
-    """
-    说明:
-        创建背包道具图片
-    参数:
-        :param props: 道具仓库字典
-    """
-    goods_list = await GoodsInfo.get_all_goods()
-    active_props = await _init_prop(props, [x for x in goods_list if not x.is_passive])
-    passive_props = await _init_prop(props, [x for x in goods_list if x.is_passive])
-    active_w = 0
-    active_h = 0
-    passive_w = 0
-    passive_h = 0
-    if active_props:
-        img = BuildImage(
-            active_props.w,
-            active_props.h + 70,
-            font="CJGaoDeGuo.otf",
-            font_size=30,
-            color="#f9f6f2",
-        )
-        await img.apaste(active_props, (0, 70))
-        await img.atext((0, 30), "主动道具")
-        active_props = img
-        active_w = img.w
-        active_h = img.h
-    if passive_props:
-        img = BuildImage(
-            passive_props.w,
-            passive_props.h + 70,
-            font="CJGaoDeGuo.otf",
-            font_size=30,
-            color="#f9f6f2",
-        )
-        await img.apaste(passive_props, (0, 70))
-        await img.atext((0, 30), "被动道具")
-        passive_props = img
-        passive_w = img.w
-        passive_h = img.h
-    A = BuildImage(
-        active_w + passive_w + 100,
-        max(active_h, passive_h) + 60,
-        font="CJGaoDeGuo.otf",
-        font_size=30,
-        color="#f9f6f2",
-    )
-    curr_w = 50
-    if active_props:
-        await A.apaste(active_props, (curr_w, 0))
-        curr_w += active_props.w + 10
-    if passive_props:
-        await A.apaste(passive_props, (curr_w, 0))
-    if active_props and passive_props:
-        await A.aline(
-            (active_props.w + 45, 70, active_props.w + 45, A.h - 20), fill=(0, 0, 0)
-        )
-    return A.pic2bs4()
-
-
-async def _init_prop(
-    props: Dict[str, int], _props: List[GoodsInfo]
-) -> Optional[BuildImage]:
-    """
-    说明:
-        构造道具列表图片
-    参数:
-        :param props: 道具仓库字典
-        :param _props: 道具列表
-    """
-    active_name = [x.goods_name for x in _props]
-    name_list = [x for x in props.keys() if x in active_name]
-    if not name_list:
-        return None
-    temp_img = BuildImage(0, 0, font_size=20)
-    image_list = []
-    num_list = []
-    for i, name in enumerate(name_list):
-        img = BuildImage(
-            temp_img.getsize(name)[0] + 50,
-            30,
-            font="msyh.ttf",
-            font_size=20,
-            color="#f9f6f2",
-        )
-        await img.atext((30, 5), f"{i + 1}.{name}")
-        goods = [x for x in _props if x.goods_name == name][0]
-        if goods.icon and (icon_path / goods.icon).exists():
-            icon = BuildImage(30, 30, background=icon_path / goods.icon)
-            await img.apaste(icon, alpha=True)
-        image_list.append(img)
-        num_list.append(
-            BuildImage(
-                30, 30, font_size=20, font="msyh.ttf", plain_text=f"×{props[name]}"
-            )
-        )
-    max_w = 0
-    num_max_w = 0
-    h = 0
-    for img, num in zip(image_list, num_list):
-        h += img.h
-        max_w = max_w if max_w > img.w else img.w
-        num_max_w = num_max_w if num_max_w > num.w else num.w
-    A = BuildImage(max_w + num_max_w + 30, h, color="#f9f6f2")
-    curr_h = 0
-    for img, num in zip(image_list, num_list):
-        await A.apaste(img, (0, curr_h))
-        await A.apaste(num, (max_w + 20, curr_h + 5), True)
-        curr_h += img.h
-    return A
@@ -1,11 +1,12 @@
-from .data_source import create_shop_help, delete_goods, update_goods, register_goods, parse_goods_info, GoodsInfo
-from nonebot.adapters.onebot.v11 import MessageEvent, Message
 from nonebot import on_command
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, MessageEvent
+from nonebot.typing import T_State
 from configs.path_config import IMAGE_PATH
 from utils.message_builder import image
+from .data_source import create_shop_help, delete_goods, update_goods, registered_goods, parse_goods_info
 from nonebot.permission import SUPERUSER
-from utils.utils import is_number, scheduler
-from nonebot.params import CommandArg
+from utils.utils import get_message_text, is_number
+from nonebot.plugin import export
 from services.log import logger
 import os

@@ -50,6 +51,11 @@ __plugin_block_limit__ = {
    "limit_type": "group"
 }

+# 导出方法供其他插件使用
+export = export()
+export.registered_goods = registered_goods
+export.delete_goods = delete_goods
+export.update_goods = update_goods

 shop_help = on_command("商店", priority=5, block=True)

@@ -61,20 +67,20 @@ shop_update_goods = on_command("修改商品", priority=5, permission=SUPERUSER,


@shop_help.handle()
-async def _():
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    await shop_help.send(image(b64=await create_shop_help()))


@shop_add_goods.handle()
-async def _(event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = get_message_text(event.json())
    if msg:
        data = parse_goods_info(msg)
        if isinstance(data, str):
            await shop_add_goods.finish(data)
        if not data.get("name") or not data.get("price") or not data.get("des"):
            await shop_add_goods.finish("name:price:des 参数不可缺少！")
-        if await register_goods(**data):
+        if await registered_goods(**data):
            await shop_add_goods.send(f"添加商品 {data['name']} 成功！\n"
                                      f"名称：{data['name']}\n"
                                      f"价格：{data['price']}金币\n"
@@ -88,8 +94,8 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):


@shop_del_goods.handle()
-async def _(event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = get_message_text(event.json())
    if msg:
        name = ""
        id_ = 0
@@ -109,8 +115,8 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):


@shop_update_goods.handle()
-async def _(event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = get_message_text(event.json())
    if msg:
        data = parse_goods_info(msg)
        if isinstance(data, str):
@@ -122,18 +128,6 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
            await shop_update_goods.send(f"修改商品 {name} 成功了...\n{text}", at_sender=True)
            logger.info(f"USER {event.user_id} 修改商品 {name} 数据 {text} 成功")
        else:
-            await shop_update_goods.send(name, at_sender=True)
+            await shop_update_goods.send(f"修改商品 {name} 失败了...", at_sender=True)
            logger.info(f"USER {event.user_id} 修改商品 {name} 数据 {text} 失败")

-
-@scheduler.scheduled_job(
-    "cron",
-    hour=0,
-    minute=0,
-)
-async def _():
-    try:
-        await GoodsInfo.reset_daily_purchase()
-        logger.info("商品每日限购次数重置成功...")
-    except Exception as e:
-        logger.error(f"商品每日限购次数重置发生错误 {type(e)}：{e}")
@@ -1,18 +1,55 @@
-from PIL import Image
-
 from models.goods_info import GoodsInfo
-from utils.image_utils import BuildImage, text2image
+from utils.image_utils import BuildImage
+from models.sign_group_user import SignGroupUser
 from utils.utils import is_number
 from configs.path_config import IMAGE_PATH
-from typing import Optional, Union, Tuple
-from utils.utils import GDict
+from typing import Optional, Union
+from configs.config import Config
+from nonebot import Driver
+from nonebot.plugin import require
+import nonebot
 import time

-icon_path = IMAGE_PATH / 'shop_icon'
+driver: Driver = nonebot.get_driver()
+
+use = require("use")


-GDict['run_sql'].append("ALTER TABLE goods_info ADD is_passive boolean DEFAULT False;")
-GDict['run_sql'].append("ALTER TABLE goods_info ADD icon VARCHAR(255);")
+@driver.on_startup
+async def init_default_shop_goods():
+    """
+    导入内置的三个商品
+    """
+
+    async def sign_card_1(**kwargs):
+        user_id = kwargs['user_id']
+        group_id = kwargs['group_id']
+        user = await SignGroupUser.ensure(user_id, group_id)
+        await user.update(add_probability=0.1).apply()
+
+    async def sign_card_2(**kwargs):
+        user_id = kwargs['user_id']
+        group_id = kwargs['group_id']
+        user = await SignGroupUser.ensure(user_id, group_id)
+        await user.update(add_probability=0.2).apply()
+
+    async def sign_card_3(**kwargs):
+        user_id = kwargs['user_id']
+        group_id = kwargs['group_id']
+        user = await SignGroupUser.ensure(user_id, group_id)
+        await user.update(add_probability=0.3).apply()
+
+    if Config.get_config("shop", "IMPORT_DEFAULT_SHOP_GOODS"):
+        await registered_goods(
+            "好感度双倍加持卡Ⅰ", 30, "下次签到双倍好感度概率 + 10%（谁才是真命天子？）（同类商品将覆盖）"
+        )
+        use.registered_use("好感度双倍加持卡Ⅰ", sign_card_1)
+        await registered_goods("好感度双倍加持卡Ⅱ", 150, "下次签到双倍好感度概率 + 20%（平平庸庸）（同类商品将覆盖）")
+        use.registered_use("好感度双倍加持卡Ⅱ", sign_card_2)
+        await registered_goods(
+            "好感度双倍加持卡Ⅲ", 250, "下次签到双倍好感度概率 + 30%（金币才是真命天子！）（同类商品将覆盖）"
+        )
+        use.registered_use("好感度双倍加持卡Ⅲ", sign_card_3)


 # 创建商店界面
@@ -22,189 +59,91 @@ async def create_shop_help() -> str:
    :return: 图片base64
    """
    goods_lst = await GoodsInfo.get_all_goods()
+    idx = 1
    _dc = {}
    font_h = BuildImage(0, 0).getsize("正")[1]
    h = 10
    _list = []
    for goods in goods_lst:
        if goods.goods_limit_time == 0 or time.time() < goods.goods_limit_time:
+            h += len(goods.goods_description.strip().split("\n")) * font_h + 80
            _list.append(goods)
-    # A = BuildImage(1100, h, color="#f9f6f2")
-    total_n = 0
-    image_list = []
-    for idx, goods in enumerate(_list):
+    A = BuildImage(1000, h, color="#f9f6f2")
+    current_h = 0
+    for goods in _list:
+        bk = BuildImage(
+            700, 80, font_size=15, color="#f9f6f2", font="CJGaoDeGuo.otf"
+        )
+        goods_image = BuildImage(
+            600, 80, font_size=20, color="#a29ad6", font="CJGaoDeGuo.otf"
+        )
        name_image = BuildImage(
            580, 40, font_size=25, color="#e67b6b", font="CJGaoDeGuo.otf"
        )
        await name_image.atext(
-            (15, 0), f"{idx + 1}.{goods.goods_name}", center_type="by_height"
+            (15, 0), f"{idx}.{goods.goods_name}", center_type="by_height"
        )
        await name_image.aline((380, -5, 280, 45), "#a29ad6", 5)
        await name_image.atext((390, 0), "售价：", center_type="by_height")
-        if goods.goods_discount != 1:
-            discount_price = int(goods.goods_discount * goods.goods_price)
-            old_price_image = BuildImage(0, 0, plain_text=str(goods.goods_price), font_color=(194, 194, 194), font="CJGaoDeGuo.otf", font_size=15)
-            await old_price_image.aline((0, int(old_price_image.h / 2), old_price_image.w + 1, int(old_price_image.h / 2)), (0, 0, 0))
-            await name_image.apaste(
-                old_price_image, (440, 0), True
-            )
-            await name_image.atext(
-                (440, 15), str(discount_price), (255, 255, 255)
-            )
-        else:
-            await name_image.atext(
-                (440, 0), str(goods.goods_price), (255, 255, 255), center_type="by_height"
-            )
+        await name_image.atext(
+            (440, 0), str(goods.goods_price), (255, 255, 255), center_type="by_height"
+        )
        await name_image.atext(
            (
                440
                + BuildImage(0, 0, plain_text=str(goods.goods_price), font_size=25).w,
                0,
            ),
-            f" 金币",
+            " 金币",
            center_type="by_height",
        )
-        des_image = None
-        font_img = BuildImage(
-            600, 80, font_size=20, color="#a29ad6", font="CJGaoDeGuo.otf"
-        )
-        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.w - p - 20:
-                    msg = ''
-                    tmp = ''
-                    for i in range(len(des)):
-                        if font_img.getsize(tmp)[0] < font_img.w - 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.h) if des_image else 50, font_size=20, color="#a29ad6", font="CJGaoDeGuo.otf"
-        )
-        if des_image:
-            await goods_image.atext((15, 50), '简介：')
-            await goods_image.apaste(des_image, (p, 50))
        await name_image.acircle_corner(5)
        await goods_image.apaste(name_image, (0, 5), True, center_type="by_width")
+        await goods_image.atext((15, 50), f"简介：{goods.goods_description}")
        await goods_image.acircle_corner(20)
-        bk = BuildImage(1180, (50 + des_image.h) 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.apaste(icon)
-        await bk.apaste(goods_image, (70, 0), alpha=True)
-        n = 0
-        _w = 650
+        await bk.apaste(goods_image, alpha=True)
        # 添加限时图标和时间
        if goods.goods_limit_time > 0:
-            n += 140
-            _limit_time_logo = BuildImage(
-                40, 40, background=f"{IMAGE_PATH}/other/time.png"
-            )
-            await bk.apaste(_limit_time_logo, (_w + 50, 0), True)
-            await bk.apaste(
-                BuildImage(0, 0, plain_text="限时！", font_size=23, font="CJGaoDeGuo.otf"),
-                (_w + 90, 10),
-                True,
-            )
-            limit_time = time.strftime(
-                "%Y-%m-%d %H:%M", time.localtime(goods.goods_limit_time)
-            ).split()
+            _limit_time_logo = BuildImage(40, 40, background=f"{IMAGE_PATH}/other/time.png")
+            await bk.apaste(_limit_time_logo, (600, 0), True)
+            await bk.apaste(BuildImage(0, 0, plain_text="限时！", font_size=23, font="CJGaoDeGuo.otf"), (640, 10), True)
+            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 = _h_m[0] + "时 " + _h_m[1] + "分"
-            await bk.atext((_w + 55, 38), str(y_m_d))
-            await bk.atext((_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.apaste(_discount_logo, (_w + 50, 10), True)
-            await bk.apaste(
-                BuildImage(0, 0, plain_text="折扣！", font_size=23, font="CJGaoDeGuo.otf"),
-                (_w + 90, 15),
-                True,
-            )
-            await bk.apaste(
-                BuildImage(0, 0, plain_text=f"{10 * goods.goods_discount:.1f} 折", font_size=30, font="CJGaoDeGuo.otf", font_color=(85, 156, 75)),
-                (_w + 50, 44),
-                True,
-            )
-            _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.apaste(_daily_limit_logo, (_w + 50, 10), True)
-            await bk.apaste(
-                BuildImage(0, 0, plain_text="限购！", font_size=23, font="CJGaoDeGuo.otf"),
-                (_w + 90, 20),
-                True,
-            )
-            await bk.apaste(
-                BuildImage(0, 0, plain_text=f"{goods.daily_limit}", font_size=30, font="CJGaoDeGuo.otf"),
-                (_w + 72, 45),
-                True,
-            )
-        if total_n < n:
-            total_n = n
-        if n:
-            await bk.aline((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
-    h = 0
-    current_h = 0
-    for img in image_list:
-        h += img.h + 10
-    A = BuildImage(1100, h, color="#f9f6f2")
-    for img in image_list:
-        await A.apaste(img, (0, current_h), True)
-        current_h += img.h + 10
-    w = 950
-    if total_n:
-        w += total_n
+            await bk.atext((605, 38), str(y_m_d))
+            await bk.atext((615, 57), str(h_m))
+            await bk.aline((550, -1, 710, -1), "#a29ad6", 5)
+            await bk.aline((550, 80, 710, 80), "#a29ad6", 5)
+        idx += 1
+        await A.apaste(bk, (0, current_h), True)
+        current_h += 90
+    w = 1000
    h = A.h + 230 + 100
    h = 1000 if h < 1000 else h
    shop_logo = BuildImage(100, 100, background=f"{IMAGE_PATH}/other/shop_text.png")
    shop = BuildImage(w, h, font_size=20, color="#f9f6f2")
-    zx_img = BuildImage(0, 0, background=f"{IMAGE_PATH}/zhenxun/toukan_3.png")
-    zx_img.transpose(Image.FLIP_LEFT_RIGHT)
+    shop.paste(A, (20, 230))
+    zx_img = BuildImage(0, 0, background=f"{IMAGE_PATH}/zhenxun/toukan.png")
    zx_img.replace_color_tran(((240, 240, 240), (255, 255, 255)), (249, 246, 242))
-    await shop.apaste(zx_img, (0, 100))
-    shop.paste(A, (20 + zx_img.w, 230))
+    await shop.apaste(zx_img, (780, 100))
    await shop.apaste(shop_logo, (450, 30), True)
    shop.text(
        (int((1000 - shop.getsize("注【通过 序号 或者 商品名称 购买】")[0]) / 2), 170),
        "注【通过 序号 或者 商品名称 购买】",
    )
-    shop.text((20 + zx_img.w, h - 100), "神秘药水\t\t售价：9999999金币\n\t\t鬼知道会有什么效果~")
+    shop.text((20, h - 100), "神秘药水\t\t售价：9999999金币\n\t\t鬼知道会有什么效果~")
    return shop.pic2bs4()


-async def register_goods(
-    name: str,
-    price: int,
-    des: str,
-    discount: Optional[float] = 1,
-    limit_time: Optional[int] = 0,
-    daily_limit: Optional[int] = 0,
-    is_passive: Optional[bool] = False,
-    icon: Optional[str] = None,
-) -> bool:
+async def registered_goods(
+        name: str,
+        price: int,
+        des: str,
+        discount: Optional[float] = 1,
+        limit_time: Optional[int] = 0,
+        **kwargs,
+):
    """
    添加商品
    例如：                                                  折扣：可选参数↓  限时时间:可选，单位为小时
@@ -215,23 +154,21 @@ async def register_goods(
    :param des: 商品简介
    :param discount: 商品折扣
    :param limit_time: 商品限时销售时间，单位为小时
-    :param daily_limit: 每日购买次数限制
-    :param is_passive: 是否为被动
-    :param icon: 图标
+    :param kwargs: kwargs
    :return: 是否添加成功
    """
-    if not await GoodsInfo.get_goods_info(name):
-        limit_time = float(limit_time) if limit_time else limit_time
-        discount = discount if discount is not None else 1
-        limit_time = (
-            int(time.time() + limit_time * 60 * 60)
-            if limit_time is not None and limit_time != 0
-            else 0
-        )
-        return await GoodsInfo.add_goods(
-            name, int(price), des, float(discount), limit_time, daily_limit, is_passive, icon
-        )
-    return False
+    if kwargs:
+        name = kwargs.get("name")
+        price = kwargs.get("price")
+        des = kwargs.get("des")
+        discount = kwargs.get("discount")
+        limit_time = kwargs.get("time_limit")
+    limit_time = float(limit_time) if limit_time else limit_time
+    discount = discount if discount is None else 1
+    limit_time = int(time.time() + limit_time * 60 * 60) if limit_time is not None and limit_time != 0 else 0
+    return await GoodsInfo.add_goods(
+        name, int(price), des, float(discount), limit_time
+    )


 # 删除商品
@@ -259,7 +196,7 @@ async def delete_goods(name: str, id_: int) -> "str, str, int":


 # 更新商品信息
-async def update_goods(**kwargs) -> Tuple[bool, str, str]:
+async def update_goods(**kwargs) -> "str, str, int":
    """
    更新商品信息
    :param kwargs: kwargs
@@ -269,19 +206,17 @@ async def update_goods(**kwargs) -> Tuple[bool, str, str]:
        goods_lst = await GoodsInfo.get_all_goods()
        if is_number(kwargs["name"]):
            if int(kwargs["name"]) < 1 or int(kwargs["name"]) > len(goods_lst):
-                return False, "序号错误，没有该序号的商品...", ""
+                return "序号错误，没有该序号的商品...", "", 999
            goods = goods_lst[int(kwargs["name"]) - 1]
        else:
            goods = await GoodsInfo.get_goods_info(kwargs["name"])
            if not goods:
-                return False, "名称错误，没有该名称的商品...", ""
-        name: str = goods.goods_name
+                return "名称错误，没有该名称的商品...", "", 999
+        name = goods.goods_name
        price = goods.goods_price
        des = goods.goods_description
        discount = goods.goods_discount
        limit_time = goods.goods_limit_time
-        daily_limit = goods.daily_limit
-        is_passive = goods.is_passive
        new_time = 0
        tmp = ""
        if kwargs.get("price"):
@@ -294,33 +229,23 @@ async def update_goods(**kwargs) -> Tuple[bool, str, str]:
            tmp += f'折扣：{discount} --> {kwargs["discount"]}\n'
            discount = kwargs["discount"]
        if kwargs.get("limit_time"):
-            kwargs["limit_time"] = float(kwargs["limit_time"])
            new_time = time.strftime(
                "%Y-%m-%d %H:%M:%S",
-                time.localtime(time.time() + kwargs["limit_time"] * 60 * 60),
-            ) if kwargs["limit_time"] != 0 else 0
-            tmp += f"限时至： {new_time}\n" if new_time else "取消了限时\n"
+                time.localtime(time.time() + int(kwargs["limit_time"] * 60 * 60)),
+            )
+            tmp += f"折扣至： {new_time}\n"
            limit_time = kwargs["limit_time"]
-        if kwargs.get("daily_limit"):
-            tmp += f'每日购买限制：{daily_limit} --> {kwargs["daily_limit"]}\n' if daily_limit else "取消了购买限制\n"
-            daily_limit = int(kwargs["daily_limit"])
-        if kwargs.get("is_passive"):
-            tmp += f'被动道具：{is_passive} --> {kwargs["is_passive"]}\n'
-            des = kwargs["is_passive"]
-        await GoodsInfo.update_goods(
-            name,
-            int(price),
-            des,
-            float(discount),
-            int(
-                time.time() + limit_time * 60 * 60
-                if limit_time != 0 and new_time
-                else 0
+        return (
+            await GoodsInfo.update_goods(
+                name,
+                int(price),
+                des,
+                float(discount),
+                int(time.time() + limit_time * 60 * 60 if limit_time != 0 and new_time else 0),
            ),
-            daily_limit,
-            is_passive
+            name,
+            tmp[:-1],
        )
-        return True, name, tmp[:-1],


 def parse_goods_info(msg: str) -> Union[dict, str]:
@@ -336,6 +261,7 @@ def parse_goods_info(msg: str) -> Union[dict, str]:
        sp = x.split(":", maxsplit=1)
        if str(sp[1]).strip():
            sp[1] = sp[1].strip()
+            print(sp)
            if sp[0] == "name":
                data["name"] = sp[1]
            elif sp[0] == "price":
@@ -350,10 +276,6 @@ def parse_goods_info(msg: str) -> Union[dict, str]:
                data["discount"] = sp[1]
            elif sp[0] == "limit_time":
                if not is_number(sp[1]) or float(sp[1]) < 0:
-                    return "limit_time参数不合法，必须为数字且大于0！"
+                    return "limit_time参数不合法，必须大于0！"
                data["limit_time"] = sp[1]
-            elif sp[0] == "daily_limit":
-                if not is_number(sp[1]) or float(sp[1]) < 0:
-                    return "daily_limit参数不合法，必须为数字且大于0！"
-                data["daily_limit"] = sp[1]
    return data
@@ -1,18 +1,13 @@
-from typing import Any, Tuple
-
-from nonebot import on_command, on_regex
-
-from models.user_shop_gold_log import UserShopGoldLog
+from nonebot import on_command
 from services.log import logger
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message
-from nonebot.params import CommandArg, RegexGroup
-
-from utils.decorator.shop import NotMeetUseConditionsException
-from utils.utils import is_number
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
+from nonebot.typing import T_State
+from utils.utils import is_number, get_message_text
 from models.bag_user import BagUser
-from nonebot.adapters.onebot.v11.permission import GROUP
+from nonebot.adapters.cqhttp.permission import GROUP
 from services.db_context import db
-from .data_source import effect, register_use, func_manager, build_params
+from nonebot.plugin import export
+from .data_source import effect, registered_use


 __zx_plugin_name__ = "商店 - 使用道具"
@@ -20,16 +15,12 @@ __plugin_usage__ = """
 usage：
    普通的使用道具
    指令：
-        使用道具 [序号或道具名称] ?[数量]=1 ?[其他信息]
-        示例：使用道具好感度双倍加持卡         使用道具好感度双倍加持卡
-        示例：使用道具1                     使用第一个道具
-        示例：使用道具1 10                  使用10个第一个道具       
-        示例：使用道具1 1 来点色图           使用第一个道具并附带信息
+        使用道具 [序号或道具名称]
    * 序号以 ”我的道具“ 为准 *
 """.strip()
 __plugin_des__ = "商店 - 使用道具"
 __plugin_cmd__ = ["使用道具 [序号或道具名称]"]
-__plugin_type__ = ("商店",)
+__plugin_type__ = ('商店',)
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 __plugin_settings__ = {
@@ -39,69 +30,47 @@ __plugin_settings__ = {
    "cmd": ["商店", "使用道具"],
 }

+# 导出方法供其他插件使用
+export = export()
+export.registered_use = registered_use

-use_props = on_command(r"使用道具", priority=5, block=True, permission=GROUP)
+use_props = on_command("使用道具", priority=5, block=True, permission=GROUP)


@use_props.handle()
-async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text()
-    num = 1
-    text = ""
-    prop_n = None
-    index = None
-    split = msg.split()
-    if size := len(split):
-        if size == 1:
-            prop_n = split[0].strip()
-            index = 1
-        if size > 1 and is_number(split[1].strip()):
-            prop_n = split[0].strip()
-            num = int(split[1].strip())
-            index = 2
-    else:
-        await use_props.finish("缺少参数，请查看帮助", at_sender=True)
-    if index:
-        text = " ".join(split[index:])
-    property_ = await BagUser.get_property(event.user_id, event.group_id, True)
-    if property_:
-        name = None
-        if prop_n and is_number(prop_n):
-            if 0 < int(prop_n) <= len(property_):
-                name = list(property_.keys())[int(prop_n) - 1]
-            else:
-                await use_props.finish("仔细看看自己的道具仓库有没有这个道具？", at_sender=True)
-        else:
-            if prop_n not in property_.keys():
-                await use_props.finish("道具名称错误！", at_sender=True)
-            name = prop_n
-        _user_prop_count = property_[name]
-        if num > _user_prop_count:
-            await use_props.finish(f"道具数量不足，无法使用{num}次！")
-        if num > (n := func_manager.get_max_num_limit(name)):
-            await use_props.finish(f"该道具单次只能使用 {n} 个！")
-        model, kwargs = build_params(bot, event, name, num, text)
-        try:
-            await func_manager.run_handle(type_="before_handle", param=model, **kwargs)
-        except NotMeetUseConditionsException as e:
-            await use_props.finish(e.get_info(), at_sender=True)
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+    msg = get_message_text(event.json())
+    if msg in ["", "帮助"]:
+        await use_props.finish(__plugin_usage__)
+    props = await BagUser.get_props(event.user_id, event.group_id)
+    if props:
        async with db.transaction():
-            if await BagUser.delete_property(event.user_id, event.group_id, name, num):
-                if func_manager.check_send_success_message(name):
-                    await use_props.send(f"使用道具 {name} {num} 次成功！", at_sender=True)
-                if msg := await effect(bot, event, name, num, text, event.message):
-                    await use_props.send(msg, at_sender=True)
+            pname_list = []
+            props = props[:-1].split(",")
+            for p in props:
+                if p != "":
+                    if p not in pname_list:
+                        pname_list.append(p)
+            if is_number(msg):
+                if 0 < int(msg) <= len(pname_list):
+                    name = pname_list[int(msg) - 1]
+                else:
+                    await use_props.finish("仔细看看自己的道具仓库有没有这个道具？", at_sender=True)
+            else:
+                if msg not in pname_list:
+                    await use_props.finish("道具名称错误！", at_sender=True)
+                name = msg
+            if await BagUser.del_props(
+                event.user_id, event.group_id, name
+            ) and await effect(event.user_id, event.group_id, name):
+                await use_props.send(f"使用道具 {name} 成功！", at_sender=True)
                logger.info(
-                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次成功"
-                )
-                await UserShopGoldLog.add_shop_log(
-                    event.user_id, event.group_id, 1, name, num
+                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} 成功"
                )
            else:
-                await use_props.send(f"使用道具 {name} {num} 次失败！", at_sender=True)
+                await use_props.send(f"使用道具 {name} 失败！", at_sender=True)
                logger.info(
-                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次失败"
+                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} 失败"
                )
-        await func_manager.run_handle(type_="after_handle", param=model, **kwargs)
    else:
-        await use_props.send("您的背包里没有任何的道具噢", at_sender=True)
+        await use_props.send("您的背包里没有任何的道具噢~", at_sender=True)
@@ -1,236 +1,45 @@
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageSegment, Message
-from services.log import logger
-from nonebot.adapters.onebot.v11 import Bot
-from pydantic import create_model
-from utils.models import ShopParam
-from typing import Optional, Union, Callable, List, Tuple, Dict, Any
-from types import MappingProxyType
-import inspect
 import asyncio
+from services.log import logger
+
+_use_func_data = {}


-class GoodsUseFuncManager:
-    def __init__(self):
-        self._data = {}
-
-    def register_use_before_handle(self, goods_name: str, fun_list: List[Callable]):
-        """
-        说明:
-            注册商品使用前函数
-        参数:
-            :param goods_name: 商品名称
-            :param fun_list: 函数列表
-        """
-        if fun_list:
-            self._data[goods_name]["before_handle"] = fun_list
-            logger.info(f"register_use_before_handle 成功注册商品：{goods_name} 的{len(fun_list)}个使用前函数")
-
-    def register_use_after_handle(self, goods_name: str, fun_list: List[Callable]):
-        """
-        说明:
-            注册商品使用后函数
-        参数:
-            :param goods_name: 商品名称
-            :param fun_list: 函数列表
-        """
-        if fun_list:
-            self._data[goods_name]["after_handle"] = fun_list
-            logger.info(f"register_use_after_handle 成功注册商品：{goods_name} 的{len(fun_list)}个使用后函数")
-
-    def register_use(self, goods_name: str, **kwargs):
-        """
-        注册商品使用方法
-        :param goods_name: 商品名称
-        :param kwargs: kwargs
-        """
-        self._data[goods_name] = kwargs
-
-    def exists(self, goods_name: str) -> bool:
-        """
-        判断商品使用方法是否被注册
-        :param goods_name: 商品名称
-        """
-        return bool(self._data.get(goods_name))
-
-    def get_max_num_limit(self, goods_name: str) -> int:
-        """
-        获取单次商品使用数量
-        :param goods_name: 商品名称
-        """
-        if self.exists(goods_name):
-            return self._data[goods_name]["kwargs"]["max_num_limit"]
-        return 1
-
-    def _parse_args(self, args_: MappingProxyType, param: ShopParam, **kwargs):
-        param_list_ = []
-        _bot = param.bot
-        param.bot = None
-        param_json = param.dict()
-        param_json["bot"] = _bot
-        for par in args_.keys():
-            if par in ["shop_param"]:
-                param_list_.append(param)
-            elif par not in ["args", "kwargs"]:
-                param_list_.append(param_json.get(par))
-                if kwargs.get(par) is not None:
-                    del kwargs[par]
-        return param_list_
-
-    async def use(
-        self, param: ShopParam, **kwargs
-    ) -> Optional[Union[str, MessageSegment]]:
-        """
-        使用道具
-        :param param: BaseModel
-        :param kwargs: kwargs
-        """
-        goods_name = param.goods_name
-        if self.exists(goods_name):
-            # 使用方法
-            args = inspect.signature(self._data[goods_name]["func"]).parameters
-            if args and list(args.keys())[0] != "kwargs":
-                if asyncio.iscoroutinefunction(self._data[goods_name]["func"]):
-                    return await self._data[goods_name]["func"](
-                        *self._parse_args(args, param, **kwargs)
-                    )
-                else:
-                    return self._data[goods_name]["func"](
-                        *self._parse_args(args, param, **kwargs)
-                    )
-            else:
-                if asyncio.iscoroutinefunction(self._data[goods_name]["func"]):
-                    return await self._data[goods_name]["func"](
-                        **kwargs,
-                    )
-                else:
-                    return self._data[goods_name]["func"](
-                        **kwargs,
-                    )
-
-    async def run_handle(self, goods_name: str, type_: str, param: ShopParam, **kwargs):
-        if self._data[goods_name].get(type_):
-            for func in self._data[goods_name].get(type_):
-                args = inspect.signature(func).parameters
-                if args and list(args.keys())[0] != "kwargs":
-                    if asyncio.iscoroutinefunction(func):
-                        await func(*self._parse_args(args, param, **kwargs))
-                    else:
-                        func(*self._parse_args(args, param, **kwargs))
-                else:
-                    if asyncio.iscoroutinefunction(func):
-                        await func(**kwargs)
-                    else:
-                        func(**kwargs)
-
-    def check_send_success_message(self, goods_name: str) -> bool:
-        """
-        检查是否发送使用成功信息
-        :param goods_name: 商品名称
-        """
-        if self.exists(goods_name):
-            return bool(self._data[goods_name]["kwargs"]["send_success_msg"])
-        return False
-
-    def get_kwargs(self, goods_name: str) -> dict:
-        """
-        获取商品使用方法的kwargs
-        :param goods_name: 商品名称
-        """
-        if self.exists(goods_name):
-            return self._data[goods_name]["kwargs"]
-        return {}
-
-    def init_model(self, goods_name: str, bot: Bot, event: GroupMessageEvent, num: int, text: str):
-        return self._data[goods_name]["model"](
-            **{
-                "goods_name": goods_name,
-                "bot": bot,
-                "event": event,
-                "user_id": event.user_id,
-                "group_id": event.group_id,
-                "num": num,
-                "message": event.message,
-                "text": text
-            }
-        )
-
-
-func_manager = GoodsUseFuncManager()
-
-
-def build_params(
-    bot: Bot, event: GroupMessageEvent, goods_name: str, num: int, text: str
-) -> Tuple[ShopParam, Dict[str, Any]]:
-    """
-    说明:
-        构造参数
-    参数:
-        :param bot: bot
-        :param event: event
-        :param goods_name: 商品名称
-        :param num: 数量
-        :param text: 其他信息
-    :return:
-    """
-    _kwargs = func_manager.get_kwargs(goods_name)
-    return (
-        func_manager.init_model(goods_name, bot, event, num, text),
-        {
-            **_kwargs,
-            "_bot": bot,
-            "event": event,
-            "group_id": event.group_id,
-            "user_id": event.user_id,
-            "num": num,
-            "text": text,
-            "message": event.message,
-            "goods_name": goods_name,
-        },
-    )
-
-
-async def effect(
-    bot: Bot, event: GroupMessageEvent, goods_name: str, num: int, text: str, message: Message
-) -> Optional[Union[str, MessageSegment]]:
+async def effect(user_id: int, group_id: int, goods_name: str) -> bool:
    """
    商品生效
-    :param bot: Bot
-    :param event: GroupMessageEvent
+    :param user_id: 用户id
+    :param group_id: 群号
    :param goods_name: 商品名称
-    :param num: 使用数量
-    :param text: 其他信息
-    :param message: Message
    :return: 使用是否成功
    """
    # 优先使用注册的商品插件
-    # try:
-    if func_manager.exists(goods_name):
-        _kwargs = func_manager.get_kwargs(goods_name)
-        model, kwargs = build_params(bot, event, goods_name, num, text)
-        return await func_manager.use(model, **kwargs)
-    # except Exception as e:
-    #     logger.error(f"use 商品生效函数effect 发生错误 {type(e)}：{e}")
-    return None
+    try:
+        if _use_func_data.get(goods_name):
+            _kwargs = _use_func_data[goods_name]["kwargs"]
+            _kwargs["goods_name"] = goods_name
+            _kwargs["user_id"] = user_id
+            _kwargs["group_id"] = group_id
+            if asyncio.iscoroutinefunction(_use_func_data[goods_name]["func"]):
+                await _use_func_data[goods_name]["func"](
+                    **_kwargs,
+                )
+            else:
+                _use_func_data[goods_name]["func"](
+                    **_kwargs,
+                )
+        return True
+    except Exception as e:
+        logger.error(f"use 商品生效函数effect 发生错误 {type(e)}：{e}")
+    return False


-def register_use(goods_name: str, func: Callable, **kwargs):
+def registered_use(goods_name: str, func, **kwargs):
    """
    注册商品使用方法
    :param goods_name: 商品名称
    :param func: 使用函数
    :param kwargs: kwargs
    """
-    if func_manager.exists(goods_name):
+    if goods_name in _use_func_data.keys():
        raise ValueError("该商品使用函数已被注册！")
-    # 发送使用成功信息
-    kwargs["send_success_msg"] = kwargs.get("send_success_msg", True)
-    kwargs["max_num_limit"] = kwargs.get("max_num_limit", 1)
-    func_manager.register_use(
-        goods_name,
-        **{
-            "func": func,
-            "model": create_model(f"{goods_name}_model", __base__=ShopParam, **kwargs),
-            "kwargs": kwargs,
-        },
-    )
-    logger.info(f"register_use 成功注册商品：{goods_name} 的使用函数")
+    _use_func_data[goods_name] = {"func": func, "kwargs": kwargs}
@@ -1,8 +1,7 @@
 import nonebot
-from pathlib import Path


-nonebot.load_plugins(str(Path(__file__).parent.resolve()))
+nonebot.load_plugins('basic_plugins/super_cmd')



@@ -1,10 +1,9 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import Bot, Message
-from nonebot.params import Command, CommandArg
-from typing import Tuple
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, MessageEvent, Message
 from nonebot.rule import to_me
-from utils.utils import is_number
+from utils.utils import get_message_text, is_number
 from utils.manager import requests_manager
 from utils.message_builder import image
 from models.group_info import GroupInfo
@@ -58,54 +57,59 @@ cls_request = on_command("查看所有请求", permission=SUPERUSER, priority=1,


@cls_group.handle()
-async def _(bot: Bot):
-    gl = await bot.get_group_list()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    gl = await bot.get_group_list(self_id=int(bot.self_id))
    msg = ["{group_id} {group_name}".format_map(g) for g in gl]
    msg = "\n".join(msg)
    msg = f"bot:{bot.self_id}\n| 群号 | 群名 | 共{len(gl)}个群\n" + msg
-    await cls_group.send(msg)
+    await bot.send_private_msg(
+        self_id=int(bot.self_id),
+        user_id=int(list(bot.config.superusers)[0]),
+        message=msg,
+    )


@cls_friend.handle()
-async def _(bot: Bot):
-    gl = await bot.get_friend_list()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    gl = await bot.get_friend_list(self_id=int(bot.self_id))
    msg = ["{user_id} {nickname}".format_map(g) for g in gl]
    msg = "\n".join(msg)
    msg = f"| QQ号 | 昵称 | 共{len(gl)}个好友\n" + msg
-    await cls_friend.send(msg)
+    await bot.send_private_msg(
+        self_id=int(bot.self_id),
+        user_id=int(list(bot.config.superusers)[0]),
+        message=msg,
+    )


@friend_handle.handle()
-async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
-    id_ = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    id_ = get_message_text(event.json())
    if is_number(id_):
        id_ = int(id_)
-        if cmd[:2] == "同意":
-            flag = await requests_manager.approve(bot, id_, "private")
+        if state["_prefix"]["raw_command"][:2] == "同意":
+            if await requests_manager.approve(bot, id_, "private"):
+                await friend_handle.send("同意好友请求成功..")
+            else:
+                await friend_handle.send("同意好友请求失败，可能是未找到此id的请求..")
        else:
-            flag = await requests_manager.refused(bot, id_, "private")
-        if flag == 1:
-            await friend_handle.send(f"{cmd[:2]}好友请求失败，该请求已失效..")
-            requests_manager.delete_request(id_, "private")
-        elif flag == 2:
-            await friend_handle.send(f"{cmd[:2]}好友请求失败，未找到此id的请求..")
-        else:
-            await friend_handle.send(f"{cmd[:2]}好友请求成功！")
+            if await requests_manager.refused(bot, id_, "private"):
+                await friend_handle.send("拒绝好友请求成功..")
+            else:
+                await friend_handle.send("拒绝好友请求失败，可能是未找到此id的请求..")
    else:
        await friend_handle.send("id必须为纯数字！")


@group_handle.handle()
-async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
-    id_ = arg.extract_plain_text().strip()
-    flag = None
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    id_ = get_message_text(event.json())
    if is_number(id_):
        id_ = int(id_)
-        if cmd[:2] == "同意":
-            rid = requests_manager.get_group_id(id_)
+        if state["_prefix"]["raw_command"][:2] == "同意":
+            rid = await requests_manager.approve(bot, id_, "group")
            if rid:
+                await friend_handle.send("同意群聊请求成功..")
                if await GroupInfo.get_group_info(rid):
                    await GroupInfo.set_group_flag(rid, 1)
                else:
@@ -117,24 +121,19 @@ async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandAr
                        group_info["member_count"],
                        1
                    )
-                flag = await requests_manager.approve(bot, id_, "group")
            else:
-                await group_handle.send("同意群聊请求失败，未找到此id的请求..")
+                await friend_handle.send("同意群聊请求失败，可能是未找到此id的请求..")
        else:
-            flag = await requests_manager.refused(bot, id_, "group")
-        if flag == 1:
-            await group_handle.send(f"{cmd[:2]}群聊请求失败，该请求已失效..")
-            requests_manager.delete_request(id_, "group")
-        elif flag == 2:
-            await group_handle.send(f"{cmd[:2]}群聊请求失败，未找到此id的请求..")
-        else:
-            await group_handle.send(f"{cmd[:2]}群聊请求成功！")
+            if await requests_manager.refused(bot, id_, "group"):
+                await friend_handle.send("拒绝群聊请求成功..")
+            else:
+                await friend_handle.send("拒绝群聊请求失败，可能是未找到此id的请求..")
    else:
-        await group_handle.send("id必须为纯数字！")
+        await friend_handle.send("id必须为纯数字！")


@cls_request.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    _str = ""
    for type_ in ["private", "group"]:
        msg = await requests_manager.show(type_)
@@ -148,6 +147,6 @@ async def _():


@clear_request.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    requests_manager.clear()
-    await clear_request.send("已清空所有好友/群聊请求..")
+    await cls_request.send("已清空所有好友/群聊请求..")
@@ -1,5 +1,7 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, MessageEvent
 from configs.path_config import TEMP_PATH
 from nonebot.rule import to_me
 from utils.utils import scheduler
@@ -33,7 +35,7 @@ resources_manager.add_temp_dir(TEMP_PATH)


@clear_data.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    await clear_data.send("开始清理临时数据....")
    size = await asyncio.get_event_loop().run_in_executor(None, _clear_data)
    await clear_data.send("共清理了 {:.2f}MB 的数据...".format(size / 1024 / 1024))
@@ -45,14 +47,13 @@ def _clear_data() -> float:
        if dir_.exists():
            for file in os.listdir(dir_):
                file = dir_ / file
-                if file.is_file():
-                    try:
-                        if time.time() - os.path.getatime(file) > 300:
-                            file_size = os.path.getsize(file)
-                            file.unlink()
-                            size += file_size
-                    except Exception as e:
-                        logger.error(f"清理临时数据错误...{type(e)}：{e}")
+                try:
+                    if time.time() - os.path.getatime(file) > 300:
+                        file_size = os.path.getsize(file)
+                        file.unlink()
+                        size += file_size
+                except Exception as e:
+                    logger.error(f"清理临时数据错误...{type(e)}：{e}")
    return float(size)


@@ -0,0 +1,74 @@
+
+
+# async def open_remind(group: int, name: str) -> str:
+#     _name = ""
+#     if name == "zwa":
+#         _name = "早晚安"
+#     if name == "dz":
+#         _name = "地震播报"
+#     if name == "hy":
+#         _name = "群欢迎"
+#     if name == "kxcz":
+#         _name = "开箱重置提醒"
+#     if name == "gb":
+#         _name = "广播"
+#     if await GroupRemind.get_status(group, name):
+#         return f"该群已经开启过 {_name} 通知，请勿重复开启！"
+#     if await GroupRemind.set_status(group, name, True):
+#         return f"成功开启 {_name} 通知！0v0"
+#     else:
+#         return f"开启 {_name} 通知失败了..."
+#
+#
+# async def close_remind(group: int, name: str) -> str:
+#     _name = ""
+#     if name == "zwa":
+#         _name = "早晚安"
+#     if name == "dz":
+#         _name = "地震播报"
+#     if name == "hy":
+#         _name = "群欢迎"
+#     if name == "kxcz":
+#         _name = "开箱重置提醒"
+#     if name == "gb":
+#         _name = "广播"
+#     if not await GroupRemind.get_status(group, name):
+#         return f"该群已经取消过 {_name} 通知，请勿重复取消！"
+#     if await GroupRemind.set_status(group, name, False):
+#         return f"成功关闭 {_name} 通知！0v0"
+#     else:
+#         return f"关闭 {_name} 通知失败了..."
+
+
+# cmd_list = ['总开关', '签到', '发送图片', '色图', '黑白草图', 'coser', '鸡汤/语录', '骂我', '开箱', '鲁迅说', '假消息', '商店系统',
+#             '操作图片', '查询皮肤', '天气', '疫情', '识番', '搜番', '点歌', 'pixiv', 'rss', '方舟一井', '查干员', '骰子娘', '原神一井']
+#
+#
+# def check_group_switch_json(group_id):
+#     if not os.path.exists(DATA_PATH + f'rule/group_switch/'):
+#         os.mkdir(DATA_PATH + f'rule/group_switch/')
+#     if not os.path.exists(DATA_PATH + f'rule/group_switch/{group_id}.json'):
+#         with open(DATA_PATH + f'rule/group_switch/{group_id}.json', 'w', encoding='utf8') as f:
+#             data = {}
+#             for cmd in cmd_list:
+#                 data[cmd] = True
+#             f.write(json.dumps(data, ensure_ascii=False))
+#     else:
+#         with open(DATA_PATH + f'rule/group_switch/{group_id}.json', 'r', encoding='utf8') as f:
+#             try:
+#                 data = json.load(f)
+#             except ValueError:
+#                 data = {}
+#             if len(data.keys()) - 1 != len(cmd_list):
+#                 for cmd in cmd_list:
+#                     if cmd not in data.keys():
+#                         data[cmd] = True
+#                 with open(DATA_PATH + f'rule/group_switch/{group_id}.json', 'w', encoding='utf8') as wf:
+#                     wf.write(json.dumps(data, ensure_ascii=False))
+#     reload(data)
+#     for file in os.listdir(DATA_PATH + 'group_help'):
+#         os.remove(DATA_PATH + f'group_help/{file}')
+
+
+def reload(data):
+    static_group_dict = data
@@ -1,86 +1,38 @@
-from nonebot.adapters.onebot.v11 import Message, Bot, MessageEvent
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, MessageEvent
 from nonebot.rule import to_me
-from utils.message_builder import custom_forward_msg
 from services.db_context import db
-from nonebot.params import CommandArg
+from utils.utils import get_message_text
 from services.log import logger

-import asyncio
-
 __zx_plugin_name__ = "执行sql [Superuser]"
 __plugin_usage__ = """
 usage：
    执行一段sql语句
    指令：
-        exec [sql语句] ([查询页数，19条/页])
-        查看所有表
+        exec [sql语句]
 """.strip()
 __plugin_des__ = "执行一段sql语句"
 __plugin_cmd__ = [
    "exec [sql语句]",
 ]
-__plugin_version__ = 0.2
+__plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"


 exec_ = on_command("exec", rule=to_me(), permission=SUPERUSER, priority=1, block=True)
-tables = on_command("查看所有表", rule=to_me(), permission=SUPERUSER, priority=1, block=True)


@exec_.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    sql = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    sql = get_message_text(event.json())
    async with db.transaction():
        try:
-            # 判断是否为SELECT语句
-            if sql.lower().startswith("select"):
-                # 分割语句
-                try:
-                    page = int(sql.split(" ")[-1]) - 1
-                    sql_list = sql.split(" ")[:-1]
-                except ValueError:
-                    page = 0
-                    sql_list = sql.split(" ")
-                # 拼接语句
-                sql = " ".join(sql_list)
-                query = db.text(sql)
-                res = await db.all(query)
-                msg_list = [f"第{page+1}页查询结果："]
-                # logger.info(res)
-                # 获取所有字段
-                keys = res[0].keys()
-                # 每页10条
-                for i in res[page * 10 : (page + 1) * 10]:
-                    msg = ""
-                    for key in keys:
-                        msg += f"{key}: {i[key]}\n"
-                    msg += f"第{page+1}页第{res.index(i)+1}条"
-                    msg_list.append(msg)
-                # 检查是私聊还是群聊
-                try:
-                    forward_msg_list = custom_forward_msg(msg_list, bot.self_id)
-                    await bot.send_group_forward_msg(group_id=event.group_id, messages=forward_msg_list)
-                except:
-                    for msg in msg_list:
-                        await exec_.send(msg)
-                        await asyncio.sleep(0.2)
-                return
            query = db.text(sql)
            await db.first(query)
            await exec_.send("执行 sql 语句成功.")
        except Exception as e:
            await exec_.send(f"执行 sql 语句失败 {type(e)}：{e}")
            logger.error(f"执行 sql 语句失败 {type(e)}：{e}")
-
-
-@tables.handle()
-async def _(bot: Bot, event: MessageEvent):
-    # 获取所有表
-    query = db.text("select tablename from pg_tables where schemaname = 'public'")
-    res = await db.all(query)
-    msg = "数据库中的所有表名：\n"
-    for tablename in res:
-        msg += str(tablename["tablename"]) + "\n"
-    await tables.finish(msg)
@@ -1,22 +1,14 @@
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    MessageEvent,
-    GROUP,
-    GroupMessageEvent,
-    Message,
-    ActionFailed,
-)
 from nonebot import on_command, on_regex
 from nonebot.permission import SUPERUSER
 from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, MessageEvent, GROUP, GroupMessageEvent
 from nonebot.rule import to_me
-from utils.utils import is_number
+from utils.utils import get_message_text, is_number
 from utils.manager import group_manager, plugins2settings_manager
 from models.group_info import GroupInfo
 from services.log import logger
 from configs.config import NICKNAME
-from nonebot.params import Command, CommandArg
-from typing import Tuple
+from nonebot.adapters.cqhttp.exception import ActionFailed


 __zx_plugin_name__ = "管理群操作 [Superuser]"
@@ -73,8 +65,8 @@ group_auth = on_command(


@del_group.handle()
-async def _(bot: Bot, arg: Message = CommandArg()):
-    group_id = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    group_id = get_message_text(event.json())
    if group_id:
        if is_number(group_id):
            try:
@@ -92,13 +84,13 @@ async def _(bot: Bot, arg: Message = CommandArg()):


@add_group_level.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = get_message_text(event.json())
    group_id = 0
    level = 0
    if not msg:
        await add_group_level.finish("用法：修改群权限 [group] [level]")
-    msg = msg.split()
+    msg = msg.split(" ")
    if len(msg) < 2:
        await add_group_level.finish("参数不完全..[group] [level]")
    if is_number(msg[0]) and is_number(msg[1]):
@@ -117,13 +109,13 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):


@my_group_level.handle()
-async def _(event: GroupMessageEvent):
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    level = group_manager.get_group_level(event.group_id)
    tmp = ""
    data = plugins2settings_manager.get_data()
    for module in data:
-        if data[module].level > level:
-            plugin_name = data[module].cmd[0]
+        if data[module]["level"] > level:
+            plugin_name = data[module]["cmd"][0]
            if plugin_name == "pixiv":
                plugin_name = "搜图 p站排行"
            tmp += f"{plugin_name}\n"
@@ -133,35 +125,38 @@ async def _(event: GroupMessageEvent):


@what_up_group_level.handle()
-async def _():
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    await what_up_group_level.finish(
        f"[此功能用于防止内鬼，如果引起不便那真是抱歉了]\n" f"目前提高群权限的方法：\n" f"\t1.管理员修改权限"
    )


@manager_group_whitelist.handle()
-async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
-    msg = arg.extract_plain_text().strip().split()
-    all_group = [g["group_id"] for g in await bot.get_group_list()]
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = get_message_text(event.json()).split()
+    all_group = [
+        g["group_id"] for g in await bot.get_group_list(self_id=int(bot.self_id))
+    ]
    group_list = []
    for group in msg:
        if is_number(group) and int(group) in all_group:
            group_list.append(int(group))
    if group_list:
        for group in group_list:
-            if cmd in ["添加群白名单"]:
+            if state["_prefix"]["raw_command"] in ["添加群白名单"]:
                group_manager.add_group_white_list(group)
            else:
                group_manager.delete_group_white_list(group)
        group_list = [str(x) for x in group_list]
-        await manager_group_whitelist.send("已成功将 " + "\n".join(group_list) + " " + cmd)
+        await manager_group_whitelist.send(
+            "已成功将 " + "\n".join(group_list) + " " + state["_prefix"]["raw_command"]
+        )
    else:
        await manager_group_whitelist.send(f"添加失败，请检查{NICKNAME}是否已加入这些群聊或重复添加/删除群白单名")


@show_group_whitelist.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    x = group_manager.get_group_white_list()
    x = [str(g) for g in x]
    if x:
@@ -171,14 +166,13 @@ async def _():


@group_auth.handle()
-async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
-    msg = arg.extract_plain_text().strip().split()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = get_message_text(event.json()).split()
    for group_id in msg:
        if not is_number(group_id):
            await group_auth.send(f"{group_id}非纯数字，已跳过该项..")
        group_id = int(group_id)
-        if cmd[:2] == "添加":
+        if state["_prefix"]["raw_command"][:2] == "添加":
            if await GroupInfo.get_group_info(group_id):
                await GroupInfo.set_group_flag(group_id, 1)
            else:
@@ -201,4 +195,6 @@ async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandAr
        else:
            if await GroupInfo.get_group_info(group_id):
                await GroupInfo.set_group_flag(group_id, 0)
-        await group_auth.send(f"已为 {group_id} {cmd[:2]}群认证..")
+        await group_auth.send(
+            f'已为 {group_id} {state["_prefix"]["raw_command"][:2]}群认证..'
+        )
@@ -7,9 +7,8 @@ from utils.manager import (
    plugins2block_manager,
    group_manager,
 )
-from configs.config import Config
-from services.log import logger
-from utils.utils import scheduler
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, MessageEvent


 __zx_plugin_name__ = "重载插件配置 [Superuser]"
@@ -29,18 +28,6 @@ __plugin_cmd__ = [
 ]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
-__plugin_configs__ = {
-    "AUTO_RELOAD": {
-        "value": False,
-        "help": "自动重载配置文件",
-        "default_value": False
-    },
-    "AUTO_RELOAD_TIME": {
-        "value": 180,
-        "help": "控制自动重载配置文件时长",
-        "default_value": 180
-    }
-}


 reload_plugins_manager = on_command(
@@ -49,24 +36,9 @@ reload_plugins_manager = on_command(


@reload_plugins_manager.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    plugins2settings_manager.reload()
    plugins2cd_manager.reload()
    plugins2block_manager.reload()
    group_manager.reload()
-    Config.reload()
    await reload_plugins_manager.send("重载完成...")
-
-
-@scheduler.scheduled_job(
-    'interval',
-    seconds=Config.get_config("reload_setting", "AUTO_RELOAD_TIME", 180),
-)
-async def _():
-    if Config.get_config("reload_setting", "AUTO_RELOAD"):
-        plugins2settings_manager.reload()
-        plugins2cd_manager.reload()
-        plugins2block_manager.reload()
-        group_manager.reload()
-        Config.reload()
-        logger.debug("已自动重载所有配置文件...")
@@ -1,12 +1,11 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
 from models.level_user import LevelUser
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, Message, GroupMessageEvent
-from utils.utils import get_message_at, is_number
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, Message
+from utils.utils import get_message_at, get_message_text, is_number
 from services.log import logger
 from utils.message_builder import at
-from nonebot.params import Command, CommandArg
-from typing import Tuple

 __zx_plugin_name__ = "用户权限管理 [Superuser]"
 __plugin_usage__ = """
@@ -37,49 +36,40 @@ super_cmd = on_command(


@super_cmd.handle()
-async def _(
-    bot: Bot,
-    event: MessageEvent,
-    cmd: Tuple[str, ...] = Command(),
-    arg: Message = CommandArg(),
-):
-    group_id = event.group_id if isinstance(event, GroupMessageEvent) else -1
-    level = None
-    args = arg.extract_plain_text().strip().split()
-    qq = get_message_at(event.json())
-    flag = 2
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+    group_id = -1
+    level = 0
    try:
-        if qq:
-            qq = qq[0]
-            if cmd[0][:2] == "添加" and args and is_number(args[0]):
-                level = int(args[0])
-        else:
-            if cmd[0][:2] == "添加":
-                if (
-                    len(args) > 2
-                    and is_number(args[0])
-                    and is_number(args[1])
-                    and is_number(args[2])
-                ):
+        args = get_message_text(event.json()).split()
+        qq = get_message_at(event.json())
+        flag = -1
+        if not qq:
+            if len(args) > 2:
+                if is_number(args[0]) and is_number(args[1]) and is_number(args[2]):
                    qq = int(args[0])
                    group_id = int(args[1])
                    level = int(args[2])
+                    flag = 1
+                else:
+                    await super_cmd.finish("所有参数必须是数字！", at_sender=True)
            else:
-                if len(args) > 1 and is_number(args[0]) and is_number(args[1]):
-                    qq = int(args[0])
-                    group_id = int(args[1])
-            flag = 1
-        level = -1 if cmd[0][:2] == "删除" else level
-        if group_id == -1 or not level or not qq:
-            raise IndexError()
-    except IndexError:
-        await super_cmd.finish(__plugin_usage__)
-    try:
-        if cmd[0][:2] == "添加":
+                await super_cmd.finish(
+                    "权限参数不完全\n\t格式：添加/删除权限 [at] [level]"
+                    "\n\t格式：添加/删除权限 [qq] [group_id] [level]",
+                    at_sender=True,
+                )
+        else:
+            if not is_number(args[0]):
+                await super_cmd.finish("所有参数必须是数字！", at_sender=True)
+            level = int(args[0])
+            qq = qq[0]
+            group_id = event.group_id
+            flag = 2
+        if state["_prefix"]["raw_command"][:2] == "添加":
            if await LevelUser.set_level(qq, group_id, level, 1):
-                result = f"添加管理成功, 权限: {level}"
+                result = "添加管理成功, 权限: " + str(level)
            else:
-                result = f"管理已存在, 更新权限: {level}"
+                result = "管理已存在, 更新权限: " + str(level)
        else:
            if await LevelUser.delete_level(qq, event.group_id):
                result = "删除管理成功!"
@@ -90,10 +80,7 @@ async def _(
        elif flag == 1:
            await bot.send_group_msg(
                group_id=group_id,
-                message=Message(
-                    f"{at(qq)}管理员修改了你的权限"
-                    f"\n--------\n你当前的权限等级：{level if level != -1 else 0}"
-                ),
+                message=Message(f"{at(qq)}管理员修改了你的权限" f"\n--------\n你当前的权限等级：{level}"),
            )
            await super_cmd.send("修改成功")
    except Exception as e:
@@ -1,12 +1,11 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, Message
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, MessageEvent
 from nonebot.rule import to_me
-from utils.utils import is_number
+from utils.utils import get_message_text, is_number
 from services.log import logger
 from utils.manager import group_manager
-from nonebot.params import Command, CommandArg
-from typing import Tuple


 __zx_plugin_name__ = "超级用户被动开关 [Superuser]"
@@ -35,9 +34,8 @@ oc_gb = on_command(


@oc_gb.handle()
-async def _(bot: Bot, event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
-    group = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    group = get_message_text(event.json())
    if group:
        if is_number(group):
            group = int(group)
@@ -46,7 +44,7 @@ async def _(bot: Bot, event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg
                    break
            else:
                await oc_gb.finish("没有加入这个群...", at_sender=True)
-            if cmd == "开启广播通知":
+            if state["_prefix"]["raw_command"] == "开启广播通知":
                logger.info(f"USER {event.user_id} 开启了 GROUP {group} 的广播")
                await oc_gb.finish(await group_manager.open_group_task(group, "broadcast",), at_sender=True)
            else:
@@ -1,5 +1,7 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, MessageEvent
 from nonebot.rule import to_me
 from utils.utils import get_bot
 from services.log import logger
@@ -32,7 +34,7 @@ update_friend_info = on_command(


@update_group_info.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    bot = get_bot()
    gl = await bot.get_group_list()
    gl = [g["group_id"] for g in gl]
@@ -45,7 +47,6 @@ async def _():
            group_info["group_name"],
            group_info["max_member_count"],
            group_info["member_count"],
-            1
        ):
            num += 1
            logger.info(f"自动更新群组 {g} 信息成功")
@@ -56,7 +57,7 @@ async def _():


@update_friend_info.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    num = 0
    rst = ""
    fl = await get_bot().get_friend_list()
@@ -1,15 +1,21 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
+from nonebot.typing import T_State
+from nonebot.adapters import Bot, Event
 from nonebot.rule import to_me
+from configs.path_config import IMAGE_PATH
 from utils.message_builder import image
-from .data_source import create_help_image, SUPERUSER_HELP_IMAGE
+from .data_source import create_help_image
+from pathlib import Path


 __zx_plugin_name__ = '超级用户帮助 [Superuser]'


-if SUPERUSER_HELP_IMAGE.exists():
-    SUPERUSER_HELP_IMAGE.unlink()
+superuser_help_image = Path(IMAGE_PATH) / 'superuser_help.png'
+
+if superuser_help_image.exists():
+    superuser_help_image.unlink()

 super_help = on_command(
    "超级用户帮助", rule=to_me(), priority=1, permission=SUPERUSER, block=True
@@ -17,8 +23,8 @@ super_help = on_command(


@super_help.handle()
-async def _():
-    if not SUPERUSER_HELP_IMAGE.exists():
+async def _(bot: Bot, event: Event, state: T_State):
+    if not superuser_help_image.exists():
        await create_help_image()
-    x = image(SUPERUSER_HELP_IMAGE)
+    x = image(superuser_help_image)
    await super_help.finish(x)
@@ -1,84 +1,80 @@
-
-import nonebot
+from utils.image_utils import BuildImage
 from configs.path_config import IMAGE_PATH
-from nonebot import Driver
 from services.log import logger
-from utils.image_template import help_template
-from utils.image_utils import (BuildImage, build_sort_image, group_image,
-                               text2image)
-from utils.manager import plugin_data_manager
-from utils.manager.models import PluginType
+from utils.utils import get_matchers
+from nonebot.adapters.cqhttp import Bot
+from pathlib import Path
+from nonebot import Driver
+import asyncio
+import nonebot
+

 driver: Driver = nonebot.get_driver()

-SUPERUSER_HELP_IMAGE = IMAGE_PATH / "superuser_help.png"
+background = Path(IMAGE_PATH) / "background" / "0.png"
+
+superuser_help_image = Path(IMAGE_PATH) / "superuser_help.png"


@driver.on_bot_connect
-async def create_help_image():
+async def create_help_image(bot: Bot = None):
    """
    创建超级用户帮助图片
    """
-    if SUPERUSER_HELP_IMAGE.exists():
-        return
-    plugin_data_ = plugin_data_manager.get_data()
-    image_list = []
-    task_list = []
-    for plugin_data in [
-        plugin_data_[x]
-        for x in plugin_data_
-        if plugin_data_[x].name != "超级用户帮助 [Superuser]"
-    ]:
+    await asyncio.get_event_loop().run_in_executor(None, _create_help_image)
+
+
+def _create_help_image():
+    """
+    创建管理员帮助图片
+    """
+    _matchers = get_matchers()
+    _plugin_name_list = []
+    width = 0
+    help_str = "超级用户帮助\n\n*  注: ‘*’ 代表可有多个相同参数 ‘?’ 代表可省略该参数  *\n\n"
+    tmp_img = BuildImage(0, 0, plain_text='1', font_size=24)
+    for matcher in _matchers:
+        plugin_name = ""
        try:
-            if plugin_data.plugin_type in [PluginType.SUPERUSER, PluginType.ADMIN]:
-                usage = None
-                if (
-                    plugin_data.plugin_type == PluginType.SUPERUSER
-                    and plugin_data.usage
-                ):
-                    usage = await text2image(
-                        plugin_data.usage, padding=5, color=(204, 196, 151)
-                    )
-                if plugin_data.superuser_usage:
-                    usage = await text2image(
-                        plugin_data.superuser_usage, padding=5, color=(204, 196, 151)
-                    )
-                if usage:
-                    await usage.acircle_corner()
-                    image = await help_template(plugin_data.name, usage)
-                    image_list.append(image)
-            if plugin_data.task:
-                for x in plugin_data.task.keys():
-                    task_list.append(plugin_data.task[x])
+            _plugin = nonebot.plugin.get_plugin(matcher.module)
+            _module = _plugin.module
+            try:
+                plugin_name = _module.__getattribute__("__zx_plugin_name__")
+            except AttributeError:
+                continue
+            is_superuser_usage = False
+            try:
+                _ = _module.__getattribute__("__plugin_superuser_usage__")
+                is_superuser_usage = True
+            except AttributeError:
+                pass
+            if (
+                ("[superuser]" in plugin_name.lower() or is_superuser_usage)
+                and plugin_name != "超级用户帮助 [Superuser]"
+                and plugin_name not in _plugin_name_list
+                and "[hidden]" not in plugin_name.lower()
+            ):
+                _plugin_name_list.append(plugin_name)
+                try:
+                    plugin_des = _module.__getattribute__("__plugin_des__")
+                except AttributeError:
+                    plugin_des = '_'
+                plugin_cmd = _module.__getattribute__("__plugin_cmd__")
+                if is_superuser_usage:
+                    plugin_cmd = [x for x in plugin_cmd if "[_superuser]" in x]
+                plugin_cmd = " / ".join(plugin_cmd).replace('[_superuser]', '').strip()
+                help_str += f"{plugin_des} -> {plugin_cmd}\n\n"
+                x = tmp_img.getsize(f"{plugin_des} -> {plugin_cmd}")[0]
+                width = width if width > x else x
        except Exception as e:
            logger.warning(
-                f"获取超级用户插件 {plugin_data.model}: {plugin_data.name} 设置失败... {type(e)}：{e}"
+                f"获取超级用户插件 {matcher.module}: {plugin_name} 设置失败... {type(e)}：{e}"
            )
-    task_str = "\n".join(task_list)
-    task_str = "通过私聊 开启被动/关闭被动 + [被动名称] 来控制全局被动\n----------\n" + task_str
-    task_image = await text2image(
-        task_str, padding=5, color=(204, 196, 151)
-    )
-    task_image = await help_template("被动任务", task_image)
-    image_list.append(task_image)
-    image_group, _ = group_image(image_list)
-    A = await build_sort_image(image_group, color="#f9f6f2", padding_top=180)
-    await A.apaste(
-        BuildImage(0, 0, font="CJGaoDeGuo.otf", plain_text="超级用户帮助", font_size=50),
-        (50, 30),
-        True,
-    )
-    await A.apaste(
-        BuildImage(
-            0,
-            0,
-            font="CJGaoDeGuo.otf",
-            plain_text="注: ‘*’ 代表可有多个相同参数 ‘?’ 代表可省略该参数",
-            font_size=30,
-            font_color="red",
-        ),
-        (50, 90),
-        True,
-    )
-    await A.asave(SUPERUSER_HELP_IMAGE)
-    logger.info(f"已成功加载 {len(image_list)} 条超级用户命令")
+    height = len(help_str.split("\n")) * 33
+    width += 500
+    A = BuildImage(width, height, font_size=24)
+    _background = BuildImage(width, height, background=background)
+    A.text((300, 140), help_str)
+    A.paste(_background, alpha=True)
+    A.save(superuser_help_image)
+    logger.info(f"已成功加载 {len(_plugin_name_list)} 条超级用户命令")
@@ -1,4 +1,6 @@
 from nonebot import on_command
+from nonebot.adapters.cqhttp import Bot, Event
+from nonebot.typing import T_State
 from utils.message_builder import image


@@ -25,7 +27,7 @@ update_info = on_command("更新信息", aliases={"更新日志"}, priority=5, b


@update_info.handle()
-async def _():
+async def _(bot: Bot, event: Event, state: T_State):
    img = image("update_info.png")
    if img:
        await update_info.finish(image("update_info.png"))
@@ -1,10 +1,11 @@
 import nonebot
-from nonebot.adapters.onebot.v11 import Adapter
+from nonebot.adapters.cqhttp import Bot as CQHTTPBot
 from services.db_context import init, disconnect

+
 nonebot.init()
 driver = nonebot.get_driver()
-driver.register_adapter(Adapter)
+driver.register_adapter("cqhttp", CQHTTPBot)
 config = driver.config
 driver.on_startup(init)
 driver.on_shutdown(disconnect)
@@ -12,7 +13,6 @@ driver.on_shutdown(disconnect)
 nonebot.load_plugin("nonebot_plugin_apscheduler")
 nonebot.load_plugins("basic_plugins")
 nonebot.load_plugins("plugins")
-nonebot.load_plugins("extensive_plugin")
 # 最后加载权限控制
 nonebot.load_plugins("basic_plugins/hooks")

@@ -2,10 +2,6 @@ from typing import Optional
 from pathlib import Path
 from .utils import ConfigsManager

-import platform
-if platform.system() == "Linux":
-    import os
-    hostip = os.popen("cat /etc/resolv.conf | grep nameserver | awk '{ print $2 }'").read().replace("\n","")

 # 回复消息名称
 NICKNAME: str = "小真寻"
@@ -22,7 +18,6 @@ port: str = ""  # 数据库端口
 database: str = ""  # 数据库名称

 # 代理，例如 "http://127.0.0.1:7890"
-# 如果是WLS 可以 f"http://{hostip}:7890" 使用寄主机的代理
 SYSTEM_PROXY: Optional[str] = None  # 全局代理


@@ -1,47 +1,41 @@
 from pathlib import Path
-import os

 # 图片路径
-IMAGE_PATH = Path() / "resources" / "image"
-# 语音路径
-RECORD_PATH = Path() / "resources" / "record"
+IMAGE_PATH = Path("resources/img/")
+# 音频路径
+VOICE_PATH = Path("resources/voice/")
 # 文本路径
-TEXT_PATH = Path() / "resources" / "text"
+TEXT_PATH = Path("resources/txt/")
 # 日志路径
-LOG_PATH = Path() / "log"
+LOG_PATH = Path("log/")
 # 字体路径
-FONT_PATH = Path() / "resources" / "font"
+FONT_PATH = Path("resources/ttf/")
 # 数据路径
-DATA_PATH = Path() / "data"
-# 临时数据路径
-TEMP_PATH = Path() / "resources" / "temp"
-# 网页模板路径
-TEMPLATE_PATH = Path() / "resources" / "template"
+DATA_PATH = Path("data/")
+# 临时图片路径
+TEMP_PATH = Path("resources/img/temp/")


-def load_path():
-    old_img_dir = Path() / "resources" / "img"
-    if not IMAGE_PATH.exists() and old_img_dir.exists():
-        os.rename(old_img_dir, IMAGE_PATH)
-    old_voice_dir = Path() / "resources" / "voice"
-    if not RECORD_PATH.exists() and old_voice_dir.exists():
-        os.rename(old_voice_dir, RECORD_PATH)
-    old_ttf_dir = Path() / "resources" / "ttf"
-    if not FONT_PATH.exists() and old_ttf_dir.exists():
-        os.rename(old_ttf_dir, FONT_PATH)
-    old_txt_dir = Path() / "resources" / "txt"
-    if not TEXT_PATH.exists() and old_txt_dir.exists():
-        os.rename(old_txt_dir, TEXT_PATH)
+def init_path():
+    global IMAGE_PATH, VOICE_PATH, TEXT_PATH, LOG_PATH, FONT_PATH, DATA_PATH, TEMP_PATH
    IMAGE_PATH.mkdir(parents=True, exist_ok=True)
-    RECORD_PATH.mkdir(parents=True, exist_ok=True)
+    VOICE_PATH.mkdir(parents=True, exist_ok=True)
    TEXT_PATH.mkdir(parents=True, exist_ok=True)
    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)

+    IMAGE_PATH = str(IMAGE_PATH.absolute()) + '/'
+    VOICE_PATH = str(VOICE_PATH.absolute()) + '/'
+    TEXT_PATH = str(TEXT_PATH.absolute()) + '/'
+    LOG_PATH = str(LOG_PATH.absolute()) + '/'
+    FONT_PATH = str(FONT_PATH.absolute()) + '/'
+    DATA_PATH = str(DATA_PATH.absolute()) + '/'
+    TEMP_PATH = str(TEMP_PATH.absolute()) + '/'

-load_path()
+
+init_path()



@@ -1,9 +1,7 @@
-import copy
 from typing import Optional, Any, Union
 from pathlib import Path
 from ruamel.yaml import YAML
 from ruamel import yaml
-from ruamel.yaml.scanner import ScannerError


 class ConfigsManager:
@@ -13,34 +11,14 @@ class ConfigsManager:

    def __init__(self, file: Path):
        self._data: dict = {}
-        self._simple_data: dict = {}
        self._admin_level_data = []
-        self._simple_file = Path() / "configs" / "config.yaml"
        if file:
            file.parent.mkdir(exist_ok=True, parents=True)
            self.file = file
-            _yaml = YAML()
            if file.exists():
+                _yaml = YAML()
                with open(file, "r", encoding="utf8") as f:
                    self._data = _yaml.load(f)
-                if not self._data:
-                    self.file.unlink()
-                    raise ValueError(
-                        "配置文件为空！\n"
-                        "***********************************************************\n"
-                        "****** 配置文件 plugins2config.yaml 为空，已删除，请重启 ******\n"
-                        "***********************************************************"
-                    )
-            if self._simple_file.exists():
-                try:
-                    with open(self._simple_file, "r", encoding="utf8") as f:
-                        self._simple_data = _yaml.load(f)
-                except ScannerError as e:
-                    raise ScannerError(
-                        f"{e}\n**********************************************\n"
-                        f"****** 可能为config.yaml配置文件填写不规范 ******\n"
-                        f"**********************************************"
-                    )

    def add_plugin_config(
        self,
@@ -93,26 +71,17 @@ class ConfigsManager:
        """
        if module in self._data.keys():
            del self._data[module]
-        self.save()

-    def set_config(self, module: str, key: str, value: Any, auto_save: bool = False, save_simple_data: bool = True):
+    def set_config(self, module: str, key: str, value: str):
        """
        设置配置值
        :param module: 模块名
        :param key: 配置名称
        :param value: 值
-        :param auto_save: 自动保存
-        :param save_simple_data: 保存至config.yaml
        """
        if module in self._data.keys():
-            if (
-                self._data[module].get(key) is not None
-                and self._data[module][key] != value
-            ):
+            if self._data[module].get(key) is not None:
                self._data[module][key]["value"] = value
-                self._simple_data[module][key] = value
-            if auto_save:
-                self.save(save_simple_data=save_simple_data)

    def set_help(self, module: str, key: str, help_: str):
        """
@@ -124,9 +93,8 @@ class ConfigsManager:
        if module in self._data.keys():
            if self._data[module].get(key) is not None:
                self._data[module][key]["help"] = help_
-                self.save()

-    def set_default_value(self, module: str, key: str, value:  Any):
+    def set_default_value(self, module: str, key: str, value: str):
        """
        设置配置默认值
        :param module: 模块名
@@ -136,11 +104,8 @@ class ConfigsManager:
        if module in self._data.keys():
            if self._data[module].get(key) is not None:
                self._data[module][key]["default_value"] = value
-                self.save()

-    def get_config(
-        self, module: str, key: str, default: Optional[Any] = None
-    ) -> Optional[Any]:
+    def get_config(self, module: str, key: str, default: Optional[Any] = None) -> Optional[Any]:
        """
        获取指定配置值
        :param module: 模块名
@@ -177,49 +142,23 @@ class ConfigsManager:
        if key in self._data.keys():
            return self._data[key]

-    def save(self, path: Union[str, Path] = None, save_simple_data: bool = False):
+    def save(self, path: Union[str, Path] = None):
        """
        保存数据
        :param path: 路径
-        :param save_simple_data: 同时保存至config.yaml
        """
-        if save_simple_data:
-            with open(self._simple_file, "w", encoding="utf8") as f:
-                yaml.dump(
-                    self._simple_data,
-                    f,
-                    indent=2,
-                    Dumper=yaml.RoundTripDumper,
-                    allow_unicode=True,
-                )
        path = path if path else self.file
        with open(path, "w", encoding="utf8") as f:
            yaml.dump(
                self._data, f, indent=2, Dumper=yaml.RoundTripDumper, allow_unicode=True
            )

-    def reload(self):
-        """
-        重新加载配置文件
-        """
-        _yaml = YAML()
-        if self._simple_file.exists():
-            with open(self._simple_file, "r", encoding="utf8") as f:
-                self._simple_data = _yaml.load(f)
-        for key in self._simple_data.keys():
-            for k in self._simple_data[key].keys():
-                self._data[key][k]["value"] = self._simple_data[key][k]
-        self.save()
-
    def get_admin_level_data(self):
        """
        获取管理插件等级
        """
        return self._admin_level_data

-    def get_data(self):
-        return copy.deepcopy(self._data)
-
    def is_empty(self) -> bool:
        return not bool(self._data)

@@ -1,40 +1,39 @@
 from services.db_context import db
-from typing import Dict
 from typing import Optional, List
 from services.log import logger
-from .goods_info import GoodsInfo


 class BagUser(db.Model):
    __tablename__ = "bag_users"
    id = db.Column(db.Integer(), primary_key=True)
    user_qq = db.Column(db.BigInteger(), nullable=False)
-    group_id = db.Column(db.BigInteger(), nullable=False)
+    belonging_group = db.Column(db.BigInteger(), nullable=False)
    gold = db.Column(db.Integer(), default=100)
-    props = db.Column(db.TEXT(), nullable=False, default="")  # 旧道具字段（废弃）
+    props = db.Column(db.TEXT(), nullable=False, default="")
    spend_total_gold = db.Column(db.Integer(), default=0)
    get_total_gold = db.Column(db.Integer(), default=0)
    get_today_gold = db.Column(db.Integer(), default=0)
    spend_today_gold = db.Column(db.Integer(), default=0)
-    property = db.Column(db.JSON(), nullable=False, default={})  # 新道具字段

-    _idx1 = db.Index("bag_group_users_idx1", "user_qq", "group_id", unique=True)
+    _idx1 = db.Index("bag_group_users_idx1", "user_qq", "belonging_group", unique=True)

    @classmethod
-    async def get_user_total_gold(cls, user_qq: int, group_id: int) -> str:
+    async def get_my_total_gold(cls, user_qq: int, belonging_group: int) -> str:
        """
-        说明:
+        说明：
            获取金币概况
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 所在群号
+            :param belonging_group: 所在群号
        """
-        query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
+        query = cls.query.where(
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
+        )
        user = await query.gino.first()
        if not user:
            user = await cls.create(
                user_qq=user_qq,
-                group_id=group_id,
+                belonging_group=belonging_group,
            )
        return (
            f"当前金币：{user.gold}\n今日获取金币：{user.get_today_gold}\n今日花费金币：{user.spend_today_gold}"
@@ -43,63 +42,62 @@ class BagUser(db.Model):
        )

    @classmethod
-    async def get_gold(cls, user_qq: int, group_id: int) -> int:
+    async def get_gold(cls, user_qq: int, belonging_group: int) -> int:
        """
-        说明:
+        说明：
            获取当前金币
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 所在群号
+            :param belonging_group: 所在群号
        """
-        query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
+        query = cls.query.where(
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
+        )
        user = await query.gino.first()
        if user:
            return user.gold
        else:
            await cls.create(
                user_qq=user_qq,
-                group_id=group_id,
+                belonging_group=belonging_group,
            )
            return 100

    @classmethod
-    async def get_property(cls, user_qq: int, group_id: int, only_active: bool = False) -> Dict[str, int]:
+    async def get_props(cls, user_qq: int, belonging_group: int) -> str:
        """
-        说明:
+        说明：
            获取当前道具
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 所在群号
-            :param only_active: 仅仅获取主动使用的道具
+            :param belonging_group: 所在群号
        """
-        query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
+        query = cls.query.where(
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
+        )
        user = await query.gino.first()
        if user:
-            if only_active and user.property:
-                data = {}
-                name_list = [x.goods_name for x in await GoodsInfo.get_all_goods() if not x.is_passive]
-                for key in [x for x in user.property.keys() if x in name_list]:
-                    data[key] = user.property[key]
-                return data
-            return user.property
+            return user.props
        else:
            await cls.create(
                user_qq=user_qq,
-                group_id=group_id,
+                belonging_group=belonging_group,
            )
-            return {}
+            return ""

    @classmethod
-    async def add_gold(cls, user_qq: int, group_id: int, num: int):
+    async def add_gold(cls, user_qq: int, belonging_group: int, num: int):
        """
-        说明:
+        说明：
            增加金币
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 所在群号
+            :param belonging_group: 所在群号
            :param num: 金币数量
        """
-        query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
+        query = cls.query.where(
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
+        )
        query = query.with_for_update()
        user = await query.gino.first()
        if user:
@@ -111,23 +109,25 @@ class BagUser(db.Model):
        else:
            await cls.create(
                user_qq=user_qq,
-                group_id=group_id,
+                belonging_group=belonging_group,
                gold=100 + num,
                get_total_gold=num,
                get_today_gold=num,
            )

    @classmethod
-    async def spend_gold(cls, user_qq: int, group_id: int, num: int):
+    async def spend_gold(cls, user_qq: int, belonging_group: int, num: int):
        """
-        说明:
+        说明：
            花费金币
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 所在群号
+            :param belonging_group: 所在群号
            :param num: 金币数量
        """
-        query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
+        query = cls.query.where(
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
+        )
        query = query.with_for_update()
        user = await query.gino.first()
        if user:
@@ -139,96 +139,103 @@ class BagUser(db.Model):
        else:
            await cls.create(
                user_qq=user_qq,
-                group_id=group_id,
+                belonging_group=belonging_group,
                gold=100 - num,
                spend_total_gold=num,
                spend_today_gold=num,
            )

    @classmethod
-    async def add_property(cls, user_qq: int, group_id: int, name: str):
+    async def add_props(cls, user_qq: int, belonging_group: int, name: str):
        """
-        说明:
+        说明：
            增加道具
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 所在群号
+            :param belonging_group: 所在群号
            :param name: 道具名称
        """
-        query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
+        query = cls.query.where(
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
+        )
        query = query.with_for_update()
        user = await query.gino.first()
        if user:
-            p = user.property
-            if p.get(name) is None:
-                p[name] = 1
-            else:
-                p[name] += 1
-            await user.update(property=p).apply()
+            await user.update(props=user.props + f"{name},").apply()
        else:
-            await cls.create(user_qq=user_qq, group_id=group_id, property={name: 1})
+            await cls.create(
+                user_qq=user_qq, belonging_group=belonging_group, props=f"{name},"
+            )

    @classmethod
-    async def delete_property(
-        cls, user_qq: int, group_id: int, name: str, num: int = 1
-    ) -> bool:
+    async def del_props(cls, user_qq: int, belonging_group: int, name: str) -> bool:
        """
-        说明:
-            使用/删除 道具
-        参数:
+        说明：
+            使用道具
+        参数：
            :param user_qq: qq号
-            :param group_id: 所在群号
+            :param belonging_group: 所在群号
            :param name: 道具名称
-            :param num: 使用个数
        """
-        query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
+        query = cls.query.where(
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
+        )
        query = query.with_for_update()
        user = await query.gino.first()
        if user:
-            property_ = user.property
-            if name in property_:
-                if property_.get(name) == num:
-                    del property_[name]
-                else:
-                    property_[name] -= num
-                await user.update(property=property_).apply()
+            rst = ""
+            props = user.props
+            if props.find(name) != -1:
+                props = props.split(",")
+                try:
+                    index = props.index(name)
+                except ValueError:
+                    return False
+                props = props[:index] + props[index + 1 :]
+                for p in props:
+                    if p != "":
+                        rst += p + ","
+                await user.update(props=rst).apply()
                return True
-        return False
+            else:
+                return False
+        else:
+            return False

    @classmethod
-    async def buy_property(
-        cls, user_qq: int, group_id: int, goods: "GoodsInfo", goods_num: int
+    async def buy_props(
+        cls, user_qq: int, belonging_group: int, goods: "GoodsInfo", goods_num: int
    ) -> bool:
        """
-        说明:
+        说明：
            购买道具
-        参数:
+        参数：
            :param user_qq: 用户qq
-            :param group_id: 所在群聊
+            :param belonging_group: 所在群聊
            :param goods: 商品
            :param goods_num: 商品数量
        """
        try:
            # 折扣后金币
            spend_gold = goods.goods_discount * goods.goods_price * goods_num
-            await BagUser.spend_gold(user_qq, group_id, spend_gold)
+            await BagUser.spend_gold(user_qq, belonging_group, spend_gold)
            for _ in range(goods_num):
-                await BagUser.add_property(user_qq, group_id, goods.goods_name)
+                await BagUser.add_props(user_qq, belonging_group, goods.goods_name)
            return True
        except Exception as e:
-            logger.error(f"buy_property 发生错误 {type(e)}：{e}")
-        return False
+            logger.error(f"buy_props 发生错误 {type(e)}：{e}")
+            return False

    @classmethod
    async def get_all_users(cls, group_id: Optional[int] = None) -> List["BagUser"]:
        """
-        说明:
+        说明：
            获取所有用户数据
-        参数:
+        参数：
            :param group_id: 群号
        """
        if not group_id:
            query = await cls.query.gino.all()
        else:
-            query = await cls.query.where((cls.group_id == group_id)).gino.all()
+            query = await cls.query.where((cls.belonging_group == group_id)).gino.all()
        return query
@@ -15,9 +15,9 @@ class BanUser(db.Model):
    @classmethod
    async def check_ban_level(cls, user_qq: int, level: int) -> bool:
        """
-        说明:
+        说明：
            检测ban掉目标的用户与unban用户的权限等级大小
-        参数:
+        参数：
            :param user_qq: unban用户的qq号
            :param level: ban掉目标用户的权限等级
        """
@@ -31,9 +31,9 @@ class BanUser(db.Model):
    @classmethod
    async def check_ban_time(cls, user_qq: int) -> str:
        """
-        说明:
+        说明：
            检测用户被ban时长
-        参数:
+        参数：
            :param user_qq: qq号
        """
        query = cls.query.where((cls.user_qq == user_qq))
@@ -49,9 +49,9 @@ class BanUser(db.Model):
    @classmethod
    async def is_ban(cls, user_qq: int) -> bool:
        """
-        说明:
+        说明：
            判断用户是否被ban
-        参数:
+        参数：
            :param user_qq: qq号
        """
        if await cls.check_ban_time(user_qq):
@@ -63,9 +63,9 @@ class BanUser(db.Model):
    @classmethod
    async def is_super_ban(cls, user_qq: int) -> bool:
        """
-        说明:
+        说明：
            判断用户是否被ban
-        参数:
+        参数：
            :param user_qq: qq号
        """
        user = await cls.query.where((cls.user_qq == user_qq)).gino.first()
@@ -77,9 +77,9 @@ class BanUser(db.Model):
    @classmethod
    async def ban(cls, user_qq: int, ban_level: int, duration: int) -> bool:
        """
-        说明:
+        说明：
            ban掉目标用户
-        参数:
+        参数：
            :param user_qq: 目标用户qq号
            :param ban_level: 使用ban命令用户的权限
            :param duration:  ban时长，秒
@@ -104,9 +104,9 @@ class BanUser(db.Model):
    @classmethod
    async def unban(cls, user_qq: int) -> bool:
        """
-        说明:
+        说明：
            unban用户
-        参数:
+        参数：
            :param user_qq: qq号
        """
        query = cls.query.where((cls.user_qq == user_qq))
@@ -1,214 +0,0 @@
-from datetime import datetime, timedelta
-from typing import List, Literal, Optional, Tuple, Union
-
-from services.db_context import db
-
-
-class ChatHistory(db.Model):
-    __tablename__ = "chat_history"
-
-    id = db.Column(db.Integer(), primary_key=True)
-    user_qq = db.Column(db.BigInteger(), nullable=False)
-    group_id = db.Column(db.BigInteger())
-    text = db.Column(db.Text())
-    plain_text = db.Column(db.Text())
-    create_time = db.Column(db.DateTime(timezone=True), nullable=False)
-
-    @classmethod
-    async def add_chat_msg(cls, user_qq: int, group_id: Optional[int], text: str, plain_text: str):
-        await cls.create(
-            user_qq=user_qq, group_id=group_id, text=text, plain_text=plain_text, create_time=datetime.now()
-        )
-
-    @classmethod
-    async def get_user_msg(
-        cls,
-        uid: int,
-        msg_type: Optional[Literal["private", "group"]],
-        days: Optional[int] = None,
-    ) -> List["ChatHistory"]:
-        """
-        说明:
-            获取用户消息
-        参数:
-            :param uid: 用户qq
-            :param msg_type: 消息类型，私聊或群聊
-            :param days: 限制日期
-        """
-        return await cls._get_msg(uid, None, "user", msg_type, days).gino.all()
-
-    @classmethod
-    async def get_group_user_msg(
-        cls,
-        uid: int,
-        gid: int,
-        limit: int = 10,
-        date_scope: Tuple[datetime, datetime] = None,
-    ) -> List["ChatHistory"]:
-        """
-        说明:
-            获取群聊指定用户聊天记录
-        参数:
-            :param uid: qq
-            :param gid: 群号
-            :param limit: 获取数量
-            :param date_scope: 日期范围，默认None为全搜索
-        """
-        return (
-            await cls._get_msg(uid, gid, "group", days=date_scope)
-            .limit(limit)
-            .gino.all()
-        )
-
-    @classmethod
-    async def get_group_user_msg_count(cls, uid: int, gid: int) -> Optional[int]:
-        """
-        说明:
-             查询群聊指定用户的聊天记录数量
-        参数:
-            :param uid: qq
-            :param gid: 群号
-        """
-        if x := await db.first(
-            db.text(
-                f"SELECT COUNT(id) as sum FROM public.chat_history WHERE user_qq = {uid} AND group_id = {gid}"
-            )
-        ):
-            return x[0]
-        return None
-
-    @classmethod
-    async def get_group_msg_rank(
-        cls,
-        gid: int,
-        limit: int = 10,
-        order: str = "DESC",
-        date_scope: Optional[Tuple[datetime, datetime]] = None,
-    ) -> Optional[Tuple[int, int]]:
-        """
-        说明:
-            获取排行数据
-        参数:
-            :param gid: 群号
-            :param limit: 获取数量
-            :param order: 排序类型，desc，des
-            :param date_scope: 日期范围
-        """
-        sql = f"SELECT user_qq, COUNT(id) as sum FROM public.chat_history WHERE group_id = {gid} "
-        if date_scope:
-            sql += f"AND create_time BETWEEN '{date_scope[0]}' AND '{date_scope[1]}' "
-        sql += f"GROUP BY user_qq ORDER BY sum {order if order and order.upper() != 'DES' else ''} LIMIT {limit}"
-        return await db.all(db.text(sql))
-
-    @classmethod
-    async def get_group_first_msg_datetime(cls, gid: int) -> Optional[datetime]:
-        """
-        说明:
-            获取群第一条记录消息时间
-        参数:
-            :param gid:
-        """
-        if (
-            msg := await cls.query.where(cls.group_id == gid)
-            .order_by(cls.create_time)
-            .gino.first()
-        ):
-            return msg.create_time
-        return None
-
-    @classmethod
-    async def get_user_msg_count(
-        cls,
-        uid: int,
-        msg_type: Optional[Literal["private", "group"]],
-        days: Optional[int] = None,
-    ) -> int:
-        """
-        说明:
-            获取用户消息数量
-        参数:
-            :param uid: 用户qq
-            :param msg_type: 消息类型，私聊或群聊
-            :param days: 限制日期
-        """
-        return (
-            await cls._get_msg(uid, None, "user", msg_type, days, True).gino.first()
-        )[0]
-
-    @classmethod
-    async def get_group_msg(
-        cls,
-        gid: int,
-        days: Optional[int] = None,
-    ) -> List["ChatHistory"]:
-        """
-        说明:
-            获取群聊消息
-        参数:
-            :param gid: 用户qq
-            :param days: 限制日期
-        """
-        return await cls._get_msg(None, gid, "group", None, days).gino.all()
-
-    @classmethod
-    async def get_group_msg_count(
-        cls,
-        gid: int,
-        days: Optional[int] = None,
-    ) -> List["ChatHistory"]:
-        """
-        说明:
-            获取群聊消息数量
-        参数:
-            :param gid: 用户qq
-            :param days: 限制日期
-        """
-        return (await cls._get_msg(None, gid, "group", None, days, True).gino.first())[
-            0
-        ]
-
-    @classmethod
-    def _get_msg(
-        cls,
-        uid: Optional[int],
-        gid: Optional[int],
-        type_: Literal["user", "group"],
-        msg_type: Optional[Literal["private", "group"]] = None,
-        days: Optional[Union[int, Tuple[datetime, datetime]]] = None,
-        is_select_count: bool = False,
-    ):
-        """
-        说明:
-            获取消息查询query
-        参数:
-            :param uid: 用户qq
-            :param gid: 群号
-            :param type_: 类型，私聊或群聊
-            :param msg_type: 消息类型，用户或群聊
-            :param days: 限制日期
-        """
-        if is_select_count:
-            setattr(ChatHistory, "count", db.func.count(cls.id).label("count"))
-            query = cls.select("count")
-        else:
-            query = cls.query
-        if type_ == "user":
-            query = query.where(cls.user_qq == uid)
-            if msg_type == "private":
-                query = query.where(cls.group_id == None)
-            elif msg_type == "group":
-                query = query.where(cls.group_id != None)
-        else:
-            query = query.where(cls.group_id == gid)
-            if uid:
-                query = query.where(cls.user_qq == uid)
-        if days:
-            if isinstance(days, int):
-                query = query.where(
-                    cls.create_time >= datetime.now() - timedelta(days=days)
-                )
-            elif isinstance(days, tuple):
-                query = query.where(cls.create_time >= days[0]).where(
-                    cls.create_time <= days[1]
-                )
-        return query
@@ -15,9 +15,9 @@ class FriendUser(db.Model):
    @classmethod
    async def get_user_name(cls, user_id: int) -> str:
        """
-        说明:
+        说明：
            获取好友用户名称
-        参数:
+        参数：
            :param user_id: qq号
        """
        query = cls.query.where(cls.user_id == user_id)
@@ -30,9 +30,9 @@ class FriendUser(db.Model):
    @classmethod
    async def add_friend_info(cls, user_id: int, user_name: str) -> bool:
        """
-        说明:
+        说明：
            添加好友信息
-        参数:
+        参数：
            :param user_id: qq号
            :param user_name: 用户名称
        """
@@ -55,9 +55,9 @@ class FriendUser(db.Model):
    @classmethod
    async def delete_friend_info(cls, user_id: int) -> bool:
        """
-        说明:
+        说明：
            删除好友信息
-        参数:
+        参数：
            :param user_id: qq号
        """
        try:
@@ -72,9 +72,9 @@ class FriendUser(db.Model):
    @classmethod
    async def get_friend_nickname(cls, user_id: int) -> str:
        """
-        说明:
+        说明：
            获取用户昵称
-        参数:
+        参数：
            :param user_id: qq号
        """
        query = cls.query.where(cls.user_id == user_id)
@@ -92,9 +92,9 @@ class FriendUser(db.Model):
    @classmethod
    async def set_friend_nickname(cls, user_id: int, nickname: str) -> bool:
        """
-        说明:
+        说明：
            设置用户昵称
-        参数:
+        参数：
            :param user_id: qq号
            :param nickname: 昵称
        """
@@ -1,5 +1,5 @@
 from services.db_context import db
-from typing import Optional, List, Tuple
+from typing import Optional, List
 from services.log import logger


@@ -12,39 +12,27 @@ class GoodsInfo(db.Model):
    goods_description = db.Column(db.TEXT(), nullable=False)  # 商品描述
    goods_discount = db.Column(db.Numeric(scale=3, asdecimal=False), default=1)  # 打折
    goods_limit_time = db.Column(db.BigInteger(), default=0)  # 限时
-    daily_limit = db.Column(db.Integer(), nullable=False, default=0)  # 每日购买限制
-    daily_purchase_limit = db.Column(
-        db.JSON(), nullable=False, default={}
-    )  # 每日购买限制数据存储
-    is_passive = db.Column(db.Boolean(), nullable=False, default=0)  # 是否为被动
-    icon = db.Column(db.String(), default=0)  # 图标

    _idx1 = db.Index("goods_group_users_idx1", "goods_name", unique=True)

    @classmethod
    async def add_goods(
-            cls,
-            goods_name: str,
-            goods_price: int,
-            goods_description: str,
-            goods_discount: float = 1,
-            goods_limit_time: int = 0,
-            daily_limit: int = 0,
-            is_passive: bool = False,
-            icon: Optional[str] = None,
+        cls,
+        goods_name: str,
+        goods_price: int,
+        goods_description: str,
+        goods_discount: float = 1,
+        goods_limit_time: int = 0,
    ) -> bool:
        """
-        说明:
+        说明：
            添加商品
-        参数:
+        参数：
            :param goods_name: 商品名称
            :param goods_price: 商品价格
            :param goods_description: 商品简介
            :param goods_discount: 商品折扣
            :param goods_limit_time: 商品限时
-            :param daily_limit: 每日购买限制
-            :param is_passive: 是否为被动道具
-            :param icon: 图标
        """
        try:
            if not await cls.get_goods_info(goods_name):
@@ -54,27 +42,24 @@ class GoodsInfo(db.Model):
                    goods_description=goods_description,
                    goods_discount=goods_discount,
                    goods_limit_time=goods_limit_time,
-                    daily_limit=daily_limit,
-                    is_passive=is_passive,
-                    icon=icon
                )
                return True
        except Exception as e:
-            logger.error(f"GoodsInfo add_goods {goods_name} 发生错误 {type(e)}：{e}")
+            logger.error(f"GoodsInfo add_goods 发生错误 {type(e)}：{e}")
        return False

    @classmethod
    async def delete_goods(cls, goods_name: str) -> bool:
        """
-        说明:
+        说明：
            删除商品
-        参数:
+        参数：
            :param goods_name: 商品名称
        """
        query = (
            await cls.query.where(cls.goods_name == goods_name)
-                .with_for_update()
-                .gino.first()
+            .with_for_update()
+            .gino.first()
        )
        if not query:
            return False
@@ -83,65 +68,59 @@ class GoodsInfo(db.Model):

    @classmethod
    async def update_goods(
-            cls,
-            goods_name: str,
-            goods_price: Optional[int] = None,
-            goods_description: Optional[str] = None,
-            goods_discount: Optional[float] = None,
-            goods_limit_time: Optional[int] = None,
-            daily_limit: Optional[int] = None,
-            is_passive: Optional[bool] = None,
-            icon: Optional[str] = None,
+        cls,
+        goods_name: str,
+        goods_price: Optional[int] = None,
+        goods_description: Optional[str] = None,
+        goods_discount: Optional[float] = None,
+        goods_limit_time: Optional[int] = None,
    ) -> bool:
        """
-        说明:
+        说明：
            更新商品信息
-        参数:
+        参数：
            :param goods_name: 商品名称
            :param goods_price: 商品价格
            :param goods_description: 商品简介
            :param goods_discount: 商品折扣
            :param goods_limit_time: 商品限时时间
-            :param daily_limit: 每日次数限制
-            :param is_passive: 是否为被动
-            :param icon: 图标
        """
        try:
            query = (
                await cls.query.where(cls.goods_name == goods_name)
-                    .with_for_update()
-                    .gino.first()
+                .with_for_update()
+                .gino.first()
            )
            if not query:
                return False
-            await query.update(
-                goods_price=goods_price or query.goods_price,
-                goods_description=goods_description or query.goods_description,
-                goods_discount=goods_discount or query.goods_discount,
-                goods_limit_time=goods_limit_time if goods_limit_time is not None else query.goods_limit_time,
-                daily_limit=daily_limit if daily_limit is not None else query.daily_limit,
-                is_passive=is_passive if is_passive is not None else query.is_passive,
-                icon=icon or query.icon
-            ).apply()
+            if goods_price:
+                await query.update(goods_price=goods_price).apply()
+            if goods_description:
+                await query.update(goods_description=goods_description).apply()
+            if goods_discount:
+                await query.update(goods_discount=goods_discount).apply()
+            if goods_limit_time:
+                await query.update(goods_limit_time=goods_limit_time).apply()
            return True
        except Exception as e:
            logger.error(f"GoodsInfo update_goods 发生错误 {type(e)}：{e}")
-        return False
+            return False

    @classmethod
    async def get_goods_info(cls, goods_name: str) -> "GoodsInfo":
        """
-        说明:
+        说明：
            获取商品对象
-        参数:
+        参数：
            :param goods_name: 商品名称
        """
-        return await cls.query.where(cls.goods_name == goods_name).gino.first()
+        query = await cls.query.where(cls.goods_name == goods_name).gino.first()
+        return query

    @classmethod
    async def get_all_goods(cls) -> List["GoodsInfo"]:
        """
-        说明:
+        说明：
            获得全部有序商品对象
        """
        query = await cls.query.gino.all()
@@ -152,62 +131,3 @@ class GoodsInfo(db.Model):
            goods_lst.append([x for x in query if x.id == min_id][0])
            id_lst.remove(min_id)
        return goods_lst
-
-    @classmethod
-    async def add_user_daily_purchase(
-            cls, goods: "GoodsInfo", user_id: int, group_id: int, num: int = 1
-    ):
-        """
-        说明:
-            添加用户明日购买限制
-        参数:
-            :param goods: 商品
-            :param user_id: 用户id
-            :param group_id: 群号
-            :param num: 数量
-        """
-        user_id = str(user_id)
-        group_id = str(group_id)
-        if goods and goods.daily_limit and goods.daily_limit > 0:
-            if not goods.daily_purchase_limit.get(group_id):
-                goods.daily_purchase_limit[group_id] = {}
-            if not goods.daily_purchase_limit[group_id].get(user_id):
-                goods.daily_purchase_limit[group_id][user_id] = 0
-            goods.daily_purchase_limit[group_id][user_id] += num
-            await goods.update(daily_purchase_limit=goods.daily_purchase_limit).apply()
-
-    @classmethod
-    async def check_user_daily_purchase(
-            cls, goods: "GoodsInfo", user_id: int, group_id: int, num: int = 1
-    ) -> Tuple[bool, int]:
-        """
-        说明:
-            检测用户每日购买上限
-        参数:
-            :param goods: 商品
-            :param user_id: 用户id
-            :param group_id: 群号
-            :param num: 数量
-        """
-        user_id = str(user_id)
-        group_id = str(group_id)
-        if goods and goods.daily_limit > 0:
-            if (
-                not goods.daily_limit
-                or not goods.daily_purchase_limit.get(group_id)
-                or not goods.daily_purchase_limit[group_id].get(user_id)
-            ):
-                return goods.daily_limit - num < 0, goods.daily_limit
-            if goods.daily_purchase_limit[group_id][user_id] + num > goods.daily_limit:
-                return (
-                    True,
-                    goods.daily_limit - goods.daily_purchase_limit[group_id][user_id],
-                )
-        return False, 0
-
-    @classmethod
-    async def reset_daily_purchase(cls):
-        """
-        重置每次次数限制
-        """
-        await cls.update.values(daily_purchase_limit={}).gino.status()
@@ -17,9 +17,9 @@ class GroupInfo(db.Model):
    @classmethod
    async def get_group_info(cls, group_id: int) -> "GroupInfo":
        """
-        说明:
+        说明：
            获取群信息
-        参数:
+        参数：
            :param group_id: 群号
        """
        query = cls.query.where(cls.group_id == group_id)
@@ -35,9 +35,9 @@ class GroupInfo(db.Model):
        group_flag: Optional[int] = None,
    ) -> bool:
        """
-        说明:
+        说明：
            添加群信息
-        参数:
+        参数：
            :param group_id: 群号
            :param group_name: 群名称
            :param max_member_count: 群员最大数量
@@ -74,9 +74,9 @@ class GroupInfo(db.Model):
    @classmethod
    async def delete_group_info(cls, group_id: int):
        """
-        说明:
+        说明：
            删除群信息
-        参数:
+        参数：
            :param group_id: 群号
        """
        await cls.delete.where(cls.group_id == group_id).gino.status()
@@ -84,7 +84,7 @@ class GroupInfo(db.Model):
    @classmethod
    async def get_all_group(cls) -> List["GroupInfo"]:
        """
-        说明:
+        说明：
            获取所有群对象
        """
        query = await cls.query.gino.all()
@@ -10,41 +10,41 @@ class GroupInfoUser(db.Model):
    id = db.Column(db.Integer(), primary_key=True)
    user_qq = db.Column(db.BigInteger(), nullable=False)
    user_name = db.Column(db.Unicode(), nullable=False)
-    group_id = db.Column(db.BigInteger(), nullable=False)
+    belonging_group = db.Column(db.BigInteger(), nullable=False)
    user_join_time = db.Column(db.DateTime(), nullable=False)
    nickname = db.Column(db.Unicode())
    uid = db.Column(db.BigInteger())

-    _idx1 = db.Index("info_group_users_idx1", "user_qq", "group_id", unique=True)
+    _idx1 = db.Index("info_group_users_idx1", "user_qq", "belonging_group", unique=True)

    @classmethod
    async def add_member_info(
        cls,
        user_qq: int,
-        group_id: int,
+        belonging_group: int,
        user_name: str,
        user_join_time: datetime,
        uid: Optional[int] = None,
    ) -> bool:
        """
-        说明:
+        说明：
            添加群内用户信息
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 群号
+            :param belonging_group: 群号
            :param user_name: 用户名称
            :param user_join_time: 入群时间
            :param uid: 用户唯一 id（自动生成）
        """
        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
        )
        try:
            if not await query.gino.first():
                await cls.create(
                    user_qq=user_qq,
                    user_name=user_name,
-                    group_id=group_id,
+                    belonging_group=belonging_group,
                    user_join_time=user_join_time,
                    uid=uid
                )
@@ -54,31 +54,31 @@ class GroupInfoUser(db.Model):

    @classmethod
    async def get_member_info(
-        cls, user_qq: int, group_id: int
+        cls, user_qq: int, belonging_group: int
    ) -> "GroupInfoUser":
        """
-        说明:
+        说明：
            查询群员信息
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 群号
+            :param belonging_group: 群号
        """
        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
        )
        return await query.gino.first()

    @classmethod
-    async def delete_member_info(cls, user_qq: int, group_id: int) -> bool:
+    async def delete_member_info(cls, user_qq: int, belonging_group: int) -> bool:
        """
-        说明:
+        说明：
            删除群员信息
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 群号
+            :param belonging_group: 群号
        """
        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
        )
        query = query.with_for_update()
        user = await query.gino.first()
@@ -87,40 +87,40 @@ class GroupInfoUser(db.Model):
                return True
            else:
                await cls.delete.where(
-                    (cls.user_qq == user_qq) & (cls.group_id == group_id)
+                    (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
                ).gino.status()
                return True
        except Exception:
            return False

    @classmethod
-    async def get_group_member_id_list(cls, group_id: int) -> List[int]:
+    async def get_group_member_id_list(cls, belonging_group: int) -> List[int]:
        """
-        说明:
+        说明：
            获取该群所有用户qq
-        参数:
-            :param group_id: 群号
+        参数：
+            :param belonging_group: 群号
        """
        member_list = []
-        query = cls.query.where((cls.group_id == group_id))
+        query = cls.query.where((cls.belonging_group == belonging_group))
        for user in await query.gino.all():
            member_list.append(user.user_qq)
        return member_list

    @classmethod
    async def set_group_member_nickname(
-        cls, user_qq: int, group_id: int, nickname: str
+        cls, user_qq: int, belonging_group: int, nickname: str
    ) -> bool:
        """
-        说明:
+        说明：
            设置群员在该群内的昵称
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 群号
+            :param belonging_group: 群号
            :param nickname: 昵称
        """
        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
        )
        user = await query.with_for_update().gino.first()
        if user:
@@ -131,27 +131,25 @@ class GroupInfoUser(db.Model):
    @classmethod
    async def get_user_all_group(cls, user_qq: int) -> List[int]:
        """
-        说明:
-            获取该用户所在的所有群聊
-        参数:
-            :param user_qq: 用户qq
+        获取该用户所在的所有群聊
+        :param user_qq: 用户qq
        """
        query = await cls.query.where(cls.user_qq == user_qq).gino.all()
        if query:
-            query = [x.group_id for x in query]
+            query = [x.belonging_group for x in query]
        return query

    @classmethod
-    async def get_group_member_nickname(cls, user_qq: int, group_id: int) -> str:
+    async def get_group_member_nickname(cls, user_qq: int, belonging_group: int) -> str:
        """
-        说明:
+        说明：
            获取用户在该群的昵称
-        参数:
+        参数：
            :param user_qq: qq号
-            :param group_id: 群号
+            :param belonging_group: 群号
        """
        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
        )
        user = await query.gino.first()
        if user:
@@ -165,12 +163,12 @@ class GroupInfoUser(db.Model):
        return ""

    @classmethod
-    async def get_group_member_uid(cls, user_qq: int, group_id: int) -> Optional[str]:
+    async def get_group_member_uid(cls, user_qq: int, belonging_group: int) -> Optional[str]:
        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
        )
        user = await query.gino.first()
-        _max_uid = cls.query.where((cls.user_qq == 114514) & (cls.group_id == 114514)).with_for_update()
+        _max_uid = cls.query.where((cls.user_qq == 114514) & (cls.belonging_group == 114514)).with_for_update()
        _max_uid_user = await _max_uid.gino.first()
        _max_uid = _max_uid_user.uid
        if not user or not user.uid:
@@ -180,9 +178,9 @@ class GroupInfoUser(db.Model):
                    return x.uid
            else:
                if not user:
-                    await GroupInfoUser.add_member_info(user_qq, group_id, '', datetime.min)
+                    await GroupInfoUser.add_member_info(user_qq, belonging_group, '', datetime.min)
                    user = await cls.query.where(
-                        (cls.user_qq == user_qq) & (cls.group_id == group_id)
+                        (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
                    ).gino.first()
                await user.update(
                    uid=_max_uid + 1,
@@ -1,5 +1,3 @@
-from asyncpg import UniqueViolationError
-
 from services.db_context import db


@@ -17,9 +15,9 @@ class LevelUser(db.Model):
    @classmethod
    async def get_user_level(cls, user_qq: int, group_id: int) -> int:
        """
-        说明:
+        说明：
            获取用户在群内的等级
-        参数:
+        参数：
            :param user_qq: qq号
            :param group_id: 群号
        """
@@ -35,9 +33,9 @@ class LevelUser(db.Model):
        cls, user_qq: int, group_id: int, level: int, group_flag: int = 0
    ) -> bool:
        """
-        说明:
+        说明：
            设置用户在群内的权限
-        参数:
+        参数：
            :param user_qq: qq号
            :param group_id: 群号
            :param level: 权限等级
@@ -46,27 +44,24 @@ class LevelUser(db.Model):
        query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
        query = query.with_for_update()
        user = await query.gino.first()
-        try:
-            if not user:
-                await cls.create(
-                    user_qq=user_qq,
-                    group_id=group_id,
-                    user_level=level,
-                    group_flag=group_flag,
-                )
-                return True
-            else:
-                await user.update(user_level=level, group_flag=group_flag).apply()
-                return False
-        except UniqueViolationError:
+        if user is None:
+            await cls.create(
+                user_qq=user_qq,
+                group_id=group_id,
+                user_level=level,
+                group_flag=group_flag,
+            )
+            return True
+        else:
+            await user.update(user_level=level, group_flag=group_flag).apply()
            return False

    @classmethod
    async def delete_level(cls, user_qq: int, group_id: int) -> bool:
        """
-        说明:
+        说明：
            删除用户权限
-        参数:
+        参数：
            :param user_qq: qq号
            :param group_id: 群号
        """
@@ -82,9 +77,9 @@ class LevelUser(db.Model):
    @classmethod
    async def check_level(cls, user_qq: int, group_id: int, level: int) -> bool:
        """
-        说明:
+        说明：
            检查用户权限等级是否大于 level
-        参数:
+        参数：
            :param user_qq: qq号
            :param group_id: 群号
            :param level: 权限等级
@@ -112,9 +107,9 @@ class LevelUser(db.Model):
    @classmethod
    async def is_group_flag(cls, user_qq: int, group_id: int) -> bool:
        """
-        说明:
+        说明：
            检测是否会被自动更新刷新权限
-        参数:
+        参数：
            :param user_qq: qq号
            :param group_id: 群号
        """
@@ -8,7 +8,8 @@ class SignGroupUser(db.Model):

    id = db.Column(db.Integer(), primary_key=True)
    user_qq = db.Column(db.BigInteger(), nullable=False)
-    group_id = db.Column(db.BigInteger(), nullable=False)
+    belonging_group = db.Column(db.BigInteger(), nullable=False)
+
    checkin_count = db.Column(db.Integer(), nullable=False)
    checkin_time_last = db.Column(db.DateTime(timezone=True), nullable=False)
    impression = db.Column(db.Numeric(scale=3, asdecimal=False), nullable=False)
@@ -19,29 +20,29 @@ class SignGroupUser(db.Model):
        db.Numeric(scale=3, asdecimal=False), nullable=False, default=0
    )

-    _idx1 = db.Index("sign_group_users_idx1", "user_qq", "group_id", unique=True)
+    _idx1 = db.Index("sign_group_users_idx1", "user_qq", "belonging_group", unique=True)

    @classmethod
    async def ensure(
-        cls, user_qq: int, group_id: int, for_update: bool = False
+        cls, user_qq: int, belonging_group: int, for_update: bool = False
    ) -> "SignGroupUser":
        """
        说明:
            获取签到用户
        参数:
            :param user_qq: 用户qq
-            :param group_id: 所在群聊
+            :param belonging_group: 所在群聊
            :param for_update: 是否存在修改数据
        """
        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
+            (cls.user_qq == user_qq) & (cls.belonging_group == belonging_group)
        )
        if for_update:
            query = query.with_for_update()
        user = await query.gino.first()
        return user or await cls.create(
            user_qq=user_qq,
-            group_id=group_id,
+            belonging_group=belonging_group,
            checkin_count=0,
            checkin_time_last=datetime.min,  # 从未签到过
            impression=0,
@@ -78,22 +79,22 @@ class SignGroupUser(db.Model):
        ).apply()

    @classmethod
-    async def get_all_impression(cls, group_id: int) -> "list, list, list":
+    async def get_all_impression(cls, belonging_group: int) -> "list, list, list":
        """
-        说明:
+        说明：
            获取该群所有用户 id 及对应 好感度
-        参数:
-            :param group_id: 群号
+        参数：
+            :param belonging_group: 群号
        """
        impression_list = []
        user_qq_list = []
        user_group = []
-        if group_id:
-            query = cls.query.where(cls.group_id == group_id)
+        if belonging_group:
+            query = cls.query.where(cls.belonging_group == belonging_group)
        else:
            query = cls.query
        for user in await query.gino.all():
            impression_list.append(user.impression)
            user_qq_list.append(user.user_qq)
-            user_group.append(user.group_id)
+            user_group.append(user.belonging_group)
        return user_qq_list, impression_list, user_group
@@ -1,59 +0,0 @@
-from datetime import datetime
-
-from services.db_context import db
-
-
-class UserShopGoldLog(db.Model):
-    __tablename__ = "user_shop_gold_log"
-    id = db.Column(db.Integer(), primary_key=True)
-    user_qq = db.Column(db.BigInteger(), nullable=False)
-    group_id = db.Column(db.BigInteger(), nullable=False)
-    type = db.Column(db.Integer(), nullable=False)  # 0: 购买，1: 使用，2: 插件
-    name = db.Column(db.String())
-    spend_gold = db.Column(db.Integer(), nullable=False)
-    num = db.Column(db.Integer(), nullable=False)
-    create_time = db.Column(db.DateTime(timezone=True), nullable=False)
-
-    @classmethod
-    async def add_shop_log(
-        cls,
-        user_qq: int,
-        group_id: int,
-        type_: int,
-        name: str,
-        num: int,
-        spend_gold: int = 0,
-    ):
-        """
-        说明:
-            添加商店购买或使用日志
-        参数:
-            :param user_qq: qq号
-            :param group_id: 所在群号
-            :param type_: 类型
-            :param name: 商品名称
-            :param num: 数量
-            :param spend_gold: 花费金币
-        """
-        await cls.create(
-            user_qq=user_qq,
-            group_id=group_id,
-            type=type_,
-            name=name,
-            num=num,
-            spend_gold=spend_gold,
-            create_time=datetime.now(),
-        )
-
-    @classmethod
-    async def get_user_log(cls, user_qq: int, group_id: int) -> "UserShopGoldLog":
-        """
-        说明:
-            获取用户日志
-        参数:
-            :param user_qq: qq号
-            :param group_id: 所在群号
-        """
-        return await cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_qq == group_id)
-        ).first()
@@ -1,4 +1,6 @@
 from nonebot import on_regex
+from nonebot.adapters.cqhttp import Bot, MessageEvent
+from nonebot.typing import T_State
 from nonebot.rule import to_me
 from pathlib import Path

@@ -27,7 +29,7 @@ about = on_regex("^关于$", priority=5, block=True, rule=to_me())


@about.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    ver_file = Path() / '__version__'
    version = None
    if ver_file.exists():
@@ -1,14 +1,15 @@
+import random
+from nonebot import on_keyword
+import os
 from utils.message_builder import image
 from configs.path_config import IMAGE_PATH
 from nonebot import on_command
 from nonebot.rule import to_me
-from nonebot.adapters.onebot.v11 import GroupMessageEvent
-from nonebot.adapters.onebot.v11.permission import GROUP
+from nonebot.typing import T_State
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, MessageEvent
+from nonebot.adapters.cqhttp.permission import GROUP
 from utils.utils import FreqLimiter
 from configs.config import NICKNAME
-import random
-from nonebot import on_keyword
-import os


 __zx_plugin_name__ = "基本设置 [Hidden]"
@@ -24,12 +25,12 @@ config_play_game = on_keyword({"打游戏"}, permission=GROUP, priority=1, block


@config_play_game.handle()
-async def _(event: GroupMessageEvent):
+async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
    if not _flmt.check(event.group_id):
        return
    _flmt.start_cd(event.group_id)
    await config_play_game.finish(
-        image(random.choice(os.listdir(IMAGE_PATH / "dayouxi")), "dayouxi")
+        image(random.choice(os.listdir(IMAGE_PATH + "dayouxi/")), "dayouxi")
    )


@@ -39,7 +40,7 @@ self_introduction = on_command(


@self_introduction.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    if NICKNAME.find('真寻') != -1:
        result = (
            "我叫绪山真寻\n"
@@ -56,6 +57,6 @@ my_wife = on_keyword({"老婆"}, rule=to_me(), priority=5, block=True)


@my_wife.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    await my_wife.finish(image("laopo.jpg", "other"))

@@ -1,16 +1,17 @@
-
 from nonebot import on_message
-from nonebot.adapters.onebot.v11 import (
+from nonebot.adapters.cqhttp import (
    Bot,
    GroupMessageEvent,
    Message,
    MessageEvent,
 )
 from nonebot.rule import to_me
+from nonebot.typing import T_State
+
 from models.friend_user import FriendUser
 from models.group_member_info import GroupInfoUser
 from services.log import logger
-from utils.utils import get_message_img, get_message_text
+from utils.utils import get_message_text, get_message_imgs
 from .data_source import get_chat_result, hello, no_result
 from configs.config import NICKNAME, Config

@@ -20,35 +21,40 @@ usage：
    与{NICKNAME}普普通通的对话吧！
 """
 __plugin_version__ = 0.1
-__plugin_author__ = "HibiKier"
+__plugin_author__ = 'HibiKier'
 __plugin_settings__ = {
    "level": 5,
    "cmd": ["Ai", "ai", "AI", "aI"],
 }
 __plugin_configs__ = {
-    "TL_KEY": {"value": [], "help": "图灵Key"},
-    "ALAPI_AI_CHECK": {"value": False, "help": "是否检测青云客骂娘回复", "default_value": False},
-    "TEXT_FILTER": {
-        "value": ["鸡", "口交"],
-        "help": "文本过滤器，将敏感词更改为*",
-        "default_value": [],
+    "TL_KEY": {
+        "value": [],
+        "help": "图灵Key"
    },
+    "ALAPI_AI_CHECK": {
+        "value": False,
+        "help": "是否检测青云客骂娘回复",
+        "default_value": False
+    }
 }
 Config.add_plugin_config(
-    "alapi", "ALAPI_TOKEN", None, help_="在 https://admin.alapi.cn/user/login 登录后获取token"
+    "alapi",
+    "ALAPI_TOKEN",
+    None,
+    help_="在https://admin.alapi.cn/user/login登录后获取token"
 )

-ai = on_message(rule=to_me(), priority=998)
+ai = on_message(rule=to_me(), priority=8)


@ai.handle()
-async def _(bot: Bot, event: MessageEvent):
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    msg = get_message_text(event.json())
-    img = get_message_img(event.json())
+    imgs = get_message_imgs(event.json())
    if "CQ:xml" in str(event.get_message()):
        return
    # 打招呼
-    if (not msg and not img) or msg in [
+    if (not msg and not imgs) or msg in [
        "你好啊",
        "你好",
        "在吗",
@@ -59,7 +65,7 @@ async def _(bot: Bot, event: MessageEvent):
        "在",
    ]:
        await ai.finish(hello())
-    img = img[0] if img else ""
+    img = imgs[0] if imgs else ""
    if isinstance(event, GroupMessageEvent):
        nickname = await GroupInfoUser.get_group_member_nickname(
            event.user_id, event.group_id
@@ -68,7 +74,7 @@ async def _(bot: Bot, event: MessageEvent):
        nickname = await FriendUser.get_friend_nickname(event.user_id)
    if not nickname:
        if isinstance(event, GroupMessageEvent):
-            nickname = event.sender.card or event.sender.nickname
+            nickname = event.sender.card if event.sender.card else event.sender.nickname
        else:
            nickname = event.sender.nickname
    result = await get_chat_result(msg, img, event.user_id, nickname)
@@ -77,9 +83,6 @@ async def _(bot: Bot, event: MessageEvent):
        f"问题：{msg} ---- 回答：{result}"
    )
    if result:
-        result = str(result)
-        for t in Config.get_config("ai", "TEXT_FILTER"):
-            result = result.replace(t, "*")
        await ai.finish(Message(result))
    else:
        await ai.finish(no_result())
@@ -20,7 +20,7 @@ check_url = "https://v2.alapi.cn/api/censor/text"

 index = 0

-anime_data = json.load(open(DATA_PATH / "anime.json", "r", encoding="utf8"))
+anime_data = json.load(open(DATA_PATH + "anime.json", "r", encoding="utf8"))


 async def get_chat_result(text: str, img_url: str, user_id: int, nickname: str) -> str:
@@ -57,7 +57,7 @@ async def get_chat_result(text: str, img_url: str, user_id: int, nickname: str)
                if random.random() < 0.2:
                    if nickname.find("大人") == -1:
                        nickname += "大~人~"
-        rst = str(rst).replace("小主人", nickname).replace("小朋友", nickname)
+        rst = rst.replace("小主人", nickname).replace("小朋友", nickname)
    ai_message_manager.add_result(user_id, rst)
    return rst

@@ -126,39 +126,35 @@ async def xie_ai(text: str) -> str:
    """
    res = await AsyncHttpx.get(f"http://api.qingyunke.com/api.php?key=free&appid=0&msg={text}")
    content = ""
-    try:
-        data = json.loads(res.text)
-        if data["result"] == 0:
-            content = data["content"]
-            if "菲菲" in content:
-                content = content.replace("菲菲", NICKNAME)
-            if "艳儿" in content:
-                content = content.replace("艳儿", NICKNAME)
-            if "公众号" in content:
-                content = ""
-            if "{br}" in content:
-                content = content.replace("{br}", "\n")
-            if "提示" in content:
-                content = content[: content.find("提示")]
-            if "淘宝" in content or "taobao.com" in content:
-                return ""
-            while True:
-                r = re.search("{face:(.*)}", content)
-                if r:
-                    id_ = r.group(1)
-                    content = content.replace(
-                        "{" + f"face:{id_}" + "}", str(face(int(id_)))
-                    )
-                else:
-                    break
-        return (
-            content
-            if not content and not Config.get_config("ai", "ALAPI_AI_CHECK")
-            else await check_text(content)
-        )
-    except Exception as e:
-        logger.error(f"Ai xie_ai 发生错误 {type(e)}：{e}")
-        return ""
+    data = json.loads(res.text)
+    if data["result"] == 0:
+        content = data["content"]
+        if "菲菲" in content:
+            content = content.replace("菲菲", NICKNAME)
+        if "艳儿" in content:
+            content = content.replace("艳儿", NICKNAME)
+        if "公众号" in content:
+            content = ""
+        if "{br}" in content:
+            content = content.replace("{br}", "\n")
+        if "提示" in content:
+            content = content[: content.find("提示")]
+        if "淘宝" in content:
+            return ""
+        while True:
+            r = re.search("{face:(.*)}", content)
+            if r:
+                id_ = r.group(1)
+                content = content.replace(
+                    "{" + f"face:{id_}" + "}", str(face(int(id_)))
+                )
+            else:
+                break
+    return (
+        content
+        if not content and not Config.get_config("ai", "ALAPI_AI_CHECK")
+        else await check_text(content)
+    )


 def hello() -> str:
@@ -174,7 +170,7 @@ def hello() -> str:
            "呼呼，叫俺干嘛",
        )
    )
-    img = random.choice(os.listdir(IMAGE_PATH / "zai"))
+    img = random.choice(os.listdir(IMAGE_PATH + "zai/"))
    if img[-4:] == ".gif":
        result += image(img, "zai")
    else:
@@ -197,7 +193,7 @@ def no_result() -> str:
                "我！不！知！道！",
            ]
        )
-        + image(random.choice(os.listdir(IMAGE_PATH / "noresult")), "noresult")
+        + image(random.choice(os.listdir(IMAGE_PATH + "noresult/")), "noresult")
    )


@@ -1,26 +0,0 @@
-from typing import Optional, Tuple, Union
-from configs.config import Config
-from utils.http_utils import AsyncHttpx
-
-
-async def get_data(url: str, params: Optional[dict] = None) -> Tuple[Union[dict, str], int]:
-    """
-    获取ALAPI数据
-    :param url: 请求链接
-    :param params: 参数
-    """
-    if not params:
-        params = {}
-    params["token"] = Config.get_config("alapi", "ALAPI_TOKEN")
-    try:
-        data = (await AsyncHttpx.get(url, params=params, timeout=5)).json()
-        if data["code"] == 200:
-            if not data["data"]:
-                return "没有搜索到...", 997
-            return data, 200
-        else:
-            if data["code"] == 101:
-                return "缺失ALAPI TOKEN，请在配置文件中填写！", 999
-            return f'发生了错误...code：{data["code"]}', 999
-    except TimeoutError:
-        return "超时了....", 998
@@ -1,6 +1,7 @@
-from nonebot import on_regex
-from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent
-from ._data_source import get_data
+from nonebot import on_command
+from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent
+from nonebot.typing import T_State
+from .data_source import get_data
 from services.log import logger

 __zx_plugin_name__ = "网易云热评"
@@ -22,8 +23,8 @@ __plugin_settings__ = {
 }


-comments_163 = on_regex(
-    "^(网易云热评|网易云评论|到点了|12点了)$", priority=5, block=True
+comments_163 = on_command(
+    "网易云热评", aliases={"网易云评论", "到点了", "12点了"}, priority=5, block=True
 )


@@ -31,7 +32,7 @@ comments_163_url = "https://v2.alapi.cn/api/comment"


@comments_163.handle()
-async def _(event: MessageEvent):
+async def _(bot: Bot, event: MessageEvent, state: T_State):
    data, code = await get_data(comments_163_url)
    if code != 200:
        await comments_163.finish(data, at_sender=True)
@@ -1,8 +1,9 @@
 from nonebot import on_command
-from nonebot.adapters.onebot.v11 import MessageEvent, Message, GroupMessageEvent
+from nonebot.adapters.cqhttp import Bot, MessageEvent, Message, GroupMessageEvent
+from nonebot.typing import T_State
 from utils.message_builder import image
-from nonebot.params import CommandArg
-from ._data_source import get_data
+from utils.utils import get_message_text
+from .data_source import get_data
 from services.log import logger

 __zx_plugin_name__ = "b封面"
@@ -31,8 +32,8 @@ cover_url = "https://v2.alapi.cn/api/bilibili/cover"


@cover.handle()
-async def _(event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = get_message_text(event.json())
    params = {"c": msg}
    data, code = await get_data(cover_url, params)
    if code != 200:
@@ -0,0 +1,49 @@
+from nonebot.adapters.cqhttp import MessageSegment
+from utils.image_utils import BuildImage
+from utils.message_builder import image
+from configs.path_config import IMAGE_PATH
+from typing import Optional
+from configs.config import Config
+from utils.http_utils import AsyncHttpx
+
+
+async def get_data(url: str, params: Optional[dict] = None) -> "Union[dict, str], int":
+    """
+    获取ALAPI数据
+    :param url: 请求链接
+    :param params: 参数
+    """
+    if not params:
+        params = {}
+    params["token"] = Config.get_config("alapi", "ALAPI_TOKEN")
+    try:
+        data = (await AsyncHttpx.get(url, params=params, timeout=5)).json()
+        if data["code"] == 200:
+            if not data["data"]:
+                return "没有搜索到...", 997
+            return data, 200
+        else:
+            return f'发生了错误...code：{data["code"]}', 999
+    except TimeoutError:
+        return "超时了....", 998
+
+
+def gen_wbtop_pic(data: dict) -> MessageSegment:
+    """
+    生成微博热搜图片
+    :param data: 微博热搜数据
+    """
+    bk = BuildImage(700, 32 * 50 + 280, 700, 32, color="#797979")
+    wbtop_bk = BuildImage(700, 280, background=f"{IMAGE_PATH}/other/webtop.png")
+    bk.paste(wbtop_bk)
+    text_bk = BuildImage(700, 32 * 50, 700, 32, color="#797979")
+    for i, data in enumerate(data):
+        title = f"{i+1}. {data['hot_word']}"
+        hot = data["hot_word_num"]
+        img = BuildImage(700, 30, font_size=20)
+        w, h = img.getsize(title)
+        img.text((10, int((30 - h) / 2)), title)
+        img.text((580, int((30 - h) / 2)), hot)
+        text_bk.paste(img)
+    bk.paste(text_bk, (0, 280))
+    return image(b64=bk.pic2bs4())
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
HibiKier	c2a54a8164	Update update_info.json	2022-01-05 23:07:03 +08:00
HibiKier	4dbab21853	Update README.md	2022-01-05 22:57:29 +08:00
HibiKier	3063c5bc02	Update README.md	2022-01-05 22:57:08 +08:00