diff --git a/yxt-yn/prod-deploy-wms8.sh b/yxt-yn/prod-deploy-wms8.sh index b0379be..e937ab6 100644 --- a/yxt-yn/prod-deploy-wms8.sh +++ b/yxt-yn/prod-deploy-wms8.sh @@ -54,24 +54,24 @@ pullCode() { # git clone echo -e "$echoPrefix cd $path $echoSuffix" - cd "$path" - if [ "$(ls -A "$path")" == "" ] || [ ! -d "$path/$position" ] || [ "$(ls -A "$path"/"$position")" == "" ]; then + cd $path + if [ "`ls -A $path`" == "" ] || [ ! -d "$path/$position" ] || [ "`ls -A $path/$position`" = "" ]; then echo -e "$echoPrefix git clone $gitUrl $position $echoSuffix" - git clone "$gitUrl" "$position" + git clone $gitUrl $position isChange="2" fi # 进入文件夹,切换分支,git pull if [ "$position" != "" ]; then echo -e "$echoPrefix cd $position $echoSuffix" - cd "$position" + cd $position fi echo -e "$echoPrefix git checkout $branch $echoSuffix" - git checkout "$branch" + git checkout $branch echo -e "$echoPrefix git checkout . $echoSuffix" git checkout . echo -e "$echoPrefix git pull $echoSuffix" - if [ "$(git pull)" == "Already up-to-date." ] && [ $isChange == "1" ]; then + if [ "`git pull`" == "Already up-to-date." ] && [ $isChange == "1" ]; then isChange="0" fi echo "" @@ -161,11 +161,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/ $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 >>/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=18100 >>/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=18100 >>/dev/null 2>&1 & echo "$serverName 启动成功!" else echo "$serverName 正在运行..." @@ -175,18 +175,18 @@ 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" - pgrep -f "DappName=${serverName}" | xargs kill + ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}' | xargs kill echo "$serverName 已停止!" fi } deployPull() { for ((idx=0; idx<${#gitUrlArr[@]}; idx++)); do - pullCode $codePath "${gitUrlArr[idx]}" "${branchArr[idx]}" "${positionArr[idx]}" + pullCode $codePath ${gitUrlArr[idx]} ${branchArr[idx]} ${positionArr[idx]} if [ "${needBuild[idx]}" == "-1" ]; then needBuild[idx]=$isChange fi @@ -201,8 +201,8 @@ deployServer() { buildCode echo "###--代码构建完成--------------------------------------------------------------------------###" # 重启服务 - if [ -n "$pid" ];then - stopServer "$pid" + if [ ! -z $pid ];then + stopServer $pid sleep 3s fi # 移动编译后的文件 @@ -218,8 +218,8 @@ deployServer() { restartServer() { pid=$1 - if [ -n "$pid" ];then - stopServer "$pid" + if [ ! -z $pid ];then + stopServer $pid sleep 3s fi startServer @@ -229,30 +229,25 @@ logs() { tail -F $logPath -n 100 } -echo "### 222" - -pid=$(pgrep -f "DappName=${serverName}") -echo "### 333 $pid" -echo "### 444 $cmd" - +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 + if [ -z $pid ];then echo "$serverName 未运行 | 输入操作参数: pull deploy restart start stop kill log logs" fi elif [ "$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 未运行 | 输入操作参数: pull deploy restart start stop kill log logs" else echo "输入操作参数: pull deploy restart start stop kill log logs" @@ -260,6 +255,4 @@ else fi fi -echo "### 111" - # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/yxt-yn/prod-deploy-wms8.sh) [cmd profiles]