open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-25 00:16:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复python和JavaScript钉钉推送的环境变量不一致 (#659)

Browse Source
This commit is contained in:
Zy143L 2021-09-05 23:53:18 +08:00 committed by GitHub
parent b3ac81b7b7
commit 0cbfca979e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sample/notify.py
View File

@ -25,7 +25,7 @@ TG_BOT_TOKEN = '' # tg
TG_USER_ID = '' # tg机器人的TG_USER_ID; secrets可填 TG_USER_ID = '' # tg机器人的TG_USER_ID; secrets可填
TG_PROXY_IP = '' # tg机器人的TG_PROXY_IP; secrets可填 TG_PROXY_IP = '' # tg机器人的TG_PROXY_IP; secrets可填
TG_PROXY_PORT = '' # tg机器人的TG_PROXY_PORT; secrets可填 TG_PROXY_PORT = '' # tg机器人的TG_PROXY_PORT; secrets可填
DD_BOT_ACCESS_TOKEN = '' # 钉钉机器人的DD_BOT_ACCESS_TOKEN; secrets可填 DD_BOT_TOKEN = '' # 钉钉机器人的DD_BOT_TOKEN; secrets可填
DD_BOT_SECRET = '' # 钉钉机器人的DD_BOT_SECRET; secrets可填 DD_BOT_SECRET = '' # 钉钉机器人的DD_BOT_SECRET; secrets可填
QYWX_APP = '' # 企业微信应用的QYWX_APP; secrets可填 参考http://note.youdao.com/s/HMiudGkb QYWX_APP = '' # 企业微信应用的QYWX_APP; secrets可填 参考http://note.youdao.com/s/HMiudGkb
@ -39,8 +39,8 @@ if "SCKEY" in os.environ and os.environ["SCKEY"]:
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"]: 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_BOT_TOKEN = os.environ["TG_BOT_TOKEN"]
TG_USER_ID = os.environ["TG_USER_ID"] TG_USER_ID = os.environ["TG_USER_ID"]
if "DD_BOT_ACCESS_TOKEN" in os.environ and os.environ["DD_BOT_ACCESS_TOKEN"] and "DD_BOT_SECRET" in os.environ and os.environ["DD_BOT_SECRET"]: 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_ACCESS_TOKEN = os.environ["DD_BOT_ACCESS_TOKEN"] DD_BOT_TOKEN = os.environ["DD_BOT_TOKEN"]
DD_BOT_SECRET = os.environ["DD_BOT_SECRET"] DD_BOT_SECRET = os.environ["DD_BOT_SECRET"]
if "QYWX_APP" in os.environ and os.environ["QYWX_APP"]: if "QYWX_APP" in os.environ and os.environ["QYWX_APP"]:
QYWX_APP = os.environ["QYWX_APP"] QYWX_APP = os.environ["QYWX_APP"]
@ -54,7 +54,7 @@ if SCKEY:
if TG_BOT_TOKEN and TG_USER_ID: if TG_BOT_TOKEN and TG_USER_ID:
notify_mode.append('telegram_bot') notify_mode.append('telegram_bot')
print("Telegram 推送打开") print("Telegram 推送打开")
if DD_BOT_ACCESS_TOKEN and DD_BOT_SECRET: if DD_BOT_TOKEN and DD_BOT_SECRET:
notify_mode.append('dingding_bot') notify_mode.append('dingding_bot')
print("钉钉机器人 推送打开") print("钉钉机器人 推送打开")
if QYWX_APP: if QYWX_APP:
@ -123,7 +123,7 @@ def dingding_bot(title, content):
hmac_code = hmac.new(secret_enc, string_to_sign_enc, digestmod=hashlib.sha256).digest() hmac_code = hmac.new(secret_enc, string_to_sign_enc, digestmod=hashlib.sha256).digest()
sign = urllib.parse.quote_plus(base64.b64encode(hmac_code)) # 签名 sign = urllib.parse.quote_plus(base64.b64encode(hmac_code)) # 签名
print('开始使用 钉钉机器人 推送消息...', end='') print('开始使用 钉钉机器人 推送消息...', end='')
url = f'https://oapi.dingtalk.com/robot/send?access_token={DD_BOT_ACCESS_TOKEN}&timestamp={timestamp}&sign={sign}' url = f'https://oapi.dingtalk.com/robot/send?access_token={DD_BOT_TOKEN}&timestamp={timestamp}&sign={sign}'
headers = {'Content-Type': 'application/json;charset=utf-8'} headers = {'Content-Type': 'application/json;charset=utf-8'}
data = { data = {
'msgtype': 'text', 'msgtype': 'text',
@ -249,7 +249,7 @@ def send(title, content):
print('未启用 Server酱') print('未启用 Server酱')
continue continue
elif i == 'dingding_bot': elif i == 'dingding_bot':
if DD_BOT_ACCESS_TOKEN and DD_BOT_SECRET: if DD_BOT_TOKEN and DD_BOT_SECRET:
dingding_bot(title=title, content=content) dingding_bot(title=title, content=content)
else: else:
print('未启用 钉钉机器人') print('未启用 钉钉机器人')