From 3f9bba537c528622dad90fa201bfe6e75627002b Mon Sep 17 00:00:00 2001 From: KingRan Date: Sun, 6 Mar 2022 22:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- function/sendNotify.js | 101 +++++++++++++++++++++-------------------- sendNotify.js | 101 +++++++++++++++++++++-------------------- 2 files changed, 102 insertions(+), 100 deletions(-) diff --git a/function/sendNotify.js b/function/sendNotify.js index a01a502..43299d7 100644 --- a/function/sendNotify.js +++ b/function/sendNotify.js @@ -31,7 +31,7 @@ const querystring = require('querystring'); const exec = require('child_process').exec; const $ = new Env(); const timeout = 15000; //超时时间(单位毫秒) -console.log("加载sendNotify，当前版本: 20220302"); +console.log("加载sendNotify，当前版本: 20220306"); // =======================================go-cqhttp通知设置区域=========================================== //gobot_url 填写请求地址http://127.0.0.1/send_private_msg //gobot_token 填写在go-cqhttp文件设置的访问密钥 @@ -1989,57 +1989,58 @@ function BarkNotify(text, desp, params = {}) { } function tgBotNotify(text, desp) { - return new Promise((resolve) => { - if (TG_BOT_TOKEN && TG_USER_ID) { - const options = { - url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`, - body: `chat_id=${TG_USER_ID}&text=${text}\n\n${desp}&disable_web_page_preview=true`, - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - }, - timeout, - }; - if (TG_PROXY_HOST && TG_PROXY_PORT) { - const tunnel = require('tunnel'); - const agent = { - https: tunnel.httpsOverHttp({ - proxy: { - host: TG_PROXY_HOST, - port: TG_PROXY_PORT * 1, - proxyAuth: TG_PROXY_AUTH, - }, - }), - }; - Object.assign(options, { - agent - }); + return new Promise(resolve => { + if (TG_BOT_TOKEN && TG_USER_ID) { + const options = { + url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`, + json: { + chat_id: `${TG_USER_ID}`, + text: `${text}\n\n${desp}`, + disable_web_page_preview:true, + }, + headers: { + 'Content-Type': 'application/json', + }, + timeout + } + if (TG_PROXY_HOST && TG_PROXY_PORT) { + const tunnel = require("tunnel"); + const agent = { + https: tunnel.httpsOverHttp({ + proxy: { + host: TG_PROXY_HOST, + port: TG_PROXY_PORT * 1, + proxyAuth: TG_PROXY_AUTH } - $.post(options, (err, resp, data) => { - try { - if (err) { - console.log('telegram发送通知消息失败！！\n'); - console.log(err); - } else { - data = JSON.parse(data); - if (data.ok) { - console.log('Telegram发送通知消息成功🎉。\n'); - } else if (data.error_code === 400) { - console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n'); - } else if (data.error_code === 401) { - console.log('Telegram bot token 填写错误。\n'); - } - } - } catch (e) { - $.logErr(e, resp); - } - finally { - resolve(data); - } - }); - } else { - resolve(); + }) } - }); + Object.assign(options, {agent}) + } + $.post(options, (err, resp, data) => { + try { + if (err) { + console.log('telegram发送通知消息失败！！\n') + console.log(err); + } else { + data = JSON.parse(data); + if (data.ok) { + console.log('Telegram发送通知消息成功�。\n') + } else if (data.error_code === 400) { + console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n') + } else if (data.error_code === 401) { + console.log('Telegram bot token 填写错误。\n') + } + } + } catch (e) { + $.logErr(e, resp); + } finally { + resolve(data); + } + }) + } else { + resolve() + } + }) } function ddBotNotify(text, desp) { diff --git a/sendNotify.js b/sendNotify.js index a01a502..43299d7 100644 --- a/sendNotify.js +++ b/sendNotify.js @@ -31,7 +31,7 @@ const querystring = require('querystring'); const exec = require('child_process').exec; const $ = new Env(); const timeout = 15000; //超时时间(单位毫秒) -console.log("加载sendNotify，当前版本: 20220302"); +console.log("加载sendNotify，当前版本: 20220306"); // =======================================go-cqhttp通知设置区域=========================================== //gobot_url 填写请求地址http://127.0.0.1/send_private_msg //gobot_token 填写在go-cqhttp文件设置的访问密钥 @@ -1989,57 +1989,58 @@ function BarkNotify(text, desp, params = {}) { } function tgBotNotify(text, desp) { - return new Promise((resolve) => { - if (TG_BOT_TOKEN && TG_USER_ID) { - const options = { - url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`, - body: `chat_id=${TG_USER_ID}&text=${text}\n\n${desp}&disable_web_page_preview=true`, - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - }, - timeout, - }; - if (TG_PROXY_HOST && TG_PROXY_PORT) { - const tunnel = require('tunnel'); - const agent = { - https: tunnel.httpsOverHttp({ - proxy: { - host: TG_PROXY_HOST, - port: TG_PROXY_PORT * 1, - proxyAuth: TG_PROXY_AUTH, - }, - }), - }; - Object.assign(options, { - agent - }); + return new Promise(resolve => { + if (TG_BOT_TOKEN && TG_USER_ID) { + const options = { + url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`, + json: { + chat_id: `${TG_USER_ID}`, + text: `${text}\n\n${desp}`, + disable_web_page_preview:true, + }, + headers: { + 'Content-Type': 'application/json', + }, + timeout + } + if (TG_PROXY_HOST && TG_PROXY_PORT) { + const tunnel = require("tunnel"); + const agent = { + https: tunnel.httpsOverHttp({ + proxy: { + host: TG_PROXY_HOST, + port: TG_PROXY_PORT * 1, + proxyAuth: TG_PROXY_AUTH } - $.post(options, (err, resp, data) => { - try { - if (err) { - console.log('telegram发送通知消息失败！！\n'); - console.log(err); - } else { - data = JSON.parse(data); - if (data.ok) { - console.log('Telegram发送通知消息成功🎉。\n'); - } else if (data.error_code === 400) { - console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n'); - } else if (data.error_code === 401) { - console.log('Telegram bot token 填写错误。\n'); - } - } - } catch (e) { - $.logErr(e, resp); - } - finally { - resolve(data); - } - }); - } else { - resolve(); + }) } - }); + Object.assign(options, {agent}) + } + $.post(options, (err, resp, data) => { + try { + if (err) { + console.log('telegram发送通知消息失败！！\n') + console.log(err); + } else { + data = JSON.parse(data); + if (data.ok) { + console.log('Telegram发送通知消息成功�。\n') + } else if (data.error_code === 400) { + console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n') + } else if (data.error_code === 401) { + console.log('Telegram bot token 填写错误。\n') + } + } + } catch (e) { + $.logErr(e, resp); + } finally { + resolve(data); + } + }) + } else { + resolve() + } + }) } function ddBotNotify(text, desp) {