From 7f1e01417e2fbde081a8c8d063964c039b7cebda Mon Sep 17 00:00:00 2001
From: guyuexuan <2651919937@qq.com>
Date: Wed, 20 Jan 2021 16:25:48 +0800
Subject: [PATCH 1/9] =?UTF-8?q?[=E4=BA=AC=E4=B8=9C=E7=A5=9E=E4=BB=99?=
 =?UTF-8?q?=E4=B9=A6=E9=99=A2]=20=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=20lng=20lat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_immortal.js | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/jd_immortal.js b/jd_immortal.js
index 7bb7b6bc..608bc8c1 100644
--- a/jd_immortal.js
+++ b/jd_immortal.js
@@ -312,7 +312,7 @@ function shareCodesFormat() {
   })
 }
 function requireConfig() {
-  return new Promise(resolve => {
+  return new Promise(async resolve => {
     console.log(`开始获取${$.name}配置文件\n`);
     //Node.js用户请在jdCookie.js处填写京东ck;
     let shareCodes = []
@@ -331,7 +331,7 @@ function requireConfig() {
           $.shareCodesArr.push(shareCodes[item])
         }
       })
-      $.cor = process.env.JD_IMMORTAL_LATLON?JSON.parse(process.env.JD_IMMORTAL_LATLON):{}
+      $.cor = process.env.JD_IMMORTAL_LATLON?JSON.parse(process.env.JD_IMMORTAL_LATLON):(await getLatLng())
     }else{
       $.cor = $.getdata("IMMORTAL_LATLON")?JSON.parse($.getdata("IMMORTAL_LATLON")):{}
     }
@@ -341,6 +341,39 @@ function requireConfig() {
   })
 }
 
+// 自动获取经纬度
+function getLatLng() {
+  return new Promise(resolve => {
+    try {
+      console.log('开始自动获取经纬度 lat lng ……');
+      $.get({
+        url: 'https://jingweidu.bmcx.com/web_system/bmcx_com_www/system/file/jingweidu/api/?v=20031911',
+        headers: {
+          "referer": "https://jingweidu.bmcx.com/",
+          'Content-Type': 'text/html; charset=utf-8',
+          "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36"
+        }
+      }, async (err, resp, data) => {
+        const res = data.match(/qq\.maps\.LatLng\(([\d\.]+), ([\d\.]+)\)/);
+        let lat = res[1];
+        let lng = res[2];
+        if (lat > 0 && lng > 0) {
+          resolve({
+            'lng': lng,
+            'lat': lat
+          });
+          return;
+        }
+        console.log('自动获取经纬度 lat lng 失败，返回经纬度结果错误');
+        resolve({});
+      });
+    } catch (e) {
+      console.log('自动获取经纬度 lat lng 失败，触发异常');
+      resolve({});
+    }
+  });
+}
+
 function taskPostUrl(function_id, body = {}, function_id2) {
   let url = `${JD_API_HOST}`;
   if (function_id2) {

From 755d08be89ee63ece9dd71cd458b86429f5e4e91 Mon Sep 17 00:00:00 2001
From: JDHelloWorld <77717629+JDHelloWorld@users.noreply.github.com>
Date: Wed, 20 Jan 2021 15:27:05 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B9=A6=E9=99=A2icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lxk0301.boxjs.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxk0301.boxjs.json b/lxk0301.boxjs.json
index cfb244b4..6eddcfeb 100644
--- a/lxk0301.boxjs.json
+++ b/lxk0301.boxjs.json
@@ -922,8 +922,8 @@
       "repo": "https://github.com/LXK9301/jd_scripts",
       "script": "https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_immortal.js",
       "icons": [
-        "https://raw.githubusercontent.com/58xinian/icon/master/jd_factory_mini.png",
-        "https://raw.githubusercontent.com/58xinian/icon/master/jd_factory.png"
+        "https://m.360buyimg.com/babel/jfs/t1/165970/14/3741/2184/600585feE6fb250f8/77db4ca560e006be.png",
+        "https://m.360buyimg.com/babel/jfs/t1/165970/14/3741/2184/600585feE6fb250f8/77db4ca560e006be.png"
       ]
     }
   ]

From c2a2ced60d3f64c84f16681a530753772e16c6d5 Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Wed, 20 Jan 2021 14:40:06 +0800
Subject: [PATCH 3/9] =?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=E7=A5=9E=E4=BB=99=E4=B9=A6=E9=99=A2?=
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 36c255ce..0370a3e6 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -64,12 +64,12 @@ inputs:
           cronExpression: "0 15 * * * * *"
           enable: true
           argument: jd_superMarket
-    - timer: #京豆变动通知 #疯狂的joy #京东排行榜 #领京豆额外奖励 #京东年货节
+    - timer: #京豆变动通知 #疯狂的joy #京东排行榜 #领京豆额外奖励 #京东年货节 #京东神仙书院
         parameters:
-          name: bean_change_crazy_joy_rankingList_bean_home_nh
+          name: bean_change_crazy_joy_rankingList_bean_home_nh_immortal
           cronExpression: "0 30 7 * * * *"
           enable: true
-          argument: jd_bean_change&jd_crazy_joy&jd_rankingList&jd_bean_home&jd_car&jd_nh
+          argument: jd_bean_change&jd_crazy_joy&jd_rankingList&jd_bean_home&jd_car&jd_nh&jd_immortal
     - timer: #金融养猪 #十元街 #京东快递 #京东赚赚 #签到领现金 #京喜签到
         parameters:
           name: pigPet_syj_kd_jdzz_cash_sign

From 6f8c21ab44525932eea8a845e78935a53eab2779 Mon Sep 17 00:00:00 2001
From: hongyunfei <34985241+hongyunfei@users.noreply.github.com>
Date: Wed, 20 Jan 2021 10:41:22 +0800
Subject: [PATCH 4/9] Update USER_AGENTS.js

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

diff --git a/USER_AGENTS.js b/USER_AGENTS.js
index 81c33f92..fd1cda2c 100644
--- a/USER_AGENTS.js
+++ b/USER_AGENTS.js
@@ -4,6 +4,7 @@ const USER_AGENTS = [
   "jdapp;iPhone;9.3.4;14.3;88732f840b77821b345bf07fd71f609e6ff12f43;network/4g;ADID/1C141FDD-C62F-425B-8033-9AAB7E4AE6A3;supportApplePay/0;hasUPPay/0;hasOCPay/0;model/iPhone11,8;addressid/2005183373;supportBestPay/0;appBuild/167502;jdSupportDarkMode/0;pv/414.19;apprpd/Babel_Native;ref/TTTChannelViewContoller;psq/5;ads/;psn/88732f840b77821b345bf07fd71f609e6ff12f43|1701;jdv/0|iosapp|t_335139774|appshare|CopyURL|1610885480412|1610885486;adk/;app_device/IOS;pap/JA2015_311210|9.3.4|IOS 14.3;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1",
   "jdapp;android;9.3.4;9;D266436653462-6665326466626;network/4g;model/Mi Note 3;addressid/137888479;aid/15225879b8538ee7;oaid/f3157082db9da676;osVer/28;appBuild/86388;partner/xiaomi001;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 9; Mi Note 3 Build/PKQ1.181007.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/045131 Mobile Safari/537.36",
   "jdapp;android;9.3.4;10;5353235373364666-4693734373436656;network/wifi;model/GM1910;addressid/993893557;aid/55257cdfd97474fe;oaid/;osVer/29;appBuild/86388;partner/oppo;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 10; GM1910 Build/QKQ1.190716.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045230 Mobile Safari/537.36"
+  "jdapp;android;9.3.6;9;8363538313830343131373538363-93D2134313639356631333737346;network/wifi;model/16T;addressid/1312262776;aid/afba6ae53ef2cece;oaid/;osVer/28;appBuild/86560;partner/meizu;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 9; 16T Build/PKQ1.190616.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/044942 Mobile Safari/537.36"
 ]
 /**
  * 生成随机数字

From 5f4ffad07e87000c719243c4fddd8cc29c3b0c88 Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Wed, 20 Jan 2021 16:07:03 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BA=91=E5=87=BD=E6=95=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=AC=E4=B8=9C=E7=A5=9E=E4=BB=99=E4=B9=A6=E9=99=A2?=
 =?UTF-8?q?=E5=9C=B0=E7=90=86=E4=BD=8D=E7=BD=AEsecret?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

云函数增加京东神仙书院地理位置secret
---
 .github/workflows/deploy_tencent_scf.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/deploy_tencent_scf.yml b/.github/workflows/deploy_tencent_scf.yml
index 883e53fa..6bd91120 100644
--- a/.github/workflows/deploy_tencent_scf.yml
+++ b/.github/workflows/deploy_tencent_scf.yml
@@ -83,6 +83,7 @@ jobs:
           if [ $MONEY_TREE_SELL_FRUIT ]; then sed -i "/variables/a\      MONEY_TREE_SELL_FRUIT: $MONEY_TREE_SELL_FRUIT" serverless.yml; fi;
           if [ $FACTORAY_WANTPRODUCT_NAME ]; then sed -i "/variables/a\      FACTORAY_WANTPRODUCT_NAME: $FACTORAY_WANTPRODUCT_NAME" serverless.yml; fi;
           if [ $JXNCTOKENS ]; then sed -i "/variables/a\      JXNCTOKENS: $JXNCTOKENS" serverless.yml; fi;
+          if [ $JD_IMMORTAL_LATLON ]; then sed -i "/variables/a\      JD_IMMORTAL_LATLON: $JD_IMMORTAL_LATLON" serverless.yml; fi;
           cat serverless.yml
           env
         env: #因为直接读取secrets里面的值很多字符不会自动转译，导致写入serverless.yml异常，所以设置到环境变量，在读取环境变量转译过的值
@@ -144,6 +145,7 @@ jobs:
           MONEY_TREE_SELL_FRUIT: ${{ secrets.MONEY_TREE_SELL_FRUIT}}
           FACTORAY_WANTPRODUCT_NAME: ${{ secrets.FACTORAY_WANTPRODUCT_NAME}}
           JXNCTOKENS: ${{ secrets.JXNCTOKENS}}
+          JD_IMMORTAL_LATLON: ${{ secrets.JD_IMMORTAL_LATLON}}
 
       - name: "部署到腾讯云函数"
         run: serverless deploy

From 01937117eebf0a3291af4280f0030815833b3333 Mon Sep 17 00:00:00 2001
From: DoveBoy <393366046@qq.com>
Date: Wed, 20 Jan 2021 16:22:28 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E7=A5=9E=E4=BB=99=E4=B9=A6=E9=99=A2=E5=9C=B0=E7=90=86=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A5=E5=8F=8A=E4=BA=92=E5=8A=A9=E7=A0=81=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新京东神仙书院地理位置以及互助码说明
---
 githubAction.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/githubAction.md b/githubAction.md
index 19f4656b..13ad4667 100644
--- a/githubAction.md
+++ b/githubAction.md
@@ -49,6 +49,7 @@
 |    `JD_CASH_SHARECODES`     |  签到领现金互助码  | 非必须 |            10/            | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) |
 |      `JXNC_SHARECODES`      |   京喜农场互助码   | 非必须 |             /             | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) |
 |     `JDNIAN_SHARECODES`     |    炸年兽互助码    | 非必须 |            10/            | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) |
+|     `JDSXSY_SHARECODES`     |    京东神仙书院    | 非必须 |            20/5            | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) |
 
 ##### 控制脚本功能环境变量
 
@@ -82,6 +83,7 @@
 |   `MONEY_TREE_SELL_FRUIT`    |    摇钱树<br>是否卖出金果    | 非必须 | 控制摇钱树脚本是否自动卖出金果兑换成金币，`true`卖出，`false`不卖出，默认`false` |
 | `FACTORAY_WANTPRODUCT_NAME`  |     东东工厂<br>心仪商品     | 非必须 | 提供心仪商品名称(请尽量填写完整和别的商品有区分度)，达到条件后兑换，<br>如不提供则会兑换当前所选商品 |
 |         `JXNCTOKENS`         |        京喜农场TOKEN         | 非必须 | 每个账号 token 是一个 json，json 需要用单引号包裹且是一行字符串，<br>否则设置环境变量时会出错，示例：'{"farm_jstoken":"749a90f871adsfads8ffda7bf3b1576760",<br>"timestamp":"1610165423873",<br>"phoneid":"42c7e3dadfadsfdsaac-18f0e4f4a0cf"}'，多账单间使用`&`或换行分开。 |
+|     `JD_IMMORTAL_LATLON`     |    京东神仙书院<br>地理位置变量     | 非必须 | 京东神仙书院地理位置，示例格式：{"lat":33.1, "lng":118.1} |
 
 
 ##### 互助码的填写规则

From 6ea528e85bfc191261f34af0987c49cee237a55d Mon Sep 17 00:00:00 2001
From: an0na <913314010@qq.com>
Date: Wed, 20 Jan 2021 15:35:14 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A5=9E=E4=BB=99?=
 =?UTF-8?q?=E4=B9=A6=E9=99=A2=E7=9A=84=E5=8A=A9=E5=8A=9B=E7=A0=81=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E4=B8=BA=EF=BC=9AJDSXSY=5FSHARECODES?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_immortal.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jd_immortal.js b/jd_immortal.js
index 608bc8c1..3d8aec58 100644
--- a/jd_immortal.js
+++ b/jd_immortal.js
@@ -2,8 +2,8 @@
 京东神仙书院
 活动时间:2021-1-20至2021-2-5
 暂不加入品牌会员，需要自行填写坐标，用于做逛身边好店任务
-环境变量JD_IMMORTAL_LATLON(经纬度)
-示例：D_IMMORTAL_LATLON={"lat":33.1, "lng":118.1}
+环境变量：JD_IMMORTAL_LATLON(经纬度)
+示例：JD_IMMORTAL_LATLON={"lat":33.1, "lng":118.1}
 boxjs IMMORTAL_LATLON
 活动入口: 京东app-我的-神仙书院
 活动地址：https://h5.m.jd.com//babelDiy//Zeus//4XjemYYyPScjmGyjej78M6nsjZvj//index.html?babelChannel=ttt9
@@ -317,11 +317,11 @@ function requireConfig() {
     //Node.js用户请在jdCookie.js处填写京东ck;
     let shareCodes = []
     console.log(`共${cookiesArr.length}个京东账号\n`);
-    if ($.isNode() && process.env.JDNIAN_SHARECODES) {
+    if ($.isNode() && process.env.JDSXSY_SHARECODES) {
       if (process.env.JDNIAN_SHARECODES.indexOf('\n') > -1) {
-        shareCodes = process.env.JDNIAN_SHARECODES.split('\n');
+        shareCodes = process.env.JDSXSY_SHARECODES.split('\n');
       } else {
-        shareCodes = process.env.JDNIAN_SHARECODES.split('&');
+        shareCodes = process.env.JDSXSY_SHARECODES.split('&');
       }
     }
     $.shareCodesArr = [];

From ecde75291a2c5d41c457556301207e6d27c6ec1b Mon Sep 17 00:00:00 2001
From: an0na <913314010@qq.com>
Date: Wed, 20 Jan 2021 15:38:17 +0800
Subject: [PATCH 8/9] Update jd_immortal.js

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

diff --git a/jd_immortal.js b/jd_immortal.js
index 3d8aec58..b44ac339 100644
--- a/jd_immortal.js
+++ b/jd_immortal.js
@@ -318,7 +318,7 @@ function requireConfig() {
     let shareCodes = []
     console.log(`共${cookiesArr.length}个京东账号\n`);
     if ($.isNode() && process.env.JDSXSY_SHARECODES) {
-      if (process.env.JDNIAN_SHARECODES.indexOf('\n') > -1) {
+      if (process.env.JDSXSY_SHARECODES.indexOf('\n') > -1) {
         shareCodes = process.env.JDSXSY_SHARECODES.split('\n');
       } else {
         shareCodes = process.env.JDSXSY_SHARECODES.split('&');

From 94c40f54638d4a7359c718cc9849d080263be0d6 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 20 Jan 2021 16:54:07 +0800
Subject: [PATCH 9/9] fix

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

diff --git a/USER_AGENTS.js b/USER_AGENTS.js
index fd1cda2c..e012bcde 100644
--- a/USER_AGENTS.js
+++ b/USER_AGENTS.js
@@ -3,7 +3,7 @@ const USER_AGENTS = [
   "jdapp;android;9.3.5;10;2346663656561603-4353564623932316;network/wifi;model/ONEPLUS A5010;addressid/138709979;aid/2dfceea045ed292a;oaid/;osVer/29;appBuild/86390;partner/jingdong;eufv/1;Mozilla/5.0 (Linux; Android 10; ONEPLUS A5010 Build/QKQ1.191014.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045230 Mobile Safari/537.36",
   "jdapp;iPhone;9.3.4;14.3;88732f840b77821b345bf07fd71f609e6ff12f43;network/4g;ADID/1C141FDD-C62F-425B-8033-9AAB7E4AE6A3;supportApplePay/0;hasUPPay/0;hasOCPay/0;model/iPhone11,8;addressid/2005183373;supportBestPay/0;appBuild/167502;jdSupportDarkMode/0;pv/414.19;apprpd/Babel_Native;ref/TTTChannelViewContoller;psq/5;ads/;psn/88732f840b77821b345bf07fd71f609e6ff12f43|1701;jdv/0|iosapp|t_335139774|appshare|CopyURL|1610885480412|1610885486;adk/;app_device/IOS;pap/JA2015_311210|9.3.4|IOS 14.3;Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148;supportJDSHWK/1",
   "jdapp;android;9.3.4;9;D266436653462-6665326466626;network/4g;model/Mi Note 3;addressid/137888479;aid/15225879b8538ee7;oaid/f3157082db9da676;osVer/28;appBuild/86388;partner/xiaomi001;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 9; Mi Note 3 Build/PKQ1.181007.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/045131 Mobile Safari/537.36",
-  "jdapp;android;9.3.4;10;5353235373364666-4693734373436656;network/wifi;model/GM1910;addressid/993893557;aid/55257cdfd97474fe;oaid/;osVer/29;appBuild/86388;partner/oppo;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 10; GM1910 Build/QKQ1.190716.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045230 Mobile Safari/537.36"
+  "jdapp;android;9.3.4;10;5353235373364666-4693734373436656;network/wifi;model/GM1910;addressid/993893557;aid/55257cdfd97474fe;oaid/;osVer/29;appBuild/86388;partner/oppo;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 10; GM1910 Build/QKQ1.190716.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045230 Mobile Safari/537.36",
   "jdapp;android;9.3.6;9;8363538313830343131373538363-93D2134313639356631333737346;network/wifi;model/16T;addressid/1312262776;aid/afba6ae53ef2cece;oaid/;osVer/28;appBuild/86560;partner/meizu;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 9; 16T Build/PKQ1.190616.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/044942 Mobile Safari/537.36"
 ]
 /**