From 250fcf0b2a2915a4d2fcd0cc6a7471ed76c0d5c6 Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 5 May 2021 13:59:13 +0800 Subject: [PATCH] =?UTF-8?q?ql=20repo=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=EF=BC=8C=E4=BF=AE=E5=A4=8Dpackage.json?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sample/package.json | 20 ++++++----- shell/api.sh | 84 +++++++++++++++++++++++++++++---------------- shell/update.sh | 18 +++++----- 3 files changed, 73 insertions(+), 49 deletions(-) diff --git a/sample/package.json b/sample/package.json index 3b6deacf..b80b416a 100644 --- a/sample/package.json +++ b/sample/package.json @@ -2,13 +2,15 @@ "name": "dependence", "author": "", "license": "ISC", - "crypto-js": "^4.0.0", - "download": "^8.0.0", - "got": "^11.5.1", - "http-server": "^0.12.3", - "qrcode-terminal": "^0.12.0", - "request": "^2.88.2", - "tough-cookie": "^4.0.0", - "tunnel": "0.0.6", - "ws": "^7.4.3" + "dependencies": { + "crypto-js": "^4.0.0", + "download": "^8.0.0", + "got": "^11.5.1", + "http-server": "^0.12.3", + "qrcode-terminal": "^0.12.0", + "request": "^2.88.2", + "tough-cookie": "^4.0.0", + "tunnel": "0.0.6", + "ws": "^7.4.3" + } } \ No newline at end of file diff --git a/shell/api.sh b/shell/api.sh index 7aff9e04..5f03c59a 100755 --- a/shell/api.sh +++ b/shell/api.sh @@ -31,16 +31,18 @@ add_cron_api() { local name=$3 fi - local api=$(curl -s "http://localhost:5600/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) + local api=$( + curl -s "http://localhost:5600/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 + ) code=$(echo $api | jq -r .code) if [[ $code == 200 ]]; then echo -e "$name 添加成功" @@ -63,17 +65,19 @@ update_cron_api() { local id=$4 fi - local api=$(curl -s "http://localhost:5600/api/crons?t=$currentTimeStamp" \ - -X 'PUT' \ - -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\",\"_id\":\"$id\"}" \ - --compressed) + local api=$( + curl -s "http://localhost:5600/api/crons?t=$currentTimeStamp" \ + -X 'PUT' \ + -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\",\"_id\":\"$id\"}" \ + --compressed + ) code=$(echo $api | jq -r .code) if [[ $code == 200 ]]; then echo -e "$name 添加成功" @@ -85,15 +89,17 @@ update_cron_api() { del_cron_api() { local id=$1 local currentTimeStamp=$(date +%s) - local api=$(curl -s "http://localhost:5600/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") + local api=$( + curl -s "http://localhost:5600/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" + ) code=$(echo $api | jq -r .code) if [[ $code == 200 ]]; then echo -e "$name 删除成功" @@ -101,3 +107,21 @@ del_cron_api() { echo -e "$name 删除失败" fi } + +get_user_info() { + local currentTimeStamp=$(date +%s) + local api=$( + curl -s "http://localhost:5700/api/user?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' \ + -H 'Referer: http://localhost:5700/crontab' \ + -H 'Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7' \ + --compressed + ) + code=$(echo $api | jq -r .code) + if [[ $code != 200 ]]; then + echo -e "请先登录！" + exit 0 + fi +} diff --git a/shell/update.sh b/shell/update.sh index 366e3bcb..043b710d 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -119,10 +119,8 @@ del_cron() { exit_status=$? detail2=$(echo $detail | perl -pe "s| |\\\n|g") if [[ $exit_status -eq 0 ]]; then - echo -e "成功删除失效的的定时任务...\n" notify "删除失效任务通知" "成功删除以下失效的定时任务：\n$detail2" else - echo -e "删除定时任务出错，请手动删除...\n" notify "删除任务失败通知" "尝试自动删除以下定时任务出错，请手动删除：\n$detail2" fi } @@ -156,10 +154,8 @@ add_cron() { exit_status=$? local detail2=$(echo $detail | perl -pe "s| |\\\n|g") if [[ $exit_status -eq 0 ]]; then - echo -e "成功添加新的定时任务...\n" notify "新增任务通知" "成功添加新的定时任务：\n$detail2" else - echo -e "添加新的定时任务出错，请手动添加...\n" notify "新任务添加失败通知" "尝试自动添加以下新的定时任务出错，请手动添加：\n$detail2" fi } @@ -247,12 +243,12 @@ run_extra_shell() { ## 脚本用法 usage() { echo -e "本脚本用法：" - echo -e "1. $cmd_update update # 更新青龙，并且运行extra.sh" - echo -e "2. $cmd_update restart # 重新启动青龙并编译，不会运行extra.sh" - echo -e "3. $cmd_update raw # 更新单个文件脚本" - echo -e "4. $cmd_update repo # 更新仓库的脚本" - echo -e "5. $cmd_update rmlog # 删除旧日志" - echo -e "6. $cmd_update code # 获取互助码" + echo -e "1. $cmd_update update # 更新青龙，并且运行extra.sh" + echo -e "2. $cmd_update restart # 重新启动青龙并编译，不会运行extra.sh" + echo -e "3. $cmd_update raw # 更新单个文件脚本" + echo -e "4. $cmd_update repo # 更新仓库的脚本" + echo -e "5. $cmd_update rmlog # 删除旧日志" + echo -e "6. $cmd_update code # 获取互助码" } ## 更新qinglong @@ -357,6 +353,7 @@ main() { restart_qinglong | tee $log_path ;; repo) + get_user_info local name=$(echo "${p2##*/}" | awk -F "." '{print $1}') log_path="$dir_log/update/${log_time}_$name.log" if [[ -n $p2 ]]; then @@ -367,6 +364,7 @@ main() { fi ;; raw) + get_user_info local name=$(echo "${p2##*/}" | awk -F "." '{print $1}') log_path="$dir_log/update/${log_time}_$name.log" if [[ -n $p2 ]]; then