From dca4ff48c39749f6cb00d6149f07e225e57cc944 Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Fri, 13 May 2022 13:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E5=88=86?=
 =?UTF-8?q?=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt/build.sh       |  2 ++
 yxt/deploy-lims.sh | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/yxt/build.sh b/yxt/build.sh
index c3c8325..ed400c4 100644
--- a/yxt/build.sh
+++ b/yxt/build.sh
@@ -263,3 +263,5 @@ echo ""
 deployPush
 echo "###--文件推送完成--------------------------------------------------------------------------###"
 echo ""
+
+# bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/yxt/build.sh)
diff --git a/yxt/deploy-lims.sh b/yxt/deploy-lims.sh
index 95d25c1..7f45741 100644
--- a/yxt/deploy-lims.sh
+++ b/yxt/deploy-lims.sh
@@ -6,13 +6,18 @@ set -e
 gitUrl=ssh://www@122.9.140.63:3022/bot_yxt/yxt_lmis.git
 dirPath=~/deploy/yxt_lmis
 serverName=yxt_lmis
-logPath=~/logs/yxt_lmis_nohup.log
+logPath=/home/www/logs/yxt_lmis/yxt_lmis.log
 
 cmd=$1
 profiles=${2:-"hwy"}
 echoPrefix="\033[36m+"
 echoSuffix="\033[0m"
 
+# 山西服务的日志位置
+if [ "$profiles" == "yxt-prod" ];then
+  logPath=/data/logs/yxt_lmis_sx/yxt_lmis_sx.log
+fi
+
 #-------------------------------------------------------------------
 JAVA_MEM_OPTS=" -DappName=${serverName} -server -Xmx4g -Xms4g"
 DATABASE_OPTS=" -Ddatabase.codeset=ISO-8859-1 -Ddatabase.logging=false"
@@ -61,8 +66,8 @@ startServer() {
   if [ -z $pid ];then
     echo -e "$echoPrefix cd $dirPath $echoSuffix"
     cd $dirPath
-    echo -e "$echoPrefix java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./ent-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8082 >$logPath 2>&1 & $echoSuffix"
-    java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./ent-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8082 >$logPath 2>&1 &
+    echo -e "$echoPrefix java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./ent-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8082 >>/dev/null 2>&1 & $echoSuffix"
+    java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./ent-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8082 >>/dev/null 2>&1 &
     echo "$serverName 启动成功!"
   else
     echo "$serverName 正在运行..."
@@ -125,3 +130,4 @@ else
   fi
 fi
 
+# bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/yxt/deploy-lims.sh) [cmd profiles]