From 53ae976cafc06b6aedca85fa9ccded93198dce01 Mon Sep 17 00:00:00 2001 From: shanmite Date: Thu, 29 Jul 2021 20:18:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E8=B4=A6=E5=8F=B7=E5=87=BA?= =?UTF-8?q?=E9=94=99=E5=9B=9E=E4=BC=A0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 8 ++++++-- my_config.example.js | 2 +- script/docker/init.sh | 7 ++++--- script/linux/check.sh | 5 ----- script/linux/clear.sh | 5 ----- script/linux/start.sh | 5 ----- script/windows/check.ps1 | 9 --------- script/windows/clear.ps1 | 9 --------- script/windows/start.ps1 | 9 --------- 9 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 script/linux/check.sh delete mode 100644 script/linux/clear.sh delete mode 100644 script/linux/start.sh delete mode 100644 script/windows/check.ps1 delete mode 100644 script/windows/clear.ps1 delete mode 100644 script/windows/start.ps1 diff --git a/main.js b/main.js index e562f2e..bbee2bc 100644 --- a/main.js +++ b/main.js @@ -33,8 +33,12 @@ async function main() { process.env.COOKIE = acco.COOKIE; process.env.NUMBER = acco.NUMBER; process.env.CLEAR = acco.CLEAR; - await main(); - await delay(acco.WAIT); + const err_msg = await main(); + if (err_msg) { + return err_msg + } else { + await delay(acco.WAIT); + } } /**多账号状态还原 */ diff --git a/my_config.example.js b/my_config.example.js index 13a056b..655f396 100644 --- a/my_config.example.js +++ b/my_config.example.js @@ -84,7 +84,7 @@ module.exports = { * - 循环等待时间(指所有操作完毕后的休眠时间) * - 单位毫秒 */ - lottery_loop_wait: 60 * 60 * 1000, + lottery_loop_wait: 0, check_loop_wait: 0, clear_loop_wait: 0, diff --git a/script/docker/init.sh b/script/docker/init.sh index b021d77..68e054e 100644 --- a/script/docker/init.sh +++ b/script/docker/init.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e # 脚本根目录 SCRIPT_FOLDER=lottery @@ -61,7 +62,7 @@ docker run \ $DOCKER_REPO \ start" \ > start.sh -chmod 777 start.sh +chmod +x start.sh echo "create check.sh" echo -e "#!/bin/bash\n\ @@ -72,7 +73,7 @@ docker run \ $DOCKER_REPO \ check" \ > check.sh -chmod 777 check.sh +chmod +x check.sh echo "create clear.sh" echo -e "#!/bin/bash\n\ @@ -83,4 +84,4 @@ docker run \ $DOCKER_REPO \ clear" \ > clear.sh -chmod 777 clear.sh +chmod +x clear.sh diff --git a/script/linux/check.sh b/script/linux/check.sh deleted file mode 100644 index 415f892..0000000 --- a/script/linux/check.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd .. -cd .. -npm i -npm run check \ No newline at end of file diff --git a/script/linux/clear.sh b/script/linux/clear.sh deleted file mode 100644 index f3a2010..0000000 --- a/script/linux/clear.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd .. -cd .. -npm i -npm run clear \ No newline at end of file diff --git a/script/linux/start.sh b/script/linux/start.sh deleted file mode 100644 index 95c22bf..0000000 --- a/script/linux/start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd .. -cd .. -npm i -npm run start \ No newline at end of file diff --git a/script/windows/check.ps1 b/script/windows/check.ps1 deleted file mode 100644 index 5042861..0000000 --- a/script/windows/check.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -chcp 65001 - -cd .. -cd .. -npm i -npm run check - -# 暂停 -pause \ No newline at end of file diff --git a/script/windows/clear.ps1 b/script/windows/clear.ps1 deleted file mode 100644 index e16c2c9..0000000 --- a/script/windows/clear.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -chcp 65001 - -cd .. -cd .. -npm i -npm run clear - -# 暂停 -pause \ No newline at end of file diff --git a/script/windows/start.ps1 b/script/windows/start.ps1 deleted file mode 100644 index 58dfc77..0000000 --- a/script/windows/start.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -chcp 65001 - -cd .. -cd .. -npm i -npm run start - -# 暂停 -pause \ No newline at end of file