移除 nginx

2026-06-30 20:35:09 +08:00 · 2025-11-02 19:29:59 +08:00
parent 07951964a1
commit 18f27a9a69
16 changed files with 46 additions and 206 deletions
@@ -41,7 +41,7 @@ add_cron_api() {
  fi

  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/open/crons?t=$currentTimeStamp" \
      -H "Accept: application/json" \
      -H "Authorization: Bearer ${__ql_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" \
@@ -76,7 +76,7 @@ update_cron_api() {
  fi

  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/open/crons?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
      -H "Authorization: Bearer ${__ql_token__}" \
@@ -108,7 +108,7 @@ update_cron_command_api() {
  fi

  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/open/crons?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
      -H "Authorization: Bearer ${__ql_token__}" \
@@ -133,7 +133,7 @@ del_cron_api() {
  local ids="$1"
  local currentTimeStamp=$(date +%s)
  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/open/crons?t=$currentTimeStamp" \
      -X 'DELETE' \
      -H "Accept: application/json" \
      -H "Authorization: Bearer ${__ql_token__}" \
@@ -163,7 +163,7 @@ update_cron() {
  local runningTime="${6:-0}"
  local currentTimeStamp=$(date +%s)
  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/open/crons/status?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
      -H "Authorization: Bearer ${__ql_token__}" \
@@ -190,7 +190,7 @@ notify_api() {
  local content="$2"
  local currentTimeStamp=$(date +%s)
  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/open/system/notify?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
      -H "Authorization: Bearer ${__ql_token__}" \
@@ -215,7 +215,7 @@ find_cron_api() {
  local params="$1"
  local currentTimeStamp=$(date +%s)
  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/open/crons/detail?$params&t=$currentTimeStamp" \
      -H "Accept: application/json" \
      -H "Authorization: Bearer ${__ql_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" \
@@ -239,7 +239,7 @@ update_auth_config() {
  local tip="$2"
  local currentTimeStamp=$(date +%s)
  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/auth/reset?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/open/system/auth/reset?t=$currentTimeStamp" \
      -X 'PUT' \
      -H "Accept: application/json" \
      -H "Authorization: Bearer ${__ql_token__}" \
@@ -20,10 +20,6 @@ copy_dep() {
  echo -e "---> 复制一份 $file_notify_js_sample 为 $file_notify_js\n"
  cp -fv $file_notify_js_sample $file_notify_js
  echo -e "---> 通知文件复制完成\n"
-
-  echo -e "---> 2. 复制nginx配置文件\n"
-  init_nginx
-  echo -e "---> 配置文件复制完成\n"
 }

 pm2_log() {
@@ -34,18 +30,6 @@ pm2_log() {
  tail -n 300 "$panelError"
 }

-check_nginx() {
-  local nginxPid=$(ps -eo pid,command | grep nginx | grep -v grep)
-  echo -e "=====> 检测nginx服务\n$nginxPid"
-  if [[ $nginxPid ]]; then
-    echo -e "\n=====> nginx服务正常\n"
-    nginx -s reload
-  else
-    echo -e "\n=====> nginx服务异常，重新启动nginx\n"
-    nginx -c /etc/nginx/nginx.conf
-  fi
-}
-
 check_ql() {
  local api=$(curl -s --noproxy "*" "http://0.0.0.0:5700")
  echo -e "\n=====> 检测面板\n\n$api\n"
@@ -58,7 +42,7 @@ check_pm2() {
  pm2_log
  local currentTimeStamp=$(date +%s)
  local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/api/system?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5700/api/system?t=$currentTimeStamp" \
      -H 'Accept: */*' \
      -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://0.0.0.0:5700/crontab' \
@@ -78,7 +62,6 @@ main() {
  reset_env
  copy_dep
  check_ql
-  check_nginx
  check_pm2
  reload_pm2
  echo -e "\n=====> 检测结束\n"
@@ -48,8 +48,6 @@ export file_notify_py=$dir_scripts/notify.py
 export file_notify_js=$dir_scripts/sendNotify.js
 export file_test_js=$dir_scripts/ql_sample.js
 export file_test_py=$dir_scripts/ql_sample.py
-export nginx_app_conf=$dir_root/docker/front.conf
-export nginx_conf=$dir_root/docker/nginx.conf
 export dep_notify_py=$dir_dep/notify.py
 export dep_notify_js=$dir_dep/sendNotify.js

@@ -211,10 +209,6 @@ fix_config() {
    cp -f $file_test_py_sample $file_test_py
  fi

-  if [[ -s /etc/nginx/conf.d/default.conf ]]; then
-    cat /dev/null >/etc/nginx/conf.d/default.conf
-  fi
-
  if [[ ! -s $dep_notify_js ]]; then
    cp -f $file_notify_js_sample $dep_notify_js
  fi
@@ -334,44 +328,6 @@ format_timestamp() {
  fi
 }

-init_nginx() {
-  cp -f $nginx_conf /etc/nginx/nginx.conf
-  cp -f $nginx_app_conf /etc/nginx/conf.d/front.conf
-  local location_url="/"
-  local aliasStr=""
-  local rootStr=""
-  if [[ $ql_base_url != "/" ]]; then
-    if [[ $ql_base_url != /* ]]; then
-      ql_base_url="/$ql_base_url"
-    fi
-    if [[ $ql_base_url != */ ]]; then
-      ql_base_url="$ql_base_url/"
-    fi
-    location_url="^~${ql_base_url%*/}"
-    aliasStr="alias ${dir_static}/dist;"
-    if ! grep -q "<base href=\"$ql_base_url\">" "${dir_static}/dist/index.html"; then
-      awk -v text="<base href=\"$ql_base_url\">" '/<link/ && !inserted {print text; inserted=1} 1' "${dir_static}/dist/index.html" >temp.html
-      mv temp.html "${dir_static}/dist/index.html"
-    fi
-  else
-    rootStr="root ${dir_static}/dist;"
-  fi
-  sed -i "s,QL_ALIAS_CONFIG,${aliasStr},g" /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_ROOT_CONFIG,${rootStr},g" /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_BASE_URL_LOCATION,${location_url},g" /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_BASE_URL,${ql_base_url},g" /etc/nginx/conf.d/front.conf
-
-  local ipv6=$(ip a | grep inet6)
-  local ipv6Str=""
-  if [[ $ipv6 ]]; then
-    ipv6Str="listen [::]:${ql_port} ipv6only=on;"
-  fi
-
-  local ipv4Str="listen ${ql_port};"
-  sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf
-  sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf
-}
-
 get_env_array() {
  exported_variables=()
  while IFS= read -r line; do