From 922c7b6abaa397b2806a2a25eb92adf797ef0c71 Mon Sep 17 00:00:00 2001 From: youfak Date: Tue, 5 Nov 2024 10:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bear.js | 101 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 45 deletions(-) diff --git a/bear.js b/bear.js index 718ad20..4ec4afd 100644 --- a/bear.js +++ b/bear.js @@ -1994,7 +1994,7 @@ class IlIIlIli { }; return iIIlIIi ? IlIili.json = IliiIi1i : IlIili.data = IliiIi1i, await this.jd_api(IlIili); } - async ["taskPostByJson"](i1IIlii1, Il111ll1 = {}, ll1ii1il = {}) { + async["taskPostByJson"](i1IIlii1, Il111ll1 = {}, ll1ii1il = {}) { return await this.taskPost(i1IIlii1, Il111ll1, ll1ii1il, true); } ["wxStop"](Iil11l) { @@ -2005,7 +2005,7 @@ class IlIIlIli { } } } - async ["wxStopSync"](I1iIli1I) { + async["wxStopSync"](I1iIli1I) { if (!I1iIli1I) return; if (/已结束/.exec(I1iIli1I)) { await this.writeLongCacheByStop(); @@ -2014,7 +2014,7 @@ class IlIIlIli { if (I1iIli1I.includes(llii1)) throw new i1I1IiII("退出"); } } - async ["wxCommonInfo"](liI11Iil = true, IIIiiIil = 3) { + async["wxCommonInfo"](liI11Iil = true, IIIiiIil = 3) { let IlI1ilii = await this.taskGet(this.activityUrl); if (IlI1ilii && IlI1ilii.includes("活动已经结束") && liI11Iil) { this.putMsg("活动已经结束,手动确认"); @@ -2069,7 +2069,7 @@ class IlIIlIli { } } } - async ["getShopOpenCardInfo"](iI1lIl11 = this.venderId || this.shopId) { + async["getShopOpenCardInfo"](iI1lIl11 = this.venderId || this.shopId) { let l1iIlilI = { "venderId": iI1lIl11, "payUpShop": true, @@ -2110,7 +2110,7 @@ class IlIIlIli { } else this.giftActId = ""; return IIlii1l; } - async ["bindWithVender"](Ili1il1i = this.venderId || this.shopId) { + async["bindWithVender"](Ili1il1i = this.venderId || this.shopId) { let IIliliI = { "venderId": Ili1il1i, "bindByVerifyCodeFlag": 1, @@ -2157,7 +2157,7 @@ class IlIIlIli { } else this.log("加入店铺[" + Ili1il1i + "]会员失败", llilI1II?.["message"]), this.canNotOpenCard = true; return llilI1II; } - async ["isvObfuscator"]() { + async["isvObfuscator"]() { if (IlIIlIli.redis) { let iIilIIi = await IlIIlIli.redis.get("" + this.pin); if (iIilIIi) { @@ -2209,7 +2209,7 @@ class IlIIlIli { } return IiiillI; } - async ["getShopInfo"](lIIIi11i = this.venderId, Iilili11 = this.shopId) { + async["getShopInfo"](lIIIi11i = this.venderId, Iilili11 = this.shopId) { if (IlIIlIli.activity.shopName) { this.shopName = IlIIlIli.activity.shopName; this.venderId = IlIIlIli.activity.venderId; @@ -2242,7 +2242,7 @@ class IlIIlIli { "venderId": this.venderId })), IiliIlll; } - async ["follow"](lliIilll = this.shopId) { + async["follow"](lliIilll = this.shopId) { let ilIi1i1 = await this.jd_api({ "api": "client.action", "method": "post", @@ -2269,7 +2269,7 @@ class IlIIlIli { if (ilIi1i1 && ilIi1i1.code === "0") return this.log(ilIi1i1.msg || "关注成功"), true; return this.log(ilIi1i1), false; } - async ["unfollow"](lil1IIII = this.shopId || this.venderId) { + async["unfollow"](lil1IIII = this.shopId || this.venderId) { let ll1lilli = await this.jd_api({ "api": "client.action", "method": "post", @@ -2296,13 +2296,13 @@ class IlIIlIli { } return this.log(ll1lilli), false; } - async ["wxApi"](illI1lII, IIIIiI = {}) { + async["wxApi"](illI1lII, IIIIiI = {}) { return await this.taskPost(illI1lII, { "activityId": this.activityId, ...IIIIiI }); } - async ["getSimpleActInfoVo"](i1Il1II1 = "customer/getSimpleActInfoVo") { + async["getSimpleActInfoVo"](i1Il1II1 = "customer/getSimpleActInfoVo") { if (IlIIlIli.activity.activityType) { this.type = IlIIlIli.activity.type; this.venderId = IlIIlIli.activity?.["venderId"]; @@ -2366,7 +2366,7 @@ class IlIIlIli { } return ii1lilii; } - async ["activityContent"](lIi1llIl = {}, lii11ll1 = "") { + async["activityContent"](lIi1llIl = {}, lii11ll1 = "") { let I1l1Iill = await this.wxApi(this.type + "/activityContent", { "activityId": this.activityId, "pin": this.secretPin, @@ -2399,14 +2399,15 @@ class IlIIlIli { } return I1l1Iill; } - async ["getGiveContent"]() { + async["getGiveContent"]() { let Il1liii = await this.wxApi("wxDrawActivity/getGiveContent", { "pin": this.secretPin }); + if (Il1liii && Il1liii?.["data"]) { } return Il1liii; } - async ["initPinToken"](i111l1 = this.venderId, IlI1Ii = this.shopId) { + async["initPinToken"](i111l1 = this.venderId, IlI1Ii = this.shopId) { let illlli1l = { "activityId": this.activityId, "jdToken": this.isvToken, @@ -2435,7 +2436,7 @@ class IlIIlIli { if (this.mode === "wx" && iiillI1 && iiillI1.result) this.secretPin = encodeURIComponent(iiillI1.data?.["secretPin"]), this.nickname = iiillI1.data?.["nickname"]; else this.mode === "100" && iiillI1 && iiillI1.resp_code === 0 ? this.pinToken = JSON.parse(iiillI1.data)?.["data"]?.["pinToken"] : (this.putMsg(iiillI1?.["errorMessage"] || iiillI1?.["data"] || iiillI1?.["resp_msg"]), this.wxStop(iiillI1?.["errorMessage"] || iiillI1?.["data"] || iiillI1?.["resp_msg"]), this.reseCookieStatus(), this.exit()); return iiillI1; } - async ["getMyPing"](ill11Ii = "customer/getMyPing", iIllI11I = this.isvToken, lI11IlIi = this.venderId) { + async["getMyPing"](ill11Ii = "customer/getMyPing", iIllI11I = this.isvToken, lI11IlIi = this.venderId) { let lIli1li1 = await this.wxApi(ill11Ii, { "userId": lI11IlIi, "token": iIllI11I, @@ -2451,7 +2452,7 @@ class IlIIlIli { } return lIli1li1; } - async ["accessLog"](i1iiI1 = this.secretPin) { + async["accessLog"](i1iiI1 = this.secretPin) { let I1IlIIIi = this.domain.includes("cjhy") ? "accessLog" : "accessLogWithAD"; await this.wxApi("common/" + I1IlIIIi, { "venderId": this.venderId, @@ -2463,7 +2464,7 @@ class IlIIlIli { "uuid": this.phoneInfo.uuid }); } - async ["saveAddress"](IlIl1ll1 = this.addressId, iI1liIi1 = this.prizeName) { + async["saveAddress"](IlIl1ll1 = this.addressId, iI1liIi1 = this.prizeName) { IlIIlIli.isSaveAddress = true; this.getAddress(); if (!this.address) { @@ -2620,7 +2621,7 @@ class IlIIlIli { } IlIIlIli.isSaveAddress = false; } - async ["getPrize"](iI11Iil = false) { + async["getPrize"](iI11Iil = false) { let Ill1li1i = await this.wxApi(this.type + "/getPrize", { "activityId": this.activityId, "pin": this.secretPin @@ -2635,7 +2636,7 @@ class IlIIlIli { if (!lIlIil) return; return this.putMsg(lIlIil), this.wxStop(lIlIil), Ill1li1i; } - async ["login"](iiIlIilI = true, iliilIIi = this.isvToken) { + async["login"](iiIlIilI = true, iliilIIi = this.isvToken) { if (this.mode === "100") { let I1IiliIl = { "activityId": this.activityId, @@ -2723,7 +2724,7 @@ class IlIIlIli { } } } - async ["lzkjBaseInfo"]() { + async["lzkjBaseInfo"]() { this.needPinToken && (await this.initPinToken()); await this.basicInfo(); await this.getPrizeList(); @@ -2739,7 +2740,7 @@ class IlIIlIli { if (!["1001", "1004"].includes(this.joinCode) && this.openCardTypes.includes(this.activityType)) return await this.bindWithVender(), await this.login(false); if (this.joinCode === "1004") await this.login(false); } - async ["basicInfo"]() { + async["basicInfo"]() { let IIIi1lII = await this.taskPostByJson("api/active/basicInfo", { "activityId": this.activityId }); @@ -3002,7 +3003,7 @@ class IlIIlIli { } return IIIi1lII; } - async ["getDefenseUrls"]() { + async["getDefenseUrls"]() { if (IlIIlIli.activity.defenseUrls) return this.defenseUrls = IlIIlIli.activity.defenseUrls; const { domain: Iil11ll1, @@ -3026,7 +3027,7 @@ class IlIIlIli { } IlIIlIli.activity.defenseUrls = this.defenseUrls; } - async ["getPrizeList"]() { + async["getPrizeList"]() { if (IlIIlIli.activity.prizeList) { this.prizeList = IlIIlIli.activity.prizeList; return; @@ -3034,11 +3035,11 @@ class IlIIlIli { let liIi1I11 = await this.lzkjApi("api/prize/drawPrize"); liIi1I11 && liIi1I11.resp_code === 0 && (this.prizeList = liIi1I11.data?.["prizeInfo"] ?? [], IlIIlIli.activity.prizeList = this.prizeList); } - async ["getUserId"]() { + async["getUserId"]() { let lii1I111 = await this.lzkjApi("api/task/share/getUserId"); return lii1I111 && lii1I111.resp_code === 0 && (this.shareUserId = lii1I111.data?.["shareUserId"]), lii1I111; } - async ["lzkjToDo"](illi11ii, Ii1ill1 = "", IIiIl1Ii = 0) { + async["lzkjToDo"](illi11ii, Ii1ill1 = "", IIiIl1Ii = 0) { let iii11I = { 1: "关注店铺", 2: "浏览店铺", @@ -3066,7 +3067,7 @@ class IlIIlIli { } return false; } - async ["lzkjTask"](ilIl11i = []) { + async["lzkjTask"](ilIl11i = []) { try { if (ilIl11i.length > 0) { for (let liIli1li of ilIl11i) { @@ -3106,7 +3107,7 @@ class IlIIlIli { this.log(i11l1iii.message); } } - async ["acquire"](l1ii1l1l) { + async["acquire"](l1ii1l1l) { let iI1I11l = await this.lzkjApi("api/prize/receive/acquire", { "prizeInfoId": l1ii1l1l, "status": 1 @@ -3119,7 +3120,7 @@ class IlIIlIli { this.putMsg(iI1I11l?.["resp_msg"]); this.wxStop(iI1I11l?.["resp_msg"]); } - async ["lzkjApi"](i1i1Ilil, IiIIiIlI = {}) { + async["lzkjApi"](i1i1Ilil, IiIIiIlI = {}) { return await this.taskPostByJson(i1i1Ilil, IiIIiIlI, { "token": this.token }); @@ -3128,7 +3129,7 @@ class IlIIlIli { const ilIiil1l = "actid" + this.activityId + "buyernick" + this.aesBuyerNick + "sysmethod" + il1II1i1 + "timestamp" + i1IlliIl; return this.hmacSHA256(this.getCookieByName("_sk") || "1111", ilIiil1l); } - async ["hdbApi"](li11liiI, liIiIi1i = {}, Il11lii1 = false, Iiill1ll = true) { + async["hdbApi"](li11liiI, liIiIi1i = {}, Il11lii1 = false, Iiill1ll = true) { let IiIi1iIi = Il11lii1 ? "/front/task/" + li11liiI : "/front/activity/" + li11liiI, iIlI1i1I = await this.taskPostByJson(IiIi1iIi, { "appJsonParams": { @@ -3142,7 +3143,7 @@ class IlIIlIli { if (iIlI1i1I && /数字签名不匹配|数字签名已失效|用户未登录/.exec(iIlI1i1I?.["message"]) && Iiill1ll) return await this.login(), await this.hdbApi(li11liiI, liIiIi1i, Il11lii1, false); return iIlI1i1I; } - async ["loadFrontAct"]() { + async["loadFrontAct"]() { let iIlIi11I = await this.hdbApi("loadFrontAct"); if (iIlIi11I && iIlIi11I?.["succ"]) { IlIIlIli.activity.shopName = iIlIi11I?.["result"]?.["activity"]?.["shopTitle"]; @@ -3171,10 +3172,10 @@ class IlIIlIli { } } } - async ["reportPVUV"]() { + async["reportPVUV"]() { await this.hdbApi("reportPVUV"); } - async ["loadFrontAward"]() { + async["loadFrontAward"]() { let IIIilIlI = await this.hdbApi("loadFrontAward"); if (IIIilIlI && IIIilIlI.succ) { // this.prizeList = IIIilIlI.result ?? []; @@ -3188,7 +3189,7 @@ class IlIIlIli { if (llliliIl?.["match"](/\d{4}年\d{1,2}月\d{1,2}日\d{2}:\d{2}:\d{2}/)) return llliliIl.replace(/(\d{4})年(\d{1,2})月(\d{1,2})日(\d{2}:\d{2}:\d{2})/, "$1-$2-$3 $4"); return llliliIl; } - async ["getRuleSETime"](illiIli1 = this.rule) { + async["getRuleSETime"](illiIli1 = this.rule) { const IlilIiii = /(\d{4}-\d{1,2}-\d{1,2} \d{2}:\d{2}|\d{4}-\d{1,2}-\d{1,2}\s\d{2}:\d{2}:\d{2}|\d{4}年\d{1,2}月\d{1,2}日\d{2}:\d{2}:\d{2})/g, I1IlI1li = illiIli1.match(IlilIiii); if (I1IlI1li) { @@ -3202,24 +3203,32 @@ class IlIIlIli { this.endTime && this.endTime < Date.now() && (this.putMsg("活动已结束"), await this.writeLongCacheByStop(), this.stop()); } } - async ["jinggengShopInfo"]() { + async["jinggengShopInfo"]() { let iiilIlII = await this.taskGet(this.activityUrl); if (iiilIlII) { let lIlll = lIl1ii.load(iiilIlII); const lii1llli = lIlll("#shop_sid").attr("value"), l1illi1l = lIlll("#shop_title").attr("value"), + actType = lIlll("#actType").attr("value"), lIIiI1lI = lIlll("#description").text(); this.debug("shop_sid", lii1llli); this.shopId = lii1llli; this.venderId = this.userId; this.shopName = l1illi1l; this.rule = lIIiI1lI; + this.buyerSign = lIlll('#buyerSign')?.val() || ''; + IlIIlIli.activity.actType = actType + if (this.activityUrl.includes("loadBlindBox")) { + IlIIlIli.activity.prizeList = JSON.parse(lIlll('#jdEquityList').attr("value")); + } else { + IlIIlIli.activity.prizeList = JSON.parse(lIlll('#awards', 'body').text()); + } const IllIll11 = lIlll("title").text(); return IlIIlIli.activity.shopName = this.shopName, IlIIlIli.activity.shopId = this.shopId, IlIIlIli.activity.venderId = this.venderId, await this.getRuleSETime(lIIiI1lI), IllIll11?.["includes"]("已结束") && (this.putMsg("活动已结束"), await this.writeLongCacheByStop(), this.stop()), lIlll; } return undefined; } - async ["setMixNick"](IllillI = this.isvToken) { + async["setMixNick"](IllillI = this.isvToken) { let IlII1i1 = await this.taskPost("front/setMixNick", { "strTMMixNick": IllillI, "userId": this.userId, @@ -3227,15 +3236,17 @@ class IlIIlIli { }); return this.debug(IlII1i1), IlII1i1 && IlII1i1.succ && (this.mixNick = IlII1i1?.["msg"]), IlII1i1 && IlII1i1?.["msg"]?.["includes"]("商家token过期") && (this.putMsg("商家token过期"), this.stop()), !this.mixNick && (this.putMsg("获取mixNick失败"), this.exit()), IlII1i1; } - async ["jinggengApi"](Iill1llI, I1illiI = {}) { + async["jinggengApi"](Iill1llI, I1illiI = {}) { let I1Il1l1I = await this.taskPost("ql/front/" + Iill1llI, { "act_id": this.activityId, "user_id": this.userId, ...I1illiI + }, { + "buyerSign": this.buyerSign }); return I1Il1l1I; } - async ["gzslApi"](l1lliil1, i1lIiiI = {}, Illl1lII = false) { + async["gzslApi"](l1lliil1, i1lIiiI = {}, Illl1lII = false) { let Iil1l1 = { "token": this.isvToken, "source": "01", @@ -3246,7 +3257,7 @@ class IlIIlIli { let li1II1il = await this.taskPostByJson("wuxian/user/" + l1lliil1 + "/" + this.activityId + (Illl1lII ? "?wxToken=" + encodeURIComponent(this.isvToken) : ""), Iil1l1); return li1II1il; } - async ["hzbzInfo"]() { + async["hzbzInfo"]() { let lI1liilI = await this.taskGet(this.activityUrl); if (!lI1liilI) return; let lIiliI11 = this.textToHtml(lI1liilI), @@ -3275,7 +3286,7 @@ class IlIIlIli { } return lIiliI11; } - async ["hzbzApi"](lilli1i1, liI1liI = {}) { + async["hzbzApi"](lilli1i1, liI1liI = {}) { let l1iilI1 = await this.taskPost("bigdraw/" + lilli1i1, liI1liI); return l1iilI1; } @@ -3300,7 +3311,7 @@ class IlIIlIli { return false; } } - async ["getActivityBase"]() { + async["getActivityBase"]() { let Iiii1iil = await this.v2Api("api/common/getActivityBase"); // this.debug(Iiii1iil); if (Iiii1iil && Iiii1iil.code === 200) { @@ -3332,7 +3343,7 @@ class IlIIlIli { this.wxStop(Iiii1iil?.["message"]); this.exit(); } - async ["v2getRule"]() { + async["v2getRule"]() { let Iiii1iil = await this.taskGet("api/common/getRule"); if (Iiii1iil && Iiii1iil.code === 200) { let prizedata = Iiii1iil.data; @@ -3341,7 +3352,7 @@ class IlIIlIli { } this.exit(); } - async ["v2getPrizes"]() { + async["v2getPrizes"]() { let Iiii1iil = await this.v2Api("api/" + this.activityType + "/getPrizes"); this.debug(Iiii1iil); if (Iiii1iil && Iiii1iil.code === 200) { @@ -3351,7 +3362,7 @@ class IlIIlIli { } this.exit(); } - async ["v2getPrizeList"]() { + async["v2getPrizeList"]() { let Iiii1iil = await this.v2Api("api/" + this.activityType + "/getPrizeList"); this.debug(Iiii1iil); if (Iiii1iil && Iiii1iil.code === 200) { @@ -3361,7 +3372,7 @@ class IlIIlIli { } this.exit(); } - async ["v2Task"]() { + async["v2Task"]() { let l11lIii = await this.v2Api("api/" + this.activityType + "/getTask"); this.debug(l11lIii); if (l11lIii && l11lIii.code === 200) { @@ -3393,7 +3404,7 @@ class IlIIlIli { } } } - async ["v2ToDoTask"](liil1iII, liliI11I = "", iiIiIIii = null) { + async["v2ToDoTask"](liil1iII, liliI11I = "", iiIiIIii = null) { let IllII1il = { 2: "浏览店铺", 5: "关注商品",