~优化自动任务功能,屏蔽低于60分钟任务的远程日志推送,修复部分显示错误,增加容错

~将/public目录下文件的在线更新一律改为从dev分支获取
~优化本地生产配置文件功能,增加容错,禁止纯数字名称
~修复自动下载缺失文件并启动后会意外报错的bug
This commit is contained in:
juewuy
2025-12-11 19:32:45 +08:00
parent 163c5a3316
commit f8f6515fb0
3 changed files with 28 additions and 25 deletions

View File

@@ -161,7 +161,9 @@ logger(){
[ "$task_push" = 1 ] && push= || push=off
[ -n "$2" -a "$2" != 0 ] && echo -e "\033[$2m$1\033[0m"
[ "$3" = 'off' ] && push=off
${CRASHDIR}/start.sh logger $1 0 $push
echo "$1"
echo "$1" |grep -qE '(每隔|时每)([1-9]|[1-9][0-9])分钟' && push=off
${CRASHDIR}/start.sh logger "$1" 0 "$push"
}
croncmd(){
if [ -n "$(crontab -h 2>&1 | grep '\-l')" ];then
@@ -321,7 +323,7 @@ task_type(){ #任务条件选择菜单
;;
1)
echo -----------------------------------------------
echo -e " 输入 0~6 对应\033[33m每周的指定某天\033[0m运行(0=周日)"
echo -e " 输入 1-7 对应\033[33m每周的指定某天\033[0m运行(7=周日)"
echo -e " 输入 1,4,0 代表\033[36m每周一、周四、周日\033[0m运行"
echo -e " 输入 1-5 代表\033[36m周一至周五\033[0m运行"
read -p "在每周哪天执行? > " week
@@ -329,8 +331,8 @@ task_type(){ #任务条件选择菜单
echo -----------------------------------------------
read -p "想在该日的具体哪个小时执行0-23 > " hour
cron_time="在每周$week的$hour点整"
cron_time=`echo ${cron_time/0/日}` #把0换成日
set_cron
cron_time=`echo ${cron_time/0/}` #把0换成日
[ -n "$week" ] && [ -n "$hour" ] && set_cron
;;
2)
echo -----------------------------------------------
@@ -340,21 +342,21 @@ task_type(){ #任务条件选择菜单
echo -----------------------------------------------
read -p "想在具体哪分钟执行0-59的整数 > " min
cron_time="在每日的$hour点$min分"
set_cron
[ -n "$min" ] && [ -n "$hour" ] && set_cron
;;
3)
echo -----------------------------------------------
read -p "想每隔多少小时执行一次1-23的整数 > " num
hour="*/$num"
cron_time="每隔$num小时"
set_cron
[ -n "$hour" ] && set_cron
;;
4)
echo -----------------------------------------------
read -p "想每隔多少分钟执行一次1-59的整数 > " num
min="*/$num"
cron_time="每隔$num分钟"
set_cron
[ -n "$min" ] && set_cron
;;
5)
set_service bfstart "$task_id" "服务启动前$task_name"
@@ -376,7 +378,7 @@ task_type(){ #任务条件选择菜单
cron_time="0 */$hour * * *"
time_des="$hour小时"
fi
set_service running "$task_id" "运行时每$time_des$task_name" "$cron_time"
[ -n "$cron_time" ] && set_service running "$task_id" "运行时每$time_des$task_name" "$cron_time"
;;
8)
echo -e "该功能会将相关启动代码注入到/etc/init.d/firewall中"