From 91feffa836f0f7d763fe48a16b5615f54dc5132c Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Wed, 13 Jan 2021 12:02:19 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BA=AC=E5=96=9C=E5=86=9C=E5=9C=BA]=20?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=20=E7=AD=94=E9=A2=98=E7=AD=94=E6=A1=88?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=20=3D=200=20got=20=E8=B0=83=E7=94=A8=20API?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20timeout=3D3000=20=E9=98=B2=E6=AD=A2=20A?=
 =?UTF-8?q?PI=20=E8=AF=B7=E6=B1=82=E5=AF=BC=E8=87=B4=E8=BF=9B=E7=A8=8B?=
 =?UTF-8?q?=E5=83=B5=E6=AD=BB=20=E5=A2=9E=E5=8A=A0=20=E6=B0=B4=E6=9E=9C?=
 =?UTF-8?q?=E6=88=90=E7=86=9F=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jd_jxnc.js b/jd_jxnc.js
index 9df094fa..1befe111 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -90,6 +90,7 @@ let assistUserShareCode = 0; // 随机助力用户 share code
             subTitle = '';
             message = '';
             option = {};
+            $.answer = 0;
             $.helpNum = 0;
             $.helpSelfNum = 0;
             await tokenFormat(); // 处理当前账号 token
@@ -310,6 +311,11 @@ function browserTask() {
                     break;
                 }
             }
+            if (status[0] === 1017) { // ret:1017 retmsg:"score full" 水滴已满，果实成熟，跳过所有任务
+                $.log('水滴已满，果实成熟，跳过所有任务');
+                resolve(true);
+                break;
+            }
             if (status[0] === 1032) {
                 $.log('任务执行失败，种植的 APP 专属种子，请提供 token 或种植非 APP 种子');
                 message += '任务执行失败，种植的 APP 专属种子，请提供 token 或种植非 APP 种子\n';
@@ -350,6 +356,10 @@ function answerTask() {
                     if (ret === 0 && right === 1) {
                         $.drip += eachtimeget;
                     }
+                    if (ret === 1017) { // ret:1017 retmsg:"score full" 水滴已满，果实成熟，跳过答题
+                        resolve();
+                        return;
+                    }
                     if (((ret !== 0 && ret !== 1029) || retmsg === 'ans err') && $.answer < 4) {
                         $.answer++;
                         await $.wait(1000);
@@ -367,7 +377,7 @@ function answerTask() {
 
 function getMessage(endInfo, startInfo) {
     const need = endInfo.target - endInfo.score;
-    const get = endInfo.modifyscore; // 本地变更获得水滴
+    const get = endInfo.modifyscore; // 本次变更获得水滴
     const leaveGet = startInfo.modifyscore; // 离开时获得水滴
     let dayGet = 0; // 今日共获取水滴数
     if ($.detail) {
@@ -379,6 +389,11 @@ function getMessage(endInfo, startInfo) {
         });
     }
     message += `【水滴】本次获得${get} 离线获得${leaveGet} 今日获得${dayGet} 还需水滴${need}\n`;
+    if (need <= 0) {
+        notifyBool = true;
+        message += `【成熟】水果已成熟请及时收取\n`;
+        return;
+    }
     if (get > 0 || leaveGet > 0 || dayGet > 0) {
         const day = Math.ceil(need / (dayGet > 0 ? dayGet : (get + leaveGet)));
         message += `【预测】还需 ${day} 天\n`;
@@ -401,6 +416,7 @@ function submitInviteId(userName) {
             $.post(
                 {
                     url: `https://api.ninesix.cc/api/jx-nc/${$.info.smp}/${encodeURIComponent(userName)}?active=${$.info.active}`,
+                    timeout: 3000
                 },
                 (err, resp, _data) => {
                     try {
@@ -426,7 +442,7 @@ function submitInviteId(userName) {
 function getAssistUser() {
     return new Promise(resolve => {
         try {
-            $.get({url: `https://api.ninesix.cc/api/jx-nc?active=${$.info.active}`}, async (err, resp, _data) => {
+            $.get({url: `https://api.ninesix.cc/api/jx-nc?active=${$.info.active}`, timeout: 3000}, async (err, resp, _data) => {
                 try {
                     const {code, data = {}} = JSON.parse(_data);
                     if (data.value) {
@@ -547,6 +563,7 @@ function taskUrl(function_path, body) {
             Host: `wq.jd.com`,
             'Accept-Language': `zh-cn`,
         },
+        timeout: 3000,
     };
 }