修改

Scripts/jhsh/jhshHelper.js

@@ -60,10 +60,21 @@ if (!lk.isExecComm) {
         lk.msg('');
         lk.done();
     }else{
-        all();
+        // all();
+        let startTime = new Date().getTime();
+        lk.log('start='+startTime)
+        await waitTest();
+        lk.log('pass='+(new Date().getTime() - startTime));
     }
 }
 
+function waitTest(){
+    return new Promise(resolve => {
+        setTimeout(resolve, 3000)
+    });
+    // return new Promise((resolve) => setTimeout(resolve, time))
+}
+
 function checkHandleRequest() {
     const url = $request.url;
     const path = $request.path;
@@ -124,22 +135,42 @@ function checkHandleRequest() {
     }
 }
 
+function checkAddActInfo(mid, txcode, data){
+    data['MID'] = mid;
+    const actId = data['ACT_ID'];
+    let allInfo = {};
+    const jsonStr = lk.getVal(jhshStoreKeyPrefix+'ActInfo'+txcode);
+    if(jsonStr){
+        allInfo = JSON.parse(jsonStr);
+    }
+    allInfo[actId] = data;
+
+    lk.setVal(jhshStoreKeyPrefix+'ActInfo-'+txcode, JSON.stringify(allInfo));
+}
+
 async function all() {
     // await getLatestVersion(); // 获取版本信息
-    const signActInfoStr = lk.getVal(jhshStoreKeyPrefix+'ActInfo-A3341A038');
-    const signActInfoArr = signActInfoStr ? signActInfoStr.split('|') : [];
     const loginInfoStr = lk.getVal(jhshStoreKeyPrefix+'LoginInfo');
     const loginInfoArr = loginInfoStr ? loginInfoStr.split('|') : [];
-    const count = Math.min(signActInfoArr.length, loginInfoArr.length);
+    const count = loginInfoArr.length;
     for (let i = 0; i < count; i++) {
         const loginInfoObj = JSON.parse(loginInfoArr[i]);
-        const signInActObj = JSON.parse(signActInfoArr[i]);
-        console.log(`\n===== 账号[${signInActObj?.USR_TEL || i}]开始签到 =====\n`);
-        if (!signInActObj?.MID || !loginInfoObj.DeviceId || !loginInfoObj.MBCUserAgent || !loginInfoObj.Body) {
-            lk.appendNotifyInfo(`🎉 账号 [${signInActObj?.USR_TEL ? hideSensitiveData(signInActObj?.USR_TEL, 3, 4) : $.index}] 缺少参数，请重新获取Cookie`);
+        console.log(`\n===== 账号[${i}]开始签到 =====\n`);
+        if (!loginInfoObj.DeviceId || !loginInfoObj.MBCUserAgent || !loginInfoObj.Body) {
+            lk.appendNotifyInfo(`❌ 账号 [${i}] 缺少参数，请重新获取Cookie`);
             continue;
         }
-        await checkSignIn(loginInfoObj, signInActObj);//签到
+        // 签到活动
+        const signActInfoStr = lk.getVal(jhshStoreKeyPrefix+'ActInfo-A3341A038');
+        const signActInfoDict = JSON.parse(signActInfoStr);
+        for(let actId in signActInfoDict){
+            const signInActObj = signActInfoDict[actId];
+            if (!signInActObj?.MID) {
+                lk.appendNotifyInfo(`❌ 缺少参数MID，请重新获取Cookie`);
+                continue;
+            }
+            await checkSignIn(loginInfoObj, signInActObj);//签到
+        }
         // await lk.wait(3000);
     }
     lk.msg('');
@@ -220,9 +251,9 @@ async function refreshLogin(loginInfo) {
 }
 
 
-async function checkSinginReward(signActInfo,session) {
+async function checkSinginReward(signActInfo,session,txcode='A3341A115') {
     let options = {
-        url: `https://yunbusiness.ccb.com/clp_coupon/txCtrl?txcode=A3341A115`,
+        url: `https://yunbusiness.ccb.com/clp_coupon/txCtrl?txcode=${txcode}`,
         headers: {
             "MID": signActInfo.MID,
             "Content-Type": "application/json;charset=utf-8",
@@ -283,10 +314,10 @@ async function checkSinginReward(signActInfo,session) {
 
 
 // 领取奖励
-async function getSignInReward(signActInfo, couponItemInfo) {
+async function getSignInReward(signActInfo, couponItemInfo, txcode='A3341A115') {
     lk.log('getSignInReward='+JSON.stringify(couponItemInfo));
     let options = {
-        url: `https://yunbusiness.ccb.com/clp_coupon/txCtrl?txcode=A3341C082`,
+        url: `https://yunbusiness.ccb.com/clp_coupon/txCtrl?txcode=${txcode}`,
         headers: {
             "MID": signActInfo?.MID,
             "Content-Type": "application/json;charset=utf-8",