From 2c933a9c58c26e9dc36f0a72f04974fed8e26de8 Mon Sep 17 00:00:00 2001 From: lxk0301 <778732665@qq.com> Date: Mon, 18 Jan 2021 10:02:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?docker=20=E6=B7=BB=E5=8A=A0=E7=82=B8?= =?UTF-8?q?=E5=B9=B4=E5=85=BD=E4=BB=A5=E5=8F=8A=E6=94=B6=E9=9B=86=E6=AF=8F?= =?UTF-8?q?=E7=A7=92=E4=BA=A7=E7=94=9F=E7=9A=84=E7=88=86=E7=AB=B9=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/crontab_list.sh | 4 ++++ jd_nian.js | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh index 3db5ede5..bd01cdb2 100644 --- a/docker/crontab_list.sh +++ b/docker/crontab_list.sh @@ -6,6 +6,10 @@ ##############短期活动############## #年货节(活动时间：2021年1月9日-2021年2月9日) 10 8 * * * node /scripts/jd_nh.js >> /scripts/logs/jd_nh.log 2>&1 +#京东炸年兽集爆竹(活动时间:2021-1-18至2021-2-11)怕有遗漏故多运行几次 +0 8,9,10 * * * node /scripts/jd_nian.js >> /scripts/logs/jd_nian.log 2>&1 +#专门收集每秒产生的爆竹(1小时运行一次) +0 * * * * node /scripts/jd_nianCollect.js >> /scripts/logs/jd_nianCollect.log 2>&1 ##############长期活动############## # 签到 0 0,18 * * * cd /scripts && node jd_bean_sign.js >> /scripts/logs/jd_bean_sign.log 2>&1 diff --git a/jd_nian.js b/jd_nian.js index b27f6da5..5e558d5f 100644 --- a/jd_nian.js +++ b/jd_nian.js @@ -1,5 +1,8 @@ /* 京东炸年兽🧨 +活动时间:2021-1-18至2021-2-11 +暂不加入品牌会员 +活动入口:https://wbbny.m.jd.com/babelDiy/Zeus/2cKMj86srRdhgWcKonfExzK4ZMBy/index.html 活动地址：京东app左侧浮动窗口 已支持IOS双京东账号,Node.js支持N个京东账号 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js @@ -43,8 +46,8 @@ if ($.isNode()) { } const JD_API_HOST = 'https://api.m.jd.com/client.action'; const inviteCodes = [ - `cgxZaDXWZPCmiUa2akPVmFMI27K6antJzucULQPYNim_BPEW1Dwd@cgxZdTXtIrPYuAqfDgSpusxr97nagU6hwFa3TXxnqM95u3ib-xt4nWqZdz8@cgxZdTXtIO-O6QmYDVf67KCEJ19JcybuMB2_hYu8NSNQg0oS2Z_FpMce45g@cgxZdTXtILiLvg7OAASp61meehou4OeZvqbjghsZlc3rI5SBk7b3InUqSQ0`, - `cgxZaDXWZPCmiUa2akPVmFMI27K6antJzucULQPYNim_BPEW1Dwd@cgxZdTXtIrPYuAqfDgSpusxr97nagU6hwFa3TXxnqM95u3ib-xt4nWqZdz8@cgxZdTXtIO-O6QmYDVf67KCEJ19JcybuMB2_hYu8NSNQg0oS2Z_FpMce45g@cgxZdTXtILiLvg7OAASp61meehou4OeZvqbjghsZlc3rI5SBk7b3InUqSQ0` + `cgxZaDXWZPCmiUa2akPVmFMI27K6antJzucULQPYNim_BPEW1Dwd@cgxZdTXtIrPYuAqfDgSpusxr97nagU6hwFa3TXxnqM95u3ib-xt4nWqZdz8@cgxZdTXtIO-O6QmYDVf67KCEJ19JcybuMB2_hYu8NSNQg0oS2Z_FpMce45g@cgxZdTXtILiLvg7OAASp61meehou4OeZvqbjghsZlc3rI5SBk7b3InUqSQ0@cgxZ9_MZ8gByP7FZ368dN8oTZBwGieaH5HvtnvXuK1Epn_KK8yol8OYGw7h3M2j_PxSZvYA`, + `cgxZaDXWZPCmiUa2akPVmFMI27K6antJzucULQPYNim_BPEW1Dwd@cgxZdTXtIrPYuAqfDgSpusxr97nagU6hwFa3TXxnqM95u3ib-xt4nWqZdz8@cgxZdTXtIO-O6QmYDVf67KCEJ19JcybuMB2_hYu8NSNQg0oS2Z_FpMce45g@cgxZdTXtILiLvg7OAASp61meehou4OeZvqbjghsZlc3rI5SBk7b3InUqSQ0@cgxZdTXtIumO4w2cDgSqvYcqHwjaAzLxu0S371Dh_fctFJtN0tXYzdR7JaY` ]; !(async () => { await requireConfig(); From 9610707879a093521469ffea00544e59a5a84c92 Mon Sep 17 00:00:00 2001 From: DoveBoy <393366046@qq.com> Date: Mon, 18 Jan 2021 10:10:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=91=E5=87=BD=E6=95=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=82=B8=E5=B9=B4=E5=85=BDtask=E3=80=81=E9=9B=86?= =?UTF-8?q?=E7=88=86=E7=AB=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 云函数新增炸年兽task、集爆竹 --- serverless.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/serverless.yml b/serverless.yml index 4da99d21..de9dc3d7 100644 --- a/serverless.yml +++ b/serverless.yml @@ -34,12 +34,12 @@ inputs: cronExpression: "0 5 6-18/6,8 * * * *" enable: true argument: jd_fruit&jd_pet&jd_bookshop&jd_jxnc - - timer: # 宠汪汪喂食# 宠汪汪# 摇钱树# 京东种豆得豆# 京喜工厂 #东东工厂 + - timer: # 宠汪汪喂食# 宠汪汪# 摇钱树# 京东种豆得豆# 京喜工厂 #东东工厂 #炸年兽收集爆竹 parameters: - name: joy_feedPets_joy_moneyTree_plantBean_dreamFactory_jdfactory + name: joy_feedPets_joy_moneyTree_plantBean_dreamFactory_jdfactory_nianCollect cronExpression: "0 3 */1 * * * *" enable: true - argument: jd_joy_feedPets&jd_joy&jd_moneyTree&jd_plantBean&jd_dreamFactory&jd_jdfactory + argument: jd_joy_feedPets&jd_joy&jd_moneyTree&jd_plantBean&jd_dreamFactory&jd_jdfactory&jd_nianCollect - timer: # 宠汪汪积分兑换奖品# 宠汪汪偷好友积分与狗# 点点券# 京东直播18豆 parameters: name: joy_reward_joy_steal_necklace_live @@ -52,12 +52,12 @@ inputs: cronExpression: "0 10 0 * * * *" enable: true argument: jd_redPacket&jd_shop&jd_unsubscribe&jd_unbind&jd_lotteryMachine&jd_small_home - - timer: # 京东天天加速# 天天提鹅 + - timer: #京东天天加速 #天天提鹅 #炸年兽 parameters: - name: jd_speed_jd_daily_egg + name: jd_speed_jd_daily_egg_nian cronExpression: "0 8 */3 * * * *" enable: true - argument: jd_speed&jd_daily_egg + argument: jd_speed&jd_daily_egg&jd_nian - timer: #东东超市 #京东家庭号 parameters: name: superMarket_family From b0b4dd6fcd2451875fa344766ce33c07146e969d Mon Sep 17 00:00:00 2001 From: DoveBoy <393366046@qq.com> Date: Mon, 18 Jan 2021 10:17:22 +0800 Subject: [PATCH 3/5] Update serverless.yml --- serverless.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverless.yml b/serverless.yml index de9dc3d7..b565a9f2 100644 --- a/serverless.yml +++ b/serverless.yml @@ -34,7 +34,7 @@ inputs: cronExpression: "0 5 6-18/6,8 * * * *" enable: true argument: jd_fruit&jd_pet&jd_bookshop&jd_jxnc - - timer: # 宠汪汪喂食# 宠汪汪# 摇钱树# 京东种豆得豆# 京喜工厂 #东东工厂 #炸年兽收集爆竹 + - timer: # 宠汪汪喂食# 宠汪汪# 摇钱树# 京东种豆得豆# 京喜工厂 #东东工厂 #京东炸年兽领爆竹 parameters: name: joy_feedPets_joy_moneyTree_plantBean_dreamFactory_jdfactory_nianCollect cronExpression: "0 3 */1 * * * *" @@ -52,7 +52,7 @@ inputs: cronExpression: "0 10 0 * * * *" enable: true argument: jd_redPacket&jd_shop&jd_unsubscribe&jd_unbind&jd_lotteryMachine&jd_small_home - - timer: #京东天天加速 #天天提鹅 #炸年兽 + - timer: #京东天天加速 #天天提鹅 #京东炸年兽 parameters: name: jd_speed_jd_daily_egg_nian cronExpression: "0 8 */3 * * * *" From fbef215960b48797b9aceef13092d43ff4e65560 Mon Sep 17 00:00:00 2001 From: lxk0301 <778732665@qq.com> Date: Mon, 18 Jan 2021 10:22:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=82=B8=E5=B9=B4=E5=85=BD,=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=92=E5=8A=A9,=E9=82=80=E8=AF=B7=E7=A0=81?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E4=B8=BA=20JDNIAN=5FSHAREC?= =?UTF-8?q?ODES,=E4=B8=80=E4=BA=BA=E4=B8=80=E5=A4=A9=E4=BA=94=E6=AC=A1?= =?UTF-8?q?=E5=8A=A9=E5=8A=9B=E6=9C=BA=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- githubAction.md | 1 + jd_nian.js | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/githubAction.md b/githubAction.md index 6780d8b0..dc096cb0 100644 --- a/githubAction.md +++ b/githubAction.md @@ -48,6 +48,7 @@ | `BOOKSHOP_SHARECODES` | 京东书店互助码 | 非必须 | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) | | `JD_CASH_SHARECODES` | 签到领现金互助码 | 非必须 | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) | | `JXNC_SHARECODES` | 京喜农场互助码 | 非必须 | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) | +| `JDNIAN_SHARECODES` | 炸年兽互助码 | 非必须 | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) | ##### 控制脚本功能环境变量 diff --git a/jd_nian.js b/jd_nian.js index 5e558d5f..e875c0dc 100644 --- a/jd_nian.js +++ b/jd_nian.js @@ -484,7 +484,7 @@ function getFriendData(inviteId) { function readShareCode() { console.log(`开始`) return new Promise(async resolve => { - $.get({url: `http://api.turinglabs.net/api/v1/jd/nian/read/${randomCount}/`}, (err, resp, data) => { + $.get({url: `https://code.chiang.fun/api/v1/jd/jdnian/read/${randomCount}/`, 'timeout': 10000}, (err, resp, data) => { try { if (err) { console.log(`${JSON.stringify(err)}`) @@ -501,8 +501,8 @@ function readShareCode() { resolve(data); } }) - // await $.wait(2000); - // resolve() + await $.wait(2000); + resolve() }) } //格式化助力码 @@ -517,7 +517,7 @@ function shareCodesFormat() { const tempIndex = $.index > inviteCodes.length ? (inviteCodes.length - 1) : ($.index - 1); $.newShareCodes = inviteCodes[tempIndex].split('@'); } - const readShareCodeRes = null //await readShareCode(); + const readShareCodeRes = await readShareCode(); if (readShareCodeRes && readShareCodeRes.code === 200) { $.newShareCodes = [...new Set([...$.newShareCodes, ...(readShareCodeRes.data || [])])]; } @@ -529,8 +529,15 @@ function requireConfig() { return new Promise(resolve => { console.log(`开始获取${$.name}配置文件\n`); //Node.js用户请在jdCookie.js处填写京东ck; - const shareCodes = [] + let shareCodes = [] console.log(`共${cookiesArr.length}个京东账号\n`); + if (process.env.JDNIAN_SHARECODES) { + if (process.env.JDNIAN_SHARECODES.indexOf('\n') > -1) { + shareCodes = process.env.JDNIAN_SHARECODES.split('\n'); + } else { + shareCodes = process.env.JDNIAN_SHARECODES.split('&'); + } + } $.shareCodesArr = []; if ($.isNode()) { Object.keys(shareCodes).forEach((item) => { From ea9c192f98bed9367d00061605681e147f759405 Mon Sep 17 00:00:00 2001 From: DoveBoy <393366046@qq.com> Date: Mon, 18 Jan 2021 10:27:07 +0800 Subject: [PATCH 5/5] =?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=82=B8=E5=B9=B4=E5=85=BD=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E7=A0=81secret?= 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 b41fa481..0c17e7d9 100644 --- a/.github/workflows/deploy_tencent_scf.yml +++ b/.github/workflows/deploy_tencent_scf.yml @@ -54,6 +54,7 @@ jobs: if [ $BOOKSHOP_SHARECODES ]; then sed -i "/variables/a\ BOOKSHOP_SHARECODES: $BOOKSHOP_SHARECODES" serverless.yml; fi; if [ $JD_CASH_SHARECODES ]; then sed -i "/variables/a\ JD_CASH_SHARECODES: $JD_CASH_SHARECODES" serverless.yml; fi; if [ $JXNC_SHARECODES ]; then sed -i "/variables/a\ JXNC_SHARECODES: $JXNC_SHARECODES" serverless.yml; fi; + if [ $JDNIAN_SHARECODES ]; then sed -i "/variables/a\ JDNIAN_SHARECODES: $JDNIAN_SHARECODES" serverless.yml; fi; if [ $JD_BEAN_STOP ]; then sed -i "/variables/a\ JD_BEAN_STOP: $JD_BEAN_STOP" serverless.yml; fi; if [ $JD_BEAN_SIGN_STOP_NOTIFY ]; then sed -i "/variables/a\ JD_BEAN_SIGN_STOP_NOTIFY: $JD_BEAN_SIGN_STOP_NOTIFY" serverless.yml; fi; if [ $JD_BEAN_SIGN_NOTIFY_SIMPLE ]; then sed -i "/variables/a\ JD_BEAN_SIGN_NOTIFY_SIMPLE: $JD_BEAN_SIGN_NOTIFY_SIMPLE" serverless.yml; fi; @@ -113,6 +114,7 @@ jobs: BOOKSHOP_SHARECODES: ${{ secrets.BOOKSHOP_SHARECODES}} JD_CASH_SHARECODES: ${{ secrets.JD_CASH_SHARECODES}} JXNC_SHARECODES: ${{ secrets.JXNC_SHARECODES}} + JDNIAN_SHARECODES: ${{ secrets.JDNIAN_SHARECODES}} JD_BEAN_STOP: ${{ secrets.JD_BEAN_STOP}} JD_BEAN_SIGN_STOP_NOTIFY: ${{ secrets.JD_BEAN_SIGN_STOP_NOTIFY}} JD_BEAN_SIGN_NOTIFY_SIMPLE: ${{ secrets.JD_BEAN_SIGN_NOTIFY_SIMPLE}}