Update

Author: github-actions[bot]

jd_queryRed.js

@@ -81,7 +81,7 @@ var date = (0, date_fns_1.getDate)(new Date());
                 console.log(parseFloat(jdRed.toFixed(2)), parseFloat(jdRedExp.toFixed(2)));
                 message = "\u3010\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "\u3011 ").concat(UserName, "\n\u4EAC\u4E1C\u7EA2\u5305  ").concat(jdRed.toFixed(2), "\n\u4ECA\u65E5\u8FC7\u671F  ").concat(jdRedExp.toFixed(2), "\n\n");
                 allMessage += message;
-                return [4 /*yield*/, (0, pushplus_1.pushplus)(message)];
+                return [4 /*yield*/, (0, pushplus_1.pushplus)('京东红包', message)];
             case 4:
                 _e.sent();
                 return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];

jd_queryRed.ts

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import {getDate} from "date-fns";
 import {pushplus} from './utils/pushplus';
-import {requireConfig, wait, randomWord} from "./TS_USER_AGENTS";
+import {requireConfig, wait, randomWord, o2s} from "./TS_USER_AGENTS";
 
 let cookie: string = '', res: any = '', UserName: string
 let message: string = '', allMessage: string = '';
@@ -19,7 +19,6 @@ let date: number = getDate(new Date())
     let jdRed: number = 0, jdRedExp: number = 0
 
     res = await api()
-
     for (let red of res.data.useRedInfo.redList) {
       if (red.orgLimitStr.includes("京喜")) {
 
@@ -36,7 +35,7 @@ let date: number = getDate(new Date())
     message = `【京东账号${index + 1}】 ${UserName}\n京东红包  ${jdRed.toFixed(2)}\n今日过期  ${jdRedExp.toFixed(2)}\n\n`
     allMessage += message
 
-    await pushplus(message)
+    await pushplus('京东红包', message)
     await wait(1000)
   }
 })()

jd_track.js

@@ -42,18 +42,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 var axios_1 = require("axios");
 var path = require("path");
-var sendNotify_1 = require("./sendNotify");
 var fs_1 = require("fs");
 var TS_USER_AGENTS_1 = require("./TS_USER_AGENTS");
-var cookie = '', UserName, index, allMessage = '', res = '', message = '';
+var pushplus_1 = require("./utils/pushplus");
+var cookie = '', UserName, allMessage = '', res = '', message = '';
 !(function () { return __awaiter(void 0, void 0, void 0, function () {
-    var cookiesArr, except, orders, i, _i, _a, order, orderId, orderType, title, t, status_1, carrier, carriageId, account, _b, account_1, acc;
-    var _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var cookiesArr, except, orders, _i, _a, _b, index, value, markdown, i, _c, _d, order, orderId, orderType, title, t, status_1, carrier, carriageId, account, _e, account_1, acc;
+    var _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0: return [4 /*yield*/, (0, TS_USER_AGENTS_1.requireConfig)()];
             case 1:
-                cookiesArr = _e.sent();
+                cookiesArr = _h.sent();
                 except = (0, TS_USER_AGENTS_1.exceptCookie)(path.basename(__filename));
                 orders = {};
                 if ((0, fs_1.existsSync)('./json')) {
@@ -68,38 +68,39 @@ var cookie = '', UserName, index, allMessage = '', res = '', message = '';
                     (0, fs_1.mkdirSync)('./json');
                     (0, fs_1.writeFileSync)('./json/jd_track.json', '{}');
                 }
-                i = 0;
-                _e.label = 2;
+                _i = 0, _a = cookiesArr.entries();
+                _h.label = 2;
             case 2:
-                if (!(i < cookiesArr.length)) return [3 /*break*/, 11];
-                cookie = cookiesArr[i];
+                if (!(_i < _a.length)) return [3 /*break*/, 13];
+                _b = _a[_i], index = _b[0], value = _b[1];
+                cookie = value;
                 UserName = decodeURIComponent(cookie.match(/pt_pin=([^;]*)/)[1]);
-                index = i + 1;
-                console.log("\n\u5F00\u59CB\u3010\u4EAC\u4E1C\u8D26\u53F7".concat(index, "\u3011").concat(UserName, "\n"));
+                console.log("\n\u5F00\u59CB\u3010\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "\u3011").concat(UserName, "\n"));
                 if (except.includes(encodeURIComponent(UserName))) {
                     console.log('已设置跳过');
-                    return [3 /*break*/, 10];
+                    return [3 /*break*/, 12];
                 }
                 message = '';
+                markdown = "", i = 1;
                 return [4 /*yield*/, getOrderList()];
             case 3:
-                res = _e.sent();
+                res = _h.sent();
                 return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
             case 4:
-                _e.sent();
-                _i = 0, _a = res.orderList;
-                _e.label = 5;
+                _h.sent();
+                _c = 0, _d = res.orderList;
+                _h.label = 5;
             case 5:
-                if (!(_i < _a.length)) return [3 /*break*/, 8];
-                order = _a[_i];
+                if (!(_c < _d.length)) return [3 /*break*/, 8];
+                order = _d[_c];
                 orderId = order.orderId;
                 orderType = order.orderType;
                 title = order.productList[0].title;
-                t = ((_c = order.progressInfo) === null || _c === void 0 ? void 0 : _c.tip) || null;
-                status_1 = ((_d = order.progressInfo) === null || _d === void 0 ? void 0 : _d.content) || null;
+                t = ((_f = order.progressInfo) === null || _f === void 0 ? void 0 : _f.tip) || null;
+                status_1 = ((_g = order.progressInfo) === null || _g === void 0 ? void 0 : _g.content) || null;
                 return [4 /*yield*/, getWuliu(orderId, orderType)];
             case 6:
-                res = _e.sent();
+                res = _h.sent();
                 carrier = res.carrier, carriageId = res.carriageId;
                 if (t && status_1) {
                     if (status_1.match(/(?=签收|已取走|已暂存)/))
@@ -109,6 +110,7 @@ var cookie = '', UserName, index, allMessage = '', res = '', message = '';
                     console.log();
                     if (Object.keys(orders).indexOf(orderId) > -1 && orders[orderId]['status'] !== status_1) {
                         message += "".concat(title, "\n").concat(carrier, "  ").concat(carriageId, "\n").concat(t, "  ").concat(status_1, "\n\n");
+                        markdown += "".concat(i++, ". ").concat(title, "\n\t- ").concat(carrier, "  ").concat(carriageId, "\n\t- ").concat(t, "  ").concat(status_1, "\n");
                     }
                     orders[orderId] = {
                         user: UserName,
@@ -119,36 +121,39 @@ var cookie = '', UserName, index, allMessage = '', res = '', message = '';
                         carriageId: carriageId
                     };
                 }
-                _e.label = 7;
+                _h.label = 7;
             case 7:
-                _i++;
+                _c++;
                 return [3 /*break*/, 5];
             case 8:
-                if (message) {
-                    message = "<\u4EAC\u4E1C\u8D26\u53F7".concat(i + 1, ">  ").concat(UserName, "\n\n").concat(message);
-                    allMessage += message;
-                }
-                return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
+                console.log(markdown);
+                if (!(message || markdown)) return [3 /*break*/, 10];
+                message = "<\u4EAC\u4E1C\u8D26\u53F7".concat(i + 1, ">  ").concat(UserName, "\n\n").concat(message);
+                markdown = "#### <".concat(UserName, ">\n").concat(markdown);
+                // await pushplus(message)
+                return [4 /*yield*/, (0, pushplus_1.pushplus)('京东快递更新', markdown, 'markdown')
+                    // allMessage += message
+                ];
             case 9:
-                _e.sent();
-                _e.label = 10;
-            case 10:
-                i++;
-                return [3 /*break*/, 2];
+                // await pushplus(message)
+                _h.sent();
+                _h.label = 10;
+            case 10: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
             case 11:
+                _h.sent();
+                _h.label = 12;
+            case 12:
+                _i++;
+                return [3 /*break*/, 2];
+            case 13:
                 orders = JSON.stringify(orders, null, 2);
                 account = JSON.parse((0, fs_1.readFileSync)('./utils/account.json').toString() || '[]') || [];
-                for (_b = 0, account_1 = account; _b < account_1.length; _b++) {
-                    acc = account_1[_b];
+                for (_e = 0, account_1 = account; _e < account_1.length; _e++) {
+                    acc = account_1[_e];
                     orders = orders.replace(new RegExp(decodeURIComponent(acc['pt_pin']), 'g'), acc['remarks']);
                 }
                 (0, fs_1.writeFileSync)('./json/jd_track.json', orders);
-                if (!allMessage) return [3 /*break*/, 13];
-                return [4 /*yield*/, (0, sendNotify_1.sendNotify)('京东快递更新', allMessage)];
-            case 12:
-                _e.sent();
-                _e.label = 13;
-            case 13: return [2 /*return*/];
+                return [2 /*return*/];
         }
     });
 }); })();

jd_track.ts

@@ -8,8 +8,9 @@ import * as path from "path"
 import {sendNotify} from './sendNotify'
 import {existsSync, mkdirSync, readFileSync, writeFileSync} from "fs"
 import USER_AGENT, {requireConfig, exceptCookie, wait} from "./TS_USER_AGENTS"
+import {pushplus} from "./utils/pushplus";
 
-let cookie: string = '', UserName: string, index: number, allMessage: string = '', res: any = '', message: string = ''
+let cookie: string = '', UserName: string, allMessage: string = '', res: any = '', message: string = ''
 
 !(async () => {
   let cookiesArr: string[] = await requireConfig()
@@ -25,18 +26,19 @@ let cookie: string = '', UserName: string, index: number, allMessage: string = '
     mkdirSync('./json')
     writeFileSync('./json/jd_track.json', '{}')
   }
-  for (let i = 0; i < cookiesArr.length; i++) {
-    cookie = cookiesArr[i]
+  for (let [index, value] of cookiesArr.entries()) {
+    cookie = value
     UserName = decodeURIComponent(cookie.match(/pt_pin=([^;]*)/)![1])
-    index = i + 1
-    console.log(`\n开始【京东账号${index}】${UserName}\n`)
+    console.log(`\n开始【京东账号${index + 1}】${UserName}\n`)
 
     if (except.includes(encodeURIComponent(UserName))) {
       console.log('已设置跳过')
       continue
     }
 
     message = ''
+    let markdown: string = ``, i: number = 1
+
     res = await getOrderList()
     await wait(2000)
 
@@ -57,15 +59,20 @@ let cookie: string = '', UserName: string, index: number, allMessage: string = '
         console.log()
         if (Object.keys(orders).indexOf(orderId) > -1 && orders[orderId]['status'] !== status) {
           message += `${title}\n${carrier}  ${carriageId}\n${t}  ${status}\n\n`
+          markdown += `${i++}. ${title}\n\t- ${carrier}  ${carriageId}\n\t- ${t}  ${status}\n`
         }
         orders[orderId] = {
           user: UserName, title, t, status, carrier, carriageId
         }
       }
     }
-    if (message) {
+    console.log(markdown)
+    if (message || markdown) {
       message = `<京东账号${i + 1}>  ${UserName}\n\n${message}`
-      allMessage += message
+      markdown = `#### <${UserName}>\n${markdown}`
+      // await pushplus(message)
+      await pushplus('京东快递更新', markdown, 'markdown')
+      // allMessage += message
     }
     await wait(1000)
   }
@@ -75,8 +82,8 @@ let cookie: string = '', UserName: string, index: number, allMessage: string = '
     orders = orders.replace(new RegExp(decodeURIComponent(acc['pt_pin']), 'g'), acc['remarks'])
   }
   writeFileSync('./json/jd_track.json', orders)
-  if (allMessage)
-    await sendNotify('京东快递更新', allMessage)
+  // if (allMessage)
+  //   await sendNotify('京东快递更新', allMessage)
 })()
 
 async function getOrderList() {

utils/pushplus.js

@@ -41,7 +41,8 @@ var axios_1 = require("axios");
 var fs_1 = require("fs");
 var TS_USER_AGENTS_1 = require("../TS_USER_AGENTS");
 var account = JSON.parse((0, fs_1.readFileSync)("./utils/account.json").toString());
-function pushplus(content) {
+function pushplus(title, content, template) {
+    if (template === void 0) { template = 'html'; }
     return __awaiter(this, void 0, void 0, function () {
         var _i, account_1, user;
         return __generator(this, function (_a) {
@@ -54,7 +55,7 @@ function pushplus(content) {
                     user = account_1[_i];
                     if (!(content.includes(decodeURIComponent(user.pt_pin)) && user.pushplus)) return [3 /*break*/, 3];
                     console.log("[Pushplus] => ".concat(decodeURIComponent(user.pt_pin)));
-                    return [4 /*yield*/, send(user.pushplus, content)];
+                    return [4 /*yield*/, send(user.pushplus, title, content, template)];
                 case 2:
                     _a.sent();
                     _a.label = 3;
@@ -67,15 +68,16 @@ function pushplus(content) {
     });
 }
 exports.pushplus = pushplus;
-function send(token, content) {
+function send(token, title, content, template) {
     return __awaiter(this, void 0, void 0, function () {
         var data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, axios_1["default"].post('https://www.pushplus.plus/send', {
                         token: token,
-                        title: '京东红包',
-                        content: content
+                        title: title,
+                        content: content,
+                        template: template
                     }, {
                         headers: {
                             'Content-Type': 'application/json'

utils/pushplus.ts

@@ -4,20 +4,21 @@ import {o2s} from "../TS_USER_AGENTS";
 
 let account: { pushplus?: string, pt_pin: string }[] = JSON.parse(readFileSync("./utils/account.json").toString());
 
-export async function pushplus(content: string) {
+export async function pushplus(title: string, content: string, template: string = 'html') {
   for (let user of account) {
     if (content.includes(decodeURIComponent(user.pt_pin)) && user.pushplus) {
       console.log(`[Pushplus] => ${decodeURIComponent(user.pt_pin)}`);
-      await send(user.pushplus, content)
+      await send(user.pushplus, title, content, template)
     }
   }
 }
 
-async function send(token: string, content: string) {
+async function send(token: string, title, content: string, template: string) {
   let {data}: any = await axios.post('https://www.pushplus.plus/send', {
     token: token,
-    title: '京东红包',
+    title: title,
     content: content,
+    template: template
   }, {
     headers: {
       'Content-Type': 'application/json'