From 3232f1efa49e1eb4db7ef11a0c1d1b049425d844 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Wed, 16 Jun 2021 21:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=B9=E5=99=A8=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker-entrypoint.sh | 12 ++++--------
 shell/update.sh             | 13 +++++--------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 467e5fd2..fc3af305 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -9,15 +9,11 @@ fix_config
 cp -fv $dir_root/docker/front.conf /etc/nginx/conf.d/front.conf
 echo
 
-echo -e "======================2. 更新源代码========================\n"
-ql update "no-restart"
-echo
-
-echo -e "======================3. 启动nginx========================\n"
+echo -e "======================2. 启动nginx========================\n"
 nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
-echo -e "======================4. 启动控制面板========================\n"
+echo -e "======================3. 启动控制面板========================\n"
 cd $dir_root
 if [[ $(pm2 info panel 2>/dev/null) ]]; then
   pm2 reload panel
@@ -26,7 +22,7 @@ else
 fi
 echo -e "控制面板启动成功...\n"
 
-echo -e "======================5. 启动定时任务========================\n"
+echo -e "======================4. 启动定时任务========================\n"
 cd $dir_root
 if [[ $(pm2 info schedule 2>/dev/null) ]]; then
   pm2 reload schedule
@@ -36,7 +32,7 @@ fi
 echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
-  echo -e "======================6. 启动bot========================\n"
+  echo -e "======================5. 启动bot========================\n"
   cd $dir_root
   ql bot
 fi
diff --git a/shell/update.sh b/shell/update.sh
index 2aeaae48..28ebe2d8 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -251,7 +251,6 @@ usage() {
 
 ## 更新qinglong
 update_qinglong() {
-    local no_restart="$1"
     echo -e "--------------------------------------------------------------\n"
     [ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json)
     reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git"
@@ -288,12 +287,10 @@ update_qinglong() {
         cd $dir_root
         rm -rf $dir_root/build && rm -rf $dir_root/dist
         cp -rf $ql_static_repo/* $dir_root
-        if [[ $no_restart != "no-restart" ]]; then
-            echo -e "重启面板中..."
-            nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
-            sleep 1
-            reload_pm2
-        fi
+        echo -e "重启面板中..."
+        nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
+        sleep 1
+        reload_pm2
     else
         echo -e "\n更新$dir_root失败，请检查原因...\n"
     fi
@@ -403,7 +400,7 @@ main() {
     log_path="$dir_log/update/${log_time}_$p1.log"
     case $p1 in
     update)
-        update_qinglong "$2" | tee $log_path
+        update_qinglong | tee $log_path
         ;;
     extra)
         run_extra_shell | tee -a $log_path