From 8804c05c14935537219294d268a1fcca91879e4c Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Fri, 20 May 2022 15:44:33 +0800
Subject: [PATCH] add prod-deploy-wms8-n2.sh

---
 yxt-yn/prod-deploy-wms8-n2.sh | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/yxt-yn/prod-deploy-wms8-n2.sh b/yxt-yn/prod-deploy-wms8-n2.sh
index 4ed9e3c..00a55d8 100644
--- a/yxt-yn/prod-deploy-wms8-n2.sh
+++ b/yxt-yn/prod-deploy-wms8-n2.sh
@@ -20,11 +20,11 @@ JAVA_OPTS_EXT=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dappli
 
 startServer() {
   pid=$1
-  if [ -z "$pid" ];then
+  if [ -z $pid ];then
     echo -e "$echoPrefix cd $dirPath../runtime_2/ $echoSuffix"
     cd $dirPath../runtime_2/
     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=28100 >>/dev/null 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=28100 >>/dev/null 2>&1 &
+    java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./servo-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,"$profiles" --server.port=28100 >>/dev/null 2>&1 &
     echo "$serverName 启动成功!"
   else
     echo "$serverName 正在运行..."
@@ -34,7 +34,7 @@ startServer() {
 
 stopServer() {
   pid=$1
-  if [ -z "$pid" ];then
+  if [ -z $pid ];then
     echo "$serverName 未运行"
   else
     echo -e "$echoPrefix ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print \$2}' | xargs kill $echoSuffix"
@@ -51,13 +51,15 @@ deployServer() {
     exit
   fi
   # 重启服务
-  if [ -n "$pid" ];then
-    stopServer "$pid"
+  if [ ! -z $pid ];then
+    stopServer $pid
     sleep 3s
   fi
   # 移动编译后的文件
   echo -e "$echoPrefix cd $dirPath $echoSuffix"
   cd $dirPath
+  echo -e "$echoPrefix rm -rf ../runtime_2 $echoSuffix"
+  rm -rf ../runtime_2
   echo -e "$echoPrefix cp -r ./ ../runtime_2 $echoSuffix"
   cp -r ./ ../runtime_2
   echo ""
@@ -66,8 +68,8 @@ deployServer() {
 
 restartServer() {
   pid=$1
-  if [ -n "$pid" ];then
-    stopServer "$pid"
+  if [ ! -z $pid ];then
+    stopServer $pid
     sleep 3s
   fi
   startServer
@@ -77,20 +79,20 @@ logs() {
   tail -F $logPath -n 100
 }
 
-pid=$(ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}')
+pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'`
 # 操作参数: deploy restart start stop kill log logs
 if [ "$cmd" == "deploy" ];then
-  deployServer "$pid"
+  deployServer $pid
 elif [ "$cmd" == "restart" ];then
-  restartServer "$pid"
+  restartServer $pid
 elif [ "$cmd" == "start" ];then
-  startServer "$pid"
+  startServer $pid
 elif [ "$cmd" == "stop" ] || [ "$cmd" == "kill" ];then
-  stopServer "$pid"
+  stopServer $pid
 elif [ "$cmd" == "log" ] || [ "$cmd" == "logs" ];then
   logs
 else
-  if [ -z "$pid" ];then
+  if [ -z $pid ];then
     echo "$serverName 未运行 | 输入操作参数: deploy restart start stop kill log logs"
   else
     echo "输入操作参数: deploy restart start stop kill log logs"