From 6c59d9ddaab86a6bd3ee1151042aa978250b17ed Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Mon, 9 May 2022 12:40:41 +0800
Subject: [PATCH] =?UTF-8?q?pre-deploy-wms8.sh=20=E4=BC=98=E5=8C=96deploy?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=81=9C=E6=9C=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-yn/pre-deploy-wms8.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/yxt-yn/pre-deploy-wms8.sh b/yxt-yn/pre-deploy-wms8.sh
index bf76727..e76e076 100644
--- a/yxt-yn/pre-deploy-wms8.sh
+++ b/yxt-yn/pre-deploy-wms8.sh
@@ -162,14 +162,8 @@ JAVA_OPTS_EXT=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dappli
 startServer() {
   pid=$1
   if [ -z $pid ];then
-    echo -e "$echoPrefix cd $dirPath $echoSuffix"
-    cd $dirPath
-    echo -e "$echoPrefix rm -rf ../runtime $echoSuffix"
-    rm -rf ../runtime
-    echo -e "$echoPrefix cp -r ./ ../runtime $echoSuffix"
-    cp -r ./ ../runtime
-    echo -e "$echoPrefix cd ../runtime $echoSuffix"
-    cd ../runtime
+    echo -e "${echoPrefix}/runtime cd $dirPath $echoSuffix"
+    cd ${echoPrefix}/runtime
     echo -e "$echoPrefix java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./servo-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=18095 >$logPath 2>&1 & $echoSuffix"
     java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./servo-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=18095 >$logPath 2>&1 &
     echo "$serverName 启动成功!"
@@ -206,6 +200,14 @@ deployServer() {
   deployPull
   buildCode
   echo "###--代码构建完成--------------------------------------------------------------------------###"
+  # 移动编译后的文件
+  echo -e "$echoPrefix cd $dirPath $echoSuffix"
+  cd $dirPath
+  echo -e "$echoPrefix rm -rf ../runtime $echoSuffix"
+  rm -rf ../runtime
+  echo -e "$echoPrefix cp -r ./ ../runtime $echoSuffix"
+  cp -r ./ ../runtime
+  # 重启服务
   if [ ! -z $pid ];then
     stopServer $pid
     sleep 3s