diff --git a/githubAction.md b/githubAction.md index a7f77f8f..02e076d9 100644 --- a/githubAction.md +++ b/githubAction.md @@ -31,6 +31,7 @@ | `PUSH_PLUS_USER` | pushplus推送 | 非必须 | 一对多推送的“群组编码”(一对多推送下面->您的群组(如无则新建)->群组编码)注:(1、需订阅者扫描二维码 2、如果您是创建群组所属人,也需点击“查看二维码”扫描绑定,否则不能接受群组消息推送),只填`PUSH_PLUS_TOKEN`默认为一对一推送 | | `TG_PROXY_HOST` | Telegram 代理的 IP | 非必须 | 代理类型为 http。例子:http代理 http://127.0.0.1:1080 则填写 127.0.0.1 | | `TG_PROXY_PORT` | Telegram 代理的端口 | 非必须 | 例子:http代理 http://127.0.0.1:1080 则填写 1080 | +| `TG_API_HOST` | Telegram api自建的反向代理地址 | 非必须 | 例子:反向代理地址 http://aaa.bbb.ccc 则填写 aaa.bbb.ccc [简略搭建教程](https://www.hostloc.com/thread-805441-1-1.html) | ##### 互助码类环境变量 diff --git a/sendNotify.js b/sendNotify.js index 1a1fd3a9..b5e14a02 100644 --- a/sendNotify.js +++ b/sendNotify.js @@ -2,7 +2,7 @@ * @Author: lxk0301 https://gitee.com/lxk0301 * @Date: 2020-08-19 16:12:40 * @Last Modified by: lxk0301 - * @Last Modified time: 2021-2-27 17:52:54 + * @Last Modified time: 2021-3-10 11:52:54 */ const querystring = require("querystring"); const $ = new Env(); @@ -25,7 +25,8 @@ let TG_BOT_TOKEN = ''; //此处填你接收通知消息的telegram用户的id,例如:129xxx206 //(环境变量名 TG_USER_ID) let TG_USER_ID = ''; - +//Telegram api自建的反向代理地址(不懂可忽略),默认tg官方api(环境变量名:TG_API_HOST) +let TG_API_HOST = 'api.telegram.org' // =======================================钉钉机器人通知设置区域=========================================== //此处填你钉钉 bot 的webhook,例如:5a544165465465645d0f31dca676e7bd07415asdasd //(环境变量名 DD_BOT_TOKEN) @@ -97,6 +98,7 @@ if (process.env.TG_BOT_TOKEN) { if (process.env.TG_USER_ID) { TG_USER_ID = process.env.TG_USER_ID; } +if (process.env.TG_API_HOST) TG_API_HOST = process.env.TG_API_HOST; if (process.env.DD_BOT_TOKEN) { DD_BOT_TOKEN = process.env.DD_BOT_TOKEN; @@ -303,7 +305,7 @@ function tgBotNotify(text, desp) { return new Promise(resolve => { if (TG_BOT_TOKEN && TG_USER_ID) { const options = { - url: `https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`, + 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'