From f43b9e00c82b722514cf271ccc7961c1e4d2669d Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Fri, 1 Jan 2021 17:20:43 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E6=B4=BB=E5=8A=A8=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

迁移过期的活动脚本
---
 jd_jdh.js => activity/jd_jdh.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename jd_jdh.js => activity/jd_jdh.js (100%)

diff --git a/jd_jdh.js b/activity/jd_jdh.js
similarity index 100%
rename from jd_jdh.js
rename to activity/jd_jdh.js
-- 
Gitee


From 55bddcf2fab30771817da84ba667f22537ed9d7e Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Fri, 1 Jan 2021 17:21:33 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E6=B4=BB=E5=8A=A8=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

迁移过期的活动脚本
---
 jd_live_redrain.js => activity/jd_live_redrain.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename jd_live_redrain.js => activity/jd_live_redrain.js (100%)

diff --git a/jd_live_redrain.js b/activity/jd_live_redrain.js
similarity index 100%
rename from jd_live_redrain.js
rename to activity/jd_live_redrain.js
-- 
Gitee


From bad0ce51ebb2f55fa2254dfa4127bf1f0eb62f9c Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Fri, 1 Jan 2021 17:21:58 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E6=B4=BB=E5=8A=A8=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

迁移过期的活动脚本
---
 jd_ms_redrain.js => activity/jd_ms_redrain.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename jd_ms_redrain.js => activity/jd_ms_redrain.js (100%)

diff --git a/jd_ms_redrain.js b/activity/jd_ms_redrain.js
similarity index 100%
rename from jd_ms_redrain.js
rename to activity/jd_ms_redrain.js
-- 
Gitee


From e4bbe58c1a2b1776ce307bcf0acd236bc15c05f4 Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Fri, 1 Jan 2021 17:22:22 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E6=B4=BB=E5=8A=A8=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

迁移过期的活动脚本
---
 jd_watch.js => activity/jd_watch.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename jd_watch.js => activity/jd_watch.js (100%)

diff --git a/jd_watch.js b/activity/jd_watch.js
similarity index 100%
rename from jd_watch.js
rename to activity/jd_watch.js
-- 
Gitee


From 54d4574405389d457706b68f0210f58f2b8f97eb Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Fri, 1 Jan 2021 17:22:45 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E6=B4=BB=E5=8A=A8=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

迁移过期的活动脚本
---
 jr_sign.js => activity/jr_sign.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename jr_sign.js => activity/jr_sign.js (100%)

diff --git a/jr_sign.js b/activity/jr_sign.js
similarity index 100%
rename from jr_sign.js
rename to activity/jr_sign.js
-- 
Gitee


From 5d0dfb7f9ae5831046bc714fe74266271a69963e Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 4 Jan 2021 12:22:11 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9C=E4=B8=9C?=
 =?UTF-8?q?=E5=B0=8F=E7=AA=9D=E5=9B=A0=E8=A3=85=E9=A5=B0=E9=A2=86=E4=BA=AC?=
 =?UTF-8?q?=E8=B1=86=E5=8A=9F=E8=83=BD=E4=B8=8B=E7=BA=BF=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Loon/lxk0301_LoonTask.conf |  2 +-
 docker/crontab_list.sh     |  2 +-
 jd_small_home.js           | 40 ++++++++++++++++++++------------------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Loon/lxk0301_LoonTask.conf b/Loon/lxk0301_LoonTask.conf
index 63977d1..13ff0c4 100644
--- a/Loon/lxk0301_LoonTask.conf
+++ b/Loon/lxk0301_LoonTask.conf
@@ -120,6 +120,6 @@ cron "10-20/5 12 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd
 # 金融打卡领年终奖
 # cron "10 6 1-31 12 *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jr_sign.js, tag=金融打卡领年终奖
 # 健康抽奖机
-cron "10 0 1-31 12 *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_health.js,tag=健康抽奖机
+cron "10 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_health.js,tag=健康抽奖机
 # 疯狂的joy日常任务
 cron "30 8 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_crazy_joy.js,tag=疯狂的joy日常任务
diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh
index 2994511..4dbf59b 100644
--- a/docker/crontab_list.sh
+++ b/docker/crontab_list.sh
@@ -5,7 +5,7 @@
 
 ##############短期活动##############
 # 健康抽奖机(2020.12.31活动过期)
-10 0 1-31 12 * node /scripts/jd_health.js >> /scripts/logs/jd_health.log 2>&1
+10 0 * * * node /scripts/jd_health.js >> /scripts/logs/jd_health.log 2>&1
 ##############长期活动##############
 # 签到
 0 0,18 * * * cd /scripts && node jd_bean_sign.js >> /scripts/logs/jd_bean_sign.log 2>&1
diff --git a/jd_small_home.js b/jd_small_home.js
index 096519e..46a21a0 100644
--- a/jd_small_home.js
+++ b/jd_small_home.js
@@ -2,7 +2,7 @@
  * @Author: lxk0301 https://github.com/lxk0301 
  * @Date: 2020-11-12 11:42:12 
  * @Last Modified by: lxk0301
- * @Last Modified time: 2020-12-23 14:27:20
+ * @Last Modified time: 2021-1-4 14:27:20
  */
 /*
 东东小窝 https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_small_home.js
@@ -274,25 +274,27 @@ function queryFurnituresCenterList() {
           if (safeGet(data)) {
             data = JSON.parse(data);
             if (data.head.code === 200) {
-              let { buy, list } = data.body;
-              $.canBuyList = [];
-              list.map((item, index) => {
-                if (buy.some((buyItem) => buyItem === item.id)) return
-                $.canBuyList.push(item);
-              })
-              $.canBuyList.sort(sortByjdBeanNum);
-              if ($.canBuyList[0].needWoB <= $.woB) {
-                await furnituresCenterPurchase($.canBuyList[0].id, $.canBuyList[0].jdBeanNum);
-              } else {
-                console.log(`\n兑换${$.canBuyList[0].jdBeanNum}京豆失败:当前wo币${$.woB}不够兑换所需的${$.canBuyList[0].needWoB}WO币`)
-                message += `【装饰领京豆】兑换${$.canBuyList[0].jdBeanNum}京豆失败,原因:WO币不够\n`;
+              if (data.body) {
+                let { buy, list } = data.body;
+                $.canBuyList = [];
+                list.map((item, index) => {
+                  if (buy.some((buyItem) => buyItem === item.id)) return
+                  $.canBuyList.push(item);
+                })
+                $.canBuyList.sort(sortByjdBeanNum);
+                if ($.canBuyList[0].needWoB <= $.woB) {
+                  await furnituresCenterPurchase($.canBuyList[0].id, $.canBuyList[0].jdBeanNum);
+                } else {
+                  console.log(`\n兑换${$.canBuyList[0].jdBeanNum}京豆失败:当前wo币${$.woB}不够兑换所需的${$.canBuyList[0].needWoB}WO币`)
+                  message += `【装饰领京豆】兑换${$.canBuyList[0].jdBeanNum}京豆失败,原因:WO币不够\n`;
+                }
+                // for (let canBuyItem of $.canBuyList) {
+                //   if (canBuyItem.needWoB <= $.woB) {
+                //     await furnituresCenterPurchase(canBuyItem.id, canBuyItem.jdBeanNum);
+                //     break
+                //   }
+                // }
               }
-              // for (let canBuyItem of $.canBuyList) {
-              //   if (canBuyItem.needWoB <= $.woB) {
-              //     await furnituresCenterPurchase(canBuyItem.id, canBuyItem.jdBeanNum);
-              //     break
-              //   }
-              // }
             }
           }
         }
-- 
Gitee


From f44b13ce8ff73aa40ca4e454209dfd491f8f72e7 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 4 Jan 2021 12:35:46 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E4=B8=9C=E4=B8=9C=E5=B7=A5=E5=8E=82?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=EF=BC=8C=E5=87=8F=E5=B0=91?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=A8=E5=AF=BC=E8=87=B4=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 activity/jd_apple_live.js |  2 +-
 activity/jd_jxstory.js    |  2 +-
 activity/jd_pubg.js       |  2 +-
 jd_crazy_joy.js           |  2 +-
 jd_dreamFactory.js        |  2 +-
 jd_fruit.js               |  2 +-
 jd_health.js              |  2 +-
 jd_jdfactory.js           | 40 +++++++++++++++++++++------------------
 jd_jdzz.js                |  2 +-
 jd_pet.js                 |  2 +-
 jd_plantBean.js           |  2 +-
 11 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/activity/jd_apple_live.js b/activity/jd_apple_live.js
index 2602281..e2d0410 100644
--- a/activity/jd_apple_live.js
+++ b/activity/jd_apple_live.js
@@ -283,7 +283,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面`)
+            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/activity/jd_jxstory.js b/activity/jd_jxstory.js
index cd46e3e..45c7994 100644
--- a/activity/jd_jxstory.js
+++ b/activity/jd_jxstory.js
@@ -498,7 +498,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面`)
+            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/activity/jd_pubg.js b/activity/jd_pubg.js
index bed15df..cc22b60 100644
--- a/activity/jd_pubg.js
+++ b/activity/jd_pubg.js
@@ -330,7 +330,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面`)
+            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/jd_crazy_joy.js b/jd_crazy_joy.js
index a87e871..f1d1f5d 100644
--- a/jd_crazy_joy.js
+++ b/jd_crazy_joy.js
@@ -666,7 +666,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面`)
+            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index 11687c9..713a46f 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -1305,7 +1305,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面`)
+            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/jd_fruit.js b/jd_fruit.js
index 03185eb..2cb8ec9 100644
--- a/jd_fruit.js
+++ b/jd_fruit.js
@@ -1239,7 +1239,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取个${randomCount}码放到您固定的互助码后面`)
+            console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/jd_health.js b/jd_health.js
index ee4ffe9..b05005d 100644
--- a/jd_health.js
+++ b/jd_health.js
@@ -265,7 +265,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面`)
+            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/jd_jdfactory.js b/jd_jdfactory.js
index b756da1..546b710 100644
--- a/jd_jdfactory.js
+++ b/jd_jdfactory.js
@@ -108,8 +108,8 @@ function showMsg() {
     } else {
       $.log(`京东账号${$.index}${$.nickName}\n${message}`);
     }
-    if (new Date().getHours() === 23) {
-      $.msg($.name, '', `京东账号${$.index}${$.nickName}\n${message}`);
+    if (new Date().getHours() === 12) {
+      $.msg($.name, '', `${message}`);
     }
     resolve()
   })
@@ -181,6 +181,7 @@ async function algorithm() {
                 }
               } else {
                 console.log(`\n此账号${$.index}${$.nickName}暂未选择商品\n`);
+                message += `京东账号${$.index} ${$.nickName}\n`;
                 message += `已选商品：暂无\n`;
                 message += `心仪商品：${wantProduct ? wantProduct : '暂无'}\n`;
                 if (wantProduct) {
@@ -216,17 +217,17 @@ async function algorithm() {
                 } else {
                   console.log(`BoxJs或环境变量暂未提供心仪商品\n如需兑换心仪商品，请提供心仪商品名称\n`);
                   await jdfactory_getProductList(true);
-                  message += `当前剩余最多商品：${$.canMakeList[0].name}\n`;
-                  message += `兑换所需电量：${$.canMakeList[0].fullScore}\n`;
+                  message += `当前剩余最多商品：${$.canMakeList[0] && $.canMakeList[0].name}\n`;
+                  message += `兑换所需电量：${$.canMakeList[0] && $.canMakeList[0].fullScore}\n`;
                   message += `您当前总电量：${$.batteryValue * 1}\n`;
-                  if ($.canMakeList[0].couponCount > 0 && $.batteryValue * 1 >= $.canMakeList[0].fullScore) {
+                  if ($.canMakeList[0] && $.canMakeList[0].couponCount > 0 && $.batteryValue * 1 >= $.canMakeList[0] && $.canMakeList[0].fullScore) {
                     let nowTimes = new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000);
                     if (new Date(nowTimes).getHours() === 12) {
-                      $.msg($.name, '', `京东账号${$.index}${$.nickName}\n${message}【满足】兑换${$.canMakeList[0].name}所需总电量：${$.canMakeList[0].fullScore}\n请点击弹窗直达活动页面\n选择此心仪商品并手动投入电量兑换`, {'open-url': 'openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://h5.m.jd.com/babelDiy/Zeus/2uSsV2wHEkySvompfjB43nuKkcHp/index.html%22%20%7D'});
-                      if ($.isNode()) await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `【京东账号${$.index}】${$.nickName}\n${message}【满足】兑换${$.canMakeList[0].name}所需总电量：${$.canMakeList[0].fullScore}\n请速去活动页面查看`);
+                      $.msg($.name, '', `京东账号${$.index}${$.nickName}\n${message}【满足】兑换${$.canMakeList[0] && $.canMakeList[0] && [0].name}所需总电量：${$.canMakeList[0] && $.canMakeList[0].fullScore}\n请点击弹窗直达活动页面\n选择此心仪商品并手动投入电量兑换`, {'open-url': 'openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://h5.m.jd.com/babelDiy/Zeus/2uSsV2wHEkySvompfjB43nuKkcHp/index.html%22%20%7D'});
+                      if ($.isNode()) await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `【京东账号${$.index}】${$.nickName}\n${message}【满足】兑换${$.canMakeList[0] && $.canMakeList[0].name}所需总电量：${$.canMakeList[0].fullScore}\n请速去活动页面查看`);
                     }
                   } else {
-                    console.log(`\n目前电量${$.batteryValue * 1},不满足兑换 ${$.canMakeList[0].name}所需的 ${$.canMakeList[0].fullScore}电量\n`)
+                    console.log(`\n目前电量${$.batteryValue * 1},不满足兑换 ${$.canMakeList[0] && $.canMakeList[0].name}所需的 ${$.canMakeList[0] && $.canMakeList[0].fullScore}电量\n`)
                   }
                 }
               }
@@ -535,17 +536,20 @@ function jdfactory_getProductList(flag = false) {
           if (safeGet(data)) {
             data = JSON.parse(data);
             if (data.data.bizCode === 0) {
+              $.canMakeList = [];
               $.canMakeList = data.data.result.canMakeList;//当前可选商品列表 sellOut:1为已抢光，0为目前可选择
-              $.canMakeList.sort(sortCouponCount);
-              console.log(`商品名称       可选状态    剩余量`)
-              for (let item of $.canMakeList) {
-                console.log(`${item.name.slice(-4)}         ${item.sellOut === 1 ? '已抢光':'可 选'}      ${item.couponCount}`);
-              }
-              if (!flag) {
+              if ($.canMakeList && $.canMakeList.length > 0) {
+                $.canMakeList.sort(sortCouponCount);
+                console.log(`商品名称       可选状态    剩余量`)
                 for (let item of $.canMakeList) {
-                  if (item.name.indexOf(wantProduct) > -1 && item.couponCount > 0 && item.sellOut === 0) {
-                    await jdfactory_makeProduct(item.skuId);
-                    break
+                  console.log(`${item.name.slice(-4)}         ${item.sellOut === 1 ? '已抢光':'可 选'}      ${item.couponCount}`);
+                }
+                if (!flag) {
+                  for (let item of $.canMakeList) {
+                    if (item.name.indexOf(wantProduct) > -1 && item.couponCount > 0 && item.sellOut === 0) {
+                      await jdfactory_makeProduct(item.skuId);
+                      break
+                    }
                   }
                 }
               }
@@ -624,7 +628,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面`)
+            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/jd_jdzz.js b/jd_jdzz.js
index f5da363..5ea61aa 100644
--- a/jd_jdzz.js
+++ b/jd_jdzz.js
@@ -343,7 +343,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取${randomCount}个码放到您固定的互助码后面`)
+            console.log(`随机取${randomCount}个码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/jd_pet.js b/jd_pet.js
index 9b19c20..cde3fd7 100644
--- a/jd_pet.js
+++ b/jd_pet.js
@@ -442,7 +442,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取个${randomCount}码放到您固定的互助码后面`)
+            console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
diff --git a/jd_plantBean.js b/jd_plantBean.js
index 8fbe3d0..c573903 100644
--- a/jd_plantBean.js
+++ b/jd_plantBean.js
@@ -521,7 +521,7 @@ function readShareCode() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (data) {
-            console.log(`随机取个${randomCount}码放到您固定的互助码后面`)
+            console.log(`随机取个${randomCount}码放到您固定的互助码后面(不影响已有固定互助)`)
             data = JSON.parse(data);
           }
         }
-- 
Gitee


From b03b33d0d5856cc76a221a3906b782d8fa2c3229 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 4 Jan 2021 13:03:49 +0800
Subject: [PATCH 08/17] update

---
 jd_bean_sign.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jd_bean_sign.js b/jd_bean_sign.js
index accf599..c54178c 100644
--- a/jd_bean_sign.js
+++ b/jd_bean_sign.js
@@ -1,7 +1,7 @@
 /*
 京豆签到,自用,可N个京东账号,IOS软件用户请使用 https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js
 Node.JS专用
-更新时间：2020-12-21
+更新时间：2021-1-4
 从 github @ruicky改写而来
 version v0.0.1
 create by ruicky
@@ -17,6 +17,7 @@ const download = require('download');
 let resultPath = "./result.txt";
 let JD_DailyBonusPath = "./JD_DailyBonus.js";
 let outPutUrl = './';
+let NodeSet = 'CookieSet.json';
 let cookiesArr = [], cookie = '';
 
 if ($.isNode()) {
@@ -130,6 +131,7 @@ async function downFile () {
 async function changeFile (content) {
   console.log(`开始替换变量`)
   let newContent = content.replace(/var Key = ''/, `var Key = '${cookie}'`);
+  newContent = newContent.replace(/const NodeSet = 'CookieSet.json'/, `const NodeSet = ${NodeSet}`)
   if (process.env.JD_BEAN_STOP && process.env.JD_BEAN_STOP !== '0') {
     newContent = newContent.replace(/var stop = 0/, `var stop = ${process.env.JD_BEAN_STOP * 1}`);
   }
@@ -219,6 +221,7 @@ function requireConfig() {
       resultPath = err ? '/tmp/result.txt' : resultPath;
       JD_DailyBonusPath = err ? '/tmp/JD_DailyBonus.js' : JD_DailyBonusPath;
       outPutUrl = err ? '/tmp/' : outPutUrl;
+      NodeSet = err ? '/tmp/CookieSet.json' : NodeSet;
       resolve()
     });
   })
-- 
Gitee


From 70565f3dcfd80ddfecd96e5fad23af61b9590f84 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 4 Jan 2021 13:08:29 +0800
Subject: [PATCH 09/17] fix

---
 jd_bean_sign.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jd_bean_sign.js b/jd_bean_sign.js
index c54178c..fb3fee0 100644
--- a/jd_bean_sign.js
+++ b/jd_bean_sign.js
@@ -131,7 +131,7 @@ async function downFile () {
 async function changeFile (content) {
   console.log(`开始替换变量`)
   let newContent = content.replace(/var Key = ''/, `var Key = '${cookie}'`);
-  newContent = newContent.replace(/const NodeSet = 'CookieSet.json'/, `const NodeSet = ${NodeSet}`)
+  newContent = newContent.replace(/const NodeSet = 'CookieSet.json'/, `const NodeSet = '${NodeSet}'`)
   if (process.env.JD_BEAN_STOP && process.env.JD_BEAN_STOP !== '0') {
     newContent = newContent.replace(/var stop = 0/, `var stop = ${process.env.JD_BEAN_STOP * 1}`);
   }
-- 
Gitee


From c983e3edfbf2b4bd7dd975717c717d8c202d4856 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 4 Jan 2021 13:47:35 +0800
Subject: [PATCH 10/17] debug

---
 jd_joy_reward.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jd_joy_reward.js b/jd_joy_reward.js
index 26bf0c0..560be57 100644
--- a/jd_joy_reward.js
+++ b/jd_joy_reward.js
@@ -299,7 +299,9 @@ function getJDServerTime() {
   })
 }
 async function get_diff_time() {
-  // console.log(await getJDServerTime())
+  console.log(`本机时间戳 ${Date.now()}`)
+  console.log(`京东服务器时间戳 ${await getJDServerTime()}`)
+  console.log(Date.now() - await getJDServerTime())
   let nowTime = new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000;
   return nowTime - await getJDServerTime();
 }
-- 
Gitee


From bfde1ba6c1fa6f45ead7d85fcb2c428ee1dd19ab Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 4 Jan 2021 13:51:16 +0800
Subject: [PATCH 11/17] debug

---
 jd_joy_reward.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/jd_joy_reward.js b/jd_joy_reward.js
index 560be57..2eaf482 100644
--- a/jd_joy_reward.js
+++ b/jd_joy_reward.js
@@ -299,11 +299,9 @@ function getJDServerTime() {
   })
 }
 async function get_diff_time() {
-  console.log(`本机时间戳 ${Date.now()}`)
-  console.log(`京东服务器时间戳 ${await getJDServerTime()}`)
-  console.log(Date.now() - await getJDServerTime())
-  let nowTime = new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000;
-  return nowTime - await getJDServerTime();
+  // console.log(`本机时间戳 ${Date.now()}`)
+  // console.log(`京东服务器时间戳 ${await getJDServerTime()}`)
+  return Date.now() - await getJDServerTime();
 }
 function jsonParse(str) {
   if (typeof str == "string") {
-- 
Gitee


From 61f5836eaa399a5ce00459374ccc54b226a8c86d Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 4 Jan 2021 17:14:58 +0800
Subject: [PATCH 12/17] update

---
 jdCookie.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/jdCookie.js b/jdCookie.js
index 4eb2bb7..8f30c69 100644
--- a/jdCookie.js
+++ b/jdCookie.js
@@ -15,17 +15,12 @@ if (process.env.JD_COOKIE) {
   } else if (process.env.JD_COOKIE.indexOf('\n') > -1) {
     console.log(`您的cookie选择的是用换行隔开\n`)
     CookieJDs = process.env.JD_COOKIE.split('\n');
-  } else if (process.env.JD_COOKIE.indexOf('\\n') > -1) {
-    //环境变量兼容腾讯云和docker下\n会被转义成\\n
-    console.log(`您的cookie选择的是用换行隔开\\n`)
-    CookieJDs = process.env.JD_COOKIE.split('\\n');
   } else {
     CookieJDs = [process.env.JD_COOKIE];
   }
   CookieJDs = [...new Set(CookieJDs)]
   console.log(`\n====================共有${CookieJDs.length}个京东账号Cookie=========\n`);
   console.log(`==================脚本执行- 北京时间(UTC+8)：${new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString()}=====================\n`)
-  // console.log(`\n==================脚本执行来自 github action=====================\n`)
 }
 for (let i = 0; i < CookieJDs.length; i++) {
   const index = (i + 1 === 1) ? '' : (i + 1);
-- 
Gitee


From ac0070cf7858dd7eae63ae90e6838ccf97f7ea8d Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 4 Jan 2021 17:22:19 +0800
Subject: [PATCH 13/17] update jdCookie.js

---
 jdCookie.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdCookie.js b/jdCookie.js
index 8f30c69..f24b398 100644
--- a/jdCookie.js
+++ b/jdCookie.js
@@ -18,10 +18,10 @@ if (process.env.JD_COOKIE) {
   } else {
     CookieJDs = [process.env.JD_COOKIE];
   }
-  CookieJDs = [...new Set(CookieJDs)]
-  console.log(`\n====================共有${CookieJDs.length}个京东账号Cookie=========\n`);
-  console.log(`==================脚本执行- 北京时间(UTC+8)：${new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString()}=====================\n`)
 }
+CookieJDs = [...new Set(CookieJDs.filter(item => item !== "" && item !== null && item !== undefined))]
+console.log(`\n====================共有${CookieJDs.length}个京东账号Cookie=========\n`);
+console.log(`==================脚本执行- 北京时间(UTC+8)：${new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString()}=====================\n`)
 for (let i = 0; i < CookieJDs.length; i++) {
   const index = (i + 1 === 1) ? '' : (i + 1);
   exports['CookieJD' + index] = CookieJDs[i];
-- 
Gitee


From 6ef92bc204282bd3b1900f0d1e890e798819514b Mon Sep 17 00:00:00 2001
From: sxx1314 <8444252+sxx1314@users.noreply.github.com>
Date: Tue, 5 Jan 2021 00:53:50 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=20=E5=BA=94=E7=94=A8=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E4=B8=AD=E7=9A=84=E6=8D=A2=E8=A1=8C=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复企业微信 应用消息图文消息推送中换行缺失的问题
- 简单的替换了换行符，以后可以按照需求增加css等样式。
- 更换了图片id的issues说明链接
---
 sendNotify.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sendNotify.js b/sendNotify.js
index 262e5e9..e32a197 100644
--- a/sendNotify.js
+++ b/sendNotify.js
@@ -49,7 +49,7 @@ let DD_BOT_SECRET = '';
 let QYWX_KEY = '';
 
 // =======================================企业微信应用消息通知设置区域===========================================
-//此处填你企业微信应用消息的 值(详见文档 https://work.weixin.qq.com/api/doc/90000/90135/90236)，依次填上corpid的值,corpsecret的值,touser的值,agentid的值，素材库图片id（见https://work.weixin.qq.com/api/doc/90000/90135/90253） 注意用,号隔开，例如：wwcff56746d9adwers,B-791548lnzXBE6_BWfxdf3kSTMJr9vFEPKAbh6WERQ,mingcheng,1000001,2COXgjH2UIfERF2zxrtUOKgQ9XklUqMdGSWLBoW_lSDAdafat
+//此处填你企业微信应用消息的 值(详见文档 https://work.weixin.qq.com/api/doc/90000/90135/90236)，依次填上corpid的值,corpsecret的值,touser的值,agentid的值，素材库图片id（见https://github.com/lxk0301/jd_scripts/issues/519) 注意用,号隔开，例如：wwcff56746d9adwers,B-791548lnzXBE6_BWfxdf3kSTMJr9vFEPKAbh6WERQ,mingcheng,1000001,2COXgjH2UIfERF2zxrtUOKgQ9XklUqMdGSWLBoW_lSDAdafat
 //注：此处设置github action用户填写到Settings-Secrets里面(Name输入QYWX_AM)
 let QYWX_AM = '';
 
@@ -430,7 +430,8 @@ function qywxamNotify(text, desp) {
 	        'Content-Type': 'application/json',
 	      },
 	    };
-	  $.post(options_accesstoken, (err, resp, data) => {  
+	  $.post(options_accesstoken, (err, resp, data) => {
+      html=desp.replace(/\n/g,"<br/>")	  
       var json = JSON.parse(data);
       accesstoken = json.access_token;
 		const options = {
@@ -446,7 +447,7 @@ function qywxamNotify(text, desp) {
                   thumb_media_id: `${QYWX_AM_AY[4]}`,  
                   author : `智能助手` ,
                   content_source_url: ``,
-                  content : `${desp}`,  //暂时直接设置成了desp
+                  content : `${html}`, 
                   digest: `${desp}`
                   }
                   ]
-- 
Gitee


From 8c45d350980e69c2294eda4c48985f0b799d2558 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Tue, 5 Jan 2021 09:20:26 +0800
Subject: [PATCH 15/17] update jdCookie.js

---
 jdCookie.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdCookie.js b/jdCookie.js
index f24b398..0dcadb2 100644
--- a/jdCookie.js
+++ b/jdCookie.js
@@ -24,5 +24,5 @@ console.log(`\n====================共有${CookieJDs.length}个京东账号Cooki
 console.log(`==================脚本执行- 北京时间(UTC+8)：${new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString()}=====================\n`)
 for (let i = 0; i < CookieJDs.length; i++) {
   const index = (i + 1 === 1) ? '' : (i + 1);
-  exports['CookieJD' + index] = CookieJDs[i];
+  exports['CookieJD' + index] = CookieJDs[i].trim();
 }
-- 
Gitee


From cdc1c465d1f4cb69893e5316fb69e1cd5b65b8f1 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Tue, 5 Jan 2021 09:39:24 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=8C=E8=BF=81=E7=A7=BBtencentscf.md?=
 =?UTF-8?q?=E5=88=B0=E5=88=AB=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                     |   4 +-
 jd_ds.js => activity/jd_ds.js |   0
 backUp/tencentscf.md          | 128 ++++++++++++++++++++++++++++++++++
 jd_fruit.js                   |  40 ++++++-----
 4 files changed, 152 insertions(+), 20 deletions(-)
 rename jd_ds.js => activity/jd_ds.js (100%)
 create mode 100644 backUp/tencentscf.md

diff --git a/README.md b/README.md
index 8783d73..005764d 100644
--- a/README.md
+++ b/README.md
@@ -85,9 +85,9 @@
 ### 方法二：云服务器、腾讯云函数等等
 
   - 需自行有云服务器，云函数等
-  - 腾讯云云函数 [快速部署教程](tencentscf.md)（免费）
+  - 腾讯云云函数 [快速部署教程](../tencentscf.md)（免费）
   - 腾讯云云函数控制台使用 [教程说明](iCloud.md)
-  - 腾讯云云函数 [GitHub Action部署教程](tencentscf.md#github-action-部署)
+  - 腾讯云云函数 [GitHub Action部署教程](../tencentscf.md#github-action-部署)
        
  
 ### 方法三：Docker（NAS或VPS用户）
diff --git a/jd_ds.js b/activity/jd_ds.js
similarity index 100%
rename from jd_ds.js
rename to activity/jd_ds.js
diff --git a/backUp/tencentscf.md b/backUp/tencentscf.md
new file mode 100644
index 0000000..30c04ca
--- /dev/null
+++ b/backUp/tencentscf.md
@@ -0,0 +1,128 @@
+
+# 云函数快速部署京东脚本
+>
+> - 本地安装依赖使用serverless部署，[点这里](tencentscf.md#1-安装-nodejs-环境)
+> - Github Action 部署[点这里](tencentscf.md#github-action-部署)
+
+## 1. 安装 Node.js 环境
+
+Node.js 环境 [下载地址](https://nodejs.org/zh-tw/download/) ，根据自己的操作系统下载和安装。
+
+## 2. 下载代码
+
+点击红框处下载压缩包
+![下载代码](https://imgbed-bucket-1251971143.cos.ap-guangzhou.myqcloud.com/1605497672397-zip.png)
+
+## 3. 安装依赖，配置 cookie
+
+### 3.1 安装依赖
+
+压缩包解压后进入项目文件夹
+
+- Windows 用户按住  **shift** 点击右键，点击 **在此处打开命令窗口**
+- Mac 用户通过终端，自行进入该文件夹
+
+在命令行内输入 `npm i `，等待运行完成。
+
+此时，项目文件夹内会多出一个 `node_modules`文件夹
+
+### 3.2 配置 cookie
+
+打开项目文件内的 `jdCookie.js`
+
+在最上面的 `CookieJDs`里写入 cookie ，多个账号以逗号分隔
+
+例如
+
+```javascript
+let CookieJDs = [
+  'pt_key=xxx;pt_pin=xxx;', 
+  'pt_key=zzz;pt_pin=zzz;',
+  'pt_key=aaa;pt_pin=xxxaaa'
+]
+```
+
+> 注：获取京东 cookie 教程参考 [浏览器获取京东cookie教程](https://github.com/lxk0301/jd_scripts/blob/master/backUp/GetJdCookie.md) , [插件获取京东cookie教程](https://github.com/lxk0301/jd_scripts/blob/master/backUp/GetJdCookie2.md)
+
+
+## 4. 部署到云函数
+
+### 4.1 开通服务
+
+依次登录 [SCF 云函数控制台](https://console.cloud.tencent.com/scf) 和 [SLS 控制台](https://console.cloud.tencent.com/sls) 开通相关服务，确保账户下已开通服务并创建相应[服务角色](https://console.cloud.tencent.com/cam/role) **SCF_QcsRole、SLS_QcsRole**
+
+> 注意！为了确保权限足够，获取这两个参数时不要使用子账户！此外，腾讯云账户需要[实名认证](https://console.cloud.tencent.com/developer/auth)。
+
+### 4.2 工具部署
+
+下载 Serverless 工具，快速部署函数
+```
+npm install -g serverless
+```
+
+执行部署命令
+```
+serverless deploy
+```
+
+如果已经配置了永久秘钥，则可以直接部署，如果没有，可以直接**微信扫码**登录腾讯云，并且授权部署。
+
+过几秒后，查看输出，可以看到函数和定时触发器都已经配置完成。
+```
+serverless ⚡framework
+Action: "deploy" - Stage: "dev" - App: "jdscript" - Instance: "jdscript"
+
+functionName: scf-jdscript
+description:  This is a function in jdscript application.
+namespace:    default
+runtime:      Nodejs12.16
+handler:      index.main_handler
+memorySize:   64
+lastVersion:  $LATEST
+traffic:      1
+triggers: 
+  timer: 
+    - timer-jdscript-dev
+
+36s › jdscript › Success
+```
+
+## 5. 查看和测试
+
+登录后，在 [腾讯云函数地址](https://console.cloud.tencent.com/scf/index) 点击管理控制台，查看最新部署的函数。
+
+在左侧栏的日志查询中，可以查看到触发的日志，包括是否打卡成功等。
+
+![测试函数](https://user-images.githubusercontent.com/6993269/99628053-5a9eea80-2a70-11eb-906f-f1d5ea2bfa3a.png)
+
+> 如果需要配置永久秘钥，则可以在[访问秘钥页面](https://console.cloud.tencent.com/cam/capi)获取账号的 TENCENT_SECRET_ID，TENCENT_SECRET_KEY，并配置在代码根目录 .env 文件中。
+
+
+# Github Action 部署
+## 1. 开通服务
+
+依次登录 [SCF 云函数控制台](https://console.cloud.tencent.com/scf) 和 [SLS 控制台](https://console.cloud.tencent.com/sls) 开通相关服务，确保账户下已开通服务并创建相应[服务角色](https://console.cloud.tencent.com/cam/role) **SCF_QcsRole、SLS_QcsRole**
+
+> 注意！为了确保权限足够，获取这两个参数时不要使用子账户！此外，腾讯云账户需要[实名认证](https://console.cloud.tencent.com/developer/auth)。
+
+## 2. 在这里新建一个访问密钥[新建密钥](https://console.cloud.tencent.com/cam/capi)
+> 将SecretId和SecretKey分别配置在仓库的secrets变量里面， TENCENT_SECRET_ID对应你的SecretId的值，TENCENT_SECRET_KEY对应你的SecretKey的值
+
+## 3. 配置自己需要secrets变量[参考这里](githubAction.md#下方提供使用到的-secrets全集合)
+### __重要的说三遍__   
+### 如果涉及一个变量配置多个值，如多个cookie，多个取消订阅关键字，去掉里面的 *__[空格]()__* 和 __*[换行]()*__ 使用 `&` 连接   
+### 如果涉及一个变量配置多个值，如多个cookie，多个取消订阅关键字，去掉里面的 *__[空格]()__* 和 __*[换行]()*__ 使用 `&` 连接   
+### 如果涉及一个变量配置多个值，如多个cookie，多个取消订阅关键字，去掉里面的 *__[空格]()__* 和 __*[换行]()*__ 使用 `&` 连接   
+> 排查问题第一步先看自己[腾讯云函数](https://console.cloud.tencent.com/scf/list-detail?rid=5&ns=default&id=scf-jdscript)那边的环境变量跟自己在仓库配置的 `secrets` 是否一致
+![image](https://user-images.githubusercontent.com/6993269/99937191-06617680-2da0-11eb-99ea-033f2c655683.png)
+
+
+## 4.执行action workflow进行部署，workflow未报错即部署成功
+![image](https://user-images.githubusercontent.com/6993269/99513289-6a152980-29c5-11eb-9266-3f56ba13d3b2.png)
+## 5. 查看和测试
+登录后，在 [腾讯云函数地址](https://console.cloud.tencent.com/scf/index) 点击管理控制台，查看最新部署的函数。
+
+在左侧栏的日志查询中，可以查看到触发的日志，包括是否打卡成功等。
+
+![测试函数](https://user-images.githubusercontent.com/6993269/99628053-5a9eea80-2a70-11eb-906f-f1d5ea2bfa3a.png)
+## 6. 设置触发器[看这里](iCloud.md#5设置触发器) 或者看这里的[注释说明](https://github.com/iouAkira/jd_scripts/blob/patch-1/index.js#L4)
diff --git a/jd_fruit.js b/jd_fruit.js
index 2cb8ec9..327e97f 100644
--- a/jd_fruit.js
+++ b/jd_fruit.js
@@ -1,6 +1,6 @@
 /*
 东东水果:脚本更新地址 https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_fruit.js
-更新时间：2020-12-25
+更新时间：2021-1-5
 东东农场活动链接：https://h5.m.jd.com/babelDiy/Zeus/3KSjXqQabiTuD1cJ28QskrpWoBKT/index.html
 已支持IOS双京东账号,Node.js支持N个京东账号
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
@@ -29,9 +29,9 @@ let cookiesArr = [], cookie = '', jdFruitShareArr = [], isBox = false, notify, n
 //下面给出两个账号的填写示例（iOS只支持2个京东账号）
 let shareCodes = [ // 这个列表填入你要助力的好友的shareCode
    //账号一的好友shareCode,不同好友的shareCode中间用@符号隔开
-  '0a74407df5df4fa99672a037eec61f7e@dbb21614667246fabcfd9685b6f448f3@6fbd26cc27ac44d6a7fed34092453f77@61ff5c624949454aa88561f2cd721bf6@56db8e7bc5874668ba7d5195230d067a',
+  '0a74407df5df4fa99672a037eec61f7e@dbb21614667246fabcfd9685b6f448f3@6fbd26cc27ac44d6a7fed34092453f77@61ff5c624949454aa88561f2cd721bf6@56db8e7bc5874668ba7d5195230d067a@',
   //账号二的好友shareCode,不同好友的shareCode中间用@符号隔开
-  'b1638a774d054a05a30a17d3b4d364b8@f92cb56c6a1349f5a35f0372aa041ea0@9c52670d52ad4e1a812f894563c746ea@8175509d82504e96828afc8b1bbb9cb3',
+  'b1638a774d054a05a30a17d3b4d364b8@f92cb56c6a1349f5a35f0372aa041ea0@9c52670d52ad4e1a812f894563c746ea@8175509d82504e96828afc8b1bbb9cb3@2673c3777d4443829b2a635059953a28',
 ]
 let message = '', subTitle = '', option = {}, isFruitFinished = false;
 const retainWater = 100;//保留水滴大于多少g,默认100g;
@@ -771,24 +771,28 @@ async function clockInIn() {
 //
 async function getAwardInviteFriend() {
   await friendListInitForFarm();//查询好友列表
-  console.log(`\n今日已邀请好友${$.friendList.inviteFriendCount}个 / 每日邀请上限${$.friendList.inviteFriendMax}个`);
-  console.log(`开始删除${$.friendList.friends.length}个好友,可拿每天的邀请奖励`);
-  for (let friend of $.friendList.friends) {
-    console.log(`\n开始删除好友 [${friend.shareCode}]`);
-    const deleteFriendForFarm = await request('deleteFriendForFarm', { "shareCode": `${friend.shareCode}`,"version":8,"channel":1 });
-    if (deleteFriendForFarm && deleteFriendForFarm.code === '0') {
-      console.log(`删除好友 [${friend.shareCode}] 成功\n`);
+  if ($.friendList) {
+    console.log(`\n今日已邀请好友${$.friendList.inviteFriendCount}个 / 每日邀请上限${$.friendList.inviteFriendMax}个`);
+    console.log(`开始删除${$.friendList.friends.length}个好友,可拿每天的邀请奖励`);
+    for (let friend of $.friendList.friends) {
+      console.log(`\n开始删除好友 [${friend.shareCode}]`);
+      const deleteFriendForFarm = await request('deleteFriendForFarm', { "shareCode": `${friend.shareCode}`,"version":8,"channel":1 });
+      if (deleteFriendForFarm && deleteFriendForFarm.code === '0') {
+        console.log(`删除好友 [${friend.shareCode}] 成功\n`);
+      }
     }
-  }
-  await receiveFriendInvite();//为他人助力,接受邀请成为别人的好友
-  if ($.friendList.inviteFriendCount > 0) {
-    if ($.friendList.inviteFriendCount > $.friendList.inviteFriendGotAwardCount) {
-      console.log('开始领取邀请好友的奖励');
-      await awardInviteFriendForFarm();
-      console.log(`领取邀请好友的奖励结果：：${JSON.stringify($.awardInviteFriendRes)}`);
+    await receiveFriendInvite();//为他人助力,接受邀请成为别人的好友
+    if ($.friendList.inviteFriendCount > 0) {
+      if ($.friendList.inviteFriendCount > $.friendList.inviteFriendGotAwardCount) {
+        console.log('开始领取邀请好友的奖励');
+        await awardInviteFriendForFarm();
+        console.log(`领取邀请好友的奖励结果：：${JSON.stringify($.awardInviteFriendRes)}`);
+      }
+    } else {
+      console.log('今日未邀请过好友')
     }
   } else {
-    console.log('今日未邀请过好友')
+    console.log(`查询好友列表失败\n`);
   }
 }
 //给好友浇水
-- 
Gitee


From 5019824093d619f7907e8ef00871e85c9b891812 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Tue, 5 Jan 2021 09:41:24 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 005764d..4290e74 100644
--- a/README.md
+++ b/README.md
@@ -85,9 +85,9 @@
 ### 方法二：云服务器、腾讯云函数等等
 
   - 需自行有云服务器，云函数等
-  - 腾讯云云函数 [快速部署教程](../tencentscf.md)（免费）
+  - 腾讯云云函数 [快速部署教程](./backUp/tencentscf.md)（免费）
   - 腾讯云云函数控制台使用 [教程说明](iCloud.md)
-  - 腾讯云云函数 [GitHub Action部署教程](../tencentscf.md#github-action-部署)
+  - 腾讯云云函数 [GitHub Action部署教程](./backUp/tencentscf.md#github-action-部署)
        
  
 ### 方法三：Docker（NAS或VPS用户）
-- 
Gitee