diff --git a/docker/Readme.md b/docker/Readme.md index be9de0ee..7069b5a0 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -8,7 +8,7 @@ 2、(由于linux进程限制,父进程无法获取子进程环境变量)在每次脚本运行前,在当前进程先调用 /scripts/docker/auto_help.sh export 把助力码注入到环境变量 + 2021-02-21更新 https://gitee.com/lxk0301/jd_scripts仓库被迫私有,老用户重新更新一下镜像:https://hub.docker.com/r/lxk0301/jd_scripts)(docker-compose.yml的REPO_URL记得修改)后续可同步更新jd_script仓库最新脚本 -+ 2021-02-10更新 docker-compose里面,填写环境变量 SHARE_CODE_FILE=/scripts/logs/sharecode.log, 多账号可实现自己互助(只限sharecode.log日志里面几个活动) ++ 2021-02-10更新 docker-compose里面,填写环境变量 SHARE_CODE_FILE=/scripts/logs/sharecode.log, 多账号可实现自己互助(只限sharecode.log日志里面几个活动),注:已停用,请使用2021-03-9更新 + 2021-01-22更新 CUSTOM_LIST_FILE 参数支持远程定时任务列表 (⚠️务必确认列表中的任务在仓库里存在) + 例1:配置远程crontab_list.sh, 此处借用 shylocks 大佬的定时任务列表, 本仓库不包含列表中的任务代码, 仅作示范 + CUSTOM_LIST_FILE=https://raw.githubusercontent.com/shylocks/Loon/main/docker/crontab_list.sh @@ -229,7 +229,6 @@ jd_scripts | Name | 归属 | 属性 | 说明 | | :---------------: | :------------: | :----: | ------------------------------------------------------------ | -| `SHARE_CODE_FILE` | 互助码日志文件 | 非必须 | docker-compose.yml文件下填写`SHARE_CODE_FILE=/scripts/logs/sharecode.log`,其他(群晖)填写对应的互助码日志文路径 | | `CRZAY_JOY_COIN_ENABLE` | 是否jd_crazy_joy_coin挂机 | 非必须 | docker-compose.yml文件下填写`CRZAY_JOY_COIN_ENABLE=Y`表示挂机,`CRZAY_JOY_COIN_ENABLE=N`表不挂机 | | `DO_NOT_RUN_SCRIPTS` | 不执行的脚本 | 非必须 | 例:docker-compose.yml文件里面填写`DO_NOT_RUN_SCRIPTS=jd_family.js&jd_dreamFactory.js&jd_jxnc.js`, 建议填写完整脚本名,不完整的文件名可能导致其他脚本被禁用 | | `ENABLE_AUTO_HELP` | 单容器多账号自动互助 | 非必须 | 例:docker-compose.yml文件里面填写`ENABLE_AUTO_HELP=true` | \ No newline at end of file diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh index 6352f27b..6426e337 100644 --- a/docker/crontab_list.sh +++ b/docker/crontab_list.sh @@ -1,5 +1,5 @@ # 每3天的23:50分清理一次日志(互助码不清理,proc_file.sh对该文件进行了去重) -50 23 */3 * * find /scripts/logs -name '*.log' | grep -v 'sharecode' | xargs rm -rf +50 23 */3 * * find /scripts/logs -name '*.log' | grep -v 'sharecodeCollection' | xargs rm -rf #收集助力码 30 * * * * sh +x /scripts/docker/auto_help.sh collect >> /scripts/logs/auto_help.log 2>&1 diff --git a/docker/proc_file.sh b/docker/proc_file.sh index 1ead0795..6fa9a9a3 100644 --- a/docker/proc_file.sh +++ b/docker/proc_file.sh @@ -1,46 +1,5 @@ #!/bin/sh -echo "整理各个日志文件里面的互助码相关信息。。。" -echo "===========================================================================" -logdDir="/scripts/logs" -sharecodeFile="${logdDir}/sharecode.log" -jdzzFile="${logdDir}/jd_jdzz.log" -jdfactoryFile="${logdDir}/jd_jdfactory.log" -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" - -sed -n '/京东赚赚好友互助码】.*/'p $jdzzFile | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile -echo "提取京东赚赚助力码完成" - -sed -n '/东东工厂好友互助码】.*/'p $jdfactoryFile | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile -echo "提取东东工厂助力码完成" - -sed -n '/京喜工厂好友互助码.*/'p $jxFactoryFile | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile -echo "提取京喜工厂助力码完成" - -sed -n '/京东种豆得豆好友互助码】.*/'p $plantBean | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile -echo "提取京东种豆助力码完成" - -sed -n '/东东农场好友互助码】.*/'p $jdfruit | awk '{print $4,$5}' | sort | uniq >>$sharecodeFile -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任务助力码完成" - -cp $sharecodeFile ${sharecodeFile}.tmp -sed -i 's/ //' ${sharecodeFile}.tmp -cat ${sharecodeFile}.tmp | sort | uniq >$sharecodeFile -rm ${sharecodeFile}.tmp -echo "互助码排序和去重完成" - -echo "===========================================================================" -echo "整理完成,具体结果请查看${sharecodeFile}文件" echo "处理jd_crazy_joy_coin任务。。。" if [ ! $CRZAY_JOY_COIN_ENABLE ]; then diff --git a/jdDreamFactoryShareCodes.js b/jdDreamFactoryShareCodes.js index 0ea91147..2f72f486 100644 --- a/jdDreamFactoryShareCodes.js +++ b/jdDreamFactoryShareCodes.js @@ -12,10 +12,10 @@ let shareCodes = [ ] // 从日志获取互助码 -const logShareCodes = require('./utils/jdShareCodes'); -if (logShareCodes.DREAM_FACTORY_SHARE_CODES.length > 0 && !process.env.DREAM_FACTORY_SHARE_CODES) { - process.env.DREAM_FACTORY_SHARE_CODES = logShareCodes.DREAM_FACTORY_SHARE_CODES.join('&'); -} +// const logShareCodes = require('./utils/jdShareCodes'); +// if (logShareCodes.DREAM_FACTORY_SHARE_CODES.length > 0 && !process.env.DREAM_FACTORY_SHARE_CODES) { +// process.env.DREAM_FACTORY_SHARE_CODES = logShareCodes.DREAM_FACTORY_SHARE_CODES.join('&'); +// } // 判断github action里面是否有京喜工厂互助码 if (process.env.DREAM_FACTORY_SHARE_CODES) { diff --git a/jdFactoryShareCodes.js b/jdFactoryShareCodes.js index 1b1d52a8..515f4539 100644 --- a/jdFactoryShareCodes.js +++ b/jdFactoryShareCodes.js @@ -12,10 +12,10 @@ let shareCodes = [ ] // 从日志获取互助码 -const logShareCodes = require('./utils/jdShareCodes'); -if (logShareCodes.DDFACTORY_SHARECODES.length > 0 && !process.env.DDFACTORY_SHARECODES) { - process.env.DDFACTORY_SHARECODES = logShareCodes.DDFACTORY_SHARECODES.join('&'); -} +// const logShareCodes = require('./utils/jdShareCodes'); +// if (logShareCodes.DDFACTORY_SHARECODES.length > 0 && !process.env.DDFACTORY_SHARECODES) { +// process.env.DDFACTORY_SHARECODES = logShareCodes.DDFACTORY_SHARECODES.join('&'); +// } // 判断github action里面是否有东东工厂互助码 if (process.env.DDFACTORY_SHARECODES) { diff --git a/jdFruitShareCodes.js b/jdFruitShareCodes.js index babb5345..0475bbec 100644 --- a/jdFruitShareCodes.js +++ b/jdFruitShareCodes.js @@ -12,10 +12,10 @@ let FruitShareCodes = [ ] // 从日志获取互助码 -const logShareCodes = require('./utils/jdShareCodes'); -if (logShareCodes.FRUITSHARECODES.length > 0 && !process.env.FRUITSHARECODES) { - process.env.FRUITSHARECODES = logShareCodes.FRUITSHARECODES.join('&'); -} +// const logShareCodes = require('./utils/jdShareCodes'); +// if (logShareCodes.FRUITSHARECODES.length > 0 && !process.env.FRUITSHARECODES) { +// process.env.FRUITSHARECODES = logShareCodes.FRUITSHARECODES.join('&'); +// } // 判断github action里面是否有东东农场互助码 if (process.env.FRUITSHARECODES) { diff --git a/jdPetShareCodes.js b/jdPetShareCodes.js index ad133a2f..ee6ed7c2 100644 --- a/jdPetShareCodes.js +++ b/jdPetShareCodes.js @@ -13,9 +13,9 @@ let PetShareCodes = [ // 从日志获取互助码 const logShareCodes = require('./utils/jdShareCodes'); -if (logShareCodes.PETSHARECODES.length > 0 && !process.env.PETSHARECODES) { - process.env.PETSHARECODES = logShareCodes.PETSHARECODES.join('&'); -} +// if (logShareCodes.PETSHARECODES.length > 0 && !process.env.PETSHARECODES) { +// process.env.PETSHARECODES = logShareCodes.PETSHARECODES.join('&'); +// } // 判断github action里面是否有东东萌宠互助码 if (process.env.PETSHARECODES) {