还原 build.sh

wms8/build.sh

@@ -48,8 +48,8 @@ pullCode() {
   isChange="1"
   # 创建文件夹
   if [ ! -d "$path" ]; then
-    echo -e "$echoPrefix 请检查服务器是否正确,再执行: mkdir -p $path $echoSuffix"
-    exit
+    echo -e "$echoPrefix mkdir -p $path $echoSuffix"
+    mkdir -p $path
   fi
 
   # git clone
@@ -77,6 +77,15 @@ pullCode() {
   echo ""
 }
 
+for ((idx=0; idx<${#gitUrlArr[@]}; idx++)); do
+  pullCode $codePath ${gitUrlArr[idx]} ${branchArr[idx]} ${positionArr[idx]}
+  if [ "${needBuild[idx]}" == "-1" ]; then
+    needBuild[idx]=$isChange
+  fi
+done
+echo "###--代码更新完成--------------------------------------------------------------------------###"
+echo ""
+
 buildCode() {
   # 构建 yvan-ext
   if [ "${needBuild[1]}" != "0" ]; then
@@ -146,6 +155,10 @@ buildCode() {
   echo ""
 }
 
+buildCode
+echo "###--代码构建完成--------------------------------------------------------------------------###"
+echo ""
+
 logPath=/home/www/output/wms8_bench_nohup.log
 dirPath=/home/www/deploy/wms8-bench/wms-biz/servo/build/libs/
 serverName=wms8_bench
@@ -164,8 +177,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 ./servo-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8095 >$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=8095 >$logPath 2>&1 &
+    echo -e "$echoPrefix java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./servo-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles >$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 >$logPath 2>&1 &
     echo "$serverName 启动成功!"
   else
     echo "$serverName 正在运行..."
@@ -184,67 +197,12 @@ stopServer() {
   fi
 }
 
-deployPull() {
-  for ((idx=0; idx<${#gitUrlArr[@]}; idx++)); do
-    pullCode $codePath ${gitUrlArr[idx]} ${branchArr[idx]} ${positionArr[idx]}
-    if [ "${needBuild[idx]}" == "-1" ]; then
-      needBuild[idx]=$isChange
-    fi
-  done
-  echo "###--代码更新完成--------------------------------------------------------------------------###"
-  echo ""
-}
-
-deployServer() {
-  pid=$1
-  if [ ! -z $pid ];then
-    stopServer $pid
-    sleep 3s
-  fi
-  deployPull
-  buildCode
-  echo "###--代码构建完成--------------------------------------------------------------------------###"
-  echo ""
-  startServer
-}
-
-restartServer() {
-  pid=$1
-  if [ ! -z $pid ];then
-    stopServer $pid
-    sleep 3s
-  fi
-  startServer
-}
-
-logs() {
-  tail -F $logPath -n 100
-}
-
 pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'`
-# 操作参数: pull deploy restart start stop kill log logs
-if [ "$cmd" == "pull" ];then
-  deployPull
-  if [ -z $pid ];then
-    echo "$serverName 未运行 | 输入操作参数: pull deploy restart start stop kill log logs"
-  fi
-elif [ "$cmd" == "deploy" ];then
-  deployServer $pid
-elif [ "$cmd" == "restart" ];then
-  restartServer $pid
-elif [ "$cmd" == "start" ];then
-  startServer $pid
-elif [ "$cmd" == "stop" ] || [ "$cmd" == "kill" ];then
+if [ ! -z $pid ];then
   stopServer $pid
-elif [ "$cmd" == "log" ] || [ "$cmd" == "logs" ];then
-  logs
-else
-  if [ -z $pid ];then
-    echo "$serverName 未运行 | 输入操作参数: pull deploy restart start stop kill log logs"
-  else
-    echo "输入操作参数: pull deploy restart start stop kill log logs"
-    echo "pid=$pid | $serverName 正在运行... | 查看日志: tail -F $logPath -n 100"
-  fi
+  sleep 3s
 fi
+startServer
 
 # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/wms8/build.sh) [cmd profiles]
+