diff --git a/shell/bot.sh b/shell/bot.sh index f9887ab2..f5dc8344 100755 --- a/shell/bot.sh +++ b/shell/bot.sh @@ -1,9 +1,5 @@ #!/usr/bin/env bash -## 导入通用变量与函数 -dir_shell=$QL_DIR/shell -. $dir_shell/share.sh - if [[ -z ${BotRepoUrl} ]]; then url="https://github.com/SuMaiKaDe/bot.git" repo_path="${dir_repo}/dockerbot" diff --git a/shell/check.sh b/shell/check.sh index c2b513f6..51fd629a 100755 --- a/shell/check.sh +++ b/shell/check.sh @@ -1,9 +1,5 @@ #!/usr/bin/env bash -dir_shell=$QL_DIR/shell -. $dir_shell/share.sh -. $dir_shell/api.sh - reset_env() { echo -e "---> 1. 开始检测配置文件\n" fix_config @@ -70,7 +66,7 @@ check_pm2() { pm2_log local currentTimeStamp=$(date +%s) local api=$( - curl -s --noproxy "*" "http://0.0.0.0:5600/api/user?t=$currentTimeStamp" \ + curl -s --noproxy "*" "http://0.0.0.0:5600/api/system?t=$currentTimeStamp" \ -H 'Accept: */*' \ -H "Authorization: Bearer $token" \ -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36' \ diff --git a/shell/otask.sh b/shell/otask.sh index 9472fc0a..bc2ed5d7 100755 --- a/shell/otask.sh +++ b/shell/otask.sh @@ -1,10 +1,5 @@ #!/usr/bin/env bash -## 导入通用变量与函数 -dir_shell=$QL_DIR/shell -. $dir_shell/share.sh -. $dir_shell/api.sh - trap "single_hanle" 2 20 15 14 single_hanle() { handle_task_after "$@" diff --git a/shell/rmlog.sh b/shell/rmlog.sh index 6a311259..7d183014 100755 --- a/shell/rmlog.sh +++ b/shell/rmlog.sh @@ -1,9 +1,5 @@ #!/usr/bin/env bash -## 导入通用变量与函数 -dir_shell=$QL_DIR/shell -. $dir_shell/share.sh - days=$1 ## 删除运行脚本的旧日志