diff --git a/USER_AGENTS.js b/USER_AGENTS.js
index dacf4fb9..433076fc 100644
--- a/USER_AGENTS.js
+++ b/USER_AGENTS.js
@@ -17,7 +17,8 @@ const USER_AGENTS = [
"jdapp;iPhone;9.3.5;14.3;4c1eb8becaa1ac13148d8e1ae757b095f3897035;network/wifi;ADID/0AEFEAA4-D39D-44C9-9C0C-0BE23F8F71AA;supportApplePay/0;hasUPPay/0;hasOCPay/0;model/iPhone12,3;addressid/902369124;supportBestPay/0;appBuild/167515;jdSupportDarkMode/1;pv/545.2;apprpd/Home_Main;ref/JDMainPageViewController;psq/1;ads/;psn/4c1eb8becaa1ac13148d8e1ae757b095f3897035|1273;jdv/0|kong|t_1000089893_157_0_184__0615da2400ad7955|tuiguang|15fa9ecbea21461d924d3dae0e870cf5|1611139506;adk/;app_device/IOS;pap/JA2015_311210|9.3.5|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.6;9;D256434363461-6531383831656;network/wifi;model/MI 6;addressid/856540565;aid/f0ee06ebc7f6e98f;oaid/7fed3628fe652595;osVer/28;appBuild/86533;psn/V0yRdEdRydfYb9nackt2CQ==|3683;psq/0;adk/;ads/;pap/JA2015_311210|9.3.6|ANDROID 9;osv/9;pv/3513.0;jdv/0|kong|t_1000089893_|tuiguang|72e393e7b2474bc6a2369615f1b262e5|1610986845;ref/;partner/jingdong;apprpd/;eufv/1;Mozilla/5.0 (Linux; Android 9; MI 6 Build/PKQ1.190118.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",
"jdapp;android;9.3.6;11;2353632303533303-4613731326261636;network/wifi;model/Redmi K30 5G;addressid/137593713;aid/25620530d171bbac;oaid/bfa9b0b7eca0475e;osVer/30;appBuild/86560;psn/oAPbHSW3fqrTmO6vGi1h73hJ0XCn9xEB|2846;psq/6;adk/;ads/;pap/JA2015_311210|9.3.6|ANDROID 11;osv/11;pv/2763.63;jdv/0|kong|t_1000089893_157_0_184__6fe1ce2ddf1f49a0|jingfen|249389d15ac843dbbbec52ce919891fb|1610851978;ref/com.jingdong.app.mall.home.JDHomeFragment;partner/xiaomi001;apprpd/Home_Main;eufv/1;jdSupportDarkMode/0;Mozilla/5.0 (Linux; Android 11; Redmi K30 5G Build/RKQ1.200826.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045511 Mobile Safari/537.36",
- "jdapp;iPhone;4.0.0;11.4;9ed0d69aaf190b5b4277868d2c0470fe1f787080;network/wifi;model/iPhone8,1;appBuild/100401;ADID/64199E21-4ECD-4217-BD79-0C4D82033FD8;supportApplePay/1;hasUPPay/0;pushNoticeIsOpen/1;hasOCPay/0;supportBestPay/0;session/73;pap/JA2019_3111789;brand/apple;supportJDSHWK/1;Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15F79"
+ "jdapp;iPhone;4.0.0;11.4;9ed0d69aaf190b5b4277868d2c0470fe1f787080;network/wifi;model/iPhone8,1;appBuild/100401;ADID/64199E21-4ECD-4217-BD79-0C4D82033FD8;supportApplePay/1;hasUPPay/0;pushNoticeIsOpen/1;hasOCPay/0;supportBestPay/0;session/73;pap/JA2019_3111789;brand/apple;supportJDSHWK/1;Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15F79",
+ "jdapp;android;9.3.0;10;3b78ecc3f490c7ba;network/wifi;model/M2006J10C;addressid/138543439;aid/3b78ecc3f490c7ba;oaid/7d5870c5a1696881;osVer/29;appBuild/85770;psn/3b78ecc3f490c7ba|599;psq/2;uid/3b78ecc3f490c7ba;adk/;ads/;pap/JA2015_311210|9.3.0|ANDROID 10;osv/10;pv/580.2;jdv/0|kong|t_1000089893_|tuiguang|e21138bd89c445d98a2cc2e375c37b4f|1606572739;ref/com.jd.lib.personal.view.fragment.JDPersonalFragment;partner/jingdong;apprpd/MyJD_Main;Mozilla/5.0 (Linux; Android 10; M2006J10C Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045230 Mobile Safari/537.36"
]
/**
* 生成随机数字
diff --git a/backUp/iCloud.md b/backUp/iCloud.md
index a2450aa0..9d410642 100644
--- a/backUp/iCloud.md
+++ b/backUp/iCloud.md
@@ -154,7 +154,7 @@ let CookieJDs = [
| `jd_bean_change` | 京豆变动通知 | 长期 | 0 2 * * * | 0 1 */1 * * | 30 7 * * * |
| `jd_bean_home` | 领京豆额外奖励 | 长期 | / | 0 1 */1 * * | 30 7 * * * |
| `jd_bean_sign` | 京豆签到 | 长期 | 0 16 * * * | 0 0 */1 * * | 0 0 * * * |
-| `jd_blueCoin` | 京小超兑换奖品 | 长期 | 0 16 * * * | 0 1 */1 * * | 0 0 * * * |
+| `jd_blueCoin` | 东东超市兑换奖品 | 长期 | 0 16 * * * | 0 1 */1 * * | 0 0 * * * |
| `jd_bookshop` | 口袋书店 | 长期 | / | / | 5 6-18/6,8 * * * |
| `jd_car` | 京东汽车 | 长期 | / | 0 0 */1 * * | 0 0 * * * |
| `jd_car_exchange` | 京东汽车兑换 | 长期 | / | / | 0 0 * * * |
diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh
index 3caa8229..52e80e97 100644
--- a/docker/crontab_list.sh
+++ b/docker/crontab_list.sh
@@ -21,7 +21,7 @@
##############长期活动##############
# 签到
0 0,18 * * * cd /scripts && node jd_bean_sign.js >> /scripts/logs/jd_bean_sign.log 2>&1
-# 京小超兑换奖品
+# 东东超市兑换奖品
0,30 0 * * * node /scripts/jd_blueCoin.js >> /scripts/logs/jd_blueCoin.log 2>&1
# 摇京豆
0 0 * * * node /scripts/jd_club_lottery.js >> /scripts/logs/jd_club_lottery.log 2>&1
diff --git a/docker/example/custom-append.yml b/docker/example/custom-append.yml
index fc3beea9..0811ed57 100644
--- a/docker/example/custom-append.yml
+++ b/docker/example/custom-append.yml
@@ -47,7 +47,7 @@ jd_scripts:
- PETSHARECODES=
# 宠汪汪的喂食数量
- JOY_FEED_COUNT=
- #京小超
+ #东东超市
# - SUPERMARKET_SHARECODES=
#兑换多少数量的京豆（20，或者1000京豆,或者其他奖品的文字）
# 例: MARKET_COIN_TO_BEANS=1000
diff --git a/docker/example/custom-overwrite.yml b/docker/example/custom-overwrite.yml
index 302528b7..ccbab602 100644
--- a/docker/example/custom-overwrite.yml
+++ b/docker/example/custom-overwrite.yml
@@ -47,7 +47,7 @@ jd_scripts:
- PETSHARECODES=
# 宠汪汪的喂食数量
- JOY_FEED_COUNT=
- #京小超
+ #东东超市
# - SUPERMARKET_SHARECODES=
#兑换多少数量的京豆（20，或者1000京豆,或者其他奖品的文字）
# 例: MARKET_COIN_TO_BEANS=1000
diff --git a/docker/example/default.yml b/docker/example/default.yml
index d4c31b62..eacc3a23 100644
--- a/docker/example/default.yml
+++ b/docker/example/default.yml
@@ -46,7 +46,7 @@ jd_scripts:
- PETSHARECODES=
# 宠汪汪的喂食数量
- JOY_FEED_COUNT=
- #京小超
+ #东东超市
# - SUPERMARKET_SHARECODES=
#兑换多少数量的京豆（20，或者1000京豆,或者其他奖品的文字）
# 例: MARKET_COIN_TO_BEANS=1000
diff --git a/githubAction.md b/githubAction.md
index 4e9f5830..f130b93e 100644
--- a/githubAction.md
+++ b/githubAction.md
@@ -68,11 +68,11 @@
| `JOY_RUN_FLAG` | 宠汪汪是否赛跑 | 非必须 | 控制`jd_joy.js`脚本是否参加赛跑(默认参加双人赛跑),
`false`为否,`true`为是，脚本默认是`true` |
| `JOY_TEAM_LEVEL` | 宠汪汪
参加什么级别的赛跑 | 非必须 | 控制`jd_joy.js`脚本参加几人的赛跑,可选数字为`2`,`10`,`50`，
其中2代表参加双人PK赛，10代表参加10人突围赛，
50代表参加50人挑战赛(注：此项功能在`JOY_RUN_FLAG`为true的时候才生效)，
如若想设置不同账号参加不同类别的比赛则用&区分即可(如下三个账号：`2&10&50`) |
| `JD_JOY_REWARD_NAME` | 宠汪汪
积分兑换多少京豆 | 非必须 | 目前可填值为`20`或者`500`,脚本默认`20`,`0`表示不兑换京豆 |
-| `MARKET_COIN_TO_BEANS` | 京小超
兑换京豆数量 | 非必须 | 控制`jd_blueCoin.js`兑换京豆数量,
可输入值为`20`或者`1000`的数字或者其他商品的名称,例如`碧浪洗衣凝珠` |
-| `MARKET_REWARD_NOTIFY` | 京小超
兑换奖品推送开关 | 非必须 | 控制`jd_blueCoin.js`兑换奖品成功后是否静默运行,
`false`为否(发送推送通知消息),`true`为是(即：不发送推送通知消息) |
-| `SUPERMARKET_UPGRADE` | 京小超自动升级 | 非必须 | 自动升级,顺序:解锁升级商品、升级货架,`true`表示自动升级,`false`表示关闭自动升级 |
-| `BUSINESS_CIRCLE_JUMP` | 京小超
自动更换商圈 | 非必须 | 小于对方300热力值自动更换商圈队伍,`true`表示运行,`false`表示禁止 |
-| `SUPERMARKET_LOTTERY` | 京小超抽奖 | 非必须 | 每天运行脚本是否使用金币去抽奖,`true`表示抽奖,`false`表示不抽奖 |
+| `MARKET_COIN_TO_BEANS` | 东东超市
兑换京豆数量 | 非必须 | 控制`jd_blueCoin.js`兑换京豆数量,
可输入值为`20`或者`1000`的数字或者其他商品的名称,例如`碧浪洗衣凝珠` |
+| `MARKET_REWARD_NOTIFY` | 东东超市
兑换奖品推送开关 | 非必须 | 控制`jd_blueCoin.js`兑换奖品成功后是否静默运行,
`false`为否(发送推送通知消息),`true`为是(即：不发送推送通知消息) |
+| `SUPERMARKET_UPGRADE` | 东东超市自动升级 | 非必须 | 自动升级,顺序:解锁升级商品、升级货架,`true`表示自动升级,`false`表示关闭自动升级 |
+| `BUSINESS_CIRCLE_JUMP` | 东东超市
自动更换商圈 | 非必须 | 小于对方300热力值自动更换商圈队伍,`true`表示运行,`false`表示禁止 |
+| `SUPERMARKET_LOTTERY` | 东东超市抽奖 | 非必须 | 每天运行脚本是否使用金币去抽奖,`true`表示抽奖,`false`表示不抽奖 |
| `FRUIT_BEAN_CARD` | 农场
使用水滴换豆卡 | 非必须 | 农场使用水滴换豆卡(如果出现限时活动时100g水换20豆,此时比浇水划算,推荐换豆),
`true`表示换豆(不浇水),`false`表示不换豆(继续浇水),脚本默认是浇水 |
| `UN_SUBSCRIBES` | jd_unsubscribe.js | 非必须 | 共四个参数,换行隔开.四个参数分别表示
`取关商品数量`,`取关店铺数量`,`遇到此商品不再进行取关`,`遇到此店铺不再进行取关`，[具体使用往下看](#取关店铺secret的说明) |
| `UN_BIND_CARD_NUM` | jd_unbind.js | 非必须 | 注销京东已开的店铺会员，不是注销京东plus会员，个别店铺无法注销。
此参数控制每次运行脚本时注销多少个店铺会员，默认200。 |
diff --git a/jd_blueCoin.js b/jd_blueCoin.js
index 795fd8ca..7fedbdcb 100644
--- a/jd_blueCoin.js
+++ b/jd_blueCoin.js
@@ -1,25 +1,25 @@
/*
-京小超兑换奖品 脚本地址：https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js
+东东超市兑换奖品 脚本地址：https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js
感谢@yangtingxiao提供PR
更新时间：2020-12-24
支持京东多个账号
脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
============QuantumultX==============
[task_local]
-#京小超兑换奖品
-0 0 0 * * * https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js, tag=京小超兑换奖品, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jxc.png, enabled=true
+#东东超市兑换奖品
+0 0 0 * * * https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js, tag=东东超市兑换奖品, img-url=https://raw.githubusercontent.com/58xinian/icon/master/jxc.png, enabled=true
====================Loon=================
[Script]
-cron "0 0 0 * * *" script-path=https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js,tag=京小超兑换奖品
+cron "0 0 0 * * *" script-path=https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js,tag=东东超市兑换奖品
===================Surge==================
-京小超兑换奖品 = type=cron,cronexp="0 0 0 * * *",wake-system=1,timeout=3600,script-path=https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js
+东东超市兑换奖品 = type=cron,cronexp="0 0 0 * * *",wake-system=1,timeout=3600,script-path=https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js
============小火箭=========
-京小超兑换奖品 = type=cron,script-path=https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js, cronexpr="0 0 0 * * *", timeout=3600, enable=true
+东东超市兑换奖品 = type=cron,script-path=https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js, cronexpr="0 0 0 * * *", timeout=3600, enable=true
*/
-const $ = new Env('京小超兑换奖品');
+const $ = new Env('东东超市兑换奖品');
const notify = $.isNode() ? require('./sendNotify') : '';
//Node.js用户请在jdCookie.js处填写京东ck;
const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
@@ -317,7 +317,7 @@ function smtgHome() {
$.get(taskUrl('smtg_home'), (err, resp, data) => {
try {
if (err) {
- console.log('\n京小超兑换奖品: API查询请求失败 ‼️‼️')
+ console.log('\n东东超市兑换奖品: API查询请求失败 ‼️‼️')
console.log(JSON.stringify(err));
} else {
if (safeGet(data)) {
diff --git a/lxk0301.boxjs.json b/lxk0301.boxjs.json
index 49741e28..0242389c 100644
--- a/lxk0301.boxjs.json
+++ b/lxk0301.boxjs.json
@@ -709,7 +709,7 @@
},
{
"id": "jd_SuperMarket",
- "name": "京小超",
+ "name": "东东超市",
"keys": [],
"settings": [
{
@@ -745,7 +745,7 @@
"repo": "https://github.com/LXK9301/jd_scripts",
"scripts":[
{
- "name" : "京小超",
+ "name" : "东东超市",
"script" : "https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_superMarket.js"
}
],
@@ -756,11 +756,11 @@
},
{
"id": "jd_SuperMarket_Reawrd",
- "name": "京小超兑换奖品",
+ "name": "东东超市兑换奖品",
"keys": [
"coinToBeans"
],
- "desc": "默认不兑换奖品,例如:兑换20京豆输入20,兑换1000京豆输入1000,兑换 柠檬果香洗手液， 输入 柠檬果香洗手液。其他详细的奖品名称去京小超活动页面查看",
+ "desc": "默认不兑换奖品,例如:兑换20京豆输入20,兑换1000京豆输入1000,兑换 柠檬果香洗手液， 输入 柠檬果香洗手液。其他详细的奖品名称去东东超市活动页面查看",
"settings": [
{
"id": "jdSuperMarketRewardNotify",
@@ -781,7 +781,7 @@
"repo": "https://github.com/LXK9301/jd_scripts",
"scripts": [
{
- "name" : "京小超兑换奖品",
+ "name" : "东东超市兑换奖品",
"script" : "https://raw.githubusercontent.com/LXK9301/jd_scripts/master/jd_blueCoin.js"
}
],
diff --git a/serverless.yml b/serverless.yml
index 9eb4f54f..f75fa341 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -22,7 +22,7 @@ inputs:
cronExpression: "0 0 0 * * * *"
enable: true
argument: jd_bean_sign
- - timer: #京小超兑换奖品 #摇京豆 #京东汽车 #京东汽车兑换
+ - timer: #东东超市兑换奖品 #摇京豆 #京东汽车 #京东汽车兑换
parameters:
name: jd_blueCoin_jd_club_lottery_car_car_exchange
cronExpression: "0 0 0 * * * *"
diff --git a/update_task.sh b/update_task.sh
index 950ade26..093c5409 100644
--- a/update_task.sh
+++ b/update_task.sh
@@ -37,7 +37,7 @@ do
grep -E "https://raw\.githubusercontent\.com.+tag.+enabled" $file | perl -pe 's|(.+\w)|\1",|' | perl -pe 's|^| \"|' >> $FileQx
grep -E "type.+cronexp.+script-path.+https://raw\.githubusercontent\.com" $file >> $FileSurge
fi
- grep -E "http-(request|response).+script-path.+https://raw\.githubusercontent\.com.+tag" $file | perl -pe "s|(.+tag=)(.+)|\n# \2\n\1\2|">> $FileLoon
+ grep -E "http-(request|response).+script-path.+https://raw\.githubusercontent\.com.+tag" $file | perl -pe "s|(.+tag=)(.+)|\n# \2\n\1\2|" >> $FileLoon
grep -E "script-(request|response)-.+https://raw\.githubusercontent\.com" $file | perl -pe "s|(.+)|\n# $TaskName\n\1|" >> $FileQxRe
grep -E "type=http-(request|response).+pattern.+script-path.+https://raw\.githubusercontent\.com" $file >> $FileSurge
done