版本更新 (#1666)

* ✨ 父级插件加载

* ✅ 添加测试：更新与添加插件 (#1594)

* ✅ 测试更新与添加插件

* ✅ Sourcery建议

* 👷 添加pytest

* 🎨 优化代码

* 🐛 bug修复

* 🐛修复添加插件返回403的问题 (#1595)

* 完善测试方法
* vscode测试配置
* 重构插件安装过程

* 🎨 修改readme

* Update README.md

* 🐛 修改bug与版本锁定

* 🐛 修复超级用户对群组功能开关

* 🐛 修复插件商店检查插件更新问题 (#1597)

* 🐛 修复插件商店检查插件更新问题

* 🐛 恶意命令检测问题

* 🐛 增加插件状态检查 (#1598)

* ✅ 优化测试用例

* 🐛 更改插件更新与安装逻辑

* 🐛 修复更新群组成员信息

* 🎨 代码优化

* 🚀 更新Dockerfile (#1599)

* 🎨 更新requirements

* ➕ 添加依赖aiocache

* ⚡ 添加github镜像

* ✨ 添加仓库目录多获取渠道

* 🐛 修复测试用例

* ✨ 添加API缓存

* 🎨 采取Sourcery建议

* 🐛 文件下载逻辑修改

* 🎨 优化代码

* 🐛 修复插件开关有时出现错误

* ✨ 重构自检ui

* 🐛 自检html修正

* 修复签到逻辑bug，并使代码更灵活以适应签到好感度等级配置 (#1606)

* 修复签到功能已知问题

* 修复签到功能已知问题

* 修改参数名称

* 修改uid判断

---------

Co-authored-by: HibiKier <[email protected]>

* 🎨 代码结构优化

* 🐛 私聊时修改插件时删除私聊帮助

* 🐛 过滤父插件

* 🐛 修复自检在ARM上的问题 (#1607)

* 🐛 修复自检在ARM上的问题

* ✅ 优化测试

* ✨ 支持mysql，psql，sqlite随机函数

* 🔧 VSCode配置修改

* 🔧 VSCode配置修改

* ✨ 添加金币排行

Co-Authored-By: HibiKier <[email protected]>

* 📝 修改README

Co-Authored-By: HibiKier <[email protected]>

* 🔨 提取GitHub相关操作 (#1609)

* 🔨 提取GitHub相关操作

* 🔨 重构API策略

* ✨ 签到/金币排行限制最大数量 (#1616)

* ✨ 签到/金币排行限制最大数量

* 🐛 修复超级用户id获取问题

* 🐛 修复路径解压与挂载 (#1619)

* 🐛 修复功能少时zhenxun帮助图片排序问题 (#1620)

* 🐛 签到文本适应 (#1622)

* 🐛 好感度排行提供默认值 (#1624)

* 🎈 优先使用github api (#1625)

* ✨ 重构帮助，限制普通用户查询管理插件 (#1626)

* 🐛 修复群权限与插件等级匹配 (#1627)

* ✨ 当管理员尝试ban真寻时将被反杀 (#1628)

* ✨ 群组发言时间检测提供开关配置 (#1630)

* 🐳 chore: 支持自动修改版本号 (#1629)

* 🎈 perf(github_utils): 支持github url下载遍历 (#1632)

* 🎈 perf(github_utils): 支持github url下载遍历

* 🐞 fix(http_utils): 修复一些下载问题

* 🦄 refactor(http_utils): 部分重构

* chore(version): Update version to v0.2.2-e6f17c4

---------

Co-authored-by: AkashiCoin <[email protected]>

* 🧪 test(auto_update): 修复测试用例 (#1633)

* 🐛 修复商店商品为空时报错 (#1634)

* 🐛 修复群权限与插件等级匹配 (#1635)

* ✨ message_build支持AtAll (#1639)

* 🎈 perf: 使用commit号下载插件 (#1641)

* 🎈 perf: 使用commit号下载插件

* chore(version): Update version to v0.2.2-f9c7360

---------

Co-authored-by: AkashiCoin <[email protected]>

* 🐳 chore: 修改运行检查触发路径 (#1642)

* 🐳 chore: 修改运行检查触发路径

* 🐳 chore: 添加tests目录

* ✨ 重构qq群事件处理 (#1643)

* 🐛 签到名称自适应 (#1644)

* 🎨  更新README (#1645)

* 🐛 fix(http_utils): 流式下载Content-Length错误 (#1647)

* 🐛 修复群组中帮助功能状态显示问题 (#1650)

* 🐛 修复群欢迎消息设置 (#1651)

* 🐛 修复webui下载后首次启动错误 (#1652)

* 🐛 修复webui下载后首次启动错误

* chore(version): Update version to v0.2.2-4a8ef85

---------

Co-authored-by: HibiKier <[email protected]>

* ✨ 移除默认图片文件夹：爬 (#1653)

* ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654)

* ✨ 新增超级用户与管理员帮助模板 (#1655)

* ✨ 新增个人信息命令 (#1657)

* ✨ 修改个人信息菜单名称 (#1658)

* ✨ 新增插件商店api (#1659)

* ✨ 新增插件商店api

* chore(version): Update version to v0.2.2-7e15f20

---------

Co-authored-by: HibiKier <[email protected]>

* ✨ 将cd，block，count限制复原配置文件 (#1662)

* 🎨 修改README (#1663)

* 🎨 修改版本号 (#1664)

* 🎨 修改requirements (#1665)

---------

Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: fanyinrumeng <[email protected]>
Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: Elaga <[email protected]>
Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: HibiKier <[email protected]>

.env.dev

@@ -16,6 +16,8 @@ SELF_NICKNAME="小真寻"
 
 # 数据库配置
 # 示例: "postgres://user:[email protected]:5432/database"
+# 示例: "mysql://user:[email protected]:3306/database"
+# 示例: "sqlite:data/db/zhenxun.db"   在data目录下建立db文件夹
 DB_URL = ""
 
 # 系统代理

.github/workflows/bot_check.yml

@@ -3,8 +3,16 @@ name: 检查bot是否运行正常
 on:
   push:
     branches: ["dev", "main"]
+    paths:
+      - zhenxun/**
+      - tests/**
+      - bot.py
   pull_request:
     branches: ["dev", "main"]
+    paths:
+      - zhenxun/**
+      - tests/**
+      - bot.py
 
 jobs:
   bot-check:
@@ -28,7 +36,14 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pypoetry
-          key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}
+          key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ hashFiles('pyproject.toml') }}
+
+      - name: Cache playwright cache
+        id: cache-playwright
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}
 
       - name: Cache Data cache
         uses: actions/cache@v3
@@ -42,7 +57,9 @@ jobs:
           rm -rf poetry.lock
           poetry source remove ali
           poetry install --no-root
-          poetry run pip install pydantic==1.10
+
+      - name: Run tests
+        run: poetry run pytest --cov=zhenxun --cov-report xml
 
       - name: Check bot run
         id: bot_check_run

.github/workflows/update_version.yml

@@ -0,0 +1,65 @@
+name: Update Version
+
+on:
+  pull_request_target:
+    paths:
+      - zhenxun/**
+      - resources/**
+      - bot.py
+    types:
+      - opened
+      - synchronize
+    branches:
+      - main
+      - dev
+
+jobs:
+  update-version:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Read current version
+        id: read_version
+        run: |
+          version_line=$(grep '__version__' __version__)
+          version=$(echo $version_line | sed -E 's/__version__:\s*v([0-9]+\.[0-9]+\.[0-9]+)(-.+)?/\1/')
+          echo "Current version: $version"
+          echo "current_version=$version" >> $GITHUB_OUTPUT
+
+      - name: Check for version file changes
+        id: check_diff
+        run: |
+          if git diff --name-only HEAD~1 HEAD | grep -q '__version__'; then
+            echo "Version file has changes"
+            echo "version_changed=true" >> $GITHUB_OUTPUT
+          else
+            echo "Version file has no changes"
+            echo "version_changed=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Get commit hash
+        id: get_commit_hash
+        run: echo "commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Update version file
+        if: steps.check_diff.outputs.version_changed == 'false'
+        run: |
+          current_version="${{ steps.read_version.outputs.current_version }}"
+          commit_hash="${{ steps.get_commit_hash.outputs.commit_hash }}"
+          new_version="v${current_version}-${commit_hash}"
+          echo "Updating version to: $new_version"
+          echo "__version__: $new_version" > __version__
+          git config --global user.name "${{ github.event.pull_request.user.login }}"
+          git config --global user.email "${{ github.event.pull_request.user.login }}@users.noreply.github.com"
+          git add __version__
+          git remote set-url origin https://github.com/${{ github.event.pull_request.head.repo.full_name }}.git
+          git commit -m "chore(version): Update version to $new_version"
+          git push origin HEAD:${{ github.event.pull_request.head.ref }}
+
+      - name: Check updated version
+        if: steps.check_diff.outputs.version_changed == 'false'
+        run: cat __version__

.gitignore

@@ -174,11 +174,9 @@ data/
 /resources/image/prts/
 /configs/config.py
 configs/config.yaml
-./.env
-./.env.dev
 plugins/csgo_server/
 plugins/activity/
 !/resources/image/genshin/alc/back.png
 !/data/genshin_alc/
 .vscode/launch.json
-/resources/template/my_info
+plugins_/

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+  "recommendations": [
+    "charliermarsh.ruff",
+    "esbenp.prettier-vscode",
+    "ms-python.black-formatter",
+    "ms-python.isort",
+    "ms-python.python",
+    "ms-python.vscode-pylance"
+  ]
+}

.vscode/settings.json

@@ -23,7 +23,37 @@
     "ujson",
     "unban",
     "userinfo",
-    "zhenxun"
+    "zhenxun",
+    "jsdelivr"
   ],
-  "python.analysis.autoImportCompletions": true
+  "python.analysis.autoImportCompletions": true,
+  "python.testing.pytestArgs": ["tests"],
+  "python.testing.unittestEnabled": false,
+  "python.testing.pytestEnabled": true,
+  "[python]": {
+    "editor.defaultFormatter": "charliermarsh.ruff", // 默认使用 Ruff 格式化
+    "editor.wordBasedSuggestions": "allDocuments",
+    "editor.formatOnType": true,
+    "editor.formatOnSave": true, // 保存时自动格式化
+    "editor.codeActionsOnSave": {
+      "source.fixAll.ruff": "explicit",
+      "source.organizeImports": "explicit"
+    }
+  },
+  "ruff.format.preview": false,
+  "isort.check": true,
+  "ruff.importStrategy": "useBundled",
+  "ruff.organizeImports": false,
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[yaml]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[markdown]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
 }

Dockerfile

@@ -6,6 +6,13 @@ WORKDIR /app/zhenxun
 
 COPY . /app/zhenxun
 
+RUN apt update && \
+    apt upgrade -y && \
+    apt install -y --no-install-recommends \
+    gcc \
+    g++ && \
+    apt clean
+
 RUN pip install poetry -i https://mirrors.aliyun.com/pypi/simple/
 
 RUN poetry install
@@ -14,6 +21,8 @@ VOLUME /app/zhenxun/data /app/zhenxun/data
 
 VOLUME /app/zhenxun/resources /app/zhenxun/resources
 
+VOLUME /app/zhenxun/.env.dev /app/zhenxun/.env.dev
+
 RUN poetry run playwright install --with-deps chromium
 
-CMD ["poetry", "run", "python", "bot.py"]
+CMD ["poetry", "run", "python", "bot.py"]