diff --git a/dailycheckin/utils/message.py b/dailycheckin/utils/message.py index 62cb79c..3909f0c 100755 --- a/dailycheckin/utils/message.py +++ b/dailycheckin/utils/message.py @@ -125,8 +125,11 @@ def message2qywxapp( qywx_corpid, qywx_agentid, qywx_corpsecret, qywx_touser, qywx_media_id, qywx_origin, content ): print("企业微信应用消息推送开始") + bastUrl = "https://qyapi.weixin.qq.com" + if qywx_origin: + bastUrl = qywx_origin; res = requests.get( - f"https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={qywx_corpid}&corpsecret={qywx_corpsecret}" + f"{bastUrl}/cgi-bin/gettoken?corpid={qywx_corpid}&corpsecret={qywx_corpsecret}" ) token = res.json().get("access_token", False) if qywx_media_id: @@ -159,16 +162,10 @@ def message2qywxapp( "btntxt": "开源项目", }, } - if qywx_origin: - requests.post( - url=f"{qywx_origin}/cgi-bin/message/send?access_token={token}", - data=json.dumps(data), - ) - else: - requests.post( - url=f"https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={token}", - data=json.dumps(data), - ) + requests.post( + url=f"{bastUrl}/cgi-bin/message/send?access_token={token}", + data=json.dumps(data), + ) return diff --git a/docs/pages/settings/notify/qywx.mdx b/docs/pages/settings/notify/qywx.mdx index 96812ec..1620a72 100644 --- a/docs/pages/settings/notify/qywx.mdx +++ b/docs/pages/settings/notify/qywx.mdx @@ -70,5 +70,5 @@ import { Cards, Card } from 'nextra/components' | _**QYWX_CORPSECRET**_ | corpsecret | | _**QYWX_TOUSER**_ | touser | | _**QYWX_MEDIA_ID**_ | media_id | -| _**QYWX_ORIGIN**_ | 企业微信反向代理地址 | +| _**QYWX_ORIGIN**_ | 企业微信反向代理地址 https://qyapi.weixin.qq.com/cgi-bin/gettoken将其中的https://qyapi.weixin.qq.com替换为**QYWX_ORIGIN** | | _**MERGE_PUSH**_ | **true**: 将推送消息合并;**false**: 分开推送 |