From 4920a897b63488516bf4712124000dfa9d25f24b Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 14:09:47 +0800
Subject: [PATCH 01/18] update

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

diff --git a/getJDCookie.js b/getJDCookie.js
index 07367f3f..0616f5a5 100644
--- a/getJDCookie.js
+++ b/getJDCookie.js
@@ -54,6 +54,8 @@ function generateQrcode() {
           $.stepsHeaders = resp.headers;
           data = JSON.parse(data);
           token = data['token'];
+          // $.log('token', token)
+
           const setCookie = resp.headers['set-cookie'][0];
           okl_token = setCookie.substring(setCookie.indexOf("=") + 1, setCookie.indexOf(";"))
           const url = 'https://plogin.m.jd.com/cgi-bin/m/tmauth?appid=300&client_type=m&token=' + token;
@@ -134,7 +136,7 @@ function formatCookie(headers) {
     const cookie1 = "pt_key=" + pt_key + ";pt_pin=" + pt_pin + ";";
 
     $.UserName = decodeURIComponent(cookie1.match(/pt_pin=(.+?);/) && cookie1.match(/pt_pin=(.+?);/)[1])
-    $.log(`京东用户名：${$.UserName} 登录成功，此cookie(有效期为90天)如下：`);
+    $.log(`京东用户：${$.UserName} Cookie获取成功(有效期：${headers['strict-transport-security'].substring("max-age=7776000".indexOf('=') + 1, "max-age=7776000".length)}秒)，cookie如下：`);
     $.log(`\n${cookie1}\n`);
     resolve()
   })

From 2785ff486eb1d514b7e453c98547ffad710877df Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Wed, 13 Jan 2021 14:40:44 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E4=BA=91=E5=87=BD=E6=95=B0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BA=AC=E4=B8=9C=E5=AE=B6=E5=BA=AD=E5=8F=B7?=
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 c23b537d..4da99d21 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -58,12 +58,12 @@ inputs:
           cronExpression: "0 8 */3 * * * *"
           enable: true
           argument: jd_speed&jd_daily_egg
-    - timer: # 东东超市
+    - timer: #东东超市 #京东家庭号
         parameters:
-          name: jd_superMarket
+          name: superMarket_family
           cronExpression: "0 15 * * * * *"
           enable: true
-          argument: jd_superMarket
+          argument: jd_superMarket&jd_family
     - timer: #京豆变动通知 #疯狂的joy #京东排行榜 #领京豆额外奖励 #京东年货节
         parameters:
           name: bean_change_crazy_joy_rankingList_bean_home_nh

From c04d6053aa49f80f84b4ffe39c4d7c32edf39898 Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Wed, 13 Jan 2021 15:39:13 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=84=9A=E6=9C=AC=20AP?=
 =?UTF-8?q?I=20=E8=AF=B7=E6=B1=82=E5=A2=9E=E5=8A=A0=20timeout=3D3000?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=20API=20=E8=AF=B7=E6=B1=82=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E5=AF=BC=E8=87=B4=E8=BF=9B=E7=A8=8B=E5=83=B5=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_fruit.js     | 11 +++++++----
 jd_jdfactory.js | 11 +++++++----
 jd_plantBean.js | 11 +++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/jd_fruit.js b/jd_fruit.js
index bd304212..d69e661a 100644
--- a/jd_fruit.js
+++ b/jd_fruit.js
@@ -1167,7 +1167,8 @@ async function initForFarm() {
         "sec-fetch-site": "same-site",
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
         "Content-Type": "application/x-www-form-urlencoded"
-      }
+      },
+      timeout: 3000,
     };
     $.post(option, (err, resp, data) => {
       try {
@@ -1239,7 +1240,7 @@ function timeFormat(time) {
 }
 function readShareCode() {
   return new Promise(async resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/farm/read/${randomCount}/`}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/farm/read/${randomCount}/`, timeout: 3000,}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
@@ -1355,7 +1356,8 @@ function TotalBean() {
         "Cookie": cookie,
         "Referer": "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2",
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0")
-      }
+      },
+      "timeout": 3000,
     }
     $.post(options, (err, resp, data) => {
       try {
@@ -1423,7 +1425,8 @@ function taskUrl(function_id, body = {}) {
     headers: {
       Cookie: cookie,
       UserAgent: $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
-    }
+    },
+    timeout: 3000,
   }
 }
 // prettier-ignore
diff --git a/jd_jdfactory.js b/jd_jdfactory.js
index 92886210..c5989111 100644
--- a/jd_jdfactory.js
+++ b/jd_jdfactory.js
@@ -503,7 +503,8 @@ function queryVkComponent() {
         "Host": `api.m.jd.com`,
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
         "Accept-Language": `zh-Hans-CN;q=1, en-CN;q=0.9`,
-      }
+      },
+      "timeout": 3000,
     }
     $.post(options, (err, resp, data) => {
       try {
@@ -621,7 +622,7 @@ function jdfactory_getHomeData() {
 function readShareCode() {
   console.log(`开始`)
   return new Promise(async resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/ddfactory/read/${randomCount}/`}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/ddfactory/read/${randomCount}/`, timeout: 3000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
@@ -695,7 +696,8 @@ function taskPostUrl(function_id, body = {}, function_id2) {
       "referer": "https://h5.m.jd.com/",
       'Content-Type': 'application/x-www-form-urlencoded',
       "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
-    }
+    },
+    timeout: 3000,
   }
 }
 function TotalBean() {
@@ -711,7 +713,8 @@ function TotalBean() {
         "Cookie": cookie,
         "Referer": "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2",
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0")
-      }
+      },
+      "timeout": 3000,
     }
     $.post(options, (err, resp, data) => {
       try {
diff --git a/jd_plantBean.js b/jd_plantBean.js
index 83f8bf61..6d66f350 100644
--- a/jd_plantBean.js
+++ b/jd_plantBean.js
@@ -514,7 +514,7 @@ async function plantBeanIndex() {
 }
 function readShareCode() {
   return new Promise(async resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/bean/read/${randomCount}/`}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/bean/read/${randomCount}/`, timeout: 3000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
@@ -635,7 +635,8 @@ function requestGet(function_id, body = {}) {
         'Accept-Language': 'zh-Hans-CN;q=1,en-CN;q=0.9',
         'Accept-Encoding': 'gzip, deflate, br',
         'Content-Type': "application/x-www-form-urlencoded"
-      }
+      },
+      timeout: 3000,
     };
     $.get(option, (err, resp, data) => {
       try {
@@ -666,7 +667,8 @@ function TotalBean() {
         "Cookie": cookie,
         "Referer": "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2",
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0")
-      }
+      },
+      "timeout": 3000,
     }
     $.post(options, (err, resp, data) => {
       try {
@@ -729,7 +731,8 @@ function taskUrl(function_id, body) {
       "Accept-Language": "zh-Hans-CN;q=1,en-CN;q=0.9",
       "Accept-Encoding": "gzip, deflate, br",
       "Content-Type": "application/x-www-form-urlencoded"
-    }
+    },
+    timeout: 3000,
   }
 }
 function getParam(url, name) {

From 4b1e6b1cc83d390cf5cdebb9a10ae677ebf5d994 Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Wed, 13 Jan 2021 15:50:26 +0800
Subject: [PATCH 04/18] =?UTF-8?q?API=20=E8=AF=B7=E6=B1=82=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E7=94=B1=203000=20=E6=94=B9=E4=B8=BA=2010000?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_fruit.js     | 8 ++++----
 jd_jdfactory.js | 8 ++++----
 jd_jxnc.js      | 6 +++---
 jd_plantBean.js | 8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/jd_fruit.js b/jd_fruit.js
index d69e661a..99ce136f 100644
--- a/jd_fruit.js
+++ b/jd_fruit.js
@@ -1168,7 +1168,7 @@ async function initForFarm() {
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
         "Content-Type": "application/x-www-form-urlencoded"
       },
-      timeout: 3000,
+      timeout: 10000,
     };
     $.post(option, (err, resp, data) => {
       try {
@@ -1240,7 +1240,7 @@ function timeFormat(time) {
 }
 function readShareCode() {
   return new Promise(async resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/farm/read/${randomCount}/`, timeout: 3000,}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/farm/read/${randomCount}/`, timeout: 10000,}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
@@ -1357,7 +1357,7 @@ function TotalBean() {
         "Referer": "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2",
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0")
       },
-      "timeout": 3000,
+      "timeout": 10000,
     }
     $.post(options, (err, resp, data) => {
       try {
@@ -1426,7 +1426,7 @@ function taskUrl(function_id, body = {}) {
       Cookie: cookie,
       UserAgent: $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
     },
-    timeout: 3000,
+    timeout: 10000,
   }
 }
 // prettier-ignore
diff --git a/jd_jdfactory.js b/jd_jdfactory.js
index c5989111..d1de85b2 100644
--- a/jd_jdfactory.js
+++ b/jd_jdfactory.js
@@ -504,7 +504,7 @@ function queryVkComponent() {
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
         "Accept-Language": `zh-Hans-CN;q=1, en-CN;q=0.9`,
       },
-      "timeout": 3000,
+      "timeout": 10000,
     }
     $.post(options, (err, resp, data) => {
       try {
@@ -622,7 +622,7 @@ function jdfactory_getHomeData() {
 function readShareCode() {
   console.log(`开始`)
   return new Promise(async resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/ddfactory/read/${randomCount}/`, timeout: 3000}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/ddfactory/read/${randomCount}/`, timeout: 10000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
@@ -697,7 +697,7 @@ function taskPostUrl(function_id, body = {}, function_id2) {
       'Content-Type': 'application/x-www-form-urlencoded',
       "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0"),
     },
-    timeout: 3000,
+    timeout: 10000,
   }
 }
 function TotalBean() {
@@ -714,7 +714,7 @@ function TotalBean() {
         "Referer": "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2",
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0")
       },
-      "timeout": 3000,
+      "timeout": 10000,
     }
     $.post(options, (err, resp, data) => {
       try {
diff --git a/jd_jxnc.js b/jd_jxnc.js
index 1befe111..164b1230 100644
--- a/jd_jxnc.js
+++ b/jd_jxnc.js
@@ -416,7 +416,7 @@ function submitInviteId(userName) {
             $.post(
                 {
                     url: `https://api.ninesix.cc/api/jx-nc/${$.info.smp}/${encodeURIComponent(userName)}?active=${$.info.active}`,
-                    timeout: 3000
+                    timeout: 10000
                 },
                 (err, resp, _data) => {
                     try {
@@ -442,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}`, timeout: 3000}, async (err, resp, _data) => {
+            $.get({url: `https://api.ninesix.cc/api/jx-nc?active=${$.info.active}`, timeout: 10000}, async (err, resp, _data) => {
                 try {
                     const {code, data = {}} = JSON.parse(_data);
                     if (data.value) {
@@ -563,7 +563,7 @@ function taskUrl(function_path, body) {
             Host: `wq.jd.com`,
             'Accept-Language': `zh-cn`,
         },
-        timeout: 3000,
+        timeout: 10000,
     };
 }
 
diff --git a/jd_plantBean.js b/jd_plantBean.js
index 6d66f350..8d132b7b 100644
--- a/jd_plantBean.js
+++ b/jd_plantBean.js
@@ -514,7 +514,7 @@ async function plantBeanIndex() {
 }
 function readShareCode() {
   return new Promise(async resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/bean/read/${randomCount}/`, timeout: 3000}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/bean/read/${randomCount}/`, timeout: 10000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
@@ -636,7 +636,7 @@ function requestGet(function_id, body = {}) {
         'Accept-Encoding': 'gzip, deflate, br',
         'Content-Type': "application/x-www-form-urlencoded"
       },
-      timeout: 3000,
+      timeout: 10000,
     };
     $.get(option, (err, resp, data) => {
       try {
@@ -668,7 +668,7 @@ function TotalBean() {
         "Referer": "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2",
         "User-Agent": $.isNode() ? (process.env.JD_USER_AGENT ? process.env.JD_USER_AGENT : (require('./USER_AGENTS').USER_AGENT)) : ($.getdata('JDUA') ? $.getdata('JDUA') : "jdapp;iPhone;9.2.2;14.2;%E4%BA%AC%E4%B8%9C/9.2.2 CFNetwork/1206 Darwin/20.1.0")
       },
-      "timeout": 3000,
+      "timeout": 10000,
     }
     $.post(options, (err, resp, data) => {
       try {
@@ -732,7 +732,7 @@ function taskUrl(function_id, body) {
       "Accept-Encoding": "gzip, deflate, br",
       "Content-Type": "application/x-www-form-urlencoded"
     },
-    timeout: 3000,
+    timeout: 10000,
   }
 }
 function getParam(url, name) {

From 32769103b119b9468618c53c50c46c7ece80192b Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 16:10:50 +0800
Subject: [PATCH 05/18] =?UTF-8?q?docker=E6=B7=BB=E5=8A=A0=E4=BA=AC?=
 =?UTF-8?q?=E4=B8=9C=E5=AE=B6=E5=BA=AD=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/crontab_list.sh | 2 ++
 jd_family.js           | 2 +-
 jd_joy_run.js          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh
index a03fb8d6..7f92f11f 100644
--- a/docker/crontab_list.sh
+++ b/docker/crontab_list.sh
@@ -87,3 +87,5 @@
 27 7 * * * node /scripts/jd_cash.js >> /scripts/logs/jd_cash.log 2>&1
 # 京喜app签到
 39 7 * * * node /scripts/jx_sign.js >> /scripts/logs/jx_sign.log 2>&1
+#京东家庭号(暂不知最佳cron)
+39 * * * * node /scripts/jd_family.js >> /scripts/logs/jd_family.log 2>&1
diff --git a/jd_family.js b/jd_family.js
index fc2c2d30..1de5dfec 100644
--- a/jd_family.js
+++ b/jd_family.js
@@ -13,7 +13,7 @@
 ============Quantumultx===============
 [task_local]
 #京东家庭号
-1 0,8,12,16 * * * https://raw.githubusercontent.com/shylocks/Loon/main/jd_family.js, tag=京东家庭号, enabled=true
+1 0,8,12,16 * * * https://raw.githubusercontent.com/shylocks/Loon/main/jd_family.js, tag=京东家庭号, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jd_family.png, enabled=true
 
 ================Loon==============
 [Script]
diff --git a/jd_joy_run.js b/jd_joy_run.js
index 4559dad7..6b3cbb95 100644
--- a/jd_joy_run.js
+++ b/jd_joy_run.js
@@ -160,7 +160,7 @@ async function getToken() {
 }
 function readToken() {
   return new Promise(resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/joy/read/1/`}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/joy/read/1/`, 'timeout': 10000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)

From 281608f5d0a0e3ee6105c22acce045d93c1b63cb Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 16:19:02 +0800
Subject: [PATCH 06/18] =?UTF-8?q?docker=E6=B7=BB=E5=8A=A0=E4=BA=AC?=
 =?UTF-8?q?=E4=B8=9C=E5=AE=B6=E5=BA=AD=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/crontab_list.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh
index 7f92f11f..611d2bae 100644
--- a/docker/crontab_list.sh
+++ b/docker/crontab_list.sh
@@ -88,4 +88,4 @@
 # 京喜app签到
 39 7 * * * node /scripts/jx_sign.js >> /scripts/logs/jx_sign.log 2>&1
 #京东家庭号(暂不知最佳cron)
-39 * * * * node /scripts/jd_family.js >> /scripts/logs/jd_family.log 2>&1
+*/20 * * * * node /scripts/jd_family.js >> /scripts/logs/jd_family.log 2>&1

From c203ee34d3bfc131e7c9d62bfe2f1cd88dab7a5b Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 16:31:16 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E4=BA=AC=E8=B1=86=E5=BA=93=E5=AD=98=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jd_joy_reward.js b/jd_joy_reward.js
index 9a76995b..f8337837 100644
--- a/jd_joy_reward.js
+++ b/jd_joy_reward.js
@@ -1,6 +1,6 @@
 /*
 宠汪汪积分兑换奖品脚本, 目前脚本只兑换京豆，兑换京豆成功，才会发出通知提示，其他情况不通知。
-更新时间：2021-1-6
+更新时间：2021-1-13
 兑换规则：一个账号一天只能兑换一次京豆。
 兑换奖品成功后才会有系统弹窗通知
 每日京豆库存会在0:00、8:00、16:00更新，经测试发现中午12:00也会有补发京豆。
@@ -136,8 +136,10 @@ async function joyReward() {
               //   await notify.BarkNotify(`${$.name}`, `【京东账号${$.index}】 ${$.nickName}\n【兑换${giftName}】成功\n【宠物等级】${data.level}\n【消耗积分】${salePrice}分\n【当前剩余】${data.coin - salePrice}积分`);
               // }
             } else if ($.exchangeRes && $.exchangeRes.errorCode === 'buy_limit') {
-              console.log(`兑换${rewardNum}京豆失败，原因：兑换京豆已达上限，请把机会留给更多的小伙伴~`)
+              console.log(`兑换${rewardNum}京豆失败，原因：兑换京豆已达上限，请把机会留给更多的小伙伴~\n`)
               //$.msg($.name, `兑换${giftName}失败`, `【京东账号${$.index}】${$.nickName}\n兑换京豆已达上限\n请把机会留给更多的小伙伴~\n`)
+            } else if ($.exchangeRes && $.exchangeRes.errorCode === 'stock_empty'){
+              console.log(`兑换${rewardNum}京豆失败，原因：当前京豆库存为空\n`)
             } else {
               console.log(`兑奖异常:${JSON.stringify($.exchangeRes)}`)
             }

From 248490330e815f4cb34c2931cd9d878b6f693ab2 Mon Sep 17 00:00:00 2001
From: Jone2008 <70353049+Jone2008@users.noreply.github.com>
Date: Wed, 13 Jan 2021 16:39:46 +0800
Subject: [PATCH 08/18] Update jd_family.js

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

diff --git a/jd_family.js b/jd_family.js
index 1de5dfec..95f3058c 100644
--- a/jd_family.js
+++ b/jd_family.js
@@ -50,7 +50,7 @@ if ($.isNode()) {
 
 !(async () => {
   if (!cookiesArr[0]) {
-    $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/', {"open-url": "https://bean.m.jd.com/"});
+    $.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 < cookiesArr.length; i++) {
@@ -65,7 +65,7 @@ if ($.isNode()) {
       await TotalBean();
       console.log(`\n******开始【京东账号${$.index}】${$.nickName || $.UserName}*********\n`);
       if (!$.isLogin) {
-        $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/`, {"open-url": "https://bean.m.jd.com/"});
+        $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, {"open-url": "https://bean.m.jd.com/bean/signIndex.action"});
         if ($.isNode()) {
           await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`);
         } else {

From 1233e9f8ba37a614f7b7afc1e8fc32c1032d82eb Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 17:06:18 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0timeout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_cash.js      | 2 +-
 jd_crazy_joy.js | 2 +-
 jd_jdzz.js      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jd_cash.js b/jd_cash.js
index 18bb18df..107a9246 100644
--- a/jd_cash.js
+++ b/jd_cash.js
@@ -259,7 +259,7 @@ function showMsg() {
 function readShareCode() {
   console.log(`开始`)
   return new Promise(async resolve => {
-    $.get({url: `https://code.chiang.fun/api/v1/jd/jdcash/read/${randomCount}/`}, (err, resp, data) => {
+    $.get({url: `https://code.chiang.fun/api/v1/jd/jdcash/read/${randomCount}/`, 'timeout': 10000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
diff --git a/jd_crazy_joy.js b/jd_crazy_joy.js
index e4c52edc..7f0cd8ea 100644
--- a/jd_crazy_joy.js
+++ b/jd_crazy_joy.js
@@ -659,7 +659,7 @@ function taskUrl(functionId, body = '') {
 function readShareCode() {
   console.log(`开始`)
   return new Promise(async resolve => {
-    $.get({url: `https://code.chiang.fun/api/v1/jd/jdcrazyjoy/read/${randomCount}/`}, (err, resp, data) => {
+    $.get({url: `https://code.chiang.fun/api/v1/jd/jdcrazyjoy/read/${randomCount}/`, 'timeout': 10000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
diff --git a/jd_jdzz.js b/jd_jdzz.js
index 806eae15..1551f02c 100644
--- a/jd_jdzz.js
+++ b/jd_jdzz.js
@@ -336,7 +336,7 @@ async function helpFriends() {
 function readShareCode() {
   console.log(`开始`)
   return new Promise(async resolve => {
-    $.get({url: `https://code.chiang.fun/api/v1/jd/jdzz/read/${randomCount}/`}, (err, resp, data) => {
+    $.get({url: `https://code.chiang.fun/api/v1/jd/jdzz/read/${randomCount}/`, 'timeout': 10000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)

From 890b5e63a8e8e72304894fc1b476be3890069281 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 17:18:51 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0timeout=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_dreamFactory.js | 2 +-
 jd_family.js       | 6 +++++-
 jd_pet.js          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index e599bee5..ac381bb4 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -1300,7 +1300,7 @@ async function showMsg() {
 function readShareCode() {
   console.log(`开始`)
   return new Promise(async resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/jxfactory/read/${randomCount}/`}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/jxfactory/read/${randomCount}/`, 'timeout': 10000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)
diff --git a/jd_family.js b/jd_family.js
index 95f3058c..81e93d6a 100644
--- a/jd_family.js
+++ b/jd_family.js
@@ -73,7 +73,11 @@ if ($.isNode()) {
         }
         continue
       }
-      await jdFamily()
+      // await jdFamily()
+      while (true) {
+        await $.wait(31000)
+        await jdFamily()
+      }
     }
   }
 })()
diff --git a/jd_pet.js b/jd_pet.js
index da69e981..22880358 100644
--- a/jd_pet.js
+++ b/jd_pet.js
@@ -439,7 +439,7 @@ async function showMsg() {
 }
 function readShareCode() {
   return new Promise(async resolve => {
-    $.get({url: `http://api.turinglabs.net/api/v1/jd/pet/read/${randomCount}/`}, (err, resp, data) => {
+    $.get({url: `http://api.turinglabs.net/api/v1/jd/pet/read/${randomCount}/`, 'timeout': 10000}, (err, resp, data) => {
       try {
         if (err) {
           console.log(`${JSON.stringify(err)}`)

From fed08256adc7621ea3a238bec2daf22ed905b7ec Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 17:42:56 +0800
Subject: [PATCH 11/18] test

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..55382630
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.sh linguist-language=Shell
+*.js linguist-language=JavaScript
\ No newline at end of file

From 2e5850b2fa62bd12059772c3ed2e3400de61e130 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 17:44:07 +0800
Subject: [PATCH 12/18] test

---
 .gitattributes | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 55382630..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-*.sh linguist-language=Shell
-*.js linguist-language=JavaScript
\ No newline at end of file

From 1b993c4e35c16cc66f6ec95d0f9dfb0b74c35d15 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 18:04:09 +0800
Subject: [PATCH 13/18] fix

---
 jd_family.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/jd_family.js b/jd_family.js
index 81e93d6a..95f3058c 100644
--- a/jd_family.js
+++ b/jd_family.js
@@ -73,11 +73,7 @@ if ($.isNode()) {
         }
         continue
       }
-      // await jdFamily()
-      while (true) {
-        await $.wait(31000)
-        await jdFamily()
-      }
+      await jdFamily()
     }
   }
 })()

From 58331f0c86754ae8a7894cd148e9dec5b05d93b6 Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Wed, 13 Jan 2021 19:12:02 +0800
Subject: [PATCH 14/18] =?UTF-8?q?fix=20=E8=AF=B4=E6=98=8E=E9=83=A8?=
 =?UTF-8?q?=E5=88=86404=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96Cron?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix 说明部分404的问题，优化Cron
---
 jd_family.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jd_family.js b/jd_family.js
index 95f3058c..49ee78c9 100644
--- a/jd_family.js
+++ b/jd_family.js
@@ -13,18 +13,19 @@
 ============Quantumultx===============
 [task_local]
 #京东家庭号
-1 0,8,12,16 * * * https://raw.githubusercontent.com/shylocks/Loon/main/jd_family.js, tag=京东家庭号, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jd_family.png, enabled=true
+1 */1 * * * https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_family.js, tag=京东家庭号, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jd_family.png, enabled=true
 
 ================Loon==============
 [Script]
-cron "1 0,8,12,16 * * *" script-path=https://raw.githubusercontent.com/shylocks/Loon/main/jd_family.js,tag=京东家庭号
+cron "1 */1 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_family.js,tag=京东家庭号
 
 ===============Surge=================
-京东家庭号 = type=cron,cronexp="1 0,8,12,16 * * *",wake-system=1,timeout=20,script-path=https://raw.githubusercontent.com/shylocks/Loon/main/jd_family.js
+京东家庭号 = type=cron,cronexp="1 */1 * * *",wake-system=1,timeout=20,script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_family.js
 
 ============小火箭=========
-京东家庭号 = type=cron,script-path=https://raw.githubusercontent.com/shylocks/Loon/main/jd_family.js, cronexpr="1 8,12,18* * *", timeout=200, enable=true
+京东家庭号 = type=cron,script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_family.js, cronexpr="1 */1 * * *", timeout=200, enable=true
  */
+
 const $ = new Env('京东家庭号');
 const notify = $.isNode() ? require('./sendNotify') : '';
 const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';

From a4ecd0360366a2086333e89c5c3bfddc85f71368 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 19:37:39 +0800
Subject: [PATCH 15/18] Update jd_family.js

---
 jd_family.js | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/jd_family.js b/jd_family.js
index 49ee78c9..417296f0 100644
--- a/jd_family.js
+++ b/jd_family.js
@@ -5,26 +5,6 @@
  * @Last Modified time: 2021-01-13 13:27:41
  */
 /*
-京东家庭号
-活动入口：玩一玩-家庭号
-8000幸福值可换100京豆，一天任务做完大概300幸福值，周期较长
-已支持IOS双京东账号,Node.js支持N个京东账号
-脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
-============Quantumultx===============
-[task_local]
-#京东家庭号
-1 */1 * * * https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_family.js, tag=京东家庭号, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jd_family.png, enabled=true
-
-================Loon==============
-[Script]
-cron "1 */1 * * *" script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_family.js,tag=京东家庭号
-
-===============Surge=================
-京东家庭号 = type=cron,cronexp="1 */1 * * *",wake-system=1,timeout=20,script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_family.js
-
-============小火箭=========
-京东家庭号 = type=cron,script-path=https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_family.js, cronexpr="1 */1 * * *", timeout=200, enable=true
- */
 
 const $ = new Env('京东家庭号');
 const notify = $.isNode() ? require('./sendNotify') : '';

From 626af1e2513e4425c0e558c935115f7852d99b0c Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 21:15:40 +0800
Subject: [PATCH 16/18] Update jd_family.js

---
 jd_family.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jd_family.js b/jd_family.js
index 417296f0..e237b3d2 100644
--- a/jd_family.js
+++ b/jd_family.js
@@ -4,7 +4,6 @@
  * @Last Modified by:   shylocks
  * @Last Modified time: 2021-01-13 13:27:41
  */
-/*
 
 const $ = new Env('京东家庭号');
 const notify = $.isNode() ? require('./sendNotify') : '';

From ce065b21764b212ceedc707aa2f94ff058c8cd92 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 21:52:29 +0800
Subject: [PATCH 17/18] Update jd_family.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

暂时关闭通知
---
 jd_family.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jd_family.js b/jd_family.js
index e237b3d2..7608e23f 100644
--- a/jd_family.js
+++ b/jd_family.js
@@ -74,7 +74,7 @@ async function jdFamily() {
 function showMsg() {
   return new Promise(resolve => {
     // message += `本次运行获得${$.beans}京豆`
-    $.msg($.name, '', `京东账号${$.index}${$.nickName}\n${message}`);
+    $.log($.name, '', `京东账号${$.index}${$.nickName}\n${message}`);
     resolve()
   })
 }

From 5cde66d37971c43000a5f1af46a25bfbf250ecce Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 13 Jan 2021 23:11:33 +0800
Subject: [PATCH 18/18] Update jd_dreamFactory.js

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

diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index ac381bb4..70be7994 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -984,7 +984,7 @@ function QueryTuan(activeId, tuanId) {
 function CreateTuan() {
   return new Promise((resolve) => {
     const options = {
-      'url': `https://m.jingxi.com/dreamfactory/tuan/CreateTuan?activeId=${escape(tuanActiveId)}&isOpenApp=2&_time=${Date.now()}&_=${Date.now()}&sceneval=2&g_login_type=1`,
+      'url': `https://m.jingxi.com/dreamfactory/tuan/CreateTuan?activeId=${escape(tuanActiveId)}&isOpenApp=1&_time=${Date.now()}&_=${Date.now()}&sceneval=2&g_login_type=1&_stk=_time,activeId,isOpenApp`,
       "headers": {
         "Accept": "*/*",
         "Accept-Encoding": "gzip, deflate, br",