From 81a76d3e3ba249dd92e9d2dcca546d77225cf1c5 Mon Sep 17 00:00:00 2001
From: echo <tzu-mingliu@qq.com>
Date: Tue, 17 Sep 2024 21:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B:bug:=20=E4=BF=AE=E5=A4=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=87=AA=E8=A1=8C=E5=AE=9A=E4=B9=89=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E7=9A=84=E6=96=B9=E5=BC=8F=E8=8E=B7=E5=8F=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChatPublicNumberPushInformation.py | 40 ++++++++++++++++------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/WeChatPublicNumberPushInformation.py b/WeChatPublicNumberPushInformation.py
index 1966e71..68388b8 100644
--- a/WeChatPublicNumberPushInformation.py
+++ b/WeChatPublicNumberPushInformation.py
@@ -4,7 +4,9 @@
 # @author           Echo
 # @EditTime         2024/9/14
 import datetime
+import os
 import random
+import re
 import time
 import httpx
 from typing import Text, Optional, List, Dict
@@ -33,25 +35,29 @@ from typing import Text, Optional, List, Dict
 """
 设置配置常量
 """
-API_KEY = ""  # 天聚数行密钥
-APP_ID = ""  # 微信公众号appid
-APP_SECRET = ""  # 微信公众号appsecret
-WECHAT_USER_IDS = []    # 要推送的微信用户ID
-TEMPLATE_ID = ""        # 模板ID
-CITY_NAME = ""          # 城市
-AREA = ""               # 区县
-EXAMINATION_DATE = ""   # 考研日期
-USER = ""               # 对象称呼
-BIRTHDAY = ""           # 对象生日
-STAR_SIGN = ""          # 对象星座
-LOVE_DATE = ""          # 恋爱开始日期
+CONFIG = {
+    "API_KEY": "",           # 天聚数行密钥
+    "APP_ID": "",            # 微信公众号appid
+    "APP_SECRET": "",        # 微信公众号appsecret
+    "TEMPLATE_ID": "",       # 模板ID
+    "CITY_NAME": "",         # 城市
+    "AREA": "",              # 区县
+    "EXAMINATION_DATE": "",  # 考研日期
+    "USER": "",              # 对象称呼
+    "BIRTHDAY": "",          # 对象生日
+    "STAR_SIGN": "",         # 对象星座
+    "LOVE_DATE": ""          # 恋爱开始日期
+}
 
+# 从环境变量中获取配置，如果环境变量不存在则使用默认值
+for key in CONFIG:
+    CONFIG[key] = os.environ.get(key, CONFIG[key])
 
-# if 'tian_api_key' in os.environ:
-#     api_key = re.split("@|&", os.environ.get("tian_api_key"))
-# else:
-#     api_key = []
-#     print("未查找到tian_api_key变量.")
+# 特殊处理 WECHAT_USER_IDS，因为它需要被分割
+WECHAT_USER_IDS = re.split("@|&", os.environ.get("WECHAT_USER_IDS", "")) if "WECHAT_USER_IDS" in os.environ else []
+
+# 使用全局变量
+globals().update(CONFIG)
 
 
 def time_diff(time1: Text, time2: Text, format) -> int: