From d12bb69142d9d704a503c4868fe5543d0902aa01 Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Mon, 9 May 2022 12:50:54 +0800
Subject: [PATCH] =?UTF-8?q?prod-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/prod-deploy-wms8.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/yxt-yn/prod-deploy-wms8.sh b/yxt-yn/prod-deploy-wms8.sh
index 4bf374f..dfc7a62 100644
--- a/yxt-yn/prod-deploy-wms8.sh
+++ b/yxt-yn/prod-deploy-wms8.sh
@@ -162,8 +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 cd $dirPath../runtime/ $echoSuffix"
+    cd $dirPath../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=18100 >$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=18100 >$logPath 2>&1 &
     echo "$serverName 启动成功!"
@@ -197,13 +197,21 @@ deployPull() {
 
 deployServer() {
   pid=$1
+  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
   fi
-  deployPull
-  buildCode
-  echo "###--代码构建完成--------------------------------------------------------------------------###"
   echo ""
   startServer
 }