diff --git a/README.md b/README.md index 2a903127..a9bf2043 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## 不要fork! 不然下次GitHub还会继续封这个仓库 +# 不要fork! 请点亮Star ## 特别声明: @@ -85,7 +85,7 @@ ### 方法三:Docker(NAS或VPS用户) - 可以精确控制任务运行时间,有二种办法:[docker办法一](https://github.com/lxk0301/jd_scripts/tree/master/docker)、[docker办法二(和本地安装Node.js类似)](https://github.com/EvineDeng/jd-base) - - [环境变量](https://github.com/lxk0301/jd_scripts/blob/master/githubAction.md#%E4%B8%8B%E6%96%B9%E6%8F%90%E4%BE%9B%E4%BD%BF%E7%94%A8%E5%88%B0%E7%9A%84-secrets%E5%85%A8%E9%9B%86%E5%90%88) + - [环境变量集合](https://github.com/lxk0301/jd_scripts/blob/master/githubAction.md) #### 注:以上三种运行机制都是Node.js,故您需仔细阅读下面几点 diff --git a/activity/jd_818.js b/activity/jd_818.js index 39753509..6acfba5c 100644 --- a/activity/jd_818.js +++ b/activity/jd_818.js @@ -50,6 +50,8 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://rdcseason.m.jd.com/api/'; @@ -77,8 +79,6 @@ let helpCode = [] if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/activity/jd_apple_live.js b/activity/jd_apple_live.js index 02c284d7..26022817 100644 --- a/activity/jd_apple_live.js +++ b/activity/jd_apple_live.js @@ -41,6 +41,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/client.action'; const inviteCodes = [`P04z54XCjVUm4aW5nJcXCCyoR8C6s-kRmWs@P04z54XCjVUm4aW5m9cZ2bx3y5Ow@P04z54XCjVUm4aW5u2ak7ZCdan1BeYMuZ9HwF34gJjW@P04z54XCjVUm4aW5m9cZ2T6jChKkkjZEdhiKUY`, `P04z54XCjVUm4aW5nJcXCCyoR8C6s-kRmWs@P04z54XCjVUm4aW5m9cZ2bx3y5Ow`]; @@ -65,8 +66,6 @@ const inviteCodes = [`P04z54XCjVUm4aW5nJcXCCyoR8C6s-kRmWs@P04z54XCjVUm4aW5m9cZ2b if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/activity/jd_digital_floor.js b/activity/jd_digital_floor.js index 5520493e..072a6e10 100644 --- a/activity/jd_digital_floor.js +++ b/activity/jd_digital_floor.js @@ -44,6 +44,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://digital-floor.m.jd.com/adf/index/'; !(async () => { @@ -67,8 +68,6 @@ const JD_API_HOST = 'https://digital-floor.m.jd.com/adf/index/'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/activity/jd_jxstory.js b/activity/jd_jxstory.js index 21532995..cd46e3ed 100644 --- a/activity/jd_jxstory.js +++ b/activity/jd_jxstory.js @@ -46,6 +46,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } !(async () => { await requireConfig(); @@ -69,8 +70,6 @@ if ($.isNode()) { if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/activity/jd_live_redrain2.js b/activity/jd_live_redrain2.js index 4e5b0ce1..aeb5c6c4 100644 --- a/activity/jd_live_redrain2.js +++ b/activity/jd_live_redrain2.js @@ -42,6 +42,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; !(async () => { diff --git a/activity/jd_pubg.js b/activity/jd_pubg.js index e009ecbd..bed15df4 100644 --- a/activity/jd_pubg.js +++ b/activity/jd_pubg.js @@ -137,6 +137,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://starsingle.m.jd.com/guardianstar/'; const inviteCodes = ['65561ad5-af72-4d1c-a5be-37b3de372b67@2d5f579d-e6d1-479e-931f-c275d602caf5@a3551e1d-fb07-40f0-b9ad-d50e4b480098@696cfa20-3719-442a-a331-0e07beaeb375@718868ed-2202-465d-b3a4-54e76b30d02a','65561ad5-af72-4d1c-a5be-37b3de372b67@2d5f579d-e6d1-479e-931f-c275d602caf5'] @@ -161,8 +162,6 @@ const inviteCodes = ['65561ad5-af72-4d1c-a5be-37b3de372b67@2d5f579d-e6d1-479e-93 if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/activity/jd_split.js b/activity/jd_split.js index ae798b89..717f09b7 100644 --- a/activity/jd_split.js +++ b/activity/jd_split.js @@ -41,6 +41,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/client.action'; $.newShareCodes = [`P04z54XCjVUnIaW5nJcXCCyoR8C6p8txXBH`, 'P04z54XCjVUnIaW5m9cZ2T6jChKki0Hfndla5k', 'P04z54XCjVUnIaW5u2ak7ZCdan1BT0NlbBGZ1-rnMYj', 'P04z54XCjVUnIaW5m9cZ2ariXVJwI64DaVTNXQ']; @@ -64,8 +65,6 @@ $.newShareCodes = [`P04z54XCjVUnIaW5nJcXCCyoR8C6p8txXBH`, 'P04z54XCjVUnIaW5m9cZ2 if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/activity/jd_xtg.js b/activity/jd_xtg.js index 0e9e59be..99aa581b 100644 --- a/activity/jd_xtg.js +++ b/activity/jd_xtg.js @@ -44,6 +44,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const starID = [ 'bolangwutiaoren', @@ -115,8 +116,6 @@ const JD_API_HOST = 'https://urvsaggpt.m.jd.com/guardianstar'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/docker/Readme.md b/docker/Readme.md index f0660b71..beb03302 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -6,6 +6,19 @@ sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose ``` +`Ubuntu`用户快速安装`docker-compose` +``` +sudo apt-get update && sudo apt-get install -y python3-pip curl vim git moreutils +pip3 install --upgrade pip +pip install docker-compose +``` + +通过`docker-compose version`查看`docker-compose`版本,确认是否安装成功。 + +- `Docker`安装 +国内一键安装 `sudo curl -sSL https://get.daocloud.io/docker | sh` +国外一键安装 `sudo curl -sSL get.docker.com | sh` + ### 如果需要使用 docker 多个账户独立并发执行定时任务,[参考这里](https://github.com/iouAkira/scripts/blob/patch-1/docker/docker%E5%A4%9A%E8%B4%A6%E6%88%B7%E4%BD%BF%E7%94%A8%E7%8B%AC%E7%AB%8B%E5%AE%B9%E5%99%A8%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E.md#%E4%BD%BF%E7%94%A8%E6%AD%A4%E6%96%B9%E5%BC%8F%E8%AF%B7%E5%85%88%E7%90%86%E8%A7%A3%E5%AD%A6%E4%BC%9A%E4%BD%BF%E7%94%A8docker%E5%8A%9E%E6%B3%95%E4%B8%80%E7%9A%84%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F) ⚠️⚠️⚠️2020-12-11更新镜像启动方式,虽然兼容旧版的运行启动方式,但是强烈建议更新镜像和配置后使用 diff --git a/docker/proc_file.sh b/docker/proc_file.sh index c8849c8c..6def887d 100644 --- a/docker/proc_file.sh +++ b/docker/proc_file.sh @@ -10,6 +10,7 @@ jxFactoryFile="${logdDir}/jd_dreamFactory.log" plantBean="${logdDir}/jd_plantBean.log" jdfruit="${logdDir}/jd_fruit.log" jdpet="${logdDir}/jd_pet.log" +jdcrazyJoy="${logdDir}/jd_crazy_joy.log" echo -e >$sharecodeFile @@ -31,24 +32,28 @@ echo "提取京东农场助力码完成" sed -n '/东东萌宠好友互助码】.*/'p $jdpet | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile echo "提取东东萌宠助力码完成" +sed -n '/crazyJoy任务好友互助码】.*/'p $jdcrazyJoy | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile +echo "提取crazyJoy任务助力码完成" + echo "===========================================================================" echo "整理完成,具体结果请查看${sharecodeFile}文件" echo "处理jd_crazy_joy_coin任务。。。" if [ ! $CRZAY_JOY_COIN_ENABLE ]; then - echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务,并重启" - eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}') - node /scripts/jd_crazy_joy_coin.js >> /scripts/logs/jd_crazy_joy_coin.log 2>&1 & - echo "默认jd_crazy_joy_coin重启完成" + echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务,并重启" + eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}') + echo '' >/scripts/logs/jd_crazy_joy_coin.log + node /scripts/jd_crazy_joy_coin.js | ts >>/scripts/logs/jd_crazy_joy_coin.log 2>&1 & + echo "默认jd_crazy_joy_coin重启完成" else if [ $CRZAY_JOY_COIN_ENABLE = "Y" ]; then echo "配置启用jd_crazy_joy_coin,杀掉jd_crazy_joy_coin任务,并重启" eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}') - node /scripts/jd_crazy_joy_coin.js >> /scripts/logs/jd_crazy_joy_coin.log 2>&1 & + echo '' >/scripts/logs/jd_crazy_joy_coin.log + node /scripts/jd_crazy_joy_coin.js | ts >>/scripts/logs/jd_crazy_joy_coin.log 2>&1 & echo "配置jd_crazy_joy_coin重启完成" - else - eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}') - echo "已配置不启用jd_crazy_joy_coin任务,不处理" - fi + else + eval $(ps -ef | grep "jd_crazy" | awk '{print "kill "$1}') + echo "已配置不启用jd_crazy_joy_coin任务,不处理" + fi fi - diff --git a/githubAction.md b/githubAction.md index fee7d186..1886e713 100644 --- a/githubAction.md +++ b/githubAction.md @@ -1,87 +1,22 @@ ## 环境变量说明 - -#### 京东Cookie - - - Secret新增`JD_COOKIE`,填入cookie信息,多账号的cookie, 使用`&`或者换行隔开(两种方法) - - - 方式已一:`&`号隔开示例(注:后面的英文引号`;`不可缺失) - 如 `账号一cookie&账号二cookie&账号三cookie`,再多账号就依次类推即可 - ``` - pt_key=xxx1;pt_pin=xxx1;&pt_key=xxx2;pt_pin=xxx2;&pt_key=xxx3;pt_pin=xxx3; - ``` - - 方式二:按`Enter`键换行隔开示例(这里给下三个账号的示例) - ``` - pt_key=bbbbbbbbbbbbbb;pt_pin=aaaaaaa; - pt_key=cccccccc;pt_pin=dddddddd; - pt_key=eeeeeeeee;pt_pin=ffffffff; - ``` - - 京东cookie获取看这里 - - [浏览器获取京东cookie教程](https://github.com/lxk0301/jd_scripts/blob/master/backUp/GetJdCookie.md) 或者 [插件获取京东cookie教程](https://github.com/lxk0301/jd_scripts/blob/master/backUp/GetJdCookie2.md) - - IOS代理软件(Surge, Quantumult X, Loon)等用户有使用过BoxJs的,可在BoxJs里面提取京东cookie(打开BoxJs -> 底部中间的 `应用` -> NobyDa脚本订阅 -> 京东(多合一签到) -> 点击会话右上方的三个点点 -> 修改会话 -> 全选复制即可),再不会看此[图文教程](icon/jd8.png) - - - - - -#### 自动同步Fork后的代码 - - > 此部分内容由tg@wukongdada和tg@goukey提供 - - - 方案A - 强制远程分支覆盖自己的分支(**新手推荐使用**) - - 1. 参考tg@wukongdada这篇教程 [保持自己github的forks自动和上游仓库同步的教程](https://github.com/lxk0301/jd_scripts/blob/master/backUp/gitSync.md) , 安装[pull插件](https://github.com/apps/pull) 并确认此项目已在pull插件的作用下(参考@twukongdada这篇教程文中1-d) - - 2. 确保.github/pull.yml文件正常存在,yml内上游作者填写正确(此项目已填好,无需更改)。 - - 3. 确保pull.yml里面是`mergeMethod: hardreset`(默认就是`hardreset`)。 - - 4. ENJOY!上游更改三小时左右就会自动发起同步。 - ``` - # 方案A可参考这里 - version: "1" - rules: # Array of rules - - base: master # Required. Target branch - upstream: lxk0301:master # Required. Must be in the same fork network. - mergeMethod: hardreset # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. - mergeUnstable: true # Optional, merge pull request even when the mergeable_state is not clean. Default: false - ``` - - 方案B - 保留自己仓库已修改过的文件(**需修改脚本或者提PR的使用**) - - > 上游变动后pull插件会自动发起pr,但如果有冲突需要自行**手动**确认。 - > 如果上游更新涉及workflow里的文件内容改动,需要自行**手动**确认。 - - 1. 参考tg@wukongdada这篇教程 [保持自己github的forks自动和上游仓库同步的教程](https://github.com/lxk0301/jd_scripts/blob/master/backUp/gitSync.md) , 安装[pull插件](https://github.com/apps/pull) 并确认此项目已在pull插件的作用下(参考@twukongdada这篇教程文中1-d) - 2. 确保.github/pull.yml文件正常存在,yml内上游作者填写正确(此项目已填好,无需更改)。 - 3. 将pull.yml里面的`mergeMethod: hardreset`修改为`mergeMethod: merge`保存。 - 4. ENJOY!上游更改三小时左右就会自动发起同步。 - ``` - # 方案B可参考这里 - version: "1" - rules: # Array of rules - - base: master # Required. Target branch - upstream: lxk0301:master # Required. Must be in the same fork network. - mergeMethod: merge # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. - mergeUnstable: true # Optional, merge pull request even when the mergeable_state is not clean. Default: false - ``` - - 方案C - 利用github-action定时cron更新同步(**新手推荐使用**) - - > 效果和方案A一样(即:强制更新覆盖) - - 新建secret,`Name`为`PAT`,填写的`Value`值需要去申请Personal access tokens,申请教程[看此处](https://www.jianshu.com/p/bb82b3ad1d11) 记得勾选`repo`权限就行 - - - -#### 下方提供使用到的 **Secrets全集合** +##### 京东(必须) | Name | 归属 | 属性 | 说明 | | :---------------------: | :----------: | --------- | ------------------------------------------------------------ | | `JD_COOKIE` | 京东 | 必须 | 京东cookie,多个账号的cookie使用`&`隔开或者换行。具体获取参考[浏览器获取京东cookie教程](https://github.com/lxk0301/jd_scripts/blob/master/backUp/GetJdCookie.md) 或者 [插件获取京东cookie教程](https://github.com/lxk0301/jd_scripts/blob/master/backUp/GetJdCookie2.md) | -| `JD_USER_AGENT` | 京东 | 非必须 | 自定义此库里京东系列脚本的UserAgent,不懂不知不会UserAgent的请不要随意填写内容。具体获取参考此[issue](https://github.com/lxk0301/jd_scripts/issues/127) | -| `JD_BEAN_STOP` | 京东 | 非必须 | jd_bean_sign.js自定义延迟签到,单位毫秒. 默认分批并发无延迟. 延迟作用于每个签到接口, 如填入延迟则切换顺序签到(耗时较长),如需填写建议输入数字`1`,详见[此处说明](https://github.com/NobyDa/Script/blob/master/JD-DailyBonus/JD_DailyBonus.js#L93) | -| `JD_BEAN_SIGN_STOP_NOTIFY`| 京东 | 非必须 | `jd_bean_sign.js`脚本运行后不推送签到结果通知,默认推送,填`true`表示不发送通知 | -| `JD_BEAN_SIGN_NOTIFY_SIMPLE`| 京东 | 非必须 | `jd_bean_sign.js`脚本运行后推送签到结果简洁版通知,默认推送全部签到结果,填`true`表示推送简洁通知,[效果图](./icon/bean_sign_simple.jpg) | + +##### 京东隐私安全 环境变量 + +| Name | 归属 | 属性 | 说明 | +| :---------------------: | :----------: | --------- | ------------------------------------------------------------ | | `JD_DEBUG` | 脚本打印log | 非必须 | 运行脚本时,是否显示log,默认显示。改成false表示不显示,注重隐私的人可以在设置secret -> `Name:JD_DEBUG,Value:false` | +| `JD_USER_AGENT` | 京东 | 非必须 | 自定义此库里京东系列脚本的UserAgent,不懂不知不会UserAgent的请不要随意填写内容。具体获取参考此[issue](https://github.com/lxk0301/jd_scripts/issues/127) | + +##### 推送通知环境变量 + +| Name | 归属 | 属性 | 说明 | +| :---------------------: | :----------: | --------- | ------------------------------------------------------------ | | `PUSH_KEY` | 微信推送 | 非必须 | cookie失效推送[server酱的微信通知](http://sc.ftqq.com/3.version) | | `BARK_PUSH` | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | 非必须 | cookie失效推送BARK这个APP,填写内容是app提供的`设备码`,例如:https://api.day.app/123 ,那么此处的设备码就是`123`,再不懂看 [这个图](icon/bark.jpg)(注:支持自建填完整链接即可) | | `BARK_SOUND` | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | 非必须 | bark推送声音设置,例如`choo`,具体值请在`bark`-`推送铃声`-`查看所有铃声` | @@ -95,17 +30,39 @@ | `QQ_MODE` | 酷推(Cool Push)推送 | 非必须 | 推送方式(send或group或者wx,默认send) [参考文档](https://cp.xuthus.cc/) | | `PUSH_PLUS_TOKEN` | pushplus推送 | 非必须 | 微信扫码登录后一对一推送或一对多推送下面的token(您的Token) [官方网站](http://pushplus.hxtrip.com/) | | `PUSH_PLUS_USER` | pushplus推送 | 非必须 | 一对多推送的“群组编码”(一对多推送下面->您的群组(如无则新建)->群组编码)注:(1、需订阅者扫描二维码 2、如果您是创建群组所属人,也需点击“查看二维码”扫描绑定,否则不能接受群组消息推送),只填`PUSH_PLUS_TOKEN`默认为一对一推送 | +| `TG_PROXY_HOST` | Telegram 代理的 IP | 非必须 | 代理类型为 http。例子:http代理 http://127.0.0.1:1080 则填写 127.0.0.1 | +| `TG_PROXY_PORT` | Telegram 代理的端口 | 非必须 | 例子:http代理 http://127.0.0.1:1080 则填写 1080 | + +##### 互助码类环境变量 + +| Name | 归属 | 属性 | 说明 | +| :---------------------: | :----------: | --------- | ------------------------------------------------------------ | +| `FRUITSHARECODES` | 东东农场互助码 | 非必须 | 填写规则请看 [jdFruitShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdFruitShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | +| `PETSHARECODES` | 东东萌宠互助码 | 非必须 | 填写规则请看 [jdPetShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdPetShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | +| `PLANT_BEAN_SHARECODES` | 种豆得豆互助码 | 非必须 | 填写规则请看 [jdPlantBeanShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdPlantBeanShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | +| `SUPERMARKET_SHARECODES`| 京小超商圈互助码 | 非必须 | 填写规则请看 [jdSuperMarketShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdSuperMarketShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | +| `DDFACTORY_SHARECODES` | 东东工厂互助码 | 非必须 | 填写规则请看 [jdFactoryShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdFactoryShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | +| `DREAM_FACTORY_SHARE_CODES`| 京喜工厂互助码 | 非必须 | 填写规则请看 [jdDreamFactoryShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdDreamFactoryShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | +| `JDZZ_SHARECODES` | 京东赚赚(jd_jdzz.js)脚本互助码 | 非必须 | 填写规则和上面类似,或见下方[互助码的填写规则](#互助码的填写规则) | + +##### 控制脚本功能环境变量 + +| Name | 归属 | 属性 | 说明 | +| :---------------------: | :----------: | --------- | ------------------------------------------------------------ | +| `JD_BEAN_STOP` | 京东 | 非必须 | `jd_bean_sign.js`自定义延迟签到,单位毫秒. 默认分批并发无延迟. 延迟作用于每个签到接口, 如填入延迟则切换顺序签到(耗时较长),如需填写建议输入数字`1`,详见[此处说明](https://github.com/NobyDa/Script/blob/master/JD-DailyBonus/JD_DailyBonus.js#L93) | +| `JD_BEAN_SIGN_STOP_NOTIFY`| 京东 | 非必须 | `jd_bean_sign.js`脚本运行后不推送签到结果通知,默认推送,填`true`表示不发送通知 | +| `JD_BEAN_SIGN_NOTIFY_SIMPLE`| 京东 | 非必须 | `jd_bean_sign.js`脚本运行后推送签到结果简洁版通知,默认推送全部签到结果,填`true`表示推送简洁通知,[效果图](./icon/bean_sign_simple.jpg) | | `PET_NOTIFY_CONTROL` | 东东萌宠推送开关 | 非必须 | 控制京东萌宠是否静默运行,`false`为否(发送推送通知消息),`true`为是(即:不发送推送通知消息) | | `FRUIT_NOTIFY_CONTROL` | 东东农场推送开关 | 非必须 | 控制京东农场是否静默运行,`false`为否(发送推送通知消息),`true`为是(即:不发送推送通知消息) | -| `JD_JOY_REWARD_NOTIFY` | 宠汪汪兑换京豆推送开关 | 非必须 | 控制jd_joy_reward.js脚本是否静默运行,`false`为否(发送推送通知消息),`true`为是(即:不发送推送通知消息) -| `JD_818_SHAREID_NOTIFY` | 京东818互助码通知开关 | 非必须 | 控制jd_818.js脚本是否在获取互助码后通知,`true`为是(发送推送通知消息),`false`为否(即:不发送推送通知消息) | -| `JOY_FEED_COUNT` | 宠汪汪喂食数量 | 非必须 | 控制jd_joy_feedPets.js脚本喂食数量 ,可以填的数字10,20,40,80 , 其他数字不可. | -| `JOY_HELP_FEED` | 宠汪汪帮好友喂食 | 非必须 | 控制jd_joy_steal.js脚本是否给好友喂食,`false`为否,`true`为是(给好友喂食) | -| `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_NOTIFY` | 宠汪汪兑换京豆推送开关 | 非必须 | 控制`jd_joy_reward.js`脚本是否静默运行,`false`为否(发送推送通知消息),`true`为是(即:不发送推送通知消息) +| `JD_818_SHAREID_NOTIFY` | 京东818互助码通知开关 | 非必须 | 控制`jd_818.js`脚本是否在获取互助码后通知,`true`为是(发送推送通知消息),`false`为否(即:不发送推送通知消息) | +| `JOY_FEED_COUNT` | 宠汪汪喂食数量 | 非必须 | 控制`jd_joy_feedPets.js`脚本喂食数量 ,可以填的数字10,20,40,80 , 其他数字不可. | +| `JOY_HELP_FEED` | 宠汪汪帮好友喂食 | 非必须 | 控制`jd_joy_steal.js`脚本是否给好友喂食,`false`为否,`true`为是(给好友喂食) | +| `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`为是(即:不发送推送通知消息) | +| `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`表示不抽奖 | @@ -113,17 +70,8 @@ | `UN_SUBSCRIBES` | jd_unsubscribe.js | 非必须 | 共四个参数,换行隔开. 四个参数分别表示`取关商品数量`,`取关店铺数量`,`遇到此商品不再进行取关`, `遇到此店铺不再进行取关`,[具体使用往下看](#取关店铺secret的说明)| | `UN_BIND_CARD_NUM` | jd_unbind.js | 非必须 | 注销京东已开的店铺会员,不是注销京东plus会员,个别店铺无法注销。此参数控制每次运行脚本时注销多少个店铺会员,默认200。| | `UN_BIND_STOP_CARD` | jd_unbind.js | 非必须 | 注销京东已开的店铺会员,不是注销京东plus会员,个别店铺无法注销。遇到此参数设定的会员卡则跳过不注销,多个会员卡之间以`&`分隔,默认值"京东PLUS会员"。 | -| `JDJOY_HELPSELF` | 疯狂的joy | 非必须 | 疯狂的joy循环助力,`true`表示循环助力,`false`表示不循环助力,默认不开启循环助力。| -| `JDJOY_APPLYJDBEAN` | 疯狂的joy | 非必须 | 疯狂的joy京豆兑换,目前最小值为500/1000京豆,默认不开启京豆兑换。| -| `FRUITSHARECODES` | 东东农场互助码 | 非必须 | 填写规则请看 [jdFruitShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdFruitShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | -| `PETSHARECODES` | 东东萌宠互助码 | 非必须 | 填写规则请看 [jdPetShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdPetShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | -| `PLANT_BEAN_SHARECODES` | 种豆得豆互助码 | 非必须 | 填写规则请看 [jdPlantBeanShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdPlantBeanShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | -| `SUPERMARKET_SHARECODES`| 京小超商圈互助码 | 非必须 | 填写规则请看 [jdSuperMarketShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdSuperMarketShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | -| `DDFACTORY_SHARECODES`| 东东工厂互助码 | 非必须 | 填写规则请看 [jdFactoryShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdFactoryShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | -| `DREAM_FACTORY_SHARE_CODES`| 京喜工厂互助码 | 非必须 | 填写规则请看 [jdDreamFactoryShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdDreamFactoryShareCodes.js) 或见下方[互助码的填写规则](#互助码的填写规则) | -| `JDZZ_SHARECODES` | 京东赚赚(jd_jdzz.js)脚本互助码 | 非必须 | 填写规则和上面类似,或见下方[互助码的填写规则](#互助码的填写规则) | -| `TG_PROXY_HOST` | Telegram 代理的 IP | 非必须 | 代理类型为 http。例子:http代理 http://127.0.0.1:1080 则填写 127.0.0.1 | -| `TG_PROXY_PORT` | Telegram 代理的端口 | 非必须 | 例子:http代理 http://127.0.0.1:1080 则填写 1080 | +| `JDJOY_HELPSELF` | 疯狂的joy | 非必须 | 疯狂的joy循环助力,`true`表示循环助力,`false`表示不循环助力,默认不开启循环助力。| +| `JDJOY_APPLYJDBEAN` | 疯狂的joy | 非必须 | 疯狂的joy京豆兑换,目前最小值为500/1000京豆,默认不开启京豆兑换。| | `MONEY_TREE_SELL_FRUIT` | 摇钱树是否卖出金果 | 非必须 | 控制摇钱树脚本是否自动卖出金果兑换成金币,`true`卖出,`false`不卖出,默认`false` | | `FACTORAY_WANTPRODUCT_NAME` | 东东工厂心仪商品 | 非必须 | 提供心仪商品名称(请尽量填写完整和别的商品有区分度),达到条件后兑换,如不提供则会兑换当前所选商品 | | `WATCH_ACCEPTBODY` | 京东看一看(jd_watch.js)脚本 | 非必须 | 抓包`functionId=discAcceptTask`(需40个,每个之间使用@符号隔开) | @@ -183,10 +131,3 @@ jd_818.js是每次获取新的互助码会通知一次,以帮助您快速上 其余的脚本平常运行都是不通知,只有在京东cookie失效后,才会推送通知 ``` - -​ -##### 参考文献 -[GitHub Actions 手动触发方式进化史](https://p3terx.com/archives/github-actions-manual-trigger.html) - -[GitHub Actions 入门教程](https://p3terx.com/archives/github-actions-started-tutorial.html) - diff --git a/jd_bean_change.js b/jd_bean_change.js index 012e6278..2c3b7623 100644 --- a/jd_bean_change.js +++ b/jd_bean_change.js @@ -39,6 +39,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } !(async () => { if (!cookiesArr[0]) { @@ -64,8 +65,6 @@ if ($.isNode()) { if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_bean_home.js b/jd_bean_home.js index b6e9ce5e..8ef8daa4 100644 --- a/jd_bean_home.js +++ b/jd_bean_home.js @@ -42,6 +42,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/'; !(async () => { diff --git a/jd_blueCoin.js b/jd_blueCoin.js index 4d4b2e65..e0e145a0 100644 --- a/jd_blueCoin.js +++ b/jd_blueCoin.js @@ -1,7 +1,7 @@ /* 京小超兑换奖品 脚本地址:https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_blueCoin.js 感谢@yangtingxiao提供PR -更新时间:2020-12-15 +更新时间:2020-12-24 支持京东多个账号 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js ======================quantumultx=============== @@ -34,6 +34,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = `https://api.m.jd.com/api?appid=jdsupermarket`; @@ -65,8 +66,6 @@ const JD_API_HOST = `https://api.m.jd.com/api?appid=jdsupermarket`; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } @@ -94,7 +93,7 @@ async function PrizeIndex() { // const prizeList = [...$.queryPrizeData, ...$.materialPrizeIndex]; const prizeList = [...$.queryPrizeData]; if (`${coinToBeans}` === '1000') { - if (prizeList[1].beanType === 'BeanPackage') { + if (prizeList[1] && prizeList[1].beanType === 'BeanPackage') { console.log(`查询换${prizeList[1].title}ID成功,ID:${prizeList[1].prizeId}`) $.title = prizeList[1].title; $.blueCost = prizeList[1].blueCost; @@ -103,11 +102,11 @@ async function PrizeIndex() { $.beanerr = `东哥今天不给换`; return ; } - if (prizeList[1].inStock === 506) { + if (prizeList[1] && prizeList[1].inStock === 506) { $.beanerr = `失败,1000京豆领光了,请明天再来`; return ; } - if (prizeList[1].targetNum === prizeList[1].finishNum) { + if (prizeList[1] && prizeList[1].targetNum === prizeList[1] && prizeList[1].finishNum) { $.beanerr = `${prizeList[1].subTitle}`; return ; } @@ -119,7 +118,7 @@ async function PrizeIndex() { $.beanerr = `兑换失败,您目前蓝币${$.totalBlue}个,不足以兑换${$.title}所需的${$.blueCost}个`; } } else if (`${coinToBeans}` === '20') { - if (prizeList[0].beanType === 'Bean') { + if (prizeList[0] && prizeList[0].beanType === 'Bean') { console.log(`查询换${prizeList[0].title}ID成功,ID:${prizeList[0].prizeId}`) $.title = prizeList[0].title; $.blueCost = prizeList[0].blueCost; @@ -128,12 +127,12 @@ async function PrizeIndex() { $.beanerr = `东哥今天不给换`; return ; } - if (prizeList[0].inStock === 506) { + if (prizeList[0] && prizeList[0].inStock === 506) { console.log(`失败,万能的京豆领光了,请明天再来`); $.beanerr = `失败,万能的京豆领光了,请明天再来`; return ; } - if (prizeList[0].targetNum === prizeList[0].finishNum) { + if ((prizeList[0] && prizeList[0].targetNum) === (prizeList[0] && prizeList[0].finishNum)) { $.beanerr = `${prizeList[0].subTitle}`; return ; } diff --git a/jd_car.js b/jd_car.js index ce67fe7c..b41d2151 100644 --- a/jd_car.js +++ b/jd_car.js @@ -42,6 +42,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://car-member.jd.com/api/'; !(async () => { diff --git a/jd_club_lottery.js b/jd_club_lottery.js index ed8d10a2..f262948c 100644 --- a/jd_club_lottery.js +++ b/jd_club_lottery.js @@ -38,6 +38,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/client.action'; !(async () => { @@ -62,8 +63,6 @@ const JD_API_HOST = 'https://api.m.jd.com/client.action'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_crazy_joy.js b/jd_crazy_joy.js index 96043c86..af863858 100644 --- a/jd_crazy_joy.js +++ b/jd_crazy_joy.js @@ -50,6 +50,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } !function (n) { "use strict"; @@ -324,7 +325,7 @@ function getUserInfo(code = "EdLPh8A6X5G1iWXu-uPYfA==") { if (safeGet(data)) { data = JSON.parse(data); if (data.success && data.data && data.data.userInviteCode) { - console.log(`您的助力码为: ${data.data.userInviteCode}`) + console.log(`\n【京东账号${$.index}(${$.nickName || $.UserName})的${$.name}好友互助码】${data.data.userInviteCode}`) $.selfCodes.push(data.data.userInviteCode) $.nextCode = data.data.userInviteCode } diff --git a/jd_crazy_joy_coin.js b/jd_crazy_joy_coin.js index 4c85ab71..0faa591d 100644 --- a/jd_crazy_joy_coin.js +++ b/jd_crazy_joy_coin.js @@ -42,6 +42,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } !function (n) { "use strict"; diff --git a/jd_daily_egg.js b/jd_daily_egg.js index 7250fd14..711e4a21 100644 --- a/jd_daily_egg.js +++ b/jd_daily_egg.js @@ -28,6 +28,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } !(async () => { if (!cookiesArr[0]) { @@ -48,8 +49,6 @@ if ($.isNode()) { if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js index dbdd5012..ba261991 100644 --- a/jd_dreamFactory.js +++ b/jd_dreamFactory.js @@ -49,6 +49,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } !(async () => { await requireConfig(); @@ -76,8 +77,6 @@ if ($.isNode()) { if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } @@ -978,7 +977,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=1&_time=${Date.now()}&_=${Date.now()}&sceneval=2&g_login_type=1`, + 'url': `https://m.jingxi.com/dreamfactory/tuan/CreateTuan?activeId=${escape(tuanActiveId)}&isOpenApp=2&_time=${Date.now()}&_=${Date.now()}&sceneval=2&g_login_type=1`, "headers": { "Accept": "*/*", "Accept-Encoding": "gzip, deflate, br", diff --git a/jd_ds.js b/jd_ds.js index cd8204ac..aa5bac6c 100644 --- a/jd_ds.js +++ b/jd_ds.js @@ -48,6 +48,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/'; !(async () => { @@ -70,8 +71,6 @@ const JD_API_HOST = 'https://api.m.jd.com/'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_fruit.js b/jd_fruit.js index c996e7b8..4f2eaa55 100644 --- a/jd_fruit.js +++ b/jd_fruit.js @@ -60,8 +60,6 @@ const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%2 if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_health.js b/jd_health.js index 5ebae0be..ee4ffe9b 100644 --- a/jd_health.js +++ b/jd_health.js @@ -40,6 +40,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/client.action'; const inviteCodes = [`P04z54XCjVUnoaW5nJcXCCyoR8C6i9QR16e`, 'P04z54XCjVUnoaW5m9cZ2T6jChKkh8FWbFAplQ', `P04z54XCjVUnoaW5u2ak7ZCdan1Bdbpik_F9ud7lznm`, `P04z54XCjVUnoaW5m9cZ2ariXVJwFN5uKHNqnc`]; @@ -64,8 +65,6 @@ const inviteCodes = [`P04z54XCjVUnoaW5nJcXCCyoR8C6i9QR16e`, 'P04z54XCjVUnoaW5m9c if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_jdfactory.js b/jd_jdfactory.js index 0c404e82..b1d7a45f 100644 --- a/jd_jdfactory.js +++ b/jd_jdfactory.js @@ -49,6 +49,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } let wantProduct = ``;//心仪商品名称 const JD_API_HOST = 'https://api.m.jd.com/client.action'; @@ -74,8 +75,6 @@ const inviteCodes = [`P04z54XCjVWnYaS5u2ak7ZCdan1Bdd2GGiWvC6_uERj`, 'P04z54XCjVW if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_jdh.js b/jd_jdh.js index e28ad9cb..9ff14775 100644 --- a/jd_jdh.js +++ b/jd_jdh.js @@ -37,6 +37,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; $.newShareCodes = ['21d9b4b51a69839577027beb0aad5105', '8edbdfa148e78f028496cff17e7df35b']; @@ -60,8 +61,6 @@ $.newShareCodes = ['21d9b4b51a69839577027beb0aad5105', '8edbdfa148e78f028496cff1 if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_jdzz.js b/jd_jdzz.js index 74c2f4a9..042a8602 100644 --- a/jd_jdzz.js +++ b/jd_jdzz.js @@ -42,6 +42,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/client.action'; const inviteCodes = [ diff --git a/jd_joy.js b/jd_joy.js index 1470a529..00166388 100644 --- a/jd_joy.js +++ b/jd_joy.js @@ -37,6 +37,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } let message = '', subTitle = ''; let FEED_NUM = ($.getdata('joyFeedCount') * 1) || 10; //每次喂养数量 [10,20,40,80] @@ -66,8 +67,6 @@ const weAppUrl = 'https://draw.jdfcloud.com//pet'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_joy_feedPets.js b/jd_joy_feedPets.js index f26ee07e..65d6db51 100644 --- a/jd_joy_feedPets.js +++ b/jd_joy_feedPets.js @@ -33,6 +33,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } let jdNotify = true;//是否开启静默运行。默认true开启 let message = '', subTitle = ''; @@ -58,8 +59,6 @@ let FEED_NUM = ($.getdata('joyFeedCount') * 1) || 10; //喂食数量默认10g, if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_joy_reward.js b/jd_joy_reward.js index f8b71370..6878e769 100644 --- a/jd_joy_reward.js +++ b/jd_joy_reward.js @@ -36,6 +36,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://jdjoy.jd.com'; !(async () => { @@ -56,8 +57,6 @@ const JD_API_HOST = 'https://jdjoy.jd.com'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_joy_run.js b/jd_joy_run.js index c22fd5ae..2b18c1e0 100644 --- a/jd_joy_run.js +++ b/jd_joy_run.js @@ -78,6 +78,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); if ($.getdata('jd_joy_invite_pin')) { invite_pins = []; invite_pins.push($.getdata('jd_joy_invite_pin')); diff --git a/jd_joy_steal.js b/jd_joy_steal.js index f456f286..c3de2099 100644 --- a/jd_joy_steal.js +++ b/jd_joy_steal.js @@ -35,6 +35,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } let message = '', subTitle = ''; @@ -62,8 +63,6 @@ const JD_API_HOST = 'https://jdjoy.jd.com/pet' if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_kd.js b/jd_kd.js index c3ef9942..ffefbe85 100644 --- a/jd_kd.js +++ b/jd_kd.js @@ -42,6 +42,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; !(async () => { @@ -64,8 +65,6 @@ const JD_API_HOST = 'https://api.m.jd.com/api'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_live.js b/jd_live.js index cc273741..ef9146b7 100644 --- a/jd_live.js +++ b/jd_live.js @@ -39,6 +39,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/client.action'; !(async () => { @@ -61,8 +62,6 @@ const JD_API_HOST = 'https://api.m.jd.com/client.action'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_live_redrain.js b/jd_live_redrain.js index 31e95302..596e3afe 100644 --- a/jd_live_redrain.js +++ b/jd_live_redrain.js @@ -59,6 +59,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; !(async () => { diff --git a/jd_moneyTree.js b/jd_moneyTree.js index 584810b9..1b3d2587 100644 --- a/jd_moneyTree.js +++ b/jd_moneyTree.js @@ -32,6 +32,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } let jdNotify = true;//是否开启静默运行,默认true开启 @@ -56,8 +57,6 @@ let userInfo = null, taskInfo = [], message = '', subTitle = '', fruitTotal = 0; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_ms_redrain.js b/jd_ms_redrain.js index 258f0dc4..c0e82585 100644 --- a/jd_ms_redrain.js +++ b/jd_ms_redrain.js @@ -41,6 +41,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; !(async () => { @@ -63,8 +64,6 @@ const JD_API_HOST = 'https://api.m.jd.com/api'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_necklace.js b/jd_necklace.js index ad7ea885..f1db53f4 100644 --- a/jd_necklace.js +++ b/jd_necklace.js @@ -46,6 +46,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; @@ -69,8 +70,6 @@ const JD_API_HOST = 'https://api.m.jd.com/api'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_pet.js b/jd_pet.js index 3671f3b7..1446989d 100644 --- a/jd_pet.js +++ b/jd_pet.js @@ -59,8 +59,6 @@ let randomCount = $.isNode() ? 20 : 5; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_pigPet.js b/jd_pigPet.js index 2b14939f..f93b4a73 100644 --- a/jd_pigPet.js +++ b/jd_pigPet.js @@ -33,6 +33,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } !(async () => { if (!cookiesArr[0]) { @@ -52,8 +53,6 @@ if ($.isNode()) { $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/`, {"open-url": "https://bean.m.jd.com/"}); if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_plantBean.js b/jd_plantBean.js index 4ae0779b..91abc363 100644 --- a/jd_plantBean.js +++ b/jd_plantBean.js @@ -63,8 +63,6 @@ let randomCount = $.isNode() ? 20 : 5; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_redPacket.js b/jd_redPacket.js index 4d383eb2..418f11b8 100644 --- a/jd_redPacket.js +++ b/jd_redPacket.js @@ -44,6 +44,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; @@ -68,8 +69,6 @@ const JD_API_HOST = 'https://api.m.jd.com/api'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_shop.js b/jd_shop.js index 65007357..4843a9d0 100644 --- a/jd_shop.js +++ b/jd_shop.js @@ -32,6 +32,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } let message = '', subTitle = ''; @@ -55,8 +56,6 @@ const JD_API_HOST = 'https://api.m.jd.com/client.action'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_small_home.js b/jd_small_home.js index 5ee50c25..096519e6 100644 --- a/jd_small_home.js +++ b/jd_small_home.js @@ -58,6 +58,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } $.newShareCodes = []; const JD_API_HOST = 'https://lkyl.dianpusoft.cn/api'; @@ -82,8 +83,6 @@ const JD_API_HOST = 'https://lkyl.dianpusoft.cn/api'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_speed.js b/jd_speed.js index 6d7a9705..f9da4a9c 100644 --- a/jd_speed.js +++ b/jd_speed.js @@ -36,6 +36,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } let jdNotify = true;//是否开启静默运行。默认true开启 let message = '', subTitle = ''; @@ -60,8 +61,6 @@ const JD_API_HOST = 'https://api.m.jd.com/' if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_syj.js b/jd_syj.js index ef3bce82..cd6dabfa 100644 --- a/jd_syj.js +++ b/jd_syj.js @@ -46,6 +46,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; !(async () => { @@ -68,8 +69,6 @@ const JD_API_HOST = 'https://api.m.jd.com/api'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_unbind.js b/jd_unbind.js index 29c14ad3..0e618a02 100644 --- a/jd_unbind.js +++ b/jd_unbind.js @@ -34,6 +34,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const jdNotify = $.getdata('jdUnsubscribeNotify');//是否关闭通知,false打开通知推送,true关闭通知推送 let cardPageSize = $.getdata('jdUnsubscribePageSize') || 200;// 运行一次取消多少个会员卡。数字0表示不注销任何会员卡 @@ -60,8 +61,6 @@ const JD_API_HOST = 'https://api.m.jd.com/'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } @@ -221,7 +220,6 @@ function TotalBean() { } function requireConfig() { return new Promise(resolve => { - process.env.UN_BIND_STOP_CARD = `123&457&34324` if ($.isNode() && process.env.UN_BIND_CARD_NUM) { $.UN_BIND_NUM = process.env.UN_BIND_CARD_NUM } diff --git a/jd_unsubscribe.js b/jd_unsubscribe.js index 7c3f9d81..02a79cd9 100644 --- a/jd_unsubscribe.js +++ b/jd_unsubscribe.js @@ -35,6 +35,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const jdNotify = $.getdata('jdUnsubscribeNotify');//是否关闭通知,false打开通知推送,true关闭通知推送 let goodPageSize = $.getdata('jdUnsubscribePageSize') || 20;// 运行一次取消多少个已关注的商品。数字0表示不取关任何商品 @@ -60,8 +61,6 @@ const JD_API_HOST = 'https://wq.jd.com/fav'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jd_watch.js b/jd_watch.js index fab4a668..499a2fe2 100644 --- a/jd_watch.js +++ b/jd_watch.js @@ -140,6 +140,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/client.action'; !(async () => { @@ -183,8 +184,6 @@ const JD_API_HOST = 'https://api.m.jd.com/client.action'; if ($.isNode()) { await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); - } else { - $.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效,故清空cookie。 } continue } diff --git a/jr_sign.js b/jr_sign.js index ff74cf2a..17dd9cea 100644 --- a/jr_sign.js +++ b/jr_sign.js @@ -39,6 +39,7 @@ if ($.isNode()) { cookiesArr.reverse(); cookiesArr.push(...[$.getdata('CookieJD2'), $.getdata('CookieJD')]); cookiesArr.reverse(); + cookiesArr = cookiesArr.filter(item => item !== "" && item !== null && item !== undefined); } const JD_API_HOST = 'https://api.m.jd.com/api'; !(async () => {