From 482e43dd1f6fb50922dfb17121e06ef4b7578910 Mon Sep 17 00:00:00 2001 From: Leon <62660101+Oreomeow@users.noreply.github.com> Date: Tue, 7 Sep 2021 17:46:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Python=20=E5=92=8C=20JavaS?= =?UTF-8?q?cript=20Server=E9=85=B1=E5=92=8C=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=8E=A8=E9=80=81=E7=9A=84=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4=20(#673)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sample/notify.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sample/notify.py b/sample/notify.py index 9e860d1f..62abdadb 100644 --- a/sample/notify.py +++ b/sample/notify.py @@ -27,23 +27,23 @@ TG_PROXY_IP = '' # tg TG_PROXY_PORT = '' # tg机器人的TG_PROXY_PORT; secrets可填 DD_BOT_TOKEN = '' # 钉钉机器人的DD_BOT_TOKEN; secrets可填 DD_BOT_SECRET = '' # 钉钉机器人的DD_BOT_SECRET; secrets可填 -QYWX_APP = '' # 企业微信应用的QYWX_APP; secrets可填 参考http://note.youdao.com/s/HMiudGkb +QYWX_AM = '' # 企业微信应用的QYWX_AM; secrets可填 参考http://note.youdao.com/s/HMiudGkb notify_mode = [] # GitHub action运行需要填写对应的secrets if "BARK" in os.environ and os.environ["BARK"]: BARK = os.environ["BARK"] -if "SCKEY" in os.environ and os.environ["SCKEY"]: - SCKEY = os.environ["SCKEY"] +if "PUSH_KEY" in os.environ and os.environ["PUSH_KEY"]: + SCKEY = os.environ["PUSH_KEY"] if "TG_BOT_TOKEN" in os.environ and os.environ["TG_BOT_TOKEN"] and "TG_USER_ID" in os.environ and os.environ["TG_USER_ID"]: TG_BOT_TOKEN = os.environ["TG_BOT_TOKEN"] TG_USER_ID = os.environ["TG_USER_ID"] if "DD_BOT_TOKEN" in os.environ and os.environ["DD_BOT_TOKEN"] and "DD_BOT_SECRET" in os.environ and os.environ["DD_BOT_SECRET"]: DD_BOT_TOKEN = os.environ["DD_BOT_TOKEN"] DD_BOT_SECRET = os.environ["DD_BOT_SECRET"] -if "QYWX_APP" in os.environ and os.environ["QYWX_APP"]: - QYWX_APP = os.environ["QYWX_APP"] +if "QYWX_AM" in os.environ and os.environ["QYWX_AM"]: + QYWX_AM = os.environ["QYWX_AM"] if BARK: notify_mode.append('bark') @@ -57,7 +57,7 @@ if TG_BOT_TOKEN and TG_USER_ID: if DD_BOT_TOKEN and DD_BOT_SECRET: notify_mode.append('dingding_bot') print("钉钉机器人 推送打开") -if QYWX_APP: +if QYWX_AM: notify_mode.append('qywxapp_bot') print("企业微信应用 推送打开") @@ -137,11 +137,11 @@ def dingding_bot(title, content): def qywxapp_bot(title, content): print("\n") - if not QYWX_APP: - print("企业微信应用的QYWX_APP未设置!!\n取消推送") + if not QYWX_AM: + print("企业微信应用的QYWX_AM未设置!!\n取消推送") return print("企业微信应用启动") - qywx_app_params = QYWX_APP.split(',') + qywx_app_params = QYWX_AM.split(',') url='https://qyapi.weixin.qq.com/cgi-bin/gettoken' headers= { 'Content-Type': 'application/json', @@ -213,7 +213,7 @@ def qywxapp_bot(title, content): print('推送失败！') def change_user_id(desp): - qywx_app_params = QYWX_APP.split(',') + qywx_app_params = QYWX_AM.split(',') if qywx_app_params[2]: userIdTmp = qywx_app_params[2].split("|") userId = "" @@ -261,7 +261,7 @@ def send(title, content): print('未启用 telegram机器人') continue elif i == 'qywxapp_bot': - if QYWX_APP: + if QYWX_AM: qywxapp_bot(title=title, content=content) else: print('未启用 企业微信应用推送')