diff --git a/yxt-yn/pre-deploy-wms8.sh b/yxt-yn/pre-deploy-wms8.sh index bf76727..e76e076 100644 --- a/yxt-yn/pre-deploy-wms8.sh +++ b/yxt-yn/pre-deploy-wms8.sh @@ -162,14 +162,8 @@ JAVA_OPTS_EXT=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dappli startServer() { pid=$1 if [ -z $pid ];then - 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 -e "$echoPrefix cd ../runtime $echoSuffix" - cd ../runtime + echo -e "${echoPrefix}/runtime cd $dirPath $echoSuffix" + cd ${echoPrefix}/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=18095 >$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=18095 >$logPath 2>&1 & echo "$serverName 启动成功!" @@ -206,6 +200,14 @@ deployServer() { deployPull buildCode echo "###--代码构建完成--------------------------------------------------------------------------###" + # 移动编译后的文件 + 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 + # 重启服务 if [ ! -z $pid ];then stopServer $pid sleep 3s