From a39d8aaccdb6ffa1125db4a9931f28b06e75f40d Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Mon, 11 Jan 2021 10:36:38 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E8=B0=83=E6=95=B4secret=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E4=BF=9D=E6=8C=81=E4=B8=8EgithubAction.md?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整secret顺序，保持与githubAction.md一致，方便查看
---
 .github/workflows/deploy_tencent_scf.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy_tencent_scf.yml b/.github/workflows/deploy_tencent_scf.yml
index 92f0db0c..183015c4 100644
--- a/.github/workflows/deploy_tencent_scf.yml
+++ b/.github/workflows/deploy_tencent_scf.yml
@@ -71,8 +71,8 @@ jobs:
           if [ $DREAM_FACTORY_SHARE_CODES ]; then sed -i "/variables/a\      DREAM_FACTORY_SHARE_CODES: $DREAM_FACTORY_SHARE_CODES" serverless.yml; fi;
           if [ $JDZZ_SHARECODES ]; then sed -i "/variables/a\      JDZZ_SHARECODES: $JDZZ_SHARECODES" serverless.yml; fi;
           if [ $JDJOY_SHARECODES ]; then sed -i "/variables/a\      JDJOY_SHARECODES: $JDJOY_SHARECODES" serverless.yml; fi;
-          if [ $JXNC_SHARECODES ]; then sed -i "/variables/a\      JXNC_SHARECODES: $JXNC_SHARECODES" serverless.yml; fi;
           if [ $BOOKSHOP_SHARECODES ]; then sed -i "/variables/a\      BOOKSHOP_SHARECODES: $BOOKSHOP_SHARECODES" serverless.yml; fi;
+          if [ $JXNC_SHARECODES ]; then sed -i "/variables/a\      JXNC_SHARECODES: $JXNC_SHARECODES" serverless.yml; fi;
           if [ $TG_PROXY_HOST ]; then sed -i "/variables/a\      TG_PROXY_HOST: $TG_PROXY_HOST" serverless.yml; fi;
           if [ $TG_PROXY_PORT ]; then sed -i "/variables/a\      TG_PROXY_PORT: $TG_PROXY_PORT" serverless.yml; fi;
           if [ $MONEY_TREE_SELL_FRUIT ]; then sed -i "/variables/a\      MONEY_TREE_SELL_FRUIT: $MONEY_TREE_SELL_FRUIT" serverless.yml; fi;
@@ -129,8 +129,8 @@ jobs:
           DREAM_FACTORY_SHARE_CODES: ${{ secrets.DREAM_FACTORY_SHARE_CODES}}
           JDZZ_SHARECODES: ${{ secrets.JDZZ_SHARECODES}}
           JDJOY_SHARECODES: ${{ secrets.JDJOY_SHARECODES}}
-          JXNC_SHARECODES: ${{ secrets.JXNC_SHARECODES}}
           BOOKSHOP_SHARECODES: ${{ secrets.BOOKSHOP_SHARECODES}}
+          JXNC_SHARECODES: ${{ secrets.JXNC_SHARECODES}}
           TG_PROXY_HOST: ${{ secrets.TG_PROXY_HOST}}
           TG_PROXY_PORT: ${{ secrets.TG_PROXY_PORT}}
           MONEY_TREE_SELL_FRUIT: ${{ secrets.MONEY_TREE_SELL_FRUIT}}

From 325ba71ba3adb48101b8b4a1fa669a937c00f547 Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Mon, 11 Jan 2021 11:51:40 +0800
Subject: [PATCH 02/14] =?UTF-8?q?fix=20=E4=BA=AC=E5=96=9C=E5=86=9C?=
 =?UTF-8?q?=E5=9C=BA=20=E5=8A=A9=E5=8A=9B=E7=A0=81=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20add=20=E8=B7=B3=E8=BF=87=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=9A=84=E5=8A=A9=E5=8A=9B=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_jxnc.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jd_jxnc.js b/jd_jxnc.js
index 1bef74f8..d55ac515 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -119,7 +119,7 @@ function requireConfig() {
 
         if ($.isNode()) {
             Object.keys(jdTokenNode).forEach((item) => {
-                tokenArr.push(tokenArr[item] ? JSON.parse(jxncShareCodeArr[item]) : tokenNull)
+                tokenArr.push(jdTokenNode[item] ? JSON.parse(jdTokenNode[item]) : tokenNull)
             })
         } else {
             tokenArr.push(...[$.getdata('jxnc_token1') || tokenNull, $.getdata('jxnc_token2') || tokenNull]);
@@ -428,6 +428,11 @@ async function helpFriends() {
 // 执行助力 return true 继续助力  false 助力结束
 function helpShareCode(code) {
     return new Promise(async resolve => {
+        if (code === $.info.smp) { // 自己的助力码，跳过，继续执行
+            $.log('助力码与当前账号相同，跳过助力。准备进行下一个助力');
+            resolve(true);
+        }
+        $.wait(300);
         $.get(
             taskUrl('help', `active=${$.info.active}&joinnum=${$.info.joinnum}&smp=${code}`),
             async (err, resp, data) => {

From 05cee6a30123b4bb8daafe463956a069394adef8 Mon Sep 17 00:00:00 2001
From: Jone2008 <70353049+Jone2008@users.noreply.github.com>
Date: Mon, 11 Jan 2021 12:28:54 +0800
Subject: [PATCH 03/14] Update jd_jxnc.js

---
 jd_jxnc.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jd_jxnc.js b/jd_jxnc.js
index f9906e6a..fa1167f8 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -55,8 +55,8 @@ $.helpNum = 0; // 当前账号 助力 ret 1011 次数
 !(async () => {
     await requireConfig();
     if (!cookieArr[0]) {
-        $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/', {"open-url": "https://bean.m.jd.com/"});
-        return;
+      $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/bean/signIndex.action', {"open-url": "https://bean.m.jd.com/bean/signIndex.action"});
+      return;
     }
 
     for (let i = 0; i < cookieArr.length; i++) {

From 9a80fcbc186d06b9439a95d6faa494696a248ab3 Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Mon, 11 Jan 2021 16:50:03 +0800
Subject: [PATCH 04/14] =?UTF-8?q?[=E4=BA=AC=E5=96=9C=E5=86=9C=E5=9C=BA]=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB=20=E6=96=B0=E5=A2=9E=20=E7=A6=BB=E7=BA=BF?=
 =?UTF-8?q?=E6=9C=9F=E9=97=B4=E8=8E=B7=E5=8F=96=E6=B0=B4=E6=BB=B4=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=20=E5=8F=98=E6=9B=B4=20=E3=80=90=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E3=80=91=E7=AE=97=E6=B3=95=E6=94=B9=E4=B8=BA=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=A4=A9=E6=95=B0=EF=BC=88=E5=90=8E=E7=BB=AD=E8=BF=98=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=86=8D=E4=BC=98=E5=8C=96=E4=B8=80=E6=AC=A1=EF=BC=89?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=20=E9=9A=8F=E6=9C=BA=E5=8A=A9=E5=8A=9B?=
 =?UTF-8?q?=E9=80=92=E5=BD=92=E6=A8=A1=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=BE=AA=E7=8E=AF=20=E4=BC=98=E5=8C=96=20=E5=8A=A9=E5=8A=9B?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=20share=20code=20=E6=97=B6=E8=B7=B3=E8=BF=87?=
 =?UTF-8?q?=20=E5=8F=98=E6=9B=B4=201011=20=E5=8A=A9=E5=8A=9B=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=AC=A1=E6=95=B0=20nodejs=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=208=20=E6=AC=A1=20=E9=9D=9E=20nodejs=203=20=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_jxnc.js | 121 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 65 insertions(+), 56 deletions(-)

diff --git a/jd_jxnc.js b/jd_jxnc.js
index 97cc99ad..14825d1c 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -32,6 +32,8 @@ cron "0 9,12,18 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_
 
 const $ = new Env('京喜农场');
 let notify = ''; // nodejs 发送通知脚本
+let notifyLevel = process.env.JXNC_NOTIFY_LEVEL || 3; // 通知级别 0=不通知;1=本次获得水滴>0;2=任务执行;3=任务执行+未种植种子;
+let notifyBool = true; // 代码内部使用，控制是否通知
 let cookieArr = []; // 用户 cookie 数组
 let currentCookie = ''; // 当前用户 cookie
 let tokenNull = {'farm_jstoken': '', 'phoneid': '', 'timestamp': ''}; // 内置一份空的 token
@@ -49,14 +51,15 @@ $.allTask = []; // 任务列表
 $.info = {}; // 用户信息
 $.answer = 0;
 $.drip = 0;
-$.maxHelpNum = shareCode.split('@').length; // 助力 ret 1011 错误最大计数
+$.maxHelpNum = $.isNode() ? 8 : 3; // 助力 ret 1011 错误最大计数
 $.helpNum = 0; // 当前账号 助力 ret 1011 次数
+let assistUserShareCode = 0; // 随机助力用户 share code
 
 !(async () => {
     await requireConfig();
     if (!cookieArr[0]) {
-      $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/bean/signIndex.action', {"open-url": "https://bean.m.jd.com/bean/signIndex.action"});
-      return;
+        $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/bean/signIndex.action', {"open-url": "https://bean.m.jd.com/bean/signIndex.action"});
+        return;
     }
 
     for (let i = 0; i < cookieArr.length; i++) {
@@ -99,6 +102,7 @@ function requireConfig() {
     return new Promise(resolve => {
         $.log('开始获取配置文件\n')
         notify = $.isNode() ? require('./sendNotify') : '';
+        notifyBool = notifyLevel > 0; // 初始化是否推送
         //Node.js用户请在jdCookie.js处填写京东ck;
         const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
         const jdTokenNode = $.isNode() ? require('./jdJxncTokens.js') : '';
@@ -218,27 +222,38 @@ async function jdJXNC() {
     subTitle = `【京东账号${$.index}】${$.nickName}`;
     $.log(`获取用户信息 & 任务列表`);
     const startInfo = await getTaskList();
-    if (!startInfo) { // 未选择种子时，当前账号流程结束
-        return false;
+    if (startInfo.prizename) {
+        message += `【水果名称】${startInfo.prizename}\n`;
     }
-    message += `【水果名称】${startInfo.prizename}\n`;
-    $.log(`【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}好友互助码】 ${$.info.smp}`);
-    $.log(`【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}种子active】 ${$.info.active}`);
-    await $.wait(500);
-    const isOk = await browserTask();
-    if (!isOk) {
-        return false;
-    }
-    await $.wait(500);
-    await answerTask();
-    await $.wait(500);
-    const endInfo = await getTaskList();
-    getMessage(endInfo, startInfo);
-    const next = await helpFriends();
-    if (next) {
-        await submitInviteId($.UserName);
+    if (startInfo) {
+        $.log(`【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}好友互助码】 ${$.info.smp}`);
+        $.log(`【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}种子active】 ${$.info.active}`);
         await $.wait(500);
-        await createAssistUser();
+        const isOk = await browserTask();
+        if (isOk) {
+            await $.wait(500);
+            await answerTask();
+            await $.wait(500);
+            const endInfo = await getTaskList();
+            getMessage(endInfo, startInfo);
+            let next = await helpFriends();
+            if (next) {
+                await submitInviteId($.UserName);
+                await $.wait(500);
+                while (true) {
+                    assistUserShareCode = await getAssistUser();
+                    if (assistUserShareCode) {
+                        await $.wait(300);
+                        next = await helpShareCode(assistUserShareCode);
+                        if (next) {
+                            await $.wait(200);
+                            continue;
+                        }
+                    }
+                    break;
+                }
+            }
+        }
     }
     await showMsg()
 }
@@ -250,16 +265,14 @@ function getTaskList() {
             try {
                 const res = data.match(/try\{whyour\(([\s\S]*)\)\;\}catch\(e\)\{\}/)[1];
                 const {detail, msg, task = [], retmsg, ...other} = JSON.parse(res);
-                $.helpTask = task.filter(x => x.tasktype === 2)[0] || { eachtimeget: 0, limit: 0 };
+                $.helpTask = task.filter(x => x.tasktype === 2)[0] || {eachtimeget: 0, limit: 0};
                 $.allTask = task.filter(x => x.tasktype !== 3 && x.tasktype !== 2 && parseInt(x.left) > 0);
                 $.info = other;
                 $.log(`获取任务列表 ${retmsg} 总共${$.allTask.length}个任务！`);
                 if (!$.info.active) {
-                    $.log('账号未选择种子，请先去京喜农场选择种子，选择 APP 专属种子时，必须提供 token');
-                    $.msg($.name, subTitle, '请先去京喜农场选择种子！\n选择app专属种子时，请参考脚本头部说明获取token，点击通知跳转', option);
-                    if ($.isNode()) {
-                        await notify.sendNotify(`${$.name}`, `京东账号${$.index}[${$.nickName || $.UserName}]请先去京喜农场选择种子！\n选择app专属种子时，请参考脚本头部说明获取token`);
-                    }
+                    $.log('账号未选择种子，请先去京喜农场选择种子。\n如果选择 APP 专属种子，必须提供 token。');
+                    message += '账号未选择种子，请先去京喜农场选择种子。\n如果选择 APP 专属种子，必须提供 token。\n';
+                    notifyBool = notifyBool && notifyLevel >= 3;
                     resolve(false);
                 }
                 resolve(other);
@@ -292,10 +305,7 @@ function browserTask() {
             }
             if (status[0] === 1032) {
                 $.log('任务执行失败，种植的 APP 专属种子，请提供 token 或种植非 APP 种子');
-                $.msg($.name, '请参考脚本头部说明获取token', '或者改中非app专属种子，点击通知跳转', option);
-                if ($.isNode()) {
-                    await notify.sendNotify(`${$.name}`, `京东账号${$.index}[${$.nickName || $.UserName}]请参考脚本头部说明获取token\n或者改中非app专属种子`);
-                }
+                message += '任务执行失败，种植的 APP 专属种子，请提供 token 或种植非 APP 种子\n';
                 resolve(false);
                 return;
             }
@@ -348,14 +358,17 @@ function answerTask() {
     });
 }
 
-function getMessage(endInfo) {
+function getMessage(endInfo, startInfo) {
     const need = endInfo.target - endInfo.score;
-    const get = $.drip;
-    message += `【水滴】获得水滴${get} 还需水滴${need}\n`;
-    if (get > 0) {
-        const max = parseInt(need / get);
-        const min = parseInt(need / (get + $.helpTask.limit * $.helpTask.eachtimeget));
-        message += `【预测】还需 ${min} ~ ${max} 天\n`;
+    const get = endInfo.modifyscore; // 本地变更获得水滴
+    const leaveGet = startInfo.modifyscore; // 离开时获得水滴
+    message += `【水滴】本次水滴${get} 离线获得${leaveGet} 还需水滴${need}\n`;
+    if (get > 0 || leaveGet > 0) {
+        notifyBool = notifyBool && notifyLevel >= 1;
+        const day = parseInt(need / (get + leaveGet));
+        message += `【预测】还需 ${day} 天\n`;
+    } else {
+        notifyBool = notifyBool && notifyLevel >= 2;
     }
 }
 
@@ -387,26 +400,21 @@ function submitInviteId(userName) {
     });
 }
 
-// 获取随机助力码并助力
-function createAssistUser() {
+function getAssistUser() {
     return new Promise(resolve => {
         $.get({url: `https://api.ninesix.cc/api/jx-nc?active=${$.info.active}`}, async (err, resp, _data) => {
             try {
                 const {code, data = {}} = JSON.parse(_data);
-                $.log(`获取随机助力码 ${code}`);
-                if (!data.value) {
-                    $.log('随机助力码不存在，跳过助力');
-                    resolve();
-                    return;
-                }
-                const next = await helpShareCode(data.value);
-                if (next) {
-                    await createAssistUser();
+                if (data.value) {
+                    $.log(`获取随机助力码成功 ${code} ${data.value}`);
+                    resolve(data.value);
                 } else {
-                    resolve();
+                    $.log(`获取随机助力码失败 ${code}`);
                 }
             } catch (e) {
                 $.logErr(e, resp);
+            } finally {
+                resolve(false);
             }
         });
     });
@@ -433,14 +441,13 @@ function helpShareCode(code) {
             $.log('助力码与当前账号相同，跳过助力。准备进行下一个助力');
             resolve(true);
         }
-        $.wait(300);
         $.get(
             taskUrl('help', `active=${$.info.active}&joinnum=${$.info.joinnum}&smp=${code}`),
             async (err, resp, data) => {
                 try {
                     const res = data.match(/try\{whyour\(([\s\S]*)\)\;\}catch\(e\)\{\}/)[1];
                     const {ret, retmsg = ''} = JSON.parse(res);
-                    $.log(`助力结果：ret=${ret} retmsg="${retmsg ? retmsg : '助力成功'}"`);
+                    $.log(`助力结果：ret=${ret} retmsg="${retmsg ? retmsg : 'OK'}"`);
                     if (ret === 0 || ret === 1021) { // 0 助力成功 1021 不能助力自己
                         resolve(true);
                     }
@@ -509,9 +516,11 @@ function taskUrl(function_path, body) {
 }
 
 async function showMsg() {
-    $.msg($.name, subTitle, message, option);
-    if ($.isNode()) {
-        await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `${subTitle}\n${message}`);
+    if (notifyBool) {
+        $.msg($.name, subTitle, message, option);
+        if ($.isNode()) {
+            await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `${subTitle}\n${message}`);
+        }
     }
 }
 

From 6697e474356e6d299a69db744a76481ff4439646 Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Mon, 11 Jan 2021 17:16:16 +0800
Subject: [PATCH 05/14] =?UTF-8?q?[=E4=BA=AC=E5=96=9C=E5=86=9C=E5=9C=BA]=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E3=80=90=E9=A2=84=E6=B5=8B=E3=80=91?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8C=89=E7=85=A7=E4=BB=8A=E6=97=A5?=
 =?UTF-8?q?=E6=80=BB=E8=8E=B7=E5=BE=97=E6=B0=B4=E6=BB=B4=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E9=A2=84=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_jxnc.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/jd_jxnc.js b/jd_jxnc.js
index 14825d1c..40ee058a 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -46,6 +46,7 @@ const openUrl = `openjd://virtual?params=${encodeURIComponent('{ "category": "ju
 let subTitle = '', message = '', option = {'open-url': openUrl}; // 消息副标题，消息正文，消息扩展参数
 const JXNC_API_HOST = 'https://wq.jd.com/';
 
+$.detail = []; // 今日明细列表
 $.helpTask = null;
 $.allTask = []; // 任务列表
 $.info = {}; // 用户信息
@@ -265,6 +266,7 @@ function getTaskList() {
             try {
                 const res = data.match(/try\{whyour\(([\s\S]*)\)\;\}catch\(e\)\{\}/)[1];
                 const {detail, msg, task = [], retmsg, ...other} = JSON.parse(res);
+                $.detail = detail;
                 $.helpTask = task.filter(x => x.tasktype === 2)[0] || {eachtimeget: 0, limit: 0};
                 $.allTask = task.filter(x => x.tasktype !== 3 && x.tasktype !== 2 && parseInt(x.left) > 0);
                 $.info = other;
@@ -362,11 +364,22 @@ function getMessage(endInfo, startInfo) {
     const need = endInfo.target - endInfo.score;
     const get = endInfo.modifyscore; // 本地变更获得水滴
     const leaveGet = startInfo.modifyscore; // 离开时获得水滴
-    message += `【水滴】本次水滴${get} 离线获得${leaveGet} 还需水滴${need}\n`;
-    if (get > 0 || leaveGet > 0) {
-        notifyBool = notifyBool && notifyLevel >= 1;
-        const day = parseInt(need / (get + leaveGet));
+    let dayGet = 0; // 今日共获取水滴数
+    if ($.detail) {
+        let dayTime = new Date(new Date().toLocaleDateString()).getTime() / 1000; // 今日 0 点时间戳（10位数）
+        $.detail.forEach(function (item, index) {
+            if (item.time >= dayTime && item.score) {
+                dayGet += item.score;
+            }
+        });
+    }
+    message += `【水滴】本次获得${get} 离线获得${leaveGet} 今日获得${dayGet} 还需水滴${need}\n`;
+    if (get > 0 || leaveGet > 0 || dayGet > 0) {
+        const day = parseInt(need / (dayGet > 0 ? dayGet : (get + leaveGet)));
         message += `【预测】还需 ${day} 天\n`;
+    }
+    if (get > 0 || leaveGet > 0) { // 本次 或 离线 有水滴
+        notifyBool = notifyBool && notifyLevel >= 1;
     } else {
         notifyBool = notifyBool && notifyLevel >= 2;
     }

From 1adb277fba15f870f25abd028149f6a37ce6f2e4 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 11 Jan 2021 17:34:05 +0800
Subject: [PATCH 06/14] fix

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

diff --git a/jd_jxnc.js b/jd_jxnc.js
index 40ee058a..fbf9f0f7 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -32,7 +32,7 @@ cron "0 9,12,18 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_
 
 const $ = new Env('京喜农场');
 let notify = ''; // nodejs 发送通知脚本
-let notifyLevel = process.env.JXNC_NOTIFY_LEVEL || 3; // 通知级别 0=不通知;1=本次获得水滴>0;2=任务执行;3=任务执行+未种植种子;
+let notifyLevel = $.isNode() ? process.env.JXNC_NOTIFY_LEVEL || 3 : 3; // 通知级别 0=不通知;1=本次获得水滴>0;2=任务执行;3=任务执行+未种植种子;
 let notifyBool = true; // 代码内部使用，控制是否通知
 let cookieArr = []; // 用户 cookie 数组
 let currentCookie = ''; // 当前用户 cookie

From e90db88db595b92f6e78a386994eb13f00946687 Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Mon, 11 Jan 2021 18:46:31 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E4=BA=91=E5=87=BD=E6=95=B0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BA=AC=E5=96=9C=E5=86=9C=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

云函数新增京喜农场
---
 serverless.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/serverless.yml b/serverless.yml
index f9c30a18..ace566a7 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -28,12 +28,12 @@ inputs:
           cronExpression: "0 0 0 * * * *"
           enable: true
           argument: jd_blueCoin&jd_club_lottery&jd_car&jd_car_exchange
-    - timer: #东东农场 #东东萌宠 #口袋书店
+    - timer: #东东农场 #东东萌宠 #口袋书店 #京喜农场
         parameters:
-          name: jd_fruit_jd_pet_bookshop
+          name: jd_fruit_jd_pet_bookshop_jxnc
           cronExpression: "0 5 6-18/6,8 * * * *"
           enable: true
-          argument: jd_fruit&jd_pet&jd_bookshop
+          argument: jd_fruit&jd_pet&jd_bookshop&jd_jxnc
     - timer: # 宠汪汪喂食# 宠汪汪# 摇钱树# 京东种豆得豆# 京喜工厂 #东东工厂
         parameters:
           name: joy_feedPets_joy_moneyTree_plantBean_dreamFactory_jdfactory

From da85a393a4f959bf5519ca9373a04c1dcdc4dfa3 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 11 Jan 2021 19:01:42 +0800
Subject: [PATCH 08/14] Update jd_bookshop.js

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

diff --git a/jd_bookshop.js b/jd_bookshop.js
index 179e3ced..16ddf3a6 100644
--- a/jd_bookshop.js
+++ b/jd_bookshop.js
@@ -27,7 +27,7 @@ let cookiesArr = [], cookie = '', message;
 const ACT_ID = 'dz2010100034444201', shareUuid = '28a699ac78d74aa3b31f7103597f8927'
 
 let inviteCodes = [
-  '28a699ac78d74aa3b31f7103597f8927@2f14ee9c92954cf79829320dd482bf49@fdf827db272543d88dbb51a505c2e869',
+  '28a699ac78d74aa3b31f7103597f8927@2f14ee9c92954cf79829320dd482bf49@fdf827db272543d88dbb51a505c2e869@ce2536153a8742fb9e8754a9a7d361da',
   '28a699ac78d74aa3b31f7103597f8927@2f14ee9c92954cf79829320dd482bf49@fdf827db272543d88dbb51a505c2e869'
 ]
 

From 8b7a34024226ef2be732f11911476ad95fcc0c31 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 11 Jan 2021 19:05:12 +0800
Subject: [PATCH 09/14] Update jd_bookshop.js

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

diff --git a/jd_bookshop.js b/jd_bookshop.js
index 16ddf3a6..e50624ee 100644
--- a/jd_bookshop.js
+++ b/jd_bookshop.js
@@ -27,7 +27,7 @@ let cookiesArr = [], cookie = '', message;
 const ACT_ID = 'dz2010100034444201', shareUuid = '28a699ac78d74aa3b31f7103597f8927'
 
 let inviteCodes = [
-  '28a699ac78d74aa3b31f7103597f8927@2f14ee9c92954cf79829320dd482bf49@fdf827db272543d88dbb51a505c2e869@ce2536153a8742fb9e8754a9a7d361da',
+  '28a699ac78d74aa3b31f7103597f8927@2f14ee9c92954cf79829320dd482bf49@fdf827db272543d88dbb51a505c2e869@ce2536153a8742fb9e8754a9a7d361da@38ba4e7ba8074b78851e928af2b4f6b2',
   '28a699ac78d74aa3b31f7103597f8927@2f14ee9c92954cf79829320dd482bf49@fdf827db272543d88dbb51a505c2e869'
 ]
 

From 3cb89b2af43b0c2b45a02389d33a52c53805c091 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 11 Jan 2021 19:08:01 +0800
Subject: [PATCH 10/14] Update jd_jxnc.js

---
 jd_jxnc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jd_jxnc.js b/jd_jxnc.js
index fbf9f0f7..2f167e41 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -10,6 +10,8 @@
 理论上脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
 助力码shareCode请先手动运行脚本查看打印可看到
 
+hostname = wq.jd.com
+
 ==========================Quantumultx=========================
 [task_local]
 0 9,12,18 * * * https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_jxnc.js, tag=京喜农场, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jxnc.png, enabled=true

From 48f36f9bc560d946084aa9431acf2dacc030b67d Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Mon, 11 Jan 2021 19:38:02 +0800
Subject: [PATCH 11/14] =?UTF-8?q?[=E4=BA=AC=E5=96=9C=E5=86=9C=E5=9C=BA]=20?=
 =?UTF-8?q?add=20=E5=8A=A9=E5=8A=9B=E8=BF=94=E5=9B=9E=20ret=201021=20canno?=
 =?UTF-8?q?t=20help=20self=20=20=E6=9C=80=E5=A4=A7=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=88=E9=99=90=E5=88=B6=203=20=E6=AC=A1?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_jxnc.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jd_jxnc.js b/jd_jxnc.js
index 2f167e41..5a6c1c41 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -56,6 +56,8 @@ $.answer = 0;
 $.drip = 0;
 $.maxHelpNum = $.isNode() ? 8 : 3; // 助力 ret 1011 错误最大计数
 $.helpNum = 0; // 当前账号 助力 ret 1011 次数
+$.maxHelpSelfNum = 3; // 助力 自身 ret 1021 cannot help self 最大次数限制（防止随机API不停返回自身 code 导致死循环）
+$.helpSelfNum = 0; // 当前账号 助力 ret 1021 cannot help self 次数
 let assistUserShareCode = 0; // 随机助力用户 share code
 
 !(async () => {
@@ -86,6 +88,7 @@ let assistUserShareCode = 0; // 随机助力用户 share code
             message = '';
             option = {};
             $.helpNum = 0;
+            $.helpSelfNum = 0;
             await tokenFormat(); // 处理当前账号 token
             await shareCodesFormat(); // 处理当前账号 助力码
             await jdJXNC(); // 执行当前账号 主代码流程
@@ -463,9 +466,15 @@ function helpShareCode(code) {
                     const res = data.match(/try\{whyour\(([\s\S]*)\)\;\}catch\(e\)\{\}/)[1];
                     const {ret, retmsg = ''} = JSON.parse(res);
                     $.log(`助力结果：ret=${ret} retmsg="${retmsg ? retmsg : 'OK'}"`);
-                    if (ret === 0 || ret === 1021) { // 0 助力成功 1021 不能助力自己
+                    if (ret === 0) { // 0 助力成功
                         resolve(true);
                     }
+                    if (ret === 1021) { // 1021 cannot help self 不能助力自己
+                        $.helpSelfNum++;
+                        if ($.helpSelfNum <= $.maxHelpSelfNum) {
+                            resolve(true);
+                        }
+                    }
                     if (ret === 1011) { // 1011 active 不同
                         $.helpNum++;
                         if ($.helpNum <= $.maxHelpNum) {

From 9006d78026701b7a5cdf19d0536b3c9aee603a09 Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Mon, 11 Jan 2021 20:36:59 +0800
Subject: [PATCH 12/14] =?UTF-8?q?[=E4=BA=AC=E5=96=9C=E5=86=9C=E5=9C=BA]=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=8F=90=E4=BA=A4=E5=8A=A9=E5=8A=9B?=
 =?UTF-8?q?=E5=88=B0=E5=A5=BD=E5=8F=8B=E5=8A=A9=E5=8A=9B=E4=B9=8B=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jd_jxnc.js b/jd_jxnc.js
index 5a6c1c41..b145b53d 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -211,10 +211,7 @@ function shareCodesFormat() {
         // console.log(`第${$.index}个京东账号的助力码:::${jdFruitShareArr[$.index - 1]}`)
         if (jxncShareCodeArr[$.index - 1]) {
             currentShareCode = jxncShareCodeArr[$.index - 1].split('@');
-            let length = currentShareCode.length;
-            if (length < 3) {
-                currentShareCode.push(...(shareCode.split('@').splice(0, 3 - length)));
-            }
+            currentShareCode.push(...(shareCode.split('@')));
         } else {
             $.log(`由于您第${$.index}个京东账号未提供shareCode,将采纳本脚本自带的助力码`)
             currentShareCode = shareCode.split('@');
@@ -242,10 +239,10 @@ async function jdJXNC() {
             await $.wait(500);
             const endInfo = await getTaskList();
             getMessage(endInfo, startInfo);
+            await submitInviteId($.UserName);
+            await $.wait(500);
             let next = await helpFriends();
             if (next) {
-                await submitInviteId($.UserName);
-                await $.wait(500);
                 while (true) {
                     assistUserShareCode = await getAssistUser();
                     if (assistUserShareCode) {

From fda2b524cc6d6402bc834e5a0573682bf398aaf7 Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Mon, 11 Jan 2021 20:45:28 +0800
Subject: [PATCH 13/14] =?UTF-8?q?[=E4=BA=AC=E5=96=9C=E5=86=9C=E5=9C=BA]=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=8D=B3=E5=B0=86=E5=8A=A9=E5=8A=9B=20sha?=
 =?UTF-8?q?re=20code=20log=20=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_jxnc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jd_jxnc.js b/jd_jxnc.js
index b145b53d..06e53461 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -456,6 +456,7 @@ function helpShareCode(code) {
             $.log('助力码与当前账号相同，跳过助力。准备进行下一个助力');
             resolve(true);
         }
+        $.log(`即将助力 share code：${code}`);
         $.get(
             taskUrl('help', `active=${$.info.active}&joinnum=${$.info.joinnum}&smp=${code}`),
             async (err, resp, data) => {

From 67d53791b0354d7d1ad41607ad4e550cfd3c94dc Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Mon, 11 Jan 2021 22:36:27 +0800
Subject: [PATCH 14/14] Update lxk0301_Task.sgmodule.sgmodule

---
 Surge/lxk0301_Task.sgmodule.sgmodule | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Surge/lxk0301_Task.sgmodule.sgmodule b/Surge/lxk0301_Task.sgmodule.sgmodule
index a4d788f1..758c38b8 100644
--- a/Surge/lxk0301_Task.sgmodule.sgmodule
+++ b/Surge/lxk0301_Task.sgmodule.sgmodule
@@ -69,7 +69,7 @@ cron "20 11 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scri
 cron "20 12 * * 6" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_unbind.js, timeout=750, wake-system=1, tag=注销京东店铺会员卡
 #疯狂的joy日常任务
 cron "30 8 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_crazy_joy.js, timeout=1750, wake-system=1, tag=疯狂的joy日常任务
-#以下为短期活动
-#健康抽奖机
-cron "30 2 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_health.js, timeout=750, wake-system=1, tag=健康抽奖机
+#签到领现金
+签到领现金 = type=cron,cronexp="0 0 * * *",wake-system=1,timeout=2220,script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_cash.js
+