Skip to content

Commit af40ff5

Browse files
github-actions[bot]github-actions[bot]
committedMar 29, 2022
Update
1 parent c225457 commit af40ff5

11 files changed

+198
-133
lines changed
 

‎jd_cash.js

+60-50
Original file line numberDiff line numberDiff line change
@@ -41,97 +41,102 @@ var cookie = '', res = '', data, UserName;
4141
var message = '';
4242
!(function () { return __awaiter(void 0, void 0, void 0, function () {
4343
var cookiesArr, _loop_1, _i, _a, _b, index, value;
44-
var _c;
45-
return __generator(this, function (_d) {
46-
switch (_d.label) {
44+
var _c, _d, _e;
45+
return __generator(this, function (_f) {
46+
switch (_f.label) {
4747
case 0: return [4 /*yield*/, (0, TS_USER_AGENTS_1.requireConfig)()];
4848
case 1:
49-
cookiesArr = _d.sent();
49+
cookiesArr = _f.sent();
5050
_loop_1 = function (index, value) {
51-
var type, otherTaskNum, taskNum, i, _e, _f, t;
52-
return __generator(this, function (_g) {
53-
switch (_g.label) {
51+
var type, otherTaskNum, taskNum, i, _g, _h, t;
52+
return __generator(this, function (_j) {
53+
switch (_j.label) {
5454
case 0:
5555
cookie = value;
5656
UserName = decodeURIComponent(cookie.match(/pt_pin=([^;]*)/)[1]);
5757
console.log("\n\u5F00\u59CB\u3010\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "\u3011").concat(UserName, "\n"));
5858
message += "\u3010\u8D26\u53F7".concat(index + 1, "\u3011 ").concat(UserName, "\n");
5959
return [4 /*yield*/, api('cash_homePage', {})];
6060
case 1:
61-
res = _g.sent();
61+
res = _j.sent();
6262
(0, TS_USER_AGENTS_1.o2s)(res);
6363
if (!(res.data.result.signedStatus !== 1)) return [3 /*break*/, 4];
6464
console.log('今日未签到');
6565
return [4 /*yield*/, api('cash_sign', { "remind": 0, "inviteCode": "", "type": 0, "breakReward": 0 })];
6666
case 2:
67-
data = _g.sent();
67+
data = _j.sent();
6868
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
6969
case 3:
70-
_g.sent();
70+
_j.sent();
7171
(0, TS_USER_AGENTS_1.o2s)(data, '签到成功');
72-
_g.label = 4;
73-
case 4:
72+
_j.label = 4;
73+
case 4: return [4 /*yield*/, api('cash_homePage', {})];
74+
case 5:
75+
res = _j.sent();
76+
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
77+
case 6:
78+
_j.sent();
7479
type = [2, 4, 31, 16, 3, 5, 17, 21];
7580
otherTaskNum = res.data.result.taskInfos.filter(function (item) { return !type.includes(item.type); }).length;
7681
taskNum = res.data.result.taskInfos.filter(function (item) { return type.includes(item.type); }).length;
77-
console.log(otherTaskNum);
78-
console.log(taskNum);
82+
console.log(taskNum, otherTaskNum);
7983
i = 0;
80-
_g.label = 5;
81-
case 5:
82-
if (!(i < 10)) return [3 /*break*/, 14];
84+
_j.label = 7;
85+
case 7:
86+
if (!(i < 10)) return [3 /*break*/, 16];
8387
return [4 /*yield*/, api('cash_homePage', {})];
84-
case 6:
85-
res = _g.sent();
88+
case 8:
89+
res = _j.sent();
90+
(0, TS_USER_AGENTS_1.o2s)(res);
8691
if (res.data.result.taskInfos.filter(function (item) { return type.includes(item.type) && item.doTimes === item.times; }).length === taskNum) {
8792
console.log('任务全部完成');
88-
return [3 /*break*/, 14];
93+
return [3 /*break*/, 16];
8994
}
90-
_e = 0, _f = res.data.result.taskInfos;
91-
_g.label = 7;
92-
case 7:
93-
if (!(_e < _f.length)) return [3 /*break*/, 11];
94-
t = _f[_e];
95-
if (!(t.doTimes < t.times && t.type !== 7)) return [3 /*break*/, 10];
95+
_g = 0, _h = ((_d = (_c = res === null || res === void 0 ? void 0 : res.data) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.taskInfos) || [];
96+
_j.label = 9;
97+
case 9:
98+
if (!(_g < _h.length)) return [3 /*break*/, 13];
99+
t = _h[_g];
100+
if (!(t.doTimes < t.times && t.type !== 7)) return [3 /*break*/, 12];
96101
console.log(t.name);
97102
return [4 /*yield*/, api('cash_doTask', { "type": t.type, "taskInfo": t.desc })];
98-
case 8:
99-
data = _g.sent();
103+
case 10:
104+
data = _j.sent();
100105
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(t.duration * 1000 || 1000)];
101-
case 9:
102-
_g.sent();
106+
case 11:
107+
_j.sent();
103108
if (data.data.bizCode === 0) {
104-
console.log('任务完成', (_c = data.data.result.totalMoney) !== null && _c !== void 0 ? _c : '');
105-
return [3 /*break*/, 11];
109+
console.log('任务完成', (_e = data.data.result.totalMoney) !== null && _e !== void 0 ? _e : '');
110+
return [3 /*break*/, 13];
106111
}
107112
else {
108113
(0, TS_USER_AGENTS_1.o2s)(data, '任务失败');
109-
return [3 /*break*/, 11];
114+
return [3 /*break*/, 13];
110115
}
111-
_g.label = 10;
112-
case 10:
113-
_e++;
114-
return [3 /*break*/, 7];
115-
case 11: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
116+
_j.label = 12;
116117
case 12:
117-
_g.sent();
118-
_g.label = 13;
119-
case 13:
118+
_g++;
119+
return [3 /*break*/, 9];
120+
case 13: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
121+
case 14:
122+
_j.sent();
123+
_j.label = 15;
124+
case 15:
120125
i++;
121-
return [3 /*break*/, 5];
122-
case 14: return [2 /*return*/];
126+
return [3 /*break*/, 7];
127+
case 16: return [2 /*return*/];
123128
}
124129
});
125130
};
126131
_i = 0, _a = cookiesArr.entries();
127-
_d.label = 2;
132+
_f.label = 2;
128133
case 2:
129134
if (!(_i < _a.length)) return [3 /*break*/, 5];
130135
_b = _a[_i], index = _b[0], value = _b[1];
131136
return [5 /*yield**/, _loop_1(index, value)];
132137
case 3:
133-
_d.sent();
134-
_d.label = 4;
138+
_f.sent();
139+
_f.label = 4;
135140
case 4:
136141
_i++;
137142
return [3 /*break*/, 2];
@@ -140,21 +145,26 @@ var message = '';
140145
});
141146
}); })();
142147
function api(fn, body) {
148+
var _a;
143149
return __awaiter(this, void 0, void 0, function () {
144150
var sign;
145-
return __generator(this, function (_a) {
146-
switch (_a.label) {
151+
return __generator(this, function (_b) {
152+
switch (_b.label) {
147153
case 0: return [4 /*yield*/, (0, TS_USER_AGENTS_1.post)('https://api.jds.codes/jd/sign', { fn: fn, body: body })];
148154
case 1:
149-
sign = _a.sent();
155+
sign = _b.sent();
156+
if (!((_a = sign === null || sign === void 0 ? void 0 : sign.data) === null || _a === void 0 ? void 0 : _a.sign)) {
157+
(0, TS_USER_AGENTS_1.o2s)(sign, 'getSign Error');
158+
return [2 /*return*/, {}];
159+
}
150160
return [4 /*yield*/, (0, TS_USER_AGENTS_1.post)("https://api.m.jd.com/client.action?functionId=".concat(fn), sign.data.sign, {
151161
'Host': 'api.m.jd.com',
152162
'Cookie': cookie,
153163
'content-type': 'application/x-www-form-urlencoded',
154164
'user-agent': TS_USER_AGENTS_1["default"],
155165
'referer': ''
156166
})];
157-
case 2: return [2 /*return*/, _a.sent()];
167+
case 2: return [2 /*return*/, _b.sent()];
158168
}
159169
});
160170
});

‎jd_cash.ts

+9-3
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,21 @@ let message: string = ''
2020
await wait(1000)
2121
o2s(data, '签到成功')
2222
}
23+
res = await api('cash_homePage', {})
24+
await wait(1000)
2325
let type: number[] = [2, 4, 31, 16, 3, 5, 17, 21]
2426
let otherTaskNum = res.data.result.taskInfos.filter(item => !type.includes(item.type)).length
2527
let taskNum = res.data.result.taskInfos.filter(item => type.includes(item.type)).length
26-
console.log(otherTaskNum)
27-
console.log(taskNum)
28+
console.log(taskNum, otherTaskNum)
2829

2930
for (let i = 0; i < 10; i++) {
3031
res = await api('cash_homePage', {})
32+
o2s(res)
3133
if (res.data.result.taskInfos.filter(item => type.includes(item.type) && item.doTimes === item.times).length === taskNum) {
3234
console.log('任务全部完成')
3335
break
3436
}
35-
for (let t of res.data.result.taskInfos) {
37+
for (let t of res?.data?.result?.taskInfos || []) {
3638
if (t.doTimes < t.times && t.type !== 7) {
3739
console.log(t.name)
3840
data = await api('cash_doTask', {"type": t.type, "taskInfo": t.desc})
@@ -53,6 +55,10 @@ let message: string = ''
5355

5456
async function api(fn: string, body: object) {
5557
let sign = await post('https://api.jds.codes/jd/sign', {fn, body})
58+
if (!sign?.data?.sign) {
59+
o2s(sign, 'getSign Error')
60+
return {}
61+
}
5662
return await post(`https://api.m.jd.com/client.action?functionId=${fn}`, sign.data.sign, {
5763
'Host': 'api.m.jd.com',
5864
'Cookie': cookie,

‎jd_fruit.js

+64-21
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,14 @@ async function turntableFarm() {
493493
await initForTurntableFarm();
494494
if ($.initForTurntableFarmRes.code === '0') {
495495
//领取定时奖励 //4小时一次
496-
let {timingIntervalHours, timingLastSysTime, sysTime, timingGotStatus, remainLotteryTimes, turntableInfos} = $.initForTurntableFarmRes;
496+
let {
497+
timingIntervalHours,
498+
timingLastSysTime,
499+
sysTime,
500+
timingGotStatus,
501+
remainLotteryTimes,
502+
turntableInfos
503+
} = $.initForTurntableFarmRes;
497504

498505
if (!timingGotStatus) {
499506
console.log(`是否到了领取免费赠送的抽奖机会----${sysTime > (timingLastSysTime + 60 * 60 * timingIntervalHours * 1000)}`)
@@ -837,7 +844,11 @@ async function getAwardInviteFriend() {
837844
if ($.friendList.friends && $.friendList.friends.length > 0) {
838845
for (let friend of $.friendList.friends) {
839846
console.log(`\n开始删除好友 [${friend.shareCode}]`);
840-
const deleteFriendForFarm = await request('deleteFriendForFarm', {"shareCode": `${friend.shareCode}`, "version": 8, "channel": 1});
847+
const deleteFriendForFarm = await request('deleteFriendForFarm', {
848+
"shareCode": `${friend.shareCode}`,
849+
"version": 8,
850+
"channel": 1
851+
});
841852
if (deleteFriendForFarm && deleteFriendForFarm.code === '0') {
842853
console.log(`删除好友 [${friend.shareCode}] 成功\n`);
843854
}
@@ -919,7 +930,12 @@ async function doFriendsWater() {
919930
//领取给3个好友浇水后的奖励水滴
920931
async function getWaterFriendGotAward() {
921932
await taskInitForFarm();
922-
const {waterFriendCountKey, waterFriendMax, waterFriendSendWater, waterFriendGotAward} = $.farmTask.waterFriendTaskInit
933+
const {
934+
waterFriendCountKey,
935+
waterFriendMax,
936+
waterFriendSendWater,
937+
waterFriendGotAward
938+
} = $.farmTask.waterFriendTaskInit
923939
if (waterFriendCountKey >= waterFriendMax) {
924940
if (!waterFriendGotAward) {
925941
await waterFriendGotAwardForFarm();
@@ -945,7 +961,6 @@ async function receiveFriendInvite() {
945961
continue
946962
}
947963
await inviteFriend(code);
948-
// console.log(`接收邀请成为好友结果:${JSON.stringify($.inviteFriendRes)}`)
949964
if ($.inviteFriendRes && $.inviteFriendRes.helpResult && $.inviteFriendRes.helpResult.code === '0') {
950965
console.log(`接收邀请成为好友结果成功,您已成为${$.inviteFriendRes.helpResult.masterUserInfo.nickName}的好友`)
951966
} else if ($.inviteFriendRes && $.inviteFriendRes.helpResult && $.inviteFriendRes.helpResult.code === '17') {
@@ -1121,23 +1136,34 @@ async function receiveStageEnergy() {
11211136
//接受对方邀请,成为对方好友的API
11221137
async function inviteFriend() {
11231138
$.inviteFriendRes = await request(`initForFarm`, {
1124-
imageUrl: "",
1125-
nickName: "",
1126-
shareCode: arguments[0] + '-inviteFriend',
1127-
version: 4,
1128-
channel: 2
1139+
"mpin": "",
1140+
"utm_campaign": "",
1141+
"utm_medium": "appshare",
1142+
"shareCode": arguments[0] + '-inviteFriend',
1143+
"utm_term": "Wxfriends",
1144+
"utm_source": "iosapp",
1145+
"imageUrl": "",
1146+
"nickName": "",
1147+
"version": 14,
1148+
"channel": 2,
1149+
"babelChannel": 0
11291150
});
11301151
}
11311152

11321153
// 助力好友API
11331154
async function masterHelp() {
11341155
$.helpResult = await request(`initForFarm`, {
1135-
imageUrl: "",
1136-
nickName: "",
1137-
shareCode: arguments[0],
1138-
babelChannel: "3",
1139-
version: 2,
1140-
channel: 1
1156+
"mpin": "",
1157+
"utm_campaign": "t_335139774",
1158+
"utm_medium": "appshare",
1159+
"shareCode": arguments[0],
1160+
"utm_term": "Wxfriends",
1161+
"utm_source": "iosapp",
1162+
"imageUrl": "",
1163+
"nickName": "",
1164+
"version": 14,
1165+
"channel": 2,
1166+
"babelChannel": 0
11411167
});
11421168
}
11431169

@@ -1230,7 +1256,10 @@ async function initForFarm() {
12301256
return new Promise(resolve => {
12311257
const option = {
12321258
url: `${JD_API_HOST}?functionId=initForFarm`,
1233-
body: `body=${encodeURIComponent(JSON.stringify({"version": 4}))}&appid=wh5&clientVersion=9.1.0`,
1259+
body: `body=${encodeURIComponent(JSON.stringify({
1260+
"version": 11,
1261+
"channel": 3
1262+
}))}&client=apple&clientVersion=10.0.4&osVersion=13.7&appid=wh5&loginType=2&loginWQBiz=interact`,
12341263
headers: {
12351264
"accept": "*/*",
12361265
"accept-encoding": "gzip, deflate, br",
@@ -1438,7 +1467,7 @@ function safeGet(data) {
14381467

14391468
function taskUrl(function_id, body = {}) {
14401469
return {
1441-
url: `${JD_API_HOST}?functionId=${function_id}&body=${encodeURIComponent(JSON.stringify(body))}&appid=wh5`,
1470+
url: `${JD_API_HOST}?functionId=${function_id}&body=${encodeURIComponent(JSON.stringify(body))}&appid=wh5&client=apple&clientVersion=10.2.4`,
14421471
headers: {
14431472
"Host": "api.m.jd.com",
14441473
"Accept": "*/*",
@@ -1560,7 +1589,11 @@ function Env(t, e) {
15601589
i = i ? i.replace(/\n/g, "").trim() : i;
15611590
let r = this.getdata("@chavy_boxjs_userCfgs.httpapi_timeout");
15621591
r = r ? 1 * r : 20, r = e && e.timeout ? e.timeout : r;
1563-
const [o, h] = i.split("@"), n = {url: `http://${h}/v1/scripting/evaluate`, body: {script_text: t, mock_type: "cron", timeout: r}, headers: {"X-Key": o, Accept: "*/*"}};
1592+
const [o, h] = i.split("@"), n = {
1593+
url: `http://${h}/v1/scripting/evaluate`,
1594+
body: {script_text: t, mock_type: "cron", timeout: r},
1595+
headers: {"X-Key": o, Accept: "*/*"}
1596+
};
15641597
this.post(n, (t, e, i) => s(i))
15651598
}).catch(t => this.logErr(t))
15661599
}
@@ -1569,7 +1602,8 @@ function Env(t, e) {
15691602
if (!this.isNode()) return {};
15701603
{
15711604
this.fs = this.fs ? this.fs : require("fs"), this.path = this.path ? this.path : require("path");
1572-
const t = this.path.resolve(this.dataFile), e = this.path.resolve(process.cwd(), this.dataFile), s = this.fs.existsSync(t), i = !s && this.fs.existsSync(e);
1605+
const t = this.path.resolve(this.dataFile), e = this.path.resolve(process.cwd(), this.dataFile),
1606+
s = this.fs.existsSync(t), i = !s && this.fs.existsSync(e);
15731607
if (!s && !i) return {};
15741608
{
15751609
const i = s ? t : e;
@@ -1585,7 +1619,8 @@ function Env(t, e) {
15851619
writedata() {
15861620
if (this.isNode()) {
15871621
this.fs = this.fs ? this.fs : require("fs"), this.path = this.path ? this.path : require("path");
1588-
const t = this.path.resolve(this.dataFile), e = this.path.resolve(process.cwd(), this.dataFile), s = this.fs.existsSync(t), i = !s && this.fs.existsSync(e), r = JSON.stringify(this.data);
1622+
const t = this.path.resolve(this.dataFile), e = this.path.resolve(process.cwd(), this.dataFile),
1623+
s = this.fs.existsSync(t), i = !s && this.fs.existsSync(e), r = JSON.stringify(this.data);
15891624
s ? this.fs.writeFileSync(t, r) : i ? this.fs.writeFileSync(e, r) : this.fs.writeFileSync(t, r)
15901625
}
15911626
}
@@ -1689,7 +1724,15 @@ function Env(t, e) {
16891724

16901725
time(t, e = null) {
16911726
const s = e ? new Date(e) : new Date;
1692-
let i = {"M+": s.getMonth() + 1, "d+": s.getDate(), "H+": s.getHours(), "m+": s.getMinutes(), "s+": s.getSeconds(), "q+": Math.floor((s.getMonth() + 3) / 3), S: s.getMilliseconds()};
1727+
let i = {
1728+
"M+": s.getMonth() + 1,
1729+
"d+": s.getDate(),
1730+
"H+": s.getHours(),
1731+
"m+": s.getMinutes(),
1732+
"s+": s.getSeconds(),
1733+
"q+": Math.floor((s.getMonth() + 3) / 3),
1734+
S: s.getMilliseconds()
1735+
};
16931736
/(y+)/.test(t) && (t = t.replace(RegExp.$1, (s.getFullYear() + "").substr(4 - RegExp.$1.length)));
16941737
for (let e in i) new RegExp("(" + e + ")").test(t) && (t = t.replace(RegExp.$1, 1 == RegExp.$1.length ? i[e] : ("00" + i[e]).substr(("" + i[e]).length)));
16951738
return t

‎jd_queryRedpacket.js

+12-11
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ var cookie = '', res = '', UserName;
4343
var message = '';
4444
!(function () { return __awaiter(void 0, void 0, void 0, function () {
4545
var cookiesArr, _i, _a, _b, index, value, day, jdRed, jdRedExp, _c, _d, j, text;
46-
return __generator(this, function (_e) {
47-
switch (_e.label) {
46+
var _e;
47+
return __generator(this, function (_f) {
48+
switch (_f.label) {
4849
case 0: return [4 /*yield*/, (0, TS_USER_AGENTS_1.requireConfig)()];
4950
case 1:
50-
cookiesArr = _e.sent();
51+
cookiesArr = _f.sent();
5152
_i = 0, _a = cookiesArr.entries();
52-
_e.label = 2;
53+
_f.label = 2;
5354
case 2:
5455
if (!(_i < _a.length)) return [3 /*break*/, 7];
5556
_b = _a[_i], index = _b[0], value = _b[1];
@@ -63,9 +64,9 @@ var message = '';
6364
'User-Agent': TS_USER_AGENTS_1["default"]
6465
})];
6566
case 3:
66-
res = _e.sent();
67+
res = _f.sent();
6768
day = new Date().getDay(), jdRed = 0, jdRedExp = 0;
68-
for (_c = 0, _d = res.data.useRedInfo.redList; _c < _d.length; _c++) {
69+
for (_c = 0, _d = ((_e = res.data.useRedInfo) === null || _e === void 0 ? void 0 : _e.redList) || []; _c < _d.length; _c++) {
6970
j = _d[_c];
7071
if (j.orgLimitStr.includes('京喜')) {
7172
}
@@ -83,18 +84,18 @@ var message = '';
8384
text = "\u3010\u8D26\u53F7\u3011 ".concat(UserName, "\n\u4EAC\u4E1C\u7EA2\u5305 ").concat(jdRed, "\n\u4ECA\u65E5\u8FC7\u671F ").concat(jdRedExp);
8485
return [4 /*yield*/, (0, pushplus_1.pushplus)('京东红包', text)];
8586
case 4:
86-
_e.sent();
87+
_f.sent();
8788
message += "".concat(text, "\n\n");
88-
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
89+
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
8990
case 5:
90-
_e.sent();
91-
_e.label = 6;
91+
_f.sent();
92+
_f.label = 6;
9293
case 6:
9394
_i++;
9495
return [3 /*break*/, 2];
9596
case 7: return [4 /*yield*/, (0, sendNotify_1.sendNotify)('京东红包', message)];
9697
case 8:
97-
_e.sent();
98+
_f.sent();
9899
return [2 /*return*/];
99100
}
100101
});

‎jd_queryRedpacket.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ let message: string = ''
1919
'User-Agent': USER_AGENT
2020
})
2121
let day: number = new Date().getDay(), jdRed: number = 0, jdRedExp: number = 0
22-
for (let j of res.data.useRedInfo.redList) {
22+
for (let j of res.data.useRedInfo?.redList || []) {
2323
if (j.orgLimitStr.includes('京喜')) {
2424
} else if (j.activityName.includes('极速版')) {
2525
} else if (j.orgLimitStr.includes('京东健康')) {
@@ -34,7 +34,7 @@ let message: string = ''
3434
await pushplus('京东红包', text)
3535

3636
message += `${text}\n\n`
37-
await wait(1000)
37+
await wait(2000)
3838
}
3939
await sendNotify('京东红包', message)
4040
})()

‎jd_track.js

+24-21
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ var cookie = '', UserName, allMessage = '', res = '';
8282
_a = 0, _b = cookiesArr.entries();
8383
_j.label = 2;
8484
case 2:
85-
if (!(_a < _b.length)) return [3 /*break*/, 13];
85+
if (!(_a < _b.length)) return [3 /*break*/, 14];
8686
_c = _b[_a], index = _c[0], value = _c[1];
8787
cookie = value;
8888
UserName = decodeURIComponent(cookie.match(/pt_pin=([^;]*)/)[1]);
8989
console.log("\n\u5F00\u59CB\u3010\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "\u3011").concat(UserName, "\n"));
9090
if (except.includes(encodeURIComponent(UserName))) {
9191
console.log('已设置跳过');
92-
return [3 /*break*/, 12];
92+
return [3 /*break*/, 13];
9393
}
9494
message = '', markdown = '', i = 1;
9595
headers = {
@@ -101,13 +101,13 @@ var cookie = '', UserName, allMessage = '', res = '';
101101
return [4 /*yield*/, (0, TS_USER_AGENTS_1.get)("https://wq.jd.com/bases/orderlist/list?order_type=2&start_page=1&last_page=0&page_size=10&callersource=mainorder&t=".concat(Date.now(), "&sceneval=2&_=").concat(Date.now(), "&sceneval=2"), '', headers)];
102102
case 3:
103103
res = _j.sent();
104-
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
104+
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
105105
case 4:
106106
_j.sent();
107107
_d = 0, _e = res.orderList;
108108
_j.label = 5;
109109
case 5:
110-
if (!(_d < _e.length)) return [3 /*break*/, 8];
110+
if (!(_d < _e.length)) return [3 /*break*/, 9];
111111
order = _e[_d];
112112
orderId = order.orderId;
113113
orderType = order.orderType;
@@ -117,10 +117,13 @@ var cookie = '', UserName, allMessage = '', res = '';
117117
return [4 /*yield*/, (0, TS_USER_AGENTS_1.get)("https://wq.jd.com/bases/wuliudetail/dealloglist?deal_id=".concat(orderId, "&orderstate=15&ordertype=").concat(orderType, "&t=").concat(Date.now(), "&sceneval=2"), '', headers)];
118118
case 6:
119119
res = _j.sent();
120+
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
121+
case 7:
122+
_j.sent();
120123
carrier = res.carrier, carriageId = res.carriageId;
121124
if (t && status_1) {
122125
if (status_1.match(/(?=签收|已取走|已暂存)/))
123-
return [3 /*break*/, 7];
126+
return [3 /*break*/, 8];
124127
if (!pushplusUser.includes(UserName)) {
125128
console.log(title);
126129
console.log('\t', t, status_1);
@@ -148,29 +151,29 @@ var cookie = '', UserName, allMessage = '', res = '';
148151
carriageId: carriageId
149152
};
150153
}
151-
_j.label = 7;
152-
case 7:
154+
_j.label = 8;
155+
case 8:
153156
_d++;
154157
return [3 /*break*/, 5];
155-
case 8:
158+
case 9:
156159
if (message) {
157-
message = "<\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "> ").concat(UserName, "\n\n").concat(message);
160+
message = "\u3010\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "\u3011 ").concat(UserName, "\n\n").concat(message);
158161
allMessage += message;
159162
}
160-
if (!markdown) return [3 /*break*/, 10];
163+
if (!markdown) return [3 /*break*/, 11];
161164
markdown = "#### <".concat(UserName, ">\n").concat(markdown);
162165
return [4 /*yield*/, (0, pushplus_1.pushplus)('京东快递更新', markdown, 'markdown')];
163-
case 9:
166+
case 10:
164167
_j.sent();
165-
_j.label = 10;
166-
case 10: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
167-
case 11:
168-
_j.sent();
169-
_j.label = 12;
168+
_j.label = 11;
169+
case 11: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
170170
case 12:
171+
_j.sent();
172+
_j.label = 13;
173+
case 13:
171174
_a++;
172175
return [3 /*break*/, 2];
173-
case 13:
176+
case 14:
174177
account = [];
175178
try {
176179
account = JSON.parse((0, fs_1.readFileSync)('./utils/account.json').toString());
@@ -194,12 +197,12 @@ var cookie = '', UserName, allMessage = '', res = '';
194197
orders = orders.replace(new RegExp(decodeURIComponent(acc.pt_pin), 'g'), acc.remarks);
195198
}
196199
(0, fs_1.writeFileSync)('./json/jd_track.json', orders);
197-
if (!allMessage) return [3 /*break*/, 15];
200+
if (!allMessage) return [3 /*break*/, 16];
198201
return [4 /*yield*/, (0, sendNotify_1.sendNotify)('京东快递更新', allMessage)];
199-
case 14:
202+
case 15:
200203
_j.sent();
201-
_j.label = 15;
202-
case 15: return [2 /*return*/];
204+
_j.label = 16;
205+
case 16: return [2 /*return*/];
203206
}
204207
});
205208
}); })();

‎jd_track.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ let cookie: string = '', UserName: string, allMessage: string = '', res: any = '
5454
}
5555

5656
res = await get(`https://wq.jd.com/bases/orderlist/list?order_type=2&start_page=1&last_page=0&page_size=10&callersource=mainorder&t=${Date.now()}&sceneval=2&_=${Date.now()}&sceneval=2`, '', headers)
57-
await wait(2000)
57+
await wait(1000)
5858

5959
for (let order of res.orderList) {
6060
let orderId: string = order.orderId
@@ -64,6 +64,7 @@ let cookie: string = '', UserName: string, allMessage: string = '', res: any = '
6464
let status: string = order.progressInfo?.content || null
6565

6666
res = await get(`https://wq.jd.com/bases/wuliudetail/dealloglist?deal_id=${orderId}&orderstate=15&ordertype=${orderType}&t=${Date.now()}&sceneval=2`, '', headers)
67+
await wait(1000)
6768
let carrier: string = res.carrier, carriageId: string = res.carriageId
6869

6970
if (t && status) {
@@ -92,7 +93,7 @@ let cookie: string = '', UserName: string, allMessage: string = '', res: any = '
9293
}
9394

9495
if (message) {
95-
message = `<京东账号${index + 1}> ${UserName}\n\n${message}`
96+
message = `【京东账号${index + 1}】 ${UserName}\n\n${message}`
9697
allMessage += message
9798
}
9899
if (markdown) {

‎jd_wechat_sign.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
4040
}
4141
};
4242
exports.__esModule = true;
43+
var sendNotify_1 = require("./sendNotify");
4344
var TS_USER_AGENTS_1 = require("./TS_USER_AGENTS");
44-
var cookie = '', res = '', UserName;
45+
var cookie = '', res = '', UserName, msg = '';
4546
!(function () { return __awaiter(void 0, void 0, void 0, function () {
4647
var cookiesArr, _i, _a, _b, index, value;
4748
return __generator(this, function (_c) {
@@ -65,8 +66,10 @@ var cookie = '', res = '', UserName;
6566
})];
6667
case 3:
6768
res = _c.sent();
68-
if (res.data)
69+
if (res.data) {
6970
console.log('已签到', res.data.signDays, '天，奖励', res.data.rewardValue, '元');
71+
msg += "\u3010\u4EAC\u4E1C\u8D26\u53F7".concat(index + 1, "\u3011 ").concat(UserName, "\n\u5DF2\u7B7E\u5230 ").concat(res.data.signDays, "\u5929\n\u5956\u52B1 ").concat(res.data.rewardValue, "\u5143\n\n");
72+
}
7073
else
7174
console.log(res.message);
7275
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(1000)];
@@ -76,7 +79,10 @@ var cookie = '', res = '', UserName;
7679
case 5:
7780
_i++;
7881
return [3 /*break*/, 2];
79-
case 6: return [2 /*return*/];
82+
case 6: return [4 /*yield*/, (0, sendNotify_1.sendNotify)('微信小程序签到红包', msg)];
83+
case 7:
84+
_c.sent();
85+
return [2 /*return*/];
8086
}
8187
});
8288
}); })();

‎jd_wechat_sign.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
* cron: 8 0 * * *
44
*/
55

6+
import {sendNotify} from './sendNotify'
67
import {post, requireConfig, wait} from './TS_USER_AGENTS'
78

8-
let cookie: string = '', res: any = '', UserName: string
9+
let cookie: string = '', res: any = '', UserName: string, msg: string = ''
910

1011
!(async () => {
1112
let cookiesArr: string[] = await requireConfig()
@@ -20,10 +21,12 @@ let cookie: string = '', res: any = '', UserName: string
2021
'referer': 'https://servicewechat.com/wx91d27dbf599dff74/581/page-frame.html',
2122
'cookie': cookie
2223
})
23-
if (res.data)
24+
if (res.data) {
2425
console.log('已签到', res.data.signDays, '天，奖励', res.data.rewardValue, '元')
25-
else
26+
msg += `【京东账号${index + 1}】 ${UserName}\n已签到 ${res.data.signDays}天\n奖励 ${res.data.rewardValue}元\n\n`
27+
} else
2628
console.log(res.message)
2729
await wait(1000)
2830
}
31+
await sendNotify('微信小程序签到红包', msg)
2932
})()

‎jd_zjd_v0.2.js

+9-14
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ var shareCodeSelf = [], shareCode = [], shareCodeHW = [], full = [];
173173
_c = 0, _d = cookiesArr.entries();
174174
_g.label = 27;
175175
case 27:
176-
if (!(_c < _d.length)) return [3 /*break*/, 42];
176+
if (!(_c < _d.length)) return [3 /*break*/, 41];
177177
_e = _d[_c], index = _e[0], value = _e[1];
178178
if (!(shareCodeHW.length === 0)) return [3 /*break*/, 29];
179179
return [4 /*yield*/, (0, TS_USER_AGENTS_1.getshareCodeHW)('zjd')];
@@ -192,7 +192,7 @@ var shareCodeSelf = [], shareCode = [], shareCodeHW = [], full = [];
192192
_f = 0, shareCode_1 = shareCode;
193193
_g.label = 31;
194194
case 31:
195-
if (!(_f < shareCode_1.length)) return [3 /*break*/, 39];
195+
if (!(_f < shareCode_1.length)) return [3 /*break*/, 38];
196196
code = shareCode_1[_f];
197197
if (!!full.includes(code.assistedPinEncrypted)) return [3 /*break*/, 37];
198198
_g.label = 32;
@@ -207,7 +207,7 @@ var shareCodeSelf = [], shareCode = [], shareCodeHW = [], full = [];
207207
}
208208
else if (res.resultCode === '2400203') {
209209
console.log('上限');
210-
return [3 /*break*/, 39];
210+
return [3 /*break*/, 38];
211211
}
212212
else if (res.resultCode === '2400205') {
213213
console.log('对方已成团');
@@ -226,27 +226,22 @@ var shareCodeSelf = [], shareCode = [], shareCodeHW = [], full = [];
226226
case 34:
227227
e_2 = _g.sent();
228228
console.log(e_2);
229-
return [3 /*break*/, 39];
229+
return [3 /*break*/, 38];
230230
case 35: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
231231
case 36:
232232
_g.sent();
233-
return [3 /*break*/, 38];
233+
_g.label = 37;
234234
case 37:
235-
console.log('已满', code.assistedPinEncrypted);
236-
_g.label = 38;
237-
case 38:
238235
_f++;
239236
return [3 /*break*/, 31];
237+
case 38: return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
240238
case 39:
241-
console.log();
242-
return [4 /*yield*/, (0, TS_USER_AGENTS_1.wait)(2000)];
243-
case 40:
244239
_g.sent();
245-
_g.label = 41;
246-
case 41:
240+
_g.label = 40;
241+
case 40:
247242
_c++;
248243
return [3 /*break*/, 27];
249-
case 42: return [2 /*return*/];
244+
case 41: return [2 /*return*/];
250245
}
251246
});
252247
}); })();

‎jd_zjd_v0.2.ts

-3
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,8 @@ interface Tuan {
120120
break
121121
}
122122
await wait(2000)
123-
} else {
124-
console.log('已满', code.assistedPinEncrypted)
125123
}
126124
}
127-
console.log()
128125
await wait(2000)
129126
}
130127
})()

0 commit comments

Comments
 (0)
Please sign in to comment.