diff --git a/docker/Readme.md b/docker/Readme.md index 02e7c1dd..40a0faf5 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -219,6 +219,8 @@ jd_scripts - 目录文件配置好之后在 `jd_scripts`目录执行。 `docker-compose up -d` 启动(修改docker-compose.yml后需要使用此命令使更改生效); `docker-compose logs` 打印日志; + `docker-compose logs -f` 打印日志,-f表示跟随日志; + `docker logs -f jd_scripts` 和上面两条相比可以显示汉字; `docker-compose pull` 更新镜像; `docker-compose stop` 停止容器; `docker-compose restart` 重启容器; @@ -230,6 +232,8 @@ jd_scripts `docker exec -it jd_scripts /bin/sh -c 'env'` 查看设置的环境变量 + `docker exec -it jd_scripts /bin/sh -c 'crontab -l'` 查看已生效的crontab_list定时器任务 + `docker exec -it jd_scripts sh -c "docker_entrypoint.sh"` 手动更新jd_scripts仓库最新脚本 `docker exec -it jd_scripts /bin/sh` 仅进入容器命令 diff --git a/docker/proc_file.sh b/docker/proc_file.sh index e138dc87..89f4627c 100644 --- a/docker/proc_file.sh +++ b/docker/proc_file.sh @@ -9,19 +9,19 @@ fi 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" | grep -v "grep" | awk '{print "kill "$1}') + eval $(ps -ef | grep "jd_crazy_joy_coin" | grep -v "grep" | awk '{print "kill "$1}') echo '' >/scripts/logs/jd_crazy_joy_coin.log $CMD /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" | grep -v "grep" | awk '{print "kill "$1}') + eval $(ps -ef | grep "jd_crazy_joy_coin" | grep -v "grep" | awk '{print "kill "$1}') echo '' >/scripts/logs/jd_crazy_joy_coin.log $CMD /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" | grep -v "grep" | awk '{print "kill "$1}') - echo "已配置不启用jd_crazy_joy_coin任务,不处理" + eval $(ps -ef | grep "jd_crazy_joy_coin" | grep -v "grep" | awk '{print "kill "$1}') + echo "已配置不启用jd_crazy_joy_coin任务,仅杀掉" fi fi diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js index 1891fcb3..2c0daff6 100644 --- a/jd_dreamFactory.js +++ b/jd_dreamFactory.js @@ -112,6 +112,7 @@ if ($.isNode()) { console.log(`\n${$.UserName} 去参加团 ${item}`); if (!$.canHelp) break; await JoinTuan(item); + await $.wait(1000); } } }