diff --git a/jd_beauty.js b/jd_beauty.js
index 535809a7..d2f59033 100644
--- a/jd_beauty.js
+++ b/jd_beauty.js
@@ -1,5 +1,6 @@
 /*
 美丽研究院
+更新时间:2021-05-08
 活动入口：京东app首页-美妆馆-底部中间按钮
 只支持Node.js支持N个京东账号
 脚本兼容: Node.js
@@ -9,10 +10,13 @@ const $ = new Env('美丽研究院');
 const notify = $.isNode() ? require('./sendNotify') : '';
 //Node.js用户请在jdCookie.js处填写京东ck;
 const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
+const WebSocket = require('ws');
 //const WebSocket = $.isNode() ? require('websocket').w3cwebsocket: SockJS;
 let jdNotify = true;//是否关闭通知，false打开通知推送，true关闭通知推送
 const randomCount = $.isNode() ? 20 : 5;
-const bean = 500
+$.accountCheck = true;
+$.init = false;
+// const bean = 1; //兑换多少豆，默认是500
 //IOS等用户直接用NobyDa的jd cookie
 let cookiesArr = [], cookie = '', message, helpInfo, ADD_CART = false;
 
@@ -53,8 +57,14 @@ const JD_API_HOST = 'https://api.m.jd.com/client.action';
         }
         continue
       }
-      await jdBeauty()
-      helpInfo = $.helpInfo
+      await accountCheck();
+      while (!$.hasDone) {
+        await $.wait(1000)
+      }
+      if ($.accountCheck) {
+        await jdBeauty();
+      }
+      if($.accountCheck){ helpInfo = $.helpInfo;}
     }
   }
 })()
@@ -65,6 +75,54 @@ const JD_API_HOST = 'https://api.m.jd.com/client.action';
     $.done();
   })
 
+async function accountCheck(){
+  $.hasDone = false;
+  console.log(`***检测账号是否黑号***`);
+  await getIsvToken()
+  await getIsvToken2()
+  await getToken()
+  if (!$.token) {
+    console.log(`\n\n提示：请尝试换服务器ip或者设置"xinruimz-isv.isvjcloud.com"域名直连，或者自定义UA再次尝试(环境变量JD_USER_AGENT)\n\n`)
+    process.exit(0);
+    return
+  }
+  let client = new WebSocket(`wss://xinruimz-isv.isvjcloud.com/wss/?token=${$.token}`,null,{
+    headers:{
+      'user-agent': process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Mobile/15E148 Safari/604.1",
+    }
+  });
+  client.onopen = async () => {
+    console.log(`美容研究院服务器连接成功`);
+    client.send('{"msg":{"type":"action","args":{"source":1},"action":"_init_"}}');
+    await $.wait(1000);
+    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)){
+      let vo = JSON.parse(e.data);
+      if (vo.action === "_init_") {
+        let vo = JSON.parse(e.data);
+        if(vo.msg === "风险用户"){
+          $.accountCheck=false;
+          // $.init=true;
+          client.close();
+          console.log(`${vo.msg}，跳过此账号`)};
+      } else if (vo.action === "get_user") {
+        // $.init=true;
+        $.accountCheck=true;
+        client.close();
+        console.log(`${vo.msg}，账号正常`);
+      }
+    };
+    client.onclose = (e) => {
+      $.hasDone = true;
+      // console.log(client.readyState);
+      console.log('服务器连接关闭');
+    };
+    await $.wait(1000);
+  }
+}
+
 async function jdBeauty() {
   $.hasDone = false
   await getIsvToken()
@@ -83,13 +141,11 @@ async function jdBeauty() {
 
 async function mr() {
   $.coins = 0
-  $.init = false
   let positionList = ['b1', 'h1', 's1', 'b2', 'h2', 's2']
   $.tokens = []
   $.pos = []
   $.helpInfo = []
   $.needs = []
-  const WebSocket = require('ws')
   let client = new WebSocket(`wss://xinruimz-isv.isvjcloud.com/wss/?token=${$.token}`,null,{
     headers:{
       'user-agent': process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Mobile/15E148 Safari/604.1",
@@ -104,8 +160,9 @@ async function mr() {
       client.send(`ping`)
       await $.wait(1000)
     }
+    console.log(helpInfo);
     for (let help of helpInfo) {
-      client.send(help)
+      client.send(help);
     }
     await $.wait(1000)
     client.send(`{"msg":{"type":"action","args":{},"action":"shop_products"}}`)
@@ -124,12 +181,12 @@ async function mr() {
     // 获得原料生产列表
     console.log(`========原料生产信息========`)
     for (let pos of positionList) {
-      client.send(`{"msg":{"type":"action","args":{"position":"${pos}"},"action":"produce_position_info"}}`)
+      client.send(`{"msg":{"type":"action","args":{"position":"${pos}"},"action":"produce_position_info_v2"}}`)
       // await $.wait(500)
     }
 
     // 获得任务
-    client.send(`{"msg":{"type":"action","args":{},"action":"get_task"}}`)
+    // client.send(`{"msg":{"type":"action","args":{},"action":"get_task"}}`)
     // 获取个人信息
     client.send(`{"msg":{"type":"action","args":{"source":1},"action":"get_user"}}`)
     await $.wait(1000)
@@ -140,7 +197,8 @@ async function mr() {
   client.onclose = () => {
     console.log(`本次运行获得美妆币${$.coins}`)
     console.log('服务器连接关闭');
-    $.hasDone = true
+    $.init = true;
+    $.hasDone = true;
     for (let i = 0; i < $.pos.length && i < $.tokens.length; ++i) {
       $.helpInfo.push(`{"msg":{"type":"action","args":{"inviter_id":"${$.userInfo.id}","position":"${$.pos[i]}","token":"${$.tokens[i]}"},"action":"employee"}}`)
     }
@@ -148,6 +206,8 @@ async function mr() {
   client.onmessage = async function (e) {
     if (e.data !== 'pong' && e.data && safeGet(e.data)) {
       let vo = JSON.parse(e.data);
+      await $.wait(Math.random()*2000+500);
+      console.log(`开始任务："${JSON.stringify(vo.action)}`);
       switch (vo.action) {
         case "get_ad":
           console.log(`当期活动：${vo.data.screen.name}`)
@@ -168,33 +228,33 @@ async function mr() {
               await $.wait(500)
             }
           } else
-            $.init = true
-          $.level = $.userInfo.level
-          console.log(`当前美妆币${$.total}，用户等级${$.level}`)
-          break
+            $.init = true;
+          $.level = $.userInfo.level;
+          console.log(`当前美妆币${$.total}，用户等级${$.level}`);
+          break;
         case "shop_products":
-          let count = $.taskState.shop_view.length
-          if (count < 5) console.log(`去做关注店铺任务`)
+          let count = $.taskState.shop_view.length;
+          if (count < 5) console.log(`去做关注店铺任务`);
           for (let i = 0; i < vo.data.shops.length && count < 5; ++i) {
-            const shop = vo.data.shops[i]
+            const shop = vo.data.shops[i];
             if (!$.taskState.shop_view.includes(shop.id)) {
-              count++
-              console.log(`去做关注店铺【${shop.name}】`)
-              client.send(`{"msg":{"type":"action","args":{"shop_id":${shop.id}},"action":"shop_view"}}`)
-              client.send(`{"msg":{"action":"write","type":"action","args":{"action_type":6,"channel":2,"source_app":2,"vender":"${shop.vender_id}"}}}`)
+              count++;
+              console.log(`去做关注店铺【${shop.name}】`);
+              client.send(`{"msg":{"type":"action","args":{"shop_id":${shop.id}},"action":"shop_view"}}`);
+              client.send(`{"msg":{"action":"write","type":"action","args":{"action_type":6,"channel":2,"source_app":2,"vender":"${shop.vender_id}"}}}`);
             }
-            await $.wait(1000)
+            await $.wait(1000);
           }
-          count = $.taskState.product_adds.length
+          count = $.taskState.product_adds.length;
           if (count < 5 && ADD_CART) console.log(`去做浏览并加购任务`)
           for (let i = 0; i < vo.data.products.length && count < 5 && ADD_CART; ++i) {
-            const product = vo.data.products[i]
+            const product = vo.data.products[i];
             if (!$.taskState.product_adds.includes(product.id)) {
-              count++
-              console.log(`去加购商品【${product.name}】`)
-              client.send(`{"msg":{"type":"action","args":{"add_product_id":${product.id}},"action":"add_product_view"}}`)
-              client.send(`{"msg":{"action":"write","type":"action","args":{"action_type":9,"channel":2,"source_app":2,"vender":"${product.id}"}}}`)
-              client.send(`{"msg":{"action":"write","type":"action","args":{"action_type":5,"channel":2,"source_app":2,"vender":"${product.id}"}}}`)
+              count++;
+              console.log(`去加购商品【${product.name}】`);
+              client.send(`{"msg":{"type":"action","args":{"add_product_id":${product.id}},"action":"add_product_view"}}`);
+              client.send(`{"msg":{"action":"write","type":"action","args":{"action_type":9,"channel":2,"source_app":2,"vender":"${product.id}"}}}`);
+              client.send(`{"msg":{"action":"write","type":"action","args":{"action_type":5,"channel":2,"source_app":2,"vender":"${product.id}"}}}`);
             }
             await $.wait(1000)
           }
@@ -254,32 +314,37 @@ async function mr() {
             console.log(`任务完成失败，错误信息${vo.msg}`)
           }
           break
-        case "produce_position_info":
-          if (vo.data.material_name !== '') {
-            console.log(`【${vo.data.position}】上正在生产【${vo.data.material_name}】，可收取 ${vo.data.produce_num} 份`)
-            if (vo.data.produce_num > 0) {
-              console.log(`剩余份数大于0份，去收取`)
-              client.send(`{"msg":{"type":"action","args":{"position":"${vo.data.position}","replace_material":false},"action":"material_fetch"}}`)
+        case "produce_position_info_v2":
+          // console.log(`${Boolean(vo?.data)};${vo?.data?.material_name !== ''}`);
+          if (vo.data && vo.data.material_name !== '') {
+            console.log(`【${vo?.data?.position}】上正在生产【${vo?.data?.material_name}】，可收取 ${vo.data.produce_num} 份`)
+            if (new Date().getTime() > vo.data.procedure.end_at) {
+              console.log(`去收取${vo?.data?.material_name}`)
+              client.send(`{"msg":{"type":"action","args":{"position":"${vo?.data?.position}","replace_material":false},"action":"material_fetch_v2"}}`)
               client.send(`{"msg":{"type":"action","args":{},"action":"to_employee"}}`)
-              $.pos.push(vo.data.position)
+              $.pos.push(vo?.data?.position)
             }
           } else {
-            if (vo.data.valid_electric > 0) {
+            if (vo?.data && vo.data.valid_electric > 0) {
               console.log(`【${vo.data.position}】上尚未开始生产`)
               let ma
+              console.log(`$.needs:${JSON.stringify($.needs)}`);
               if($.needs.length){
                 ma = $.needs.pop()
+                console.log(`ma:${JSON.stringify(ma)}`);
+              } else {
+                ma = $.material.base[0]['items'][positionList.indexOf(vo.data.position)];
+                console.log(`elsema:${JSON.stringify(ma)}`);
               }
-              else ma = $.material.base[0]['items'][positionList.indexOf(vo.data.position)]
-              console.log()
+              console.log(`ma booleam${Boolean(ma)}`);
               if (ma) {
                 console.log(`去生产${ma.name}`)
-                client.send(`{"msg":{"type":"action","args":{"position":"${vo.data.position}","material_id":${ma.id}},"action":"material_produce"}}`)
+                client.send(`{"msg":{"type":"action","args":{"position":"${vo.data.position}","material_id":${ma.id}},"action":"material_produce_v2"}}`)
               } else {
                 ma = $.material.base[1]['items'][positionList.indexOf(vo.data.position)]
                 if (ma) {
-                  console.log(`去生产${ma.name}`)
-                  client.send(`{"msg":{"type":"action","args":{"position":"${vo.data.position}","material_id":${ma.id}},"action":"material_produce"}}`)
+                  console.log(`else去生产${ma.name}`)
+                  client.send(`{"msg":{"type":"action","args":{"position":"${vo.data.position}","material_id":${ma.id}},"action":"material_produce_v2"}}`)
                 }
               }
             }
@@ -288,12 +353,12 @@ async function mr() {
             }
           }
           break
-        case "material_produce":
-          console.log(`【${vo.data.position}】上开始生产${vo.data.material_name}`)
+        case "material_produce_v2":
+          console.log(`【${vo.data.position}】上开始生产${vo?.data?.material_name}`)
           client.send(`{"msg":{"type":"action","args":{},"action":"to_employee"}}`)
           $.pos.push(vo.data.position)
           break
-        case "material_fetch":
+        case "material_fetch_v2":
           if (vo.code === '200' || vo.code === 200) {
             console.log(vo)
             console.log(`【${vo.data.position}】收取成功，获得${vo.data.procedure.produce_num}份${vo.data.material_name}`)
@@ -322,16 +387,20 @@ async function mr() {
             for (let product of $.products) {
               let num = Infinity
               let msg = ''
-              msg += `生产【${product.name}】需要原料`
+              msg += `生产【${product.name}】`
               for (let material of product.product_materials) {
-                msg += `【${material.material.name}】${material.num} 份 `
-                const ma = $.materials.filter(vo => vo.item_id === material.material_id)[0]
+                msg += `需要原料“${material.material.name}${material.num} 份” ` //material.num 需要材料数量
+                const ma = $.materials.filter(vo => vo.item_id === material.material_id)[0] //仓库里对应的材料信息
+                // console.log(`ma:${JSON.stringify(ma)}`);
                 if (ma) {
-                  msg += `（库存 ${ma.num} 份）`
-                  num = Math.min(num, Math.trunc(ma.num / material.num))
+                  msg += `（库存 ${ma.num} 份）`;
+                  num = Math.min(num, Math.trunc(ma.num / material.num)) ;//Math.trunc 取整数部分
+                  if(material.num > ma.num){need_material.push(material.material)};
+                  // console.log(`num:${JSON.stringify(num)}`);
                 } else {
                   if(need_material.findIndex(vo=>vo.id===material.material.id)===-1)
                     need_material.push(material.material)
+                  console.log(`need_material:${JSON.stringify(need_material)}`);
                   msg += `(没有库存)`
                   num = -1000
                 }
@@ -340,6 +409,7 @@ async function mr() {
                 msg += `，可生产 ${num}份`
                 console.log(msg)
                 console.log(`【${product.name}】可生产份数大于0，去生产`)
+                //product_produce 产品研发里的生产
                 client.send(`{"msg":{"type":"action","args":{"product_id":${product.id},"amount":${num}},"action":"product_produce"}}`)
                 await $.wait(500)
               } else {
@@ -348,13 +418,17 @@ async function mr() {
               }
             }
             $.needs = need_material
+            // console.log(`product_lists $.needs:${JSON.stringify($.needs)}`);
             console.log(`=======================`)
           } else {
             console.log(`生产信息获取失败，错误信息：${vo.msg}`)
           }
+          // await $.wait(2000);
+          // client.close();
           break
         case "product_produce":
           if (vo.code === '200' || vo.code === 200) {
+            // console.log(`product_produce:${JSON.stringify(vo)}`)
             console.log(`生产成功`)
           } else {
             console.log(`生产信息获取失败，错误信息${vo.msg}`)
@@ -364,7 +438,7 @@ async function mr() {
           if (vo.code === '200' || vo.code === 200) {
             for (let product of vo.data) {
               if (product.num === product.produce_num) {
-                client.send(`{"msg":{"type":"action","args":{"log_id":${product.id}},"action":"product_fetch"}}`)
+                client.send(`{"msg":{"type":"action","args":{"log_id":${product.id}},"action":"new_product_fetch"}}`)
               } else {
                 console.log(`产品【${product.product.id}】未生产完成，无法收取`)
               }
@@ -373,36 +447,46 @@ async function mr() {
             console.log(`生产商品信息获取失败，错误信息${vo.msg}`)
           }
           break
-        case "product_fetch":
+        case "new_product_fetch":
           if (vo.code === '200' || vo.code === 200) {
             console.log(`收取产品【${vo.data.product.name}】${vo.data.num}份`)
           } else {
             console.log(`收取产品失败，错误信息${vo.msg}`)
           }
           break
-        case "get_task":
-          console.log(`当前任务【${vo.data.describe}】，需要【${vo.data.product.name}】${vo.data.package_stock}/${vo.data.num}份`)
-          if (vo.data.package_stock >= vo.data.num) {
-            console.log(`满足任务要求，去完成任务`)
-            client.send(`{"msg":{"type":"action","args":{"task_id":${vo.data.id}},"action":"complete_task"}}`)
-          }
-          break
+          // case "get_task":
+          //   console.log(`当前任务【${vo.data.describe}】，需要【${vo.data.product.name}】${vo.data.package_stock}/${vo.data.num}份`)
+          //   if (vo.data.package_stock >= vo.data.num) {
+          //     console.log(`满足任务要求，去完成任务`)
+          //     client.send(`{"msg":{"type":"action","args":{"task_id":${vo.data.id}},"action":"complete_task"}}`)
+          //   }
+          //   break
         case 'get_benefit':
           for (let benefit of vo.data) {
-            if (benefit.type === 1) {
-              console.log(`物品【${benefit.description}】需要${benefit.coins}美妆币，库存${benefit.stock}份`)
-              if (parseInt(benefit.setting.beans_count) === bean &&
-                $.total > benefit.coins &&
-                parseInt(benefit.day_exchange_count) < benefit.day_limit) {
-                console.log(`满足条件，去兑换`)
-                client.send(`{"msg":{"type":"action","args":{"benefit_id":${benefit.id}},"action":"to_exchange"}}`)
-                await $.wait(1000)
+            if (benefit.type === 1) { //type 1 是京豆
+              console.log(`benefit:${JSON.stringify(benefit)}`);
+              if(benefit.description === "1 京豆" &&   //500颗京豆打包兑换
+                  parseInt(benefit.day_exchange_count) < 10 &&
+                  $.total > benefit.coins){
+                for (let i = benefit.day_exchange_count; i < 10; i++){
+                  // console.log(`开始兑换`)
+                  client.send(`{"msg":{"type":"action","args":{"benefit_id":${benefit.id}},"action":"to_exchange"}}`);
+                  await $.wait(1000);
+                }
               }
+              // console.log(`物品【${benefit.description}】需要${benefit.coins}美妆币，库存${benefit.stock}份`)
+              // if (parseInt(benefit.setting.beans_count) === bean && //兑换多少豆 bean500就500豆
+              //   $.total > benefit.coins &&
+              //   parseInt(benefit.day_exchange_count) < benefit.day_limit) {
+              //   console.log(`满足条件，去兑换`)
+              //   client.send(`{"msg":{"type":"action","args":{"benefit_id":${benefit.id}},"action":"to_exchange"}}`)
+              //   await $.wait(1000)
+              // }
             }
           }
           break
         case "to_exchange":
-          console.log(`兑换成功`)
+          console.log(`兑换${vo.data.coins/-100}京豆成功;${JSON.stringify(vo)}`)
           break
         case "get_produce_material":
           $.material = vo.data
@@ -441,8 +525,8 @@ function getIsvToken() {
         } else {
           if (safeGet(data)) {
             data = JSON.parse(data);
-            $.isvToken = data['tokenKey']
-            console.log($.isvToken)
+            $.isvToken = data['tokenKey'];
+            console.log(`isvToken:${$.isvToken}`);
           }
         }
       } catch (e) {
@@ -477,7 +561,7 @@ function getIsvToken2() {
           if (safeGet(data)) {
             data = JSON.parse(data);
             $.token2 = data['token']
-            console.log($.token2)
+            console.log(`token2:${$.token2}`);
           }
         }
       } catch (e) {