diff --git a/Scripts/sh/1custom.sh b/Scripts/sh/1custom.sh index 1ae216c..8bca9b0 100644 --- a/Scripts/sh/1custom.sh +++ b/Scripts/sh/1custom.sh @@ -20,7 +20,7 @@ elif [ "${all}" = 0 ]; then else read -p "config.sh 操作(替换或下载选项为 y,不替换为 n,回车为替换)请输入:" Rconfig Rconfig=${Rconfig:-'y'} - read -p "extra.sh 操作(替换或下载选项为 a,修改默认拉取仓库设置为 b,添加到定时任务为 c,立即执行一次为 d,全部不执行为 n,回车全部执行 | 示例:acd)请输入:" extra + read -p "extra.sh 操作(替换或下载选项为 a,修改设置区设置为 b,添加到定时任务为 c,立即执行一次为 d,全部不执行为 n,回车全部执行 | 示例:acd)请输入:" extra extra=${extra:-'abcd'} read -p "code.sh 操作(替换或下载选项为 a,修改默认调用日志设置为 b,添加到定时任务为 c,全部不执行为 n,回车全部执行 | 示例:ac)请输入:" code code=${code:-'abcd'} @@ -80,8 +80,8 @@ set_default_extra(){ sed -i "s/CollectedRepo=(4)/CollectedRepo=(${CollectedRepo})/g" $extra_shell_path sed -i "s/OtherRepo=()/OtherRepo=(${OtherRepo})/g" $extra_shell_path echo -e "Ninja\n### (1)默认启动并自动更新,未运行成功将强制重装\n### (2)!!!未修改容器映射的请勿运行,否则会出现青龙打不开或者设备死机等不良后果,映射参考 https://github.com/MoonBegonia/ninja#%E5%AE%B9%E5%99%A8%E5%86%85" - read -p "Ninja="up" ##up为运行,down为不运行 输入您的设置(默认运行) up/down" Ninja - sed -i "s/\"up\"/\"${Ninja}\"" $extra_shell_path + read -p "Ninja="up" ##up为运行,down为不运行 输入您的设置(默认运行) up/down:" Ninja + sed -i "s/\"up\"/\"${Ninja}\"/" $extra_shell_path } # 将 ql extra 添加到定时任务 add_ql_extra(){ diff --git a/Scripts/sh/scanNinja.sh b/Scripts/sh/scanNinja.sh index 8075ce0..80ce2ae 100644 --- a/Scripts/sh/scanNinja.sh +++ b/Scripts/sh/scanNinja.sh @@ -1,50 +1,52 @@ #/bin/sh + NOWTIME=$(date +%Y-%m-%d-%H-%M-%S) i=0 -while ((i<=0)) -do -echo "扫描NINA程序是否在线" -ps -fe|grep ninja|grep -v grep -if [ $? -ne 0 ] -then - i=0 - echo $NOWTIME" 扫描结束!NINA 掉线了不用担心马上重启!" - git clone https://gitee.com/mjf521/ninja.git /ql/ninja - cd /ql/ninja/backend - pnpm install - pm2 start - ps -fe|grep Daemon |grep -v grep - if [ $? -ne 1 ];then + +while ((i<=0)); do + echo "扫描 NINJA 程序是否在线" + ps -fe|grep ninja|grep -v grep + if [ $? -ne 0 ]; then + i=0 + echo $NOWTIME" 扫描结束!NINJA 掉线了不用担心马上重启!" + cd /ql + ps -ef|grep ninja|grep -v grep|awk '{print $1}'|xargs kill -9 && rm -rf /ql/ninja && rm -rf /ql/ninja + git clone https://github.com/MoonBegonia/ninja.git /ql/ninja ## 拉取仓库 + cd /ql/ninja/backend + pnpm install ## 安装局部依赖 + cp .env.example .env ## 复制环境变量配置文件 + cp sendNotify.js /ql/scripts/sendNotify.js ## 复制通知脚本到青龙容器 + pm2 start + ps -fe|grep Daemon |grep -v grep + if [ $? -ne 1 ]; then i=1 - echo $NOWTIME" NINA重启完成!" - curl "https://api.telegram.org/bot1878231691:AAG42gjTy0kQWyFnlUkgWDGXhMlyPl4oW18/sendMessage?chat_id=1565562101&text=NINA已重启完成" - fi - -else - i=1 - echo $NOWTIME" 扫描结束!NINA还在!" -fi + echo $NOWTIME" NINJA 重启完成!" + curl "https://api.telegram.org/bot1878231691:AAG42gjTy0kQWyFnlUkgWDGXhMlyPl4oW18/sendMessage?chat_id=1565562101&text=NINJA 已重启完成" + fi + else + i=1 + echo $NOWTIME" 扫描结束!NINJA还在!" + fi done echo "开始扫描机器人是否在线!" ps -fe|grep jbot|grep -v grep -if [ $? -ne 0 ] -then - echo $NOWTIME" 扫描结束!不好了不好了机器人掉线了,准备重启!" - nohup python3 -m jbot >/dev/null 2>&1 & - echo $NOWTIME" 扫描结束!机器人准备重启完成!" - curl "https://api.telegram.org/bot1878231691:AAG42gjTy0kQWyFnlUkgWDGXhMlyPl4oW18/sendMessage?chat_id=1565562101&text=扫描结束!机器人准备重启完成!" +if [ $? -ne 0 ]; then + echo $NOWTIME" 扫描结束!不好了不好了机器人掉线了,准备重启!" + nohup python3 -m jbot >/dev/null 2>&1 & + echo $NOWTIME" 扫描结束!机器人准备重启完成!" + curl "https://api.telegram.org/bot1878231691:AAG42gjTy0kQWyFnlUkgWDGXhMlyPl4oW18/sendMessage?chat_id=1565562101&text=扫描结束!机器人准备重启完成!" else - echo $NOWTIME" 扫描结束!机器人还在!" + echo $NOWTIME" 扫描结束!机器人还在!" fi + echo "开始扫描静态解析是否在线!" ps -fe|grep nginx|grep -v grep -if [ $? -ne 0 ] -then - echo $NOWTIME" 扫描结束!Nginx静态解析停止了!准备重启!" - nginx -c /etc/nginx/nginx.conf - echo $NOWTIME" Nginx静态解析重启完成!" - curl "https://api.telegram.org/bot1878231691:AAG42gjTy0kQWyFnlUkgWDGXhMlyPl4oW18/sendMessage?chat_id=1565562101&text= Nginx静态解析重启完成!" +if [ $? -ne 0 ]; then + echo $NOWTIME" 扫描结束!Nginx 静态解析停止了!准备重启!" + nginx -c /etc/nginx/nginx.conf + echo $NOWTIME" Nginx 静态解析重启完成!" + curl "https://api.telegram.org/bot1878231691:AAG42gjTy0kQWyFnlUkgWDGXhMlyPl4oW18/sendMessage?chat_id=1565562101&text= Nginx 静态解析重启完成!" else - echo $NOWTIME" 扫描结束!Nginx静态解析正常呢!" + echo $NOWTIME" 扫描结束!Nginx 静态解析正常呢!" fi diff --git a/Scripts/sh/v4.sh b/Scripts/sh/v4.sh index 31ef3f8..6ca2d7f 100644 --- a/Scripts/sh/v4.sh +++ b/Scripts/sh/v4.sh @@ -270,9 +270,8 @@ docker run -dit \ -v $CONFIG_PATH:/jd/config \ -v $LOG_PATH:/jd/log \ -v $OWN_PATH:/jd/own \ - -v $SCRIPT_PATH:/jd/scripts \ - -v $DIY_PATH:/jd/jbot/diy \ $MOUNT_SCRIPT \ + -v $DIY_PATH:/jd/jbot/diy \ $MAPPING_PORT \ --name $CONTAINER_NAME \ --hostname jd_v4_bot \ diff --git a/Tasks/qlrepo/extra.sh b/Tasks/qlrepo/extra.sh index 63f87a8..84100d7 100644 --- a/Tasks/qlrepo/extra.sh +++ b/Tasks/qlrepo/extra.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -## Mod: Build20210804V1 +## Mod: Build20210805V1 ## 添加你需要重启自动执行的任意命令,比如 ql repo ## 安装node依赖使用 pnpm install -g xxx xxx(Build 20210728-002 及以上版本的 code.sh,可忽略) ## 安装python依赖使用 pip3 install xxx(Build 20210728-002 及以上版本的 code.sh,可忽略) @@ -126,7 +126,7 @@ done # 🍪Ninja update_Ninja_normal(){ - cd /ql/ninja/backend && git checkout . && git pull && pnpm install && pm2 start && cp sendNotify.js /ql/scripts/sendNotify.js + cd /ql/ninja/backend && git pull -f && pnpm install && pm2 start && cp sendNotify.js /ql/scripts/sendNotify.js } reinstall_Ninja_force(){