全新定时任务管理

shell/api.sh

@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+get_token() {
+  echo $AuthConf
+  local authInfo=$(cat $AuthConf)
+  token=$(get_json_value "$authInfo" "token")
+}
+
+get_json_value() {
+  local json=$1
+  local key=$2
+
+  if [[ -z "$3" ]]; then
+    local num=1
+  else
+    local num=$3
+  fi
+
+  local value=$(echo "${json}" | awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p)
+
+  echo ${value}
+}
+
+add_cron_api() {
+  local currentTimeStamp=$(date +%s%3)
+  if [ $# -eq 1 ]; then
+    local schedule=$(echo "$1" | awk -F ": " '{print $1}')
+    local command=$(echo "$1" | awk -F ": " '{print $2}')
+    local name=$(echo "$1" | awk -F ": " '{print $3}')
+  else
+    local schedule=$1
+    local command=$2
+    local name=$3
+  fi
+
+  local api=$(curl "http://localhost:5678/api/crons?t=$currentTimeStamp" \
+    -H "Accept: application/json" \
+    -H "Authorization: Bearer $token" \
+    -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+    -H "Content-Type: application/json;charset=UTF-8" \
+    -H "Origin: http://localhost:5700" \
+    -H "Referer: http://localhost:5700/crontab" \
+    -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+    --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\"}" \
+    --compressed)
+  echo $api
+  code=$(get_json_value $api "code")
+  if [[ $code == 200 ]]; then
+    echo -e "$name 添加成功"
+  else
+    echo -e "$name 添加失败"
+  fi
+}
+
+del_cron_api() {
+  local id=$1
+  local currentTimeStamp=$(date +%s%3)
+  local api=$(curl "http://localhost:5678/api/crons/$id?t=$currentTimeStamp" \
+    -X 'DELETE' \
+    -H "Accept: application/json" \
+    -H "Authorization: Bearer $token" \
+    -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+    -H "Content-Type: application/json;charset=UTF-8" \
+    -H "Origin: http://localhost:5700" \
+    -H "Referer: http://localhost:5700/crontab" \
+    -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7")
+  echo $api
+  code=$(get_json_value $api "code")
+  if [[ $code == 200 ]]; then
+    echo -e "$name 删除成功"
+  else
+    echo -e "$name 删除失败"
+  fi
+}

shell/git_pull.sh

@@ -16,6 +16,7 @@ ScriptsDir=$ShellDir/scripts
 ConfigDir=$ShellDir/config
 FileConf=$ConfigDir/config.sh
 CookieConf=$ConfigDir/cookie.sh
+AuthConf=$ConfigDir/auth.json
 ExtraShell=$ConfigDir/extra.sh
 FileConfSample=$ShellDir/sample/config.sh.sample
 ListCronSample=$ShellDir/sample/crontab.list.sample
@@ -44,6 +45,8 @@ Import_Conf() {
   fi
   [ -f $CookieConf ] && . $CookieConf
   [ -f $FileConf ] && . $FileConf
+
+  . $ShellDir/shell/api.sh
 }
 
 # 更新shell
@@ -198,7 +201,7 @@ Git_Pull_Scripts_Next() {
 
 Diff_Cron() {
   cat $ListCronRemote | grep -E "node.+j[drx]_\w+\.js" | perl -pe "s|.+(j[drx]_\w+)\.js.+|\1|" | sort -u >$ListRemoteTask
-  cat $ListCronCurrent | grep -E "$ShellJs j[drx]_\w+" | perl -pe "s|.*$ShellJs (j[drx]_\w+)\.*|\1|" | sort -u >$ListCurrentTask
+  cat $ListCronCurrent | grep -E "$ShellJs j[drx]_\w+" | perl -pe "s|.*ID=(.*)$ShellJs (j[drx]_\w+)\.*|\1|" | sort -u >$ListCurrentTask
   if [ -s $ListCurrentTask ]; then
     grep -vwf $ListCurrentTask $ListRemoteTask >$ListJsAdd
   else
@@ -218,7 +221,7 @@ Del_Cron() {
     echo
     JsDrop=$(cat $ListJsDrop)
     for Cron in $JsDrop; do
-      perl -i -ne "{print unless / $Cron( |$)/}" $ListCronCurrent
+      del_cron_api "$Cron"
     done
     crontab $ListCronCurrent
     echo -e "成功删除失效的脚本与定时任务\n"
@@ -234,7 +237,8 @@ Add_Cron() {
       if [[ $Cron == jd_bean_sign ]]; then
         echo "4 0,9 * * * $ShellJs $Cron" >> $ListCronCurrent
       else
-        cat $ListCronRemote | grep -E "\/$Cron\." | perl -pe "s|(^.+)node */scripts/(j[drx]_\w+)\.js.+|\1$ShellJs \2|" >> $ListCronCurrent
+        param=$(cat $ListCronRemote | grep -E "\/$Cron\." | perl -pe "s|(^.+)node */scripts/(j[drx]_\w+)\.js.+|\1\: $ShellJs \2: \2|")
+        add_cron_api "$param"
       fi
     done
 
@@ -274,6 +278,8 @@ echo -e "--------------------------------------------------------------\n"
 Import_Conf
 Random_Pull_Cron
 
+get_token
+
 # 更新shell
 [ -f $ShellDir/package.json ] && PanelDependOld=$(cat $ShellDir/package.json)
 Git_Pull_Shell