From 0620df11efe33a0c4b339ea2beed05b6cd035a54 Mon Sep 17 00:00:00 2001
From: wisz2021 <wei09mozzie@gmail.com>
Date: Thu, 13 May 2021 10:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E5=8F=96=E7=BE=8E?=
 =?UTF-8?q?=E5=A6=86=E5=B8=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_beauty.js       | 34 +++++++++++++++++++++++-----------
 jd_live_redrain.js |  2 +-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/jd_beauty.js b/jd_beauty.js
index 662eb845..269fae93 100644
--- a/jd_beauty.js
+++ b/jd_beauty.js
@@ -64,7 +64,9 @@ const JD_API_HOST = 'https://api.m.jd.com/client.action';
       if ($.accountCheck) {
         await jdBeauty();
       }
-      if($.accountCheck){ helpInfo = $.helpInfo;}
+      if ($.accountCheck) {
+        helpInfo = $.helpInfo;
+      }
     }
   }
 })()
@@ -75,7 +77,7 @@ const JD_API_HOST = 'https://api.m.jd.com/client.action';
     $.done();
   })
 
-async function accountCheck(){
+async function accountCheck() {
   $.hasDone = false;
   console.log(`***检测账号是否黑号***`);
   await getIsvToken()
@@ -86,8 +88,8 @@ async function accountCheck(){
     process.exit(0);
     return
   }
-  let client = new WebSocket(`wss://xinruimz-isv.isvjcloud.com/wss/?token=${$.token}`,null,{
-    headers:{
+  let client = new WebSocket(`wss://xinruimz-isv.isvjcloud.com/wss/?token=${$.token}`, null, {
+    headers: {
       'user-agent': "jdapp;android;9.5.0;5.1.1;8363331303230333330383934363-73D2138356239366237373730303;network/wifi;model/vivo X7;addressid/4092959325;aid/e3378926a846c4f7;oaid/;osVer/22;appBuild/87697;partner/vivo;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 5.1.1; vivo X7 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/044942 Mobile Safari/537.36",
     }
   });
@@ -98,22 +100,23 @@ async function accountCheck(){
     client.send(`{"msg":{"type":"action","args":{"source":1},"action":"get_user"}}`);
   };
   client.onmessage = async function (e) {
-    if(e.data !== 'pong' && e.data && safeGet(e.data)){
+    if (e.data !== 'pong' && e.data && safeGet(e.data)) {
       let vo = JSON.parse(e.data);
       if (vo.action === "_init_") {
         let vo = JSON.parse(e.data);
-        if(vo.msg === "风险用户"){
-          $.accountCheck=false;
+        if (vo.msg === "风险用户") {
+          $.accountCheck = false;
           // $.init=true;
           client.close();
-          console.log(`${vo.msg}，跳过此账号`)};
+          console.log(`${vo.msg}，跳过此账号`)
+        }
       } else if (vo.action === "get_user") {
         // $.init=true;
-        $.accountCheck=true;
+        $.accountCheck = true;
         client.close();
         console.log(`${vo.msg}，账号正常`);
       }
-    };
+    }
     client.onclose = (e) => {
       $.hasDone = true;
       // console.log(client.readyState);
@@ -160,7 +163,7 @@ async function mr() {
       client.send(`ping`)
       await $.wait(1000)
     }
-    console.log(helpInfo);
+    console.log('helpInfo', helpInfo);
     for (let help of helpInfo) {
       client.send(help);
     }
@@ -192,6 +195,7 @@ async function mr() {
     await $.wait(1000)
     // 获得福利中心
     client.send(`{"msg":{"type":"action","args":{},"action":"get_benefit"}}`)
+    client.send(`{"msg":{"type":"action","args":{},"action":"collect_coins"}}`);
   };
 
   client.onclose = () => {
@@ -433,6 +437,14 @@ async function mr() {
             console.log(`生产信息获取失败，错误信息${vo.msg}`)
           }
           break
+        case "collect_coins":
+          if (vo.code === '200' || vo.code === 200) {
+            // console.log(`product_produce:${JSON.stringify(vo)}`)
+            console.log(`收取成功，获得${vo['data']['coins']}美妆币，当前总美妆币：${vo['data']['user_coins']}\n`)
+          } else {
+            console.log(`收取美妆币失败，错误信息${vo.msg}`)
+          }
+          break
         case "product_producing":
           if (vo.code === '200' || vo.code === 200) {
             for (let product of vo.data) {
diff --git a/jd_live_redrain.js b/jd_live_redrain.js
index a3567730..f1c5286e 100644
--- a/jd_live_redrain.js
+++ b/jd_live_redrain.js
@@ -101,7 +101,7 @@ const JD_API_HOST = 'https://api.m.jd.com/api';
       // console.log(nowTs, $.startTime, $.endTime)
       for (let id of $.newAcids) {
         // $.activityId = id;
-        await receiveRedRain(id);
+        if (id) await receiveRedRain(id);
       }
       // await showMsg();
     }