merge: resolve onmyoji_gacha conflicts

2026-05-11 22:32:13 +08:00
parent 7556352477 698b0ec93a
commit 3db17fc08b
19 changed files with 1941 additions and 1091 deletions
--- a/danding_bot/plugins/onmyoji_gacha/config.py
+++ b/danding_bot/plugins/onmyoji_gacha/config.py
@@ -128,4 +128,4 @@ class Config(BaseSettings):
        """运行时警告：如果使用默认admin token，在生产环境可能被猜解"""
        if self.WEB_ADMIN_TOKEN == "onmyoji_admin_token_2024":
            logger.warning("⚠️ WEB_ADMIN_TOKEN 使用默认值，生产环境请务必通过环境变量覆盖！")
-        return self
+        return self