🚑 修复代理设置问题 (#1928)

* 增强 httpx 兼容性

* 顺便修了对tx图片服务器的ssl错误

* 🚨 auto fix by pre-commit hooks

* 修复通不过检查的问题

* 🚨 auto fix by pre-commit hooks

* 适配 httpx 0.28.0+版本

* 🚨 auto fix by pre-commit hooks

* 🎨 代码格式化

* ⚡ 代码优化

* 🎨 代码格式化

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: HibiKier <45528451+HibiKier@users.noreply.github.com>

.dockerignore

@@ -1,7 +1,11 @@
 .devcontainer/
 .github/
 .vscode/
-assets/
+.idea/
+.pytest_cache/
+.ruff_cache/
+.venv/
+docs_image/
 k8s/
 tests/
 .dockerignore
@@ -9,6 +13,7 @@ tests/
 .gitignore
 .pre-commit-config.yaml
 .prettier*
+.env.dev
 docker-compose.yml
 Dockerfile
 LICENSE

.env.dev

@@ -6,7 +6,7 @@ SESSION_RUNNING_EXPRESSION="别急呀,小真寻要宕机了!QAQ"
 
 NICKNAME=["真寻", "小真寻", "绪山真寻", "小寻子"]
 
-SESSION_EXPIRE_TIMEOUT=30
+SESSION_EXPIRE_TIMEOUT=00:00:30
 
 ALCONNA_USE_COMMAND_START=True
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,98 @@
+name: Bug 反馈
+title: "Bug: "
+description: 提交 Bug 反馈以帮助我们改进代码
+labels: [ "bug" ]
+body:
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 提交前检查项
+      description: 在提交问题之前，请确认以下事项：
+      options:
+        - label: 我已搜索相关的 issue，但没有找到类似的问题
+          required: true
+        - label: 我已更新到最新版本(包括但不限于真寻本体，插件以及相关依赖)，问题仍然存在
+          required: true
+        - label: 我已仔细阅读文档，确认我的配置正确
+          required: true
+
+  - type: dropdown
+    id: env-os
+    attributes:
+      label: 操作系统
+      description: 选择运行 zhenxun_bot 的系统
+      options:
+        - Windows
+        - MacOS
+        - Linux
+        - Other
+    validations:
+      required: true
+
+  - type: input
+    id: env-python-ver
+    attributes:
+      label: Python 版本
+      description: 填写运行 zhenxun_bot 的 Python 版本
+      placeholder: e.g. 3.11.0
+    validations:
+      required: true
+
+  - type: input
+    id: env-zhenxun-ver
+    attributes:
+      label: zhenxun_bot 版本
+      description: 填写 zhenxun_bot 版本
+      placeholder: e.g. 0.1.0
+    validations:
+      required: true
+
+  - type: input
+    id: env-adapter
+    attributes:
+      label: 适配器
+      description: 填写使用的适配器以及版本
+      placeholder: e.g. OneBot v11 2.2.2
+    validations:
+      required: true
+
+  - type: input
+    id: env-protocol
+    attributes:
+      label: 协议端
+      description: 填写连接 zhenxun_bot 的协议端及版本
+      placeholder: e.g. NapCat V4.0.3
+    validations:
+      required: true
+
+  - type: textarea
+    id: describe
+    attributes:
+      label: 描述问题
+      description: 清晰简洁地说明问题是什么
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: 复现步骤
+      description: 提供能复现此问题的详细操作步骤
+      placeholder: |
+        1. 首先……
+        2. 然后……
+        3. 发生……
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: 期望的结果
+      description: 清晰简洁地描述你期望发生的事情
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: 截图或日志（请勿包含敏感信息如密码、令牌等）
+      description: 提供有助于诊断问题的任何日志和截图

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/document.yml

@@ -0,0 +1,18 @@
+name: 文档改进
+title: "Docs: 描述"
+description: 文档错误及改进意见反馈
+labels: ["documentation"]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: 描述问题或主题
+    validations:
+      required: true
+
+  - type: textarea
+    id: improve
+    attributes:
+      label: 需做出的修改
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,27 @@
+name: 功能建议
+title: "Feature: 功能描述"
+description: 提出关于项目新功能的想法
+labels: [ "enhancement" ]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: 希望能解决的问题
+      description: 在使用中遇到什么问题而需要新的功能？
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature
+    attributes:
+      label: 描述所需要的功能
+      description: 请说明需要的功能或解决方法
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 我有能力且愿意为这个功能贡献代码
+      options:
+        - label: 我有能力且愿意为这个功能贡献代码

.github/ISSUE_TEMPLATE/issue-template.md

@@ -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错误...

.github/actions/setup-python/action.yml

@@ -0,0 +1,40 @@
+name: Setup Python
+description: Setup Python
+
+inputs:
+  python-version:
+    description: Python version
+    required: false
+    default: "3.10"
+  env-dir:
+    description: Environment directory
+    required: false
+    default: "."
+  no-root:
+    description: Do not install package in the environment
+    required: false
+    default: "false"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install poetry
+      run: pipx install poetry
+      shell: bash
+
+    - uses: actions/setup-python@v5
+      with:
+        python-version: ${{ inputs.python-version }}
+        cache: "poetry"
+        cache-dependency-path: |
+          ./poetry.lock
+          ${{ inputs.env-dir }}/poetry.lock
+
+    - run: |
+        cd ${{ inputs.env-dir }}
+        if [ "${{ inputs.no-root }}" = "true" ]; then
+          poetry install --all-extras --no-root
+        else
+          poetry install --all-extras
+        fi
+      shell: bash

.github/workflows/ISSUE_TEMPLATE.md

@@ -1,9 +0,0 @@
-### 系统版本：Ubuntu 20.04
-### 真寻版本：0.1.5.3
-
-### 错误截图
-
-[img]
-
-### 错误说明
-发生了xx错误...

.github/workflows/bot_check.yml

@@ -2,16 +2,18 @@ name: 检查bot是否运行正常
 
 on:
   push:
-    branches: ["dev", "main"]
+    branches: ["main"]
     paths:
       - zhenxun/**
       - tests/**
+      - .github/workflows/bot_check.yml
       - bot.py
   pull_request:
-    branches: ["dev", "main"]
+    branches: ["main"]
     paths:
       - zhenxun/**
       - tests/**
+      - .github/workflows/bot_check.yml
       - bot.py
 
 jobs:
@@ -55,9 +57,18 @@ jobs:
         if: steps.cache-poetry.outputs.cache-hit != 'true'
         run: |
           rm -rf poetry.lock
-          poetry source remove ali
+          poetry source remove aliyun
           poetry install --no-root
 
+      - name: Install playwright
+        if: steps.cache-playwright.outputs.cache-hit != 'true'
+        run: |
+          poetry run sudo apt-get update
+          poetry run sudo apt-get install -y libgstreamer-plugins-base1.0-0 libgstreamer1.0-0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-libav flite x264 libx264-dev
+          poetry run pip install playwright
+          poetry run playwright install-deps
+          poetry run playwright install
+
       - name: Run tests
         run: poetry run pytest --cov=zhenxun --cov-report xml
 

.github/workflows/codeql.yml

@@ -0,0 +1,94 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Code Security Analysis"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '45 21 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: python
+            build-mode: none
+          - language: javascript-typescript
+            build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # If the analyze step fails for one of the languages you are analyzing with
+      # "We were unable to automatically build your code", modify the matrix above
+      # to set the build mode to "manual" for that language. Then modify this step
+      # to build your code.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      - if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          echo 'If you are using a "manual" build mode for one or more of the' \
+            'languages you are analyzing, replace this with the commands to build' \
+            'your code, for example:'
+          echo '  make bootstrap'
+          echo '  make release'
+          exit 1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"

.github/workflows/linting.yml

@@ -0,0 +1,11 @@
+name: Sequential Lint and Type Check
+
+on: [push, pull_request]
+
+jobs:
+  ruff-call:
+    uses: ./.github/workflows/ruff.yml
+
+  pyright-call:
+    needs: ruff-call
+    uses: ./.github/workflows/pyright.yml

.github/workflows/pyright.yml

@@ -0,0 +1,55 @@
+name: Pyright Lint
+
+on:
+  workflow_call:
+
+  workflow_dispatch:
+    inputs:
+      python-version:
+        description: "Python version"
+        required: false
+        type: choice
+        options:
+          - "all"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+        default: "all"
+      debug-mode:
+        description: "enable debug mode"
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  pyright:
+    name: Pyright Lint
+    runs-on: ubuntu-latest
+    concurrency:
+      group: pyright-${{ github.ref }}-${{ matrix.env }}
+      cancel-in-progress: true
+    strategy:
+      matrix:
+        env: [pydantic-v1, pydantic-v2]
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Python environment
+        uses: ./.github/actions/setup-python
+        with:
+          env-dir: ./envs/${{ matrix.env }}
+          no-root: true
+
+      - run: |
+          (cd ./envs/${{ matrix.env }} && echo "$(poetry env info --path)/bin" >> $GITHUB_PATH)
+          if [ "${{ matrix.env }}" = "pydantic-v1" ]; then
+            sed -i 's/PYDANTIC_V2 = true/PYDANTIC_V2 = false/g' ./pyproject.toml
+          fi
+        shell: bash
+
+      - name: Run Pyright Check
+        uses: jakebailey/pyright-action@v2
+        with:
+          pylance-version: latest-release

.github/workflows/ruff.yml

@@ -0,0 +1,20 @@
+name: Ruff Lint
+
+on:
+  workflow_call:
+
+jobs:
+  ruff:
+    name: Ruff Lint
+    runs-on: ubuntu-latest
+    concurrency:
+      group: ruff-${{ github.ref }}
+      cancel-in-progress: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Ruff
+        uses: astral-sh/ruff-action@v3
+      - name: Run Ruff Check
+        run: ruff check

.gitignore

@@ -113,6 +113,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.env.dev
 
 # Spyder project settings
 .spyderproject
@@ -151,32 +152,9 @@ backup/
 extensive_plugin/
 test/
 bot.py
-data/
-.env
-.env.dev
-/resources/text/
-# /resources/image/
-/resources/temp/
-/resources/image/genshin/
-/resources/image/draw_card/
-/resources/image/card/
-/resources/image/temp/
-/resources/image/sign/today_card/
-/resources/image/image_management/
-/resources/image/bilibili_sub/
-/resources/image/other/
-/resources/image/_setu/
-/resources/image/_r18/
-/resources/image/csgo_cases/
-!/resources/image/csgo_cases/_background/
-/resources/image/superuser_help.png
-/resources/image/update_img_help.png
-/resources/image/prts/
+.idea/
+resources/
 /configs/config.py
 configs/config.yaml
-plugins/csgo_server/
-plugins/activity/
-!/resources/image/genshin/alc/back.png
-!/data/genshin_alc/
 .vscode/launch.json
 plugins_/

.markdownlint.yaml

@@ -0,0 +1,4 @@
+MD013: false
+MD024: # 重复标题
+  siblings_only: true
+MD033: false # 允许 html

.pre-commit-config.yaml

@@ -1,33 +1,16 @@
-default_install_hook_types: [pre-commit, prepare-commit-msg]
+default_install_hook_types: [pre-commit]
 ci:
   autofix_commit_msg: ":rotating_light: auto fix by pre-commit hooks"
   autofix_prs: true
-  autoupdate_branch: dev
-  autoupdate_schedule: weekly
+  autoupdate_branch: main
+  autoupdate_schedule: monthly
   autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.6
+    rev: v0.8.2
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
-        stages: [commit]
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        stages: [commit]
-
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
-    hooks:
-      - id: black
-        stages: [commit]
-
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
-    hooks:
-      - id: prettier
-        types_or: [javascript, jsx, ts, tsx, markdown, yaml, json]
-        stages: [commit]
+        args: [--fix]
+        stages: [pre-commit]
+      - id: ruff-format
+        stages: [pre-commit]

.vscode/extensions.json

@@ -2,8 +2,6 @@
   "recommendations": [
     "charliermarsh.ruff",
     "esbenp.prettier-vscode",
-    "ms-python.black-formatter",
-    "ms-python.isort",
     "ms-python.python",
     "ms-python.vscode-pylance"
   ]

.vscode/settings.json

@@ -16,6 +16,7 @@
     "jsdelivr",
     "kaiheila",
     "lolicon",
+    "Mahiro",
     "nonebot",
     "onebot",
     "pixiv",
@@ -24,6 +25,7 @@
     "tobytes",
     "ujson",
     "unban",
+    "Uninfo",
     "userinfo",
     "zhenxun"
   ],
@@ -32,10 +34,10 @@
   "python.testing.unittestEnabled": false,
   "python.testing.pytestEnabled": true,
   "[python]": {
-    "editor.defaultFormatter": "charliermarsh.ruff", // 默认使用 Ruff 格式化
+    "editor.defaultFormatter": "charliermarsh.ruff",
     "editor.wordBasedSuggestions": "allDocuments",
     "editor.formatOnType": true,
-    "editor.formatOnSave": true, // 保存时自动格式化
+    "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
       "source.fixAll.ruff": "explicit",
       "source.organizeImports": "explicit"

CODE_OF_CONDUCT.md

@@ -0,0 +1,87 @@
+# zhenxun_bot 贡献者公约
+
+## 我们的承诺
+
+身为社区成员、贡献者和负责人，我们承诺使社区参与者不受骚扰，无论其年龄、体型、可见或不可见的缺陷、族裔、性征、性别认同和表达、经验水平、教育程度、社会与经济地位、国籍、相貌、种族、种姓、肤色、宗教信仰、性倾向或性取向如何。
+
+我们承诺以有助于建立开放、友善、多样化、包容、健康社区的方式行事和互动。
+
+## 我们的准则
+
+有助于为我们的社区创造积极环境的行为例子包括但不限于：
+
+* 表现出对他人的同情和善意
+* 尊重不同的主张、观点和感受
+* 提出和大方接受建设性意见
+* 承担责任并向受我们错误影响的人道歉
+* 注重社区共同诉求，而非个人得失
+
+不当行为例子包括：
+
+* 使用情色化的语言或图像，及性引诱或挑逗
+* 嘲弄、侮辱或诋毁性评论，以及人身或政治攻击
+* 公开或私下的骚扰行为
+* 未经他人明确许可，公布他人的私人信息，如物理或电子邮件地址
+* 其他有理由认定为违反职业操守的不当行为
+
+## 责任和权力
+
+社区负责人有责任解释和落实我们所认可的行为准则，并妥善公正地对他们认为不当、威胁、冒犯或有害的任何行为采取纠正措施。
+
+社区负责人有权力和责任删除、编辑或拒绝或拒绝与本行为准则不相符的评论（comment）、提交（commits）、代码、维基（wiki）编辑、议题（issues）或其他贡献，并在适当时机知采取措施的理由。
+
+## 适用范围
+
+本行为准则适用于所有社区场合，也适用于在公共场所代表社区时的个人。
+
+代表社区的情形包括使用官方电子邮件地址、通过官方社交媒体帐户发帖或在线上或线下活动中担任指定代表。
+
+## 监督
+
+辱骂、骚扰或其他不可接受的行为可通过 775757368@qq.com 向负责监督的社区负责人报告。
+所有投诉都将得到及时和公平的审查和调查。
+
+所有社区负责人都有义务尊重任何事件报告者的隐私和安全。
+
+## 处理方针
+
+社区负责人将遵循下列社区处理方针来明确他们所认定违反本行为准则的行为的处理方式：
+
+### 1. 纠正
+
+**社区影响**：使用不恰当的语言或其他在社区中被认定为不符合职业道德或不受欢迎的行为。
+
+**处理意见**：由社区负责人发出非公开的书面警告，明确说明违规行为的性质，并解释举止如何不妥。或将要求公开道歉。
+
+### 2. 警告
+
+**社区影响**：单个或一系列违规行为。
+
+**处理意见**：警告并对连续性行为进行处理。在指定时间内，不得与相关人员互动，包括主动与行为准则执行者互动。这包括避免在社区场所和外部渠道中的互动。违反这些条款可能会导致临时或永久封禁。
+
+### 3. 临时封禁
+
+**社区影响**: 严重违反社区准则，包括持续的不当行为。
+
+**处理意见**: 在指定时间内，暂时禁止与社区进行任何形式的互动或公开交流。在此期间，不得与相关人员进行公开或私下互动，包括主动与行为准则执行者互动。违反这些条款可能会导致永久封禁。
+
+### 4. 永久封禁
+
+**社区影响**：行为模式表现出违反社区准则，包括持续的不当行为、骚扰个人或攻击或贬低某个类别的个体。
+
+**处理意见**：永久禁止在社区内进行任何形式的公开互动。
+
+## 参见
+
+本行为准则改编自 [Contributor Covenant][homepage] 2.1 版, 参见 [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]。
+
+社区处理方针灵感来源于 [Mozilla's code of conduct enforcement ladder][Mozilla CoC]。
+
+有关本行为准则的常见问题的答案，参见 [https://www.contributor-covenant.org/faq][FAQ]。
+其他语言翻译参见 [https://www.contributor-covenant.org/translations][translations]。
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

@@ -0,0 +1,95 @@
+# zhenxun_bot 贡献指南
+
+首先，感谢你愿意为 zhenxun_bot 贡献自己的一份力量！
+
+本指南旨在引导你更规范地向 zhenxun_bot 提交贡献，请务必认真阅读。
+
+## 提交 Issue
+
+在提交 Issue 前，我们建议你先查看 [已有的 Issues](https://github.com/HibiKier/zhenxun_bot/issues)，以防重复提交。
+
+### 报告问题、故障与漏洞
+
+如果你在使用过程中发现问题并确信是由 zhenxun_bot 引起的，欢迎提交 Issue。
+
+请使用我们提供的 **Bug 反馈** 模板，并尽可能详细地描述：
+
+- 问题描述
+- 重现步骤
+- 你的环境信息（如操作系统、依赖版本等）
+
+### 建议功能
+
+如果你有新的功能需求或改进建议，欢迎提出。
+
+请使用 **功能建议** 模板，并详细描述你所需要的特性，可能的话可以提出你认为可行的解决方案。
+
+### 文档相关
+
+如果你觉得文档有误或缺乏更新，欢迎提出。
+
+请使用 **文档改进** 模板，并详细描述问题或主题，希望我们做出的修改
+
+## Pull Request
+
+### 分支管理
+
+请从 `main` 分支创建新功能分支，例如：
+
+- 新功能：`feature/功能描述`
+- 问题修复：`bugfix/问题描述`
+
+### 代码风格
+
+zhenxun_bot 使用 `pre-commit` 进行代码格式化和检查，请在提交前确保代码通过检查。
+
+```bash
+# 在安装项目依赖后安装 pre-commit 钩子
+pre-commit install
+```
+
+> 未通过 `pre-commit` 检查的代码将无法合并。
+
+### Commit 规范
+
+请确保你的每一个 commit 都能清晰地描述其意图，一个 commit 尽量只有一个目的。
+
+我们建议遵循 [gitmoji](https://gitmoji.dev/) 的 commit message 格式，在创建 commit 时请牢记这一点。
+
+### 工作流程概述
+
+`main` 分支为 zhenxun_bot 的主分支，在任何情况下都请不要直接修改 `main` 分支，而是创建一个目标分支为 `main` 的 Pull Request 来提交修改。Pull Request 标题请尽量清晰，以便维护者进行审核。
+
+如果你不是 zhenxun_bot 团队的成员，可在 fork 本仓库后，向本仓库的 `main` 分支发起 Pull Request，注意遵循先前提到的 commit message 规范创建 commit。我们将在 code review 通过后合并你的贡献。
+
+### 撰写文档
+
+如果你对文档有改进建议，欢迎提交 Pull Request 或者 Issue。
+
+[//]: # (我们使用 Markdown 编写文档，建议遵循以下规范：)
+
+[//]: # ()
+[//]: # (1. 中文与英文、数字、半角符号之间需要有空格。例：`zhenxun_bot 是一个高效的聊天机器人。`)
+
+[//]: # (2. 若非英文整句，使用全角标点符号。例：`现在你可以看到机器人回复你：“Hello，世界！”。`)
+
+[//]: # (3. 直引号`「」`和弯引号`“”`都可接受，但同一份文件里应使用同种引号。)
+
+[//]: # (4. **不要使用斜体**，你不需要一种与粗体不同的强调。)
+
+[//]: # (5. 文档中应以“我们”指代开发者，以“用户”指代机器人的使用者。)
+
+[//]: # ()
+[//]: # (如果你需要编辑器检查 Markdown 规范，可以在 VSCode 中安装 `markdownlint` 扩展。)
+
+### 参与开发
+
+zhenxun_bot 的代码风格遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) 与 [PEP 484](https://www.python.org/dev/peps/pep-0484/) 规范，请确保你的代码风格和项目已有的代码保持一致，变量命名清晰，有适当的注释与测试代码。
+
+> 暂未搭建测试框架，因此暂不要求添加测试代码。
+
+## 项目沟通
+
+如有关于贡献流程的疑问或需要进一步指导，请通过 [QQ群](https://jq.qq.com/?_wv=1027&k=u8PgBkMZ) 联系我们。
+
+再次感谢你的贡献！

Dockerfile

@@ -1,28 +1,67 @@
-FROM python:3.11-slim-bookworm
+FROM python:3.11-bookworm AS requirements-stage
 
-EXPOSE 8080
+WORKDIR /tmp
+
+ENV POETRY_HOME="/opt/poetry" PATH="${PATH}:/opt/poetry/bin"
+
+RUN curl -sSL https://install.python-poetry.org | python - -y && \
+  poetry self add poetry-plugin-export
+
+COPY ./pyproject.toml ./poetry.lock* /tmp/
+
+RUN poetry export \
+      -f requirements.txt \
+      --output requirements.txt \
+      --without-hashes \
+      --without-urls
+
+FROM python:3.11-bookworm AS build-stage
+
+WORKDIR /wheel
+
+COPY --from=requirements-stage /tmp/requirements.txt /wheel/requirements.txt
+
+# RUN python3 -m pip config set global.index-url https://mirrors.aliyun.com/pypi/simple
+
+RUN pip wheel --wheel-dir=/wheel --no-cache-dir --requirement /wheel/requirements.txt
+
+FROM python:3.11-bookworm AS metadata-stage
+
+WORKDIR /tmp
+
+RUN --mount=type=bind,source=./.git/,target=/tmp/.git/ \
+  git describe --tags --exact-match > /tmp/VERSION 2>/dev/null \
+  || git rev-parse --short HEAD > /tmp/VERSION \
+  && echo "Building version: $(cat /tmp/VERSION)"
+
+FROM python:3.11-slim-bookworm
 
 WORKDIR /app/zhenxun
 
-COPY . /app/zhenxun
+ENV TZ=Asia/Shanghai PYTHONUNBUFFERED=1
+#COPY ./scripts/docker/start.sh /start.sh
+#RUN chmod +x /start.sh
+
+EXPOSE 8080
 
 RUN apt update && \
-    apt upgrade -y && \
-    apt install -y --no-install-recommends \
-    gcc \
-    g++ && \
-    apt clean
+    apt install -y --no-install-recommends curl fontconfig fonts-noto-color-emoji \
+    && apt clean \
+    && fc-cache -fv \
+    && apt-get purge -y --auto-remove curl \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN pip install poetry -i https://mirrors.aliyun.com/pypi/simple/
+# 复制依赖项和应用代码
+COPY --from=build-stage /wheel /wheel
+COPY . .
 
-RUN poetry install
+RUN pip install --no-cache-dir --no-index --find-links=/wheel -r /wheel/requirements.txt && rm -rf /wheel
 
-VOLUME /app/zhenxun/data /app/zhenxun/data
+RUN playwright install --with-deps chromium \
+  && rm -rf /var/lib/apt/lists/* /tmp/*
 
-VOLUME /app/zhenxun/resources /app/zhenxun/resources
+COPY --from=metadata-stage /tmp/VERSION /app/VERSION
 
-VOLUME /app/zhenxun/.env.dev /app/zhenxun/.env.dev
+VOLUME ["/app/zhenxun/data", "/app/zhenxun/resources", "/app/zhenxun/log"]
 
-RUN poetry run playwright install --with-deps chromium
-
-CMD ["poetry", "run", "python", "bot.py"]
+CMD ["python", "bot.py"]

__version__

@@ -1 +1 @@
-__version__: v0.2.4-fix2
+__version__: v0.2.4-2c97eea

bot.py

@@ -1,8 +1,8 @@
 import nonebot
 
 # from nonebot.adapters.discord import Adapter as DiscordAdapter
-from nonebot.adapters.dodo import Adapter as DoDoAdapter
-from nonebot.adapters.kaiheila import Adapter as KaiheilaAdapter
+# from nonebot.adapters.dodo import Adapter as DoDoAdapter
+# from nonebot.adapters.kaiheila import Adapter as KaiheilaAdapter
 from nonebot.adapters.onebot.v11 import Adapter as OneBotV11Adapter
 
 nonebot.init()
@@ -10,13 +10,13 @@ nonebot.init()
 
 driver = nonebot.get_driver()
 driver.register_adapter(OneBotV11Adapter)
-driver.register_adapter(KaiheilaAdapter)
-driver.register_adapter(DoDoAdapter)
+# driver.register_adapter(KaiheilaAdapter)
+# driver.register_adapter(DoDoAdapter)
 # driver.register_adapter(DiscordAdapter)
 
-from zhenxun.services.db_context import init, disconnect
+from zhenxun.services.db_context import disconnect
 
-driver.on_startup(init)
+# driver.on_startup(init)
 driver.on_shutdown(disconnect)
 
 # nonebot.load_builtin_plugins("echo")

data/genshin_alc/config.json

@@ -1,66 +0,0 @@
-{
-  "抽卡":{
-    "buff": ["欧气满满，十连出金","出金不歪"],
-    "debuff": ["武器大师","保底出金","金色会是痛苦大剑"]
-  },
-  "刷世界boss":{
-    "buff": ["双攻双爆角斗士"],
-    "debuff": ["只有保底材料","贪生怕死角斗士"]
-  },
-  "刷风本":{
-    "buff": ["会有极品猎人套","会掉真正的少女心","治疗加成少女头"],
-    "debuff": ["勇往直前少女心","少女飘摇的杀意","少女暴怒的容颜"]
-  },
-  "刷火本":{
-    "buff": ["魔女帽子火伤杯","暴伤魔女帽！","火伤魔女心！"],
-    "debuff": ["幡 然 醒 悟","这么阴间的地方真的会有魔女套吗？","不务正业火魔女","会匹配到3个卢姥爷"]
-  },
-  "刷岩本":{
-    "buff": ["悠久的磐岩伴你左右","岩神的庇护常在"],
-    "debuff": ["防御流星杯，你值得拥有"]
-  },
-  "刷宗室":{
-    "buff": ["物理伤害骑士道，元素精通宗室套"],
-    "debuff": ["贪生怕死骑士道，物理伤害宗室杯"]
-  },
-  "刷冰本":{
-    "buff": ["双暴词条概率up"],
-    "debuff": ["防御力船帽，无人可及"]
-  },
-  "刷雷本":{
-    "buff": ["愿雷鸟伴你左右"],
-    "debuff": ["来表演一个只掉平雷套的绝活","风神忽悠雷凶兆"]
-  },
-  "锄大地":{
-    "buff": ["会掉一大堆紫色材料"],
-    "debuff": ["深渊法师爱你哟","会被冰水法控到死"]
-  },
-  "挖矿":{
-    "buff": ["开矿出双材料"],
-    "debuff": ["去别人世界会被拒"]
-  },
-  "刷天赋本":{
-    "buff": ["金色！我看到了金色的书！"],
-    "debuff": ["2蓝2绿不会变"]
-  },
-  "刷突破材料":{
-    "buff": ["金色！我看到了金色的材料！"],
-    "debuff": ["2蓝2绿不会变"]
-  },
-  "升级圣遗物":{
-    "buff": ["稀有词条跳跳跳","会双爆拉满"],
-    "debuff": ["女 仆 狂 喜","无中生有防御力","生命拉满","完美避开双爆"]
-  },
-  "打风魔龙":{
-    "buff": ["看我一箭一个风魔鸡","今天特瓦林可以给想要的突破材料","5金加原胚！"],
-    "debuff": ["会不小心掉下平台","不小心被地板烫死了"]
-  },
-  "打狼王":{
-    "buff": ["今天安德琉斯的心情不错，可以py一下","5金加原胚！"],
-    "debuff": ["狼尾巴*1"]
-  },
-  "打公子":{
-    "buff": ["今天可以和公子py想要的突破材料","5金加原胚！"],
-    "debuff": ["要角没有！要命一条！"]
-  }
-}

docker-compose-dev.yml

@@ -0,0 +1,67 @@
+services:
+  db:
+    image: postgres:15
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: zhenxun
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    labels:
+      - "prometheus.io/scrape=true"
+      - "prometheus.io/port=9187"
+
+  postgres-exporter:
+    image: prometheuscommunity/postgres-exporter
+    environment:
+      DATA_SOURCE_NAME: "postgresql://postgres:password@db:5432/zhenxun?sslmode=disable"
+    ports:
+      - "9187:9187"
+    depends_on:
+      - db
+
+  redis:
+    image: redis:7
+    ports:
+      - "6379:6379"
+    labels:
+      - "prometheus.io/scrape=true"
+      - "prometheus.io/port=9121"
+
+  redis-exporter:
+    image: oliver006/redis_exporter
+    environment:
+      REDIS_ADDR: redis://redis:6379
+    ports:
+      - "9121:9121"
+    depends_on:
+      - redis
+
+  prometheus:
+    image: prom/prometheus
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+      - prometheus_data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+      - '--web.console.libraries=/etc/prometheus/console_libraries'
+      - '--web.console.templates=/etc/prometheus/consoles'
+
+  grafana:
+    image: grafana/grafana
+    ports:
+      - "3000:3000"
+    volumes:
+      - grafana_data:/var/lib/grafana
+    depends_on:
+      - prometheus
+
+volumes:
+  pgdata:
+  prometheus_data:
+  grafana_data:

envs/pydantic-v1/pyproject.toml

@@ -0,0 +1,140 @@
+[tool.poetry]
+name = "zhenxun_bot"
+version = "0.2.4"
+description = "基于 Nonebot2 和 go-cqhttp 开发，以 postgresql 作为数据库，非常可爱的绪山真寻bot"
+authors = ["HibiKier <775757368@qq.com>"]
+license = "AGPL"
+package-mode = false
+
+[[tool.poetry.source]]
+name = "aliyun"
+url = "https://mirrors.aliyun.com/pypi/simple/"
+priority = "primary"
+
+[tool.poetry.dependencies]
+python = "^3.10"
+playwright = "^1.41.1"
+nonebot-adapter-onebot = "^2.3.1"
+nonebot-plugin-apscheduler = "^0.5"
+tortoise-orm = { extras = ["asyncpg"], version = "^0.20.0" }
+cattrs = "^23.2.3"
+ruamel-yaml = "^0.18.5"
+strenum = "^0.4.15"
+nonebot-plugin-session = "^0.2.3"
+ujson = "^5.9.0"
+nb-cli = "^1.3.0"
+nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
+pillow = "^10.0.0"
+retrying = "^1.3.4"
+aiofiles = "^23.2.1"
+nonebot-plugin-htmlrender = ">=0.6.0,<1.0.0"
+pypinyin = "^0.51.0"
+beautifulsoup4 = "^4.12.3"
+lxml = "^5.1.0"
+psutil = "^5.9.8"
+feedparser = "^6.0.11"
+imagehash = "^4.3.1"
+cn2an = "^0.5.22"
+dateparser = "^1.2.0"
+bilireq = "0.2.3post0"
+python-jose = { extras = ["cryptography"], version = "^3.3.0" }
+python-multipart = "^0.0.9"
+aiocache = "^0.12.2"
+py-cpuinfo = "^9.0.0"
+nonebot-plugin-alconna = "^0.54.0"
+tenacity = "^9.0.0"
+nonebot-plugin-uninfo = ">0.4.1"
+pydantic = "1.10.18"
+
+[tool.poetry.group.dev.dependencies]
+nonebug = "^0.4"
+pytest-cov = "^5.0.0"
+pytest-mock = "^3.6.1"
+pytest-asyncio = "^0.25"
+pytest-xdist = "^3.3.1"
+respx = "^0.21.1"
+ruff = "^0.8.0"
+pre-commit = "^4.0.0"
+
+
+[tool.nonebot]
+plugins = [
+    "nonebot_plugin_apscheduler",
+    "nonebot_plugin_session",
+    "nonebot_plugin_htmlrender",
+    "nonebot_plugin_alconna",
+]
+plugin_dirs = ["zhenxun/services", "zhenxun/builtin_plugins", "zhenxun/plugins"]
+adapters = [
+    { name = "OneBot V11", module_name = "nonebot.adapters.onebot.v11" },
+    #    { name = "DoDo", module_name = "nonebot.adapters.dodo" },
+    #    { name = "开黑啦", module_name = "nonebot.adapters.kaiheila" },
+]
+
+[tool.ruff]
+line-length = 88
+target-version = "py310"
+
+[tool.ruff.format]
+line-ending = "lf"
+
+[tool.ruff.lint]
+select = [
+    "F", # Pyflakes
+    "W", # pycodestyle warnings
+    "E", # pycodestyle errors
+    "I", # isort
+    "UP", # pyupgrade
+    "ASYNC", # flake8-async
+    "C4", # flake8-comprehensions
+    "T10", # flake8-debugger
+    "T20", # flake8-print
+    "PYI", # flake8-pyi
+    "PT", # flake8-pytest-style
+    "Q", # flake8-quotes
+    "TID", # flake8-tidy-imports
+    "RUF", # Ruff-specific rules
+]
+ignore = [
+    "E402", # module-import-not-at-top-of-file
+    "UP037", # quoted-annotation
+    "RUF001", # ambiguous-unicode-character-string
+    "RUF002", # ambiguous-unicode-character-docstring
+    "RUF003", # ambiguous-unicode-character-comment
+    "TID252", # relative-imports
+]
+
+[tool.ruff.lint.isort]
+force-sort-within-sections = true
+known-first-party = ["zhenxun", "tests/*"]
+extra-standard-library = ["typing_extensions"]
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+mark-parentheses = false
+
+[tool.ruff.lint.pyupgrade]
+keep-runtime-typing = true
+
+[tool.pyright]
+pythonVersion = "3.10"
+pythonPlatform = "All"
+defineConstant = { PYDANTIC_V2 = true }
+executionEnvironments = [
+    { root = "./tests", extraPaths = [
+        "./",
+    ] },
+    { root = "./" },
+]
+
+typeCheckingMode = "standard"
+reportShadowedImports = false
+disableBytesTypePromotions = true
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

envs/pydantic-v2/pyproject.toml

@@ -0,0 +1,140 @@
+[tool.poetry]
+name = "zhenxun_bot"
+version = "0.2.4"
+description = "基于 Nonebot2 和 go-cqhttp 开发，以 postgresql 作为数据库，非常可爱的绪山真寻bot"
+authors = ["HibiKier <775757368@qq.com>"]
+license = "AGPL"
+package-mode = false
+
+[[tool.poetry.source]]
+name = "aliyun"
+url = "https://mirrors.aliyun.com/pypi/simple/"
+priority = "primary"
+
+[tool.poetry.dependencies]
+python = "^3.10"
+playwright = "^1.41.1"
+nonebot-adapter-onebot = "^2.3.1"
+nonebot-plugin-apscheduler = "^0.5"
+tortoise-orm = { extras = ["asyncpg"], version = "^0.20.0" }
+cattrs = "^23.2.3"
+ruamel-yaml = "^0.18.5"
+strenum = "^0.4.15"
+nonebot-plugin-session = "^0.2.3"
+ujson = "^5.9.0"
+nb-cli = "^1.3.0"
+nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
+pillow = "^10.0.0"
+retrying = "^1.3.4"
+aiofiles = "^23.2.1"
+nonebot-plugin-htmlrender = ">=0.6.0,<1.0.0"
+pypinyin = "^0.51.0"
+beautifulsoup4 = "^4.12.3"
+lxml = "^5.1.0"
+psutil = "^5.9.8"
+feedparser = "^6.0.11"
+imagehash = "^4.3.1"
+cn2an = "^0.5.22"
+dateparser = "^1.2.0"
+bilireq = "0.2.3post0"
+python-jose = { extras = ["cryptography"], version = "^3.3.0" }
+python-multipart = "^0.0.9"
+aiocache = "^0.12.2"
+py-cpuinfo = "^9.0.0"
+nonebot-plugin-alconna = "^0.54.0"
+tenacity = "^9.0.0"
+nonebot-plugin-uninfo = ">0.4.1"
+pydantic = "2.10.6"
+
+[tool.poetry.group.dev.dependencies]
+nonebug = "^0.4"
+pytest-cov = "^5.0.0"
+pytest-mock = "^3.6.1"
+pytest-asyncio = "^0.25"
+pytest-xdist = "^3.3.1"
+respx = "^0.21.1"
+ruff = "^0.8.0"
+pre-commit = "^4.0.0"
+
+
+[tool.nonebot]
+plugins = [
+    "nonebot_plugin_apscheduler",
+    "nonebot_plugin_session",
+    "nonebot_plugin_htmlrender",
+    "nonebot_plugin_alconna",
+]
+plugin_dirs = ["zhenxun/services", "zhenxun/builtin_plugins", "zhenxun/plugins"]
+adapters = [
+    { name = "OneBot V11", module_name = "nonebot.adapters.onebot.v11" },
+    #    { name = "DoDo", module_name = "nonebot.adapters.dodo" },
+    #    { name = "开黑啦", module_name = "nonebot.adapters.kaiheila" },
+]
+
+[tool.ruff]
+line-length = 88
+target-version = "py310"
+
+[tool.ruff.format]
+line-ending = "lf"
+
+[tool.ruff.lint]
+select = [
+    "F", # Pyflakes
+    "W", # pycodestyle warnings
+    "E", # pycodestyle errors
+    "I", # isort
+    "UP", # pyupgrade
+    "ASYNC", # flake8-async
+    "C4", # flake8-comprehensions
+    "T10", # flake8-debugger
+    "T20", # flake8-print
+    "PYI", # flake8-pyi
+    "PT", # flake8-pytest-style
+    "Q", # flake8-quotes
+    "TID", # flake8-tidy-imports
+    "RUF", # Ruff-specific rules
+]
+ignore = [
+    "E402", # module-import-not-at-top-of-file
+    "UP037", # quoted-annotation
+    "RUF001", # ambiguous-unicode-character-string
+    "RUF002", # ambiguous-unicode-character-docstring
+    "RUF003", # ambiguous-unicode-character-comment
+    "TID252", # relative-imports
+]
+
+[tool.ruff.lint.isort]
+force-sort-within-sections = true
+known-first-party = ["zhenxun", "tests/*"]
+extra-standard-library = ["typing_extensions"]
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+mark-parentheses = false
+
+[tool.ruff.lint.pyupgrade]
+keep-runtime-typing = true
+
+[tool.pyright]
+pythonVersion = "3.10"
+pythonPlatform = "All"
+defineConstant = { PYDANTIC_V2 = true }
+executionEnvironments = [
+    { root = "./tests", extraPaths = [
+        "./",
+    ] },
+    { root = "./" },
+]
+
+typeCheckingMode = "standard"
+reportShadowedImports = false
+disableBytesTypePromotions = true
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

prometheus.yml

@@ -0,0 +1,12 @@
+global:
+  scrape_interval: 15s
+  evaluation_interval: 15s
+
+scrape_configs:
+  - job_name: 'postgresql'
+    static_configs:
+      - targets: [ 'postgres-exporter:9187' ]
+
+  - job_name: 'redis'
+    static_configs:
+      - targets: [ 'redis-exporter:9121' ]

pyproject.toml

@@ -1,127 +1,122 @@
 [tool.poetry]
 name = "zhenxun_bot"
-version = "0.1.1"
+version = "0.2.4"
 description = "基于 Nonebot2 和 go-cqhttp 开发，以 postgresql 作为数据库，非常可爱的绪山真寻bot"
 authors = ["HibiKier <775757368@qq.com>"]
 license = "AGPL"
 package-mode = false
 
 [[tool.poetry.source]]
-name = "ali"
-default = true
+name = "aliyun"
 url = "https://mirrors.aliyun.com/pypi/simple/"
+priority = "primary"
 
 [tool.poetry.dependencies]
 python = "^3.10"
 playwright = "^1.41.1"
 nonebot-adapter-onebot = "^2.3.1"
-nonebot-plugin-apscheduler = "^0.3.0"
+nonebot-plugin-apscheduler = "^0.5"
 tortoise-orm = { extras = ["asyncpg"], version = "^0.20.0" }
 cattrs = "^23.2.3"
 ruamel-yaml = "^0.18.5"
 strenum = "^0.4.15"
 nonebot-plugin-session = "^0.2.3"
 ujson = "^5.9.0"
-nonebot-adapter-kaiheila = "^0.3.0"
 nb-cli = "^1.3.0"
-nonebot2 = "^2.1.3"
-pydantic = "1.10.18"
-nonebot-adapter-discord = "^0.1.3"
-nonebot-adapter-dodo = "^0.1.4"
-pillow = "9.5"
+nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
+pillow = "^10.0.0"
 retrying = "^1.3.4"
 aiofiles = "^23.2.1"
-nonebot-plugin-htmlrender = "^0.3.0"
-nonebot-plugin-userinfo = "^0.1.3"
+nonebot-plugin-htmlrender = ">=0.6.0,<1.0.0"
 pypinyin = "^0.51.0"
 beautifulsoup4 = "^4.12.3"
 lxml = "^5.1.0"
 psutil = "^5.9.8"
 feedparser = "^6.0.11"
-opencv-python = "^4.9.0.80"
 imagehash = "^4.3.1"
-black = "^24.4.2"
 cn2an = "^0.5.22"
-aiohttp = "^3.9.5"
 dateparser = "^1.2.0"
 bilireq = "0.2.3post0"
 python-jose = { extras = ["cryptography"], version = "^3.3.0" }
 python-multipart = "^0.0.9"
 aiocache = "^0.12.2"
 py-cpuinfo = "^9.0.0"
-nonebot-plugin-uninfo = "^0.4.1"
-nonebot-plugin-alconna = "^0.53.1"
+nonebot-plugin-alconna = "^0.54.0"
+tenacity = "^9.0.0"
+nonebot-plugin-uninfo = ">0.4.1"
+nonebot-plugin-waiter = "^0.8.1"
+multidict = ">=6.0.0,!=6.3.2"
 
-[tool.poetry.dev-dependencies]
-nonebug = "^0.3.2"
+[tool.poetry.group.dev.dependencies]
+nonebug = "^0.4"
 pytest-cov = "^5.0.0"
 pytest-mock = "^3.6.1"
-pytest-asyncio = "^0.23.5"
+pytest-asyncio = "^0.25"
 pytest-xdist = "^3.3.1"
 respx = "^0.21.1"
+ruff = "^0.8.0"
+pre-commit = "^4.0.0"
+
 
 [tool.nonebot]
 plugins = [
     "nonebot_plugin_apscheduler",
     "nonebot_plugin_session",
     "nonebot_plugin_htmlrender",
-    "nonebot_plugin_userinfo",
     "nonebot_plugin_alconna",
 ]
 plugin_dirs = ["zhenxun/services", "zhenxun/builtin_plugins", "zhenxun/plugins"]
 adapters = [
     { name = "OneBot V11", module_name = "nonebot.adapters.onebot.v11" },
-    { name = "DoDo", module_name = "nonebot.adapters.dodo" },
-    { name = "开黑啦", module_name = "nonebot.adapters.kaiheila" },
+    #    { name = "DoDo", module_name = "nonebot.adapters.dodo" },
+    #    { name = "开黑啦", module_name = "nonebot.adapters.kaiheila" },
 ]
 
-[tool.black]
-line-length = 88
-target-version = ["py39", "py310", "py311", "py312"]
-include = '\.pyi?$'
-extend-exclude = '''
-'''
-
-[tool.isort]
-profile = "black"
-line_length = 88
-length_sort = true
-skip_gitignore = true
-force_sort_within_sections = true
-src_paths = ["zhenxun", "tests"]
-extra_standard_library = ["typing_extensions"]
-
 [tool.ruff]
 line-length = 88
 target-version = "py310"
 
+[tool.ruff.format]
+line-ending = "lf"
+
 [tool.ruff.lint]
 select = [
-    "F",     # Pyflakes
-    "W",     # pycodestyle warnings
-    "E",     # pycodestyle errors
-    "UP",    # pyupgrade
+    "F", # Pyflakes
+    "W", # pycodestyle warnings
+    "E", # pycodestyle errors
+    "I", # isort
+    "UP", # pyupgrade
     "ASYNC", # flake8-async
-    "C4",    # flake8-comprehensions
-    "T10",   # flake8-debugger
-    "T20",   # flake8-print
-    "PYI",   # flake8-pyi
-    "PT",    # flake8-pytest-style
-    "Q",     # flake8-quotes
-    "RUF",   # Ruff-specific rules
+    "C4", # flake8-comprehensions
+    "T10", # flake8-debugger
+    "T20", # flake8-print
+    "PYI", # flake8-pyi
+    "PT", # flake8-pytest-style
+    "Q", # flake8-quotes
+    "TID", # flake8-tidy-imports
+    "RUF", # Ruff-specific rules
 ]
 ignore = [
-    "E402",   # module-import-not-at-top-of-file
-    "UP037",  # quoted-annotation
+    "E402", # module-import-not-at-top-of-file
+    "UP037", # quoted-annotation
     "RUF001", # ambiguous-unicode-character-string
     "RUF002", # ambiguous-unicode-character-docstring
     "RUF003", # ambiguous-unicode-character-comment
+    "TID252", # relative-imports
 ]
 
+[tool.ruff.lint.isort]
+force-sort-within-sections = true
+known-first-party = ["zhenxun", "tests/*"]
+extra-standard-library = ["typing_extensions"]
+
 [tool.ruff.lint.flake8-pytest-style]
 fixture-parentheses = false
 mark-parentheses = false
 
+[tool.ruff.lint.pyupgrade]
+keep-runtime-typing = true
+
 [tool.pyright]
 pythonVersion = "3.10"
 pythonPlatform = "All"
@@ -139,6 +134,7 @@ disableBytesTypePromotions = true
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]