1

jd_cjzdgf.js

@@ -533,7 +533,7 @@ function saveTeam(_0xd519d7 = 0) {
     return new Promise(_0x270eca => {
         let _0x1a0f79 = encodeURIComponent(encodeURIComponent($.Pin));
         if (_0xd519d7 == 1) _0x1a0f79 = encodeURIComponent(encodeURIComponent($.Pin));
-        let _0x44652e = 'activityId=' + activityId + '&pin=' + _0x1a0f79 + '&pinImg=' + encodeURIComponent(encodeURIComponent($.attrTouXiang));
+        let _0x44652e = 'activityId=' + activityId + '&pin=' + _0x1a0f79 + '&pinImg=' + encodeURIComponent(encodeURIComponent($.attrTouXiang))+'&venderId='+$.userId;
         $.post(taskPostUrl('/wxTeam/saveCaptain', _0x44652e), async (_0x767d7b, _0x17080e, _0x1070a3) => {
             try {
                 if (_0x767d7b) {
@@ -589,7 +589,7 @@ function joinTeam(_0x5a3500 = 0) {
     return new Promise(_0x40dede => {
         let _0x5d51ce = encodeURIComponent(encodeURIComponent($.Pin));
         if (_0x5a3500 == 1) _0x5d51ce = encodeURIComponent(encodeURIComponent($.Pin));
-        let _0x14deba = 'activityId=' + activityId + '&signUuid=' + $.signUuid + '&pin=' + _0x5d51ce + '&pinImg=' + encodeURIComponent(encodeURIComponent($.attrTouXiang));
+        let _0x14deba = 'activityId=' + activityId + '&signUuid=' + $.signUuid + '&pin=' + _0x5d51ce + '&pinImg=' + encodeURIComponent(encodeURIComponent($.attrTouXiang))+'&venderId='+$.userId;
         $.post(taskPostUrl('/wxTeam/saveMember', _0x14deba), async (_0x53be06, _0x5ed55f, _0x19a125) => {
             try {
                 if (_0x53be06) {

sendNotify.js

@@ -1,20 +1,27 @@
 /*
- * @Author: lxk0301 https://gitee.com/lxk0301
+ * @Author: ccwav https://github.com/ccwav/QLScript2 
- * @Date: 2020-08-19 16:12:40
+ 
- * @Last Modified by: whyour
+ * sendNotify 推送通知功能 (text, desp, params , author , strsummary)
- * @Last Modified time: 2021-5-1 15:00:54
+ * @param text 通知标题  (必要)
- * sendNotify 推送通知功能
+ * @param desp 通知内容  (必要)
- * @param text 通知头
+ * @param params 某些推送通知方式点击弹窗可跳转, 例：{ url: 'https://abc.com' } ，没啥用,只是为了兼容旧脚本保留  (非必要)
- * @param desp 通知体
+ * @param author 通知底部作者`  (非必要)
- * @param params 某些推送通知方式点击弹窗可跳转, 例：{ url: 'https://abc.com' }
+ * @param strsummary 指定某些微信模板通知的预览信息，空则默认为desp  (非必要)
- * @param author 作者仓库等信息  例：`本通知 By：https://github.com/whyour/qinglong`
+ 
+ * sendNotifybyWxPucher 一对一推送通知功能 (text, desp, PtPin, author, strsummary )
+ * @param text 通知标题  (必要)
+ * @param desp 通知内容  (必要)
+ * @param PtPin CK的PTPIN (必要)
+ * @param author 通知底部作者`  (非必要)
+ * @param strsummary 指定某些微信模板通知的预览信息，空则默认为desp  (非必要)
+ 
  */
 //详细说明参考 https://github.com/ccwav/QLScript2.
 const querystring = require('querystring');
 const exec = require('child_process').exec;
 const $ = new Env();
 const timeout = 15000; //超时时间(单位毫秒)
-console.log("加载sendNotify，当前版本: 20220722");
+console.log("加载sendNotify，当前版本: 20220723");
 // =======================================go-cqhttp通知设置区域===========================================
 //gobot_url 填写请求地址http://127.0.0.1/send_private_msg
 //gobot_token 填写在go-cqhttp文件设置的访问密钥
@@ -111,15 +118,6 @@ let WP_UIDS_ONE = "";
 let GOTIFY_URL = '';
 let GOTIFY_TOKEN = '';
 let GOTIFY_PRIORITY = 0;
-
-/**
- * sendNotify 推送通知功能
- * @param text 通知头
- * @param desp 通知体
- * @param params 某些推送通知方式点击弹窗可跳转, 例：{ url: 'https://abc.com' }
- * @param author 作者仓库等信息  例：`本通知 By：https://github.com/whyour/qinglong`
- * @returns {Promise<unknown>}
- */
 let PushErrorTime = 0;
 let strTitle = "";
 let ShowRemarkType = "1";
@@ -569,11 +567,22 @@ async function sendNotify(text, desp, params = {}, author = '\n\n本通知 By cc
 		        }
 		    }
 		}
-        
+        if (desp) {
-
+            for (lncount = 2; lncount < 20; lncount++) {
-        //console.log("UseGroup2 :"+UseGroup2);
+                if (process.env["NOTIFY_INCLUDE_TEXT" + lncount]) {
-        //console.log("UseGroup3 :"+UseGroup3);
+                    Notify_IncludeText = process.env["NOTIFY_INCLUDE_TEXT" + lncount].split('&');
-
+                    if (Notify_IncludeText.length > 0) {
+                        for (var Templ in Notify_IncludeText) {
+                            if (desp.indexOf(Notify_IncludeText[Templ]) != -1) {
+                                console.log("检测内容到内容存在组别推送的关键字(" + Notify_IncludeText[Templ] + ")，将推送到组" + lncount + "...");
+                                UseGroupNotify = lncount;
+								break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
 		if (UseGroupNotify == 1)
 		    UseGroupNotify = "";
 
@@ -1352,7 +1361,7 @@ function tgBotNotify(text, desp) {
           } else {
             data = JSON.parse(data);
             if (data.ok) {
-              console.log('Telegram发送通知消息成功<EFBFBD>。\n')
+              console.log('Telegram发送通知消息成功🎉\n')
             } else if (data.error_code === 400) {
               console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n')
             } else if (data.error_code === 401) {