diff --git a/.github/workflows/deploy_tencent_scf.yml b/.github/workflows/deploy_tencent_scf.yml index 714d8a37..b375b6f0 100644 --- a/.github/workflows/deploy_tencent_scf.yml +++ b/.github/workflows/deploy_tencent_scf.yml @@ -71,7 +71,7 @@ jobs: if [ $DREAM_FACTORY_SHARE_CODES ]; then sed -i "/variables/a\ DREAM_FACTORY_SHARE_CODES: $DREAM_FACTORY_SHARE_CODES" serverless.yml; fi; if [ $JDZZ_SHARECODES ]; then sed -i "/variables/a\ JDZZ_SHARECODES: $JDZZ_SHARECODES" serverless.yml; fi; if [ $JDJOY_SHARECODES ]; then sed -i "/variables/a\ JDJOY_SHARECODES: $JDJOY_SHARECODES" serverless.yml; fi; - if [ $JXNCSHARECODES ]; then sed -i "/variables/a\ JXNCSHARECODES: $JXNCSHARECODES" serverless.yml; fi; + if [ $JXNC_SHARECODES ]; then sed -i "/variables/a\ JXNC_SHARECODES: $JXNC_SHARECODES" serverless.yml; fi; if [ $TG_PROXY_HOST ]; then sed -i "/variables/a\ TG_PROXY_HOST: $TG_PROXY_HOST" serverless.yml; fi; if [ $TG_PROXY_PORT ]; then sed -i "/variables/a\ TG_PROXY_PORT: $TG_PROXY_PORT" serverless.yml; fi; if [ $MONEY_TREE_SELL_FRUIT ]; then sed -i "/variables/a\ MONEY_TREE_SELL_FRUIT: $MONEY_TREE_SELL_FRUIT" serverless.yml; fi; @@ -128,7 +128,7 @@ jobs: DREAM_FACTORY_SHARE_CODES: ${{ secrets.DREAM_FACTORY_SHARE_CODES}} JDZZ_SHARECODES: ${{ secrets.JDZZ_SHARECODES}} JDJOY_SHARECODES: ${{ secrets.JDJOY_SHARECODES}} - JXNCSHARECODES: ${{ secrets.JXNCSHARECODES}} + JXNC_SHARECODES: ${{ secrets.JXNC_SHARECODES}} TG_PROXY_HOST: ${{ secrets.TG_PROXY_HOST}} TG_PROXY_PORT: ${{ secrets.TG_PROXY_PORT}} MONEY_TREE_SELL_FRUIT: ${{ secrets.MONEY_TREE_SELL_FRUIT}} diff --git a/githubAction.md b/githubAction.md index f84c0ebe..2d685a34 100644 --- a/githubAction.md +++ b/githubAction.md @@ -45,7 +45,7 @@ | `DREAM_FACTORY_SHARE_CODES` | 京喜工厂互助码 | 非必须 | 填写规则请看[jdDreamFactoryShareCodes.js](https://github.com/lxk0301/jd_scripts/blob/master/jdDreamFactoryShareCodes.js)或见下方[互助码的填写规则](#互助码的填写规则) | | `JDZZ_SHARECODES` | 京东赚赚互助码 | 非必须 | 填写规则和上面类似,或见下方[互助码的填写规则](#互助码的填写规则) | | `JDJOY_SHARECODES` | 疯狂的JOY互助码 | 非必须 | 填写规则和上面类似,或见下方[互助码的填写规则](#互助码的填写规则) | -| `JXNCSHARECODES` | 京喜农场互助码 | 非必须 | 填写规则和上面类似,或见下方[互助码的填写规则](#互助码的填写规则) | +| `JXNC_SHARECODES` | 京喜农场互助码 | 非必须 | 填写规则和上面类似,或见下方[互助码的填写规则](#互助码的填写规则) | ##### 控制脚本功能环境变量 diff --git a/jdJxncShareCodes.js b/jdJxncShareCodes.js index 48d1856a..7f9f85da 100644 --- a/jdJxncShareCodes.js +++ b/jdJxncShareCodes.js @@ -13,15 +13,15 @@ let JxncShareCodes = [ '',//账号二的好友shareCode,不同好友中间用@符号隔开 ] // 判断github action里面是否有京喜农场助力码 -if (process.env.JXNCSHARECODES) { - if (process.env.JXNCSHARECODES.indexOf('&') > -1) { +if (process.env.JXNC_SHARECODES) { + if (process.env.JXNC_SHARECODES.indexOf('&') > -1) { console.log(`您的京喜农场助力码选择的是用&隔开\n`) - JxncShareCodes = process.env.JXNCSHARECODES.split('&'); - } else if (process.env.JXNCSHARECODES.indexOf('\n') > -1) { + JxncShareCodes = process.env.JXNC_SHARECODES.split('&'); + } else if (process.env.JXNC_SHARECODES.indexOf('\n') > -1) { console.log(`您的京喜农场助力码选择的是用换行隔开\n`) - JxncShareCodes = process.env.JXNCSHARECODES.split('\n'); + JxncShareCodes = process.env.JXNC_SHARECODES.split('\n'); } else { - JxncShareCodes = process.env.JXNCSHARECODES.split(); + JxncShareCodes = process.env.JXNC_SHARECODES.split(); } } else if (process.env.JD_COOKIE) { // console.log(`由于您secret里面未提供助力码,故此处运行将会给脚本内置的码进行助力,请知晓!`) diff --git a/jd_jxnc.js b/jd_jxnc.js index 7c853b5c..1bef74f8 100644 --- a/jd_jxnc.js +++ b/jd_jxnc.js @@ -4,7 +4,7 @@ 感谢 @whyour 大佬 京喜农场:脚本更新地址 https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_jxnc.js -更新时间:2021-01-09 20:46:10 +更新时间:2021-01-10 22:47:51 东东农场活动链接:https://wqsh.jd.com/sns/201912/12/jxnc/detail.html?ptag=7155.9.32&smp=b47f4790d7b2a024e75279f55f6249b9&active=jdnc_1_chelizi1205_2 已支持IOS双京东账号,Node.js支持N个京东账号 理论上脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js @@ -127,8 +127,8 @@ function requireConfig() { if ($.isNode()) { Object.keys(jdJxncShareCodeNode).forEach((item) => { - if (jxncShareCodeArr[item]) { - jxncShareCodeArr.push(jxncShareCodeArr[item]) + if (jdJxncShareCodeNode[item]) { + jxncShareCodeArr.push(jdJxncShareCodeNode[item]) } }) } @@ -249,7 +249,7 @@ function getTaskList() { try { const res = data.match(/try\{whyour\(([\s\S]*)\)\;\}catch\(e\)\{\}/)[1]; const {detail, msg, task = [], retmsg, ...other} = JSON.parse(res); - $.helpTask = task.filter(x => x.tasktype === 2)[0]; + $.helpTask = task.filter(x => x.tasktype === 2)[0] || { eachtimeget: 0, limit: 0 }; $.allTask = task.filter(x => x.tasktype !== 3 && x.tasktype !== 2 && parseInt(x.left) > 0); $.info = other; $.log(`获取任务列表 ${retmsg} 总共${$.allTask.length}个任务!`); @@ -351,6 +351,11 @@ function getMessage(endInfo) { const need = endInfo.target - endInfo.score; const get = $.drip; message += `【水滴】获得水滴${get} 还需水滴${need}\n`; + if (get > 0) { + const max = parseInt(need / get); + const min = parseInt(need / (get + $.helpTask.limit * $.helpTask.eachtimeget)); + message += `【预测】还需 ${min} ~ ${max} 天\n`; + } } // 提交助力码