Skip to content

Commit 51be8d7

Browse files
github-actions[bot]github-actions[bot]
committedFeb 21, 2022
Update
1 parent 1a48dad commit 51be8d7

10 files changed

+120
-263
lines changed
 

‎jd_fruit_moreTask.js

-135
This file was deleted.

‎jd_fruit_moreTask.ts

-56
This file was deleted.

‎jd_health.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ var cookie = '', res = '', UserName;
131131
e_1 = _g.sent();
132132
console.log('Error', e_1);
133133
return [3 /*break*/, 24];
134-
case 21: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(3000)];
134+
case 21: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(10000)];
135135
case 22:
136136
_g.sent();
137137
_g.label = 23;

‎jd_health.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ let cookie: string = '', res: any = '', UserName: string
5959
console.log('Error', e)
6060
break
6161
}
62-
await wait(3000)
62+
await wait(10000)
6363
}
6464
}
6565
})();

‎jd_speed_redpocke.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cron "20 0,22 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master
2424
const $ = new Env('京东极速版红包');
2525
const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
2626
let cookiesArr = [], cookie = '', message;
27-
const linkIds = ["7ya6o83WSbNhrbYJqsMfFA", "Eu7-E0CUzqYyhZJo9d3YkQ"];
27+
const linkIds = ["7ya6o83WSbNhrbYJqsMfFA"];
2828
const signLinkId = '9WA12jYGulArzWS7vcrwhw';
2929
let linkId
3030

‎jd_track.js

+62-42
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,32 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
4242
exports.__esModule = true;
4343
var axios_1 = require("axios");
4444
var path = require("path");
45+
var sendNotify_1 = require("./sendNotify");
4546
var fs_1 = require("fs");
4647
var TS_USER_AGENTS_1 = require("./TS_USER_AGENTS");
4748
var pushplus_1 = require("./utils/pushplus");
48-
var cookie = '', UserName, allMessage = '', res = '', message = '';
49+
var cookie = '', UserName, allMessage = '', res = '';
4950
!(function () { return __awaiter(void 0, void 0, void 0, function () {
50-
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;
51-
var _f, _g;
52-
return __generator(this, function (_h) {
53-
switch (_h.label) {
51+
var cookiesArr, except, orders, pushplusArr, pushplusUser, _i, pushplusArr_1, user, _a, _b, _c, index, value, message, markdown, i, _d, _e, order, orderId, orderType, title, t, status_1, carrier, carriageId, account, _f, account_1, acc;
52+
var _g, _h;
53+
return __generator(this, function (_j) {
54+
switch (_j.label) {
5455
case 0: return [4 /*yield*/, (0, TS_USER_AGENTS_1.requireConfig)()];
5556
case 1:
56-
cookiesArr = _h.sent();
57+
cookiesArr = _j.sent();
5758
except = (0, TS_USER_AGENTS_1.exceptCookie)(path.basename(__filename));
58-
orders = {};
59+
orders = {}, pushplusUser = [];
60+
try {
61+
pushplusArr = JSON.parse((0, fs_1.readFileSync)('./utils/pushplus.json', 'utf-8').toString());
62+
}
63+
catch (e) {
64+
console.log('utils/pushplus.json 加载错误');
65+
pushplusArr = [];
66+
}
67+
for (_i = 0, pushplusArr_1 = pushplusArr; _i < pushplusArr_1.length; _i++) {
68+
user = pushplusArr_1[_i];
69+
pushplusUser.push(decodeURIComponent(user.pt_pin));
70+
}
5971
if ((0, fs_1.existsSync)('./json')) {
6072
if ((0, fs_1.existsSync)('./json/jd_track.json')) {
6173
orders = JSON.parse((0, fs_1.readFileSync)('./json/jd_track.json').toString() || '{}');
@@ -68,39 +80,38 @@ var cookie = '', UserName, allMessage = '', res = '', message = '';
6880
(0, fs_1.mkdirSync)('./json');
6981
(0, fs_1.writeFileSync)('./json/jd_track.json', '{}');
7082
}
71-
_i = 0, _a = cookiesArr.entries();
72-
_h.label = 2;
83+
_a = 0, _b = cookiesArr.entries();
84+
_j.label = 2;
7385
case 2:
74-
if (!(_i < _a.length)) return [3 /*break*/, 13];
75-
_b = _a[_i], index = _b[0], value = _b[1];
86+
if (!(_a < _b.length)) return [3 /*break*/, 13];
87+
_c = _b[_a], index = _c[0], value = _c[1];
7688
cookie = value;
7789
UserName = decodeURIComponent(cookie.match(/pt_pin=([^;]*)/)[1]);
7890
console.log("\n\u5F00\u59CB\u3010\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "\u3011").concat(UserName, "\n"));
7991
if (except.includes(encodeURIComponent(UserName))) {
8092
console.log('已设置跳过');
8193
return [3 /*break*/, 12];
8294
}
83-
message = '';
84-
markdown = "", i = 1;
95+
message = '', markdown = "", i = 1;
8596
return [4 /*yield*/, getOrderList()];
8697
case 3:
87-
res = _h.sent();
98+
res = _j.sent();
8899
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
89100
case 4:
90-
_h.sent();
91-
_c = 0, _d = res.orderList;
92-
_h.label = 5;
101+
_j.sent();
102+
_d = 0, _e = res.orderList;
103+
_j.label = 5;
93104
case 5:
94-
if (!(_c < _d.length)) return [3 /*break*/, 8];
95-
order = _d[_c];
105+
if (!(_d < _e.length)) return [3 /*break*/, 8];
106+
order = _e[_d];
96107
orderId = order.orderId;
97108
orderType = order.orderType;
98109
title = order.productList[0].title;
99-
t = ((_f = order.progressInfo) === null || _f === void 0 ? void 0 : _f.tip) || null;
100-
status_1 = ((_g = order.progressInfo) === null || _g === void 0 ? void 0 : _g.content) || null;
110+
t = ((_g = order.progressInfo) === null || _g === void 0 ? void 0 : _g.tip) || null;
111+
status_1 = ((_h = order.progressInfo) === null || _h === void 0 ? void 0 : _h.content) || null;
101112
return [4 /*yield*/, getWuliu(orderId, orderType)];
102113
case 6:
103-
res = _h.sent();
114+
res = _j.sent();
104115
carrier = res.carrier, carriageId = res.carriageId;
105116
if (t && status_1) {
106117
if (status_1.match(/(?=签收|已取走|已暂存)/))
@@ -109,8 +120,14 @@ var cookie = '', UserName, allMessage = '', res = '', message = '';
109120
console.log('\t', t, status_1);
110121
console.log();
111122
if (Object.keys(orders).indexOf(orderId) > -1 && orders[orderId]['status'] !== status_1) {
112-
message += "".concat(title, "\n").concat(carrier, " ").concat(carriageId, "\n").concat(t, " ").concat(status_1, "\n\n");
113-
markdown += "".concat(i++, ". ").concat(title, "\n\t- ").concat(carrier, " ").concat(carriageId, "\n\t- ").concat(t, " ").concat(status_1, "\n");
123+
if (pushplusUser.includes(UserName)) {
124+
console.log('+ pushplus');
125+
markdown += "".concat(i++, ". ").concat(title, "\n\t- ").concat(carrier, " ").concat(carriageId, "\n\t- ").concat(t, " ").concat(status_1, "\n");
126+
}
127+
else {
128+
console.log('+ sendNotify');
129+
message += "".concat(title, "\n").concat(carrier, " ").concat(carriageId, "\n").concat(t, " ").concat(status_1, "\n\n");
130+
}
114131
}
115132
orders[orderId] = {
116133
user: UserName,
@@ -121,39 +138,42 @@ var cookie = '', UserName, allMessage = '', res = '', message = '';
121138
carriageId: carriageId
122139
};
123140
}
124-
_h.label = 7;
141+
_j.label = 7;
125142
case 7:
126-
_c++;
143+
_d++;
127144
return [3 /*break*/, 5];
128145
case 8:
129-
console.log(markdown);
130-
if (!(message || markdown)) return [3 /*break*/, 10];
131-
message = "<\u4EAC\u4E1C\u8D26\u53F7".concat(i + 1, "> ").concat(UserName, "\n\n").concat(message);
146+
if (message) {
147+
message = "<\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "> ").concat(UserName, "\n\n").concat(message);
148+
allMessage += message;
149+
}
150+
if (!markdown) return [3 /*break*/, 10];
132151
markdown = "#### <".concat(UserName, ">\n").concat(markdown);
133-
// await pushplus(message)
134-
return [4 /*yield*/, (0, pushplus_1.pushplus)('京东快递更新', markdown, 'markdown')
135-
// allMessage += message
136-
];
152+
return [4 /*yield*/, (0, pushplus_1.pushplus)('京东快递更新', markdown, 'markdown')];
137153
case 9:
138-
// await pushplus(message)
139-
_h.sent();
140-
_h.label = 10;
154+
_j.sent();
155+
_j.label = 10;
141156
case 10: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
142157
case 11:
143-
_h.sent();
144-
_h.label = 12;
158+
_j.sent();
159+
_j.label = 12;
145160
case 12:
146-
_i++;
161+
_a++;
147162
return [3 /*break*/, 2];
148163
case 13:
149164
orders = JSON.stringify(orders, null, 2);
150165
account = JSON.parse((0, fs_1.readFileSync)('./utils/account.json').toString() || '[]') || [];
151-
for (_e = 0, account_1 = account; _e < account_1.length; _e++) {
152-
acc = account_1[_e];
166+
for (_f = 0, account_1 = account; _f < account_1.length; _f++) {
167+
acc = account_1[_f];
153168
orders = orders.replace(new RegExp(decodeURIComponent(acc['pt_pin']), 'g'), acc['remarks']);
154169
}
155170
(0, fs_1.writeFileSync)('./json/jd_track.json', orders);
156-
return [2 /*return*/];
171+
if (!allMessage) return [3 /*break*/, 15];
172+
return [4 /*yield*/, (0, sendNotify_1.sendNotify)('京东快递更新', allMessage)];
173+
case 14:
174+
_j.sent();
175+
_j.label = 15;
176+
case 15: return [2 /*return*/];
157177
}
158178
});
159179
}); })();

0 commit comments

Comments
 (0)
Please sign in to comment.