qnloft
/
jdpro
mirror of https://github.com/6dylan6/jdpro.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加企业微信代理地址

This commit is contained in:
graywolf 2024-01-31 11:52:06 +08:00
parent c637d5d25c
commit 55d374abe2
No known key found for this signature in database
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sendNotify.js
View File

@ -73,7 +73,7 @@ let DD_BOT_SECRET = '';
//此处填你企业微信机器人的 webhook(详见文档 https://work.weixin.qq.com/api/doc/90000/90136/91770)，例如：693a91f6-7xxx-4bc4-97a0-0ec2sifa5aaa
//(环境变量名 QYWX_KEY)
let QYWX_KEY = '';
let QYWX_ORIGIN = 'qyapi.weixin.qq.com';
// =======================================企业微信应用消息通知设置区域===========================================
/*
此处填你企业微信应用消息的值(详见文档 https://work.weixin.qq.com/api/doc/90000/90135/90236)
@ -232,6 +232,7 @@ async function sendNotify(text, desp, params = {}, author = "\n=================
DD_BOT_TOKEN = '';
DD_BOT_SECRET = '';
QYWX_KEY = '';
QYWX_ORIGIN = 'qyapi.weixin.qq.com';
QYWX_AM = '';
FS_KEY = '';
IGOT_PUSH_KEY = '';
@ -685,6 +686,9 @@ async function sendNotify(text, desp, params = {}, author = "\n=================
QYWX_AM = process.env["QYWX_AM" + UseGroupNotify];
}
if (process.env["QYWX_ORIGIN"])
QYWX_ORIGIN = process.env["QYWX_ORIGIN"];
if (process.env["FS_KEY" + UseGroupNotify] && Use_fsBotNotify) {
FS_KEY = process.env["FS_KEY" + UseGroupNotify];
}
@ -1492,7 +1496,7 @@ function ddBotNotify(text, desp) {
function qywxBotNotify(text, desp) {
return new Promise((resolve) => {
const options = {
url: `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${QYWX_KEY}`,
url: `https://${QYWX_ORIGIN}/cgi-bin/webhook/send?key=${QYWX_KEY}`,
json: {
msgtype: 'text',
text: {
@ -1610,7 +1614,7 @@ function qywxamNotify(text, desp, strsummary = "") {
if (QYWX_AM) {
const QYWX_AM_AY = QYWX_AM.split(',');
const options_accesstoken = {
url: `https://qyapi.weixin.qq.com/cgi-bin/gettoken`,
url: `https://${QYWX_ORIGIN}/cgi-bin/gettoken`,
json: {
corpid: `${QYWX_AM_AY[0]}`,
corpsecret: `${QYWX_AM_AY[1]}`,
@ -1677,7 +1681,7 @@ function qywxamNotify(text, desp, strsummary = "") {
};
}
options = {
url: `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${accesstoken}`,
url: `https://${QYWX_ORIGIN}/cgi-bin/message/send?access_token=${accesstoken}`,
json: {
touser: `${ChangeUserId(desp)}`,
agentid: `${QYWX_AM_AY[3]}`,

13
sendNotify.py
View File

@ -33,6 +33,7 @@ DD_BOT_TOKEN = '' # 钉钉机器人的DD_BOT_TOKEN; secrets可填
DD_BOT_SECRET = '' # 钉钉机器人的DD_BOT_SECRET; secrets可填
QQ_SKEY = '' # qq机器人的QQ_SKEY; secrets可填
QQ_MODE = '' # qq机器人的QQ_MODE; secrets可填
QYWX_ORIGIN = 'qyapi.weixin.qq.com' # 企业微信反向代理地址
QYWX_AM = '' # 企业微信
QYWX_KEY = '' # 企业微信BOT
PUSH_PLUS_TOKEN = '' # 微信推送Plus+
@ -70,6 +71,8 @@ if "QYWX_AM" in os.environ:
if len(os.environ["QYWX_AM"]) > 1:
QYWX_AM = os.environ["QYWX_AM"]
if "QYWX_ORIGIN" in os.environ and os.environ["QYWX_ORIGIN"]:
QYWX_ORIGIN = os.environ["QYWX_ORIGIN"]
if "QYWX_KEY" in os.environ:
if len(os.environ["QYWX_KEY"]) > 1:
@ -275,8 +278,8 @@ def wecom_key(title, content):
}
}
print(f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={QYWX_KEY}")
response = requests.post(f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={QYWX_KEY}", json=data,headers=headers).json()
print(f"https://{QYWX_ORIGIN}/cgi-bin/webhook/send?key={QYWX_KEY}")
response = requests.post(f"https://{QYWX_ORIGIN}/cgi-bin/webhook/send?key={QYWX_KEY}", json=data,headers=headers).json()
print(response)
# 飞书机器人推送
@ -339,7 +342,7 @@ class WeCom:
self.AGENTID = agentid
def get_access_token(self):
url = 'https://qyapi.weixin.qq.com/cgi-bin/gettoken'
url = 'https://{QYWX_ORIGIN}/cgi-bin/gettoken'
values = {'corpid': self.CORPID,
'corpsecret': self.CORPSECRET,
}
@ -348,7 +351,7 @@ class WeCom:
return data["access_token"]
def send_text(self, message, touser="@all"):
send_url = 'https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=' + self.get_access_token()
send_url = 'https://{QYWX_ORIGIN}/cgi-bin/message/send?access_token=' + self.get_access_token()
send_values = {
"touser": touser,
"msgtype": "text",
@ -364,7 +367,7 @@ class WeCom:
return respone["errmsg"]
def send_mpnews(self, title, message, media_id, touser="@all"):
send_url = 'https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=' + self.get_access_token()
send_url = 'https://{QYWX_ORIGIN}/cgi-bin/message/send?access_token=' + self.get_access_token()
send_values = {
"touser": touser,
"msgtype": "mpnews",