JD: fix checkin.

JD-DailyBonus/JD_DailyBonus.js

@@ -2,8 +2,8 @@
 
 京东多合一签到脚本
 
-更新时间: 2020.10.19 18:55 v1.76
-有效接口: 39+
+更新时间: 2020.10.21 19:30 v1.77
+有效接口: 40+
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
 电报频道: @NobyDa 
 问题反馈: @NobyDa_bot 
@@ -115,7 +115,7 @@ async function all() {
       JDFlashSale(stop), //京东闪购
       JDOverseas(stop), //京东国际
       JingDongCash(stop), //京东现金红包
-      JDMagicCube(stop), //京东小魔方
+      JDMagicCube(stop, 2), //京东小魔方
       JingDongPrize(stop), //京东抽大奖
       JingDongSubsidy(stop), //京东金贴
       JingDongGetCash(stop), //京东领现金
@@ -139,7 +139,7 @@ async function all() {
       JDUserSignPre(stop, 'JDBook', '京东商城-图书', '3SC6rw5iBg66qrXPGmZMqFDwcyXi') //京东图书
     ]);
     await Promise.all([
-      //JDUserSignPre(stop, 'JDSchool', '京东商城-校园', '4812pn2PAcUyfNdWr7Cvpww5MCyW'), //京东校园
+      JDUserSignPre(stop, 'JDSchool', '京东商城-校园', '4812pn2PAcUyfNdWr7Cvpww5MCyW'), //京东校园
       JDUserSignPre(stop, 'JDHealth', '京东商城-健康', 'w2oeK5yLdHqHvwef7SMMy4PL8LF'), //京东健康
       JDUserSignPre(stop, 'JDPet', '京东商城-宠物', '37ta5sh5ocrMZF3Fz5UMJbTsL42'), //京东宠物馆
       JDUserSignPre(stop, 'JDShand', '京东拍拍-二手', '3S28janPLYmtFxypu37AYAGgivfp'), //京东拍拍二手
@@ -162,7 +162,7 @@ async function all() {
     await JDFlashSale(stop); //京东闪购
     await JDOverseas(stop); //京东国际
     await JingDongCash(stop); //京东现金红包
-    await JDMagicCube(stop); //京东小魔方
+    await JDMagicCube(stop, 2); //京东小魔方
     await JingDongGetCash(stop); //京东领现金
     await JingDongPrize(stop); //京东抽大奖
     await JingDongSubsidy(stop); //京东金贴
@@ -171,7 +171,7 @@ async function all() {
     await JingRongDoll(stop, 'JRDoll', '京东金融-签壹', '890418F764');
     await JingRongDoll(stop, 'JRTwoDoll', '京东金融-签贰', '3A3E839252');
     await JingRongDoll(stop, 'JRThreeDoll', '京东金融-签叁', '69F5EC743C');
-    //await JDUserSignPre(stop, 'JDSchool', '京东商城-校园', '4812pn2PAcUyfNdWr7Cvpww5MCyW'); //京东校园
+    await JDUserSignPre(stop, 'JDSchool', '京东商城-校园', '4812pn2PAcUyfNdWr7Cvpww5MCyW'); //京东校园
     await JDUserSignPre(stop, 'JDHealth', '京东商城-健康', 'w2oeK5yLdHqHvwef7SMMy4PL8LF'); //京东健康
     await JDUserSignPre(stop, 'JDShoes', '京东商城-鞋靴', '4RXyb1W4Y986LJW8ToqMK14BdTD'); //京东鞋靴
     await JDUserSignPre(stop, 'JDEsports', '京东商城-电竞', 'CHdHQhA5AYDXXQN9FLt3QUAPRsB'); //京东电竞
@@ -1139,29 +1139,34 @@ function JingDongCash(s) {
   });
 }
 
-function JDMagicCube(s) {
+function JDMagicCube(s, sign) {
   return new Promise((resolve, reject) => {
     if (disable("JDCube")) return reject()
     const JDUrl = {
-      url: 'https://api.m.jd.com/client.action?functionId=getNewsInteractionInfo&appid=smfe',
+      url: `https://api.m.jd.com/client.action?functionId=getNewsInteractionInfo&appid=smfe${sign?`&body=${encodeURIComponent(`{"sign":${sign}}`)}`:``}`,
       headers: {
         Cookie: KEY,
       }
     };
-    $nobyda.get(JDUrl, function(error, response, data) {
+    $nobyda.get(JDUrl, async (error, response, data) => {
       try {
         if (error) throw new Error(error)
         const Details = LogDetails ? "response:\n" + data : '';
+        console.log(`\n京东魔方-尝试查询活动(${sign}) ${Details}`)
         if (data.match(/\"interactionId\":\d+/)) {
-          merge.JDCube.key = data.match(/\"interactionId\":(\d+)/)[1]
-          console.log("\n京东魔方-查询活动成功 " + Details)
+          resolve({
+            id: data.match(/\"interactionId\":(\d+)/)[1],
+            sign: sign || null
+          })
+        } else if (data.match(/配置异常/) && sign) {
+          await JDMagicCube(s, sign == 2 ? 1 : null)
+          reject()
         } else {
-          console.log("\n京东魔方-暂无有效活动 " + Details)
+          resolve(null)
         }
       } catch (eor) {
         $nobyda.AnError("京东魔方-查询", "JDCube", eor, response, data)
-      } finally {
-        resolve(merge.JDCube.key)
+        reject()
       }
     })
     if (out) setTimeout(reject, out + s)
@@ -1174,7 +1179,7 @@ function JDMagicCubeSign(s, id) {
   return new Promise(resolve => {
     setTimeout(() => {
       const JDMCUrl = {
-        url: `https://api.m.jd.com/client.action?functionId=getNewsInteractionLotteryInfo&appid=smfe${id ? `&body=%7B%22interactionId%22%3A${id}%7D` : ``}`,
+        url: `https://api.m.jd.com/client.action?functionId=getNewsInteractionLotteryInfo&appid=smfe${id?`&body=${encodeURIComponent(`{${id.sign?`"sign":${id.sign},`:``}"interactionId":${id.id}}`)}`:``}`,
         headers: {
           Cookie: KEY,
         }