[merge] 合并 nubeslove/DicePP- 仓库改动

- 新增 LOG 日志系统、COC 角色卡、业力骰子、Mode 模式等 13 个功能模块
- 修改 19 个现有模块文件
- 更新配置和依赖
Co-authored-by: nubeslove <nubeslove@gmail.com>
Co-authored-by: kagangtuya-star <kagangtuya@star-kagangtuya.cn>

Author: pear-studio

.gitignore

@@ -1,4 +1,3 @@
-
 # Created by https://www.toptal.com/developers/gitignore/api/python
 # Edit at https://www.toptal.com/developers/gitignore?templates=python
 
@@ -148,6 +147,7 @@ dmypy.json
 
 # DicePP
 src/plugins/DicePP/Data/
+src/plugins/DicePP/module/misc/log_command.py
 
 # Poetry
 poetry.lock

Dockerfile

@@ -1,9 +1,8 @@
-FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8
-
-RUN python3 -m pip config set global.index-url https://mirrors.aliyun.com/pypi/simple
-
-RUN python3 -m pip install poetry && poetry config virtualenvs.create false --local
-
-COPY ./pyproject.toml ./poetry.lock* /app/
-
-RUN poetry install --no-root --no-dev
+FROM python:3.8-slim
+WORKDIR /app
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+COPY . .
+CMD ["python", "bot.py"]

README.md

@@ -2,3 +2,7 @@
 基于Python的DND骰娘机器人, 可作为机器人项目Nonebot的插件使用
 
 请加入交流群861919492获取整合包和部署指南
+
+V2.0.5更新内容：
+- 修复部分bug
+- 优化log代码，新增外部接口

bot.py

@@ -3,20 +3,28 @@
 import os
 import sys
 import nonebot
+from nonebot.log import logger, default_format
 from nonebot.adapters.onebot.v11 import Adapter as OneBot_V11_Adapter
 
 # Fix import path problem in server
 dir_path = os.path.abspath(os.path.dirname(__file__))
 sys.path.insert(0, dir_path)
 
-# Custom your logger
-# 
-# from nonebot.log import logger, default_format
-# logger.add("error.log",
-#            rotation="00:00",
-#            diagnose=False,
-#            level="ERROR",
-#            format=default_format)
+# Custom your logger: reduce console noise and persist errors to file
+# Console shows WARNING and above, while errors are written to error.log
+try:
+    # remove default sinks to customize
+    logger.remove()
+except Exception:
+    pass
+logger.add(sys.stderr,
+           level="WARNING",
+           format=default_format)
+logger.add("error.log",
+           rotation="10 MB",
+           diagnose=False,
+           level="ERROR",
+           format=default_format)
 
 # You can pass some keyword args config to init function
 nonebot.init()

docker-compose.yml

@@ -1,28 +1,23 @@
-version: "2"
+version: "3"
+
 services:
-  # 其他配置参考 https://hub.docker.com/r/tiangolo/uvicorn-gunicorn-fastapi/
-  nonebot:
-    container_name: dicepp
+  bot:
     build: .
-    volumes:
-      - "/etc/localtime:/etc/localtime:ro"
-      - "./:/app/"
-    # ports:
-    #   - "8080:8080" # 映射端口到宿主机 宿主机端口:容器端口
+    container_name: dicepp_nonebot_bot
+    restart: always
+    ports:
+      - "8080:8080" # 将容器的 8080 端口映射到主机的 8080 端口
     env_file:
+      - .env # 加载 .env 文件中的环境变量
       - ".env.linux" # fastapi 使用的环境变量文件
     environment:
       - ENVIRONMENT=linux # 配置 nonebot 运行环境，此项会被 .env 文件覆盖
       - APP_MODULE=bot:app # 配置 asgi 入口
       - SECRET # 通过 SECRET=xxx nb up -d 传递密钥
       - ACCESS_TOKEN # 通过 ACCESS_TOKEN=xxx nb up -d 传递密钥
       - MAX_WORKERS=1 # 如果你有多个QQ，且存在 self_id 指定，多个 worker 会导致无法找到其他 websocket 连接
-    logging:
-      driver: json-file
-      options:
-        max-size: "200k"
-        max-file: "10"
-networks:
-  default:
-    external:
-      name: dice-net
+    volumes:
+      # 挂载整个项目目录，实现代码热更新
+      - .:/app
+      # 将插件的数据目录挂载到宿主机，实现数据持久化
+      - ./src/plugins/DicePP/data:/app/src/plugins/DicePP/data # <--- 新增的挂载点

pyproject.toml

@@ -1,18 +1,21 @@
 [tool.poetry]
 name = "DicePP"
-version = "1.0.0"
+version = "1.0.0 Beta2"
 description = "DicePP"
 authors = ["Pear"]
 readme = "README.md"
 
-[tool.nonebot]
+[tool.poetry.dependencies]
 python = "^3.8"
+aiohttp = "^4.0.2"
 nonebot2 = "^2.0.0b1"
 nb-cli = "^0.6.4"
 openpyxl = "^3.0.9"
 rsa = "^4.8"
 nonebot-adapter-cqhttp = "^2.0.0b1"
 gitpython = "3.1.26"
+python-docx = "^0.8.11"
+lxml = "^4.9.2"
 
 [nonebot.plugins]
 plugins = []
@@ -25,4 +28,8 @@ build-backend = "poetry.masonry.api"
 [[tool.poetry.source]]
 name = "tsinghua"
 default = true
-url = "https://pypi.tuna.tsinghua.edu.cn/simple"
+url = "https://pypi.tuna.tsinghua.edu.cn/simple"
+
+[tool.nonebot]
+plugins = []
+plugin_dirs = ["src/plugins"]

requirements.txt

@@ -1,9 +1,11 @@
-fastapi>=0.68.0
-pydantic>=1.8.0
-uvicorn>=0.15.0
+wheel
+uvicorn[standard]
 nb-cli==0.6.4
 nonebot-adapter-onebot==2.0.0b1
-nonebot2==2.0.0b1
+fastapi>=0.68.0
 openpyxl==3.0.9
 rsa==4.8
-gitpython==3.1.26
+gitpython==3.1.26
+python-docx==0.8.11
+zhconv==1.4.3
+psutil>=5.9.0