diff --git a/dailycheckin/utils/message.py b/dailycheckin/utils/message.py index 22ef715b1..3909f0c55 100755 --- a/dailycheckin/utils/message.py +++ b/dailycheckin/utils/message.py @@ -122,11 +122,14 @@ def message2qywxrobot(qywx_key, content): def message2qywxapp( - qywx_corpid, qywx_agentid, qywx_corpsecret, qywx_touser, qywx_media_id, content + 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: @@ -160,7 +163,7 @@ def message2qywxapp( }, } requests.post( - url=f"https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={token}", + url=f"{bastUrl}/cgi-bin/message/send?access_token={token}", data=json.dumps(data), ) return @@ -218,6 +221,7 @@ def push_message(content_list: list, notice_info: dict): qywx_corpsecret = notice_info.get("qywx_corpsecret") qywx_touser = notice_info.get("qywx_touser") qywx_media_id = notice_info.get("qywx_media_id") + qywx_origin = notice_info.get("qywx_origin") pushplus_token = notice_info.get("pushplus_token") pushplus_topic = notice_info.get("pushplus_topic") merge_push = notice_info.get("merge_push") @@ -270,6 +274,7 @@ def push_message(content_list: list, notice_info: dict): qywx_corpsecret=qywx_corpsecret, qywx_touser=qywx_touser, qywx_media_id=qywx_media_id, + qywx_origin=qywx_origin, content=message, ) except Exception as e: diff --git a/docker/config.template.json b/docker/config.template.json index c51515e16..38ff48ff9 100644 --- a/docker/config.template.json +++ b/docker/config.template.json @@ -17,6 +17,7 @@ "QYWX_KEY":"", "QYWX_MEDIA_ID":"", "QYWX_TOUSER":"", + "QYWX_ORIGIN":"", "SCKEY":"", "SENDKEY":"", "TG_API_HOST":"", diff --git a/docs/pages/settings/notify/qywx.mdx b/docs/pages/settings/notify/qywx.mdx index a83177a2b..1620a7292 100644 --- a/docs/pages/settings/notify/qywx.mdx +++ b/docs/pages/settings/notify/qywx.mdx @@ -70,4 +70,5 @@ import { Cards, Card } from 'nextra/components' | _**QYWX_CORPSECRET**_ | corpsecret | | _**QYWX_TOUSER**_ | touser | | _**QYWX_MEDIA_ID**_ | media_id | +| _**QYWX_ORIGIN**_ | 企业微信反向代理地址 https://qyapi.weixin.qq.com/cgi-bin/gettoken将其中的https://qyapi.weixin.qq.com替换为**QYWX_ORIGIN** | | _**MERGE_PUSH**_ | **true**: 将推送消息合并;**false**: 分开推送 |