05api-prod.groovy

05api-prod.sh

05shengke/05api-prod.groovy

@@ -21,10 +21,9 @@ pipeline {
                 sh """
                     wget -N http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/05shengke/05api-prod.sh
                     chmod +x ./05api-prod.sh
-                    ./05api-prod.sh deploy
+                    ./05api-prod.sh build
                 """
                 sh """
-                    sleep 3s
                     JENKINS_NODE_COOKIE=dontKillMe nohup ./05api-prod.sh restart > /dev/null 2>&1 &
                 """
             }

05shengke/05api-prod.sh

@@ -87,11 +87,22 @@ DATABASE_OPTS=" -Ddatabase.codeset=ISO-8859-1 -Ddatabase.logging=false"
 JAVA_OPTS_EXT=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dapplication.codeset=UTF-8 -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Shanghai -Duser.name=user"
 #-------------------------------------------------------------------
 
+moveBuildFile() {
+  # 移动编译后的文件
+  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 ""
+}
+
 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 ./wms8-api-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8094 >>/dev/null 2>&1 & $echoSuffix"
     java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./wms8-api-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8094 >>/dev/null 2>&1 &
     echo "$serverName 启动成功!"
@@ -132,7 +143,7 @@ deployServer() {
   deployPull
   buildCode
   echo "###--代码构建完成--------------------------------------------------------------------------###"
-  echo ""
+  moveBuildFile
   startServer
 }
 
@@ -142,6 +153,7 @@ restartServer() {
     stopServer $pid
     sleep 3s
   fi
+  moveBuildFile
   startServer
 }
 
@@ -150,8 +162,12 @@ logs() {
 }
 
 pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'`
-# 操作参数: deploy restart start stop kill log logs
-if [ "$cmd" == "deploy" ];then
+# 操作参数: build deploy restart start stop kill log logs
+if [ "$cmd" == "build" ];then
+  deployPull
+  buildCode
+  echo "###--代码构建完成--------------------------------------------------------------------------###"
+elif [ "$cmd" == "deploy" ];then
   deployServer $pid
 elif [ "$cmd" == "restart" ];then
   restartServer $pid
@@ -163,9 +179,9 @@ elif [ "$cmd" == "log" ] || [ "$cmd" == "logs" ];then
   logs
 else
   if [ -z $pid ];then
-    echo "$serverName 未运行 | 输入操作参数: deploy restart start stop kill log logs"
+    echo "$serverName 未运行 | 输入操作参数: build deploy restart start stop kill log logs"
   else
-    echo "输入操作参数: deploy restart start stop kill log logs"
+    echo "输入操作参数: build deploy restart start stop kill log logs"
     echo "pid=$pid | $serverName 正在运行... | 查看日志: tail -F $logPath -n 100"
   fi
 fi