From 3e6d9d1fdbd5af86b0a85bf87c02aa27ddcdbb12 Mon Sep 17 00:00:00 2001 From: aszerW Date: Mon, 18 May 2026 22:23:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E7=BB=9F=E4=B8=80=E9=92=89?= =?UTF-8?q?=E9=92=89=E5=A4=9A=E7=BE=A4=E9=85=8D=E7=BD=AE=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit .env 配置命名统一： - 群1: DINGTALK_WEBHOOK_1 + DINGTALK_SECRET_1 - 群2: DINGTALK_WEBHOOK_2 + DINGTALK_SECRET_2 settings.py 读取逻辑简化： - 从 i=1 开始读取编号配置 - 移除不带编号的默认配置处理 --- .env | 4 ++-- config/settings.py | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.env b/.env index 99f3b80..974bc5c 100644 --- a/.env +++ b/.env @@ -4,8 +4,8 @@ TUSHARE_TOKEN=ae768b520150da8865a38f0d9c480578f695293588c3c684f00077a1 # 钉钉机器人配置 - 群1 -DINGTALK_WEBHOOK=https://oapi.dingtalk.com/robot/send?access_token=fb70c1561d8beba94b4f11568f4bb15e3ae07ccbdc8ac19676434a9d1cd17546 -DINGTALK_SECRET=SEC1ae7cd2f1a6f9da3611af37da3e7d954c1e8533fc073c6c8cc5e5af3b6e5926b +DINGTALK_WEBHOOK_1=https://oapi.dingtalk.com/robot/send?access_token=fb70c1561d8beba94b4f11568f4bb15e3ae07ccbdc8ac19676434a9d1cd17546 +DINGTALK_SECRET_1=SEC1ae7cd2f1a6f9da3611af37da3e7d954c1e8533fc073c6c8cc5e5af3b6e5926b # 钉钉机器人配置 - 群2 DINGTALK_WEBHOOK_2=https://oapi.dingtalk.com/robot/send?access_token=87c7abfcdd69b699c32da4e4f5981cd2ca6b0445474fc6ffb36f2ed0f6262fbb diff --git a/config/settings.py b/config/settings.py index d651434..f13fd2c 100644 --- a/config/settings.py +++ b/config/settings.py @@ -40,7 +40,7 @@ def get_all_dingtalk_configs() -> List[Dict[str, str]]: 获取所有钉钉机器人配置（支持多群） 环境变量格式: - 群1: DINGTALK_WEBHOOK + DINGTALK_SECRET（不带编号） + 群1: DINGTALK_WEBHOOK_1 + DINGTALK_SECRET_1 群2: DINGTALK_WEBHOOK_2 + DINGTALK_SECRET_2 群3: DINGTALK_WEBHOOK_3 + DINGTALK_SECRET_3 ... @@ -50,13 +50,8 @@ def get_all_dingtalk_configs() -> List[Dict[str, str]]: """ configs = [] - # 1. 先读取不带编号的默认配置（群1） - default_config = get_dingtalk_config() - if default_config["webhook"]: - configs.append(default_config) - - # 2. 从 i=2 开始读取编号配置（群2、群3...） - i = 2 + # 从 i=1 开始读取编号配置 + i = 1 while True: webhook = os.getenv(f"DINGTALK_WEBHOOK_{i}", "") secret = os.getenv(f"DINGTALK_SECRET_{i}", "")