修改系统重启逻辑

shell/check.sh

@@ -81,6 +81,7 @@ main() {
   check_ql
   check_nginx
   check_pm2
+  reload_update
   reload_pm2
   echo -e "\n=====> 检测结束\n"
 }

shell/share.sh

@@ -305,6 +305,11 @@ random_range() {
   echo $((RANDOM % ($end - $beg) + $beg))
 }
 
+delete_pm2() {
+  cd $dir_root
+  pm2 delete ecosystem.config.js
+}
+
 reload_pm2() {
   cd $dir_root
   restore_env_vars
@@ -312,6 +317,13 @@ reload_pm2() {
   pm2 startOrGracefulReload ecosystem.config.js
 }
 
+reload_update() {
+  cd $dir_root
+  restore_env_vars
+  pm2 flush &>/dev/null
+  pm2 startOrGracefulReload other.config.js
+}
+
 diff_time() {
   local format="$1"
   local begin_time="$2"

shell/update.sh

@@ -231,6 +231,8 @@ usage() {
 }
 
 reload_qinglong() {
+  delete_pm2
+
   local reload_target="${1}"
   local primary_branch="master"
   if [[ "${QL_BRANCH}" == "develop" ]]; then
@@ -245,8 +247,8 @@ reload_qinglong() {
   fi
 
   if [[ "$reload_target" == 'data' ]]; then
-    rm -rf ${dir_root}/data
-    cp -rf ${dir_tmp}/data ${dir_root}/
+    rm -rf ${dir_root}/data/*
+    mv -f ${dir_tmp}/data/* ${dir_root}/data/
   fi
 
   reload_pm2
@@ -310,6 +312,8 @@ check_update_dep() {
     echo -e "更新包下载成功..."
 
     if [[ "$needRestart" == 'true' ]]; then
+      delete_pm2
+
       cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
       rm -rf $dir_static/*
       cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/