diff --git a/hua_wei_yun/10wms86-test.sh b/hua_wei_yun/10wms86-test.sh index a176abe..f07c207 100644 --- a/hua_wei_yun/10wms86-test.sh +++ b/hua_wei_yun/10wms86-test.sh @@ -86,6 +86,19 @@ buildCode() { echo "yvan-ui 文件未变化" fi + # 构建 wms-ui + if [ "${needBuild[0]}" != "0" ]; then + echo -e "$echoPrefix cd $codePath/wms-ui $echoSuffix" + cd "$codePath/wms-ui" + echo -e "$echoPrefix yarn $echoSuffix" + yarn + echo -e "$echoPrefix yarn link yvan-ui $echoSuffix" + yarn link yvan-ui + echo "" + else + echo "yvan-ui 文件未变化" + fi + # 构建 java echo -e "$echoPrefix cd $codePath $echoSuffix" cd $codePath @@ -95,7 +108,7 @@ buildCode() { } logPath=/data/logs/wms85std_test/server.log -dirPath=/home/www/deploy/wms85std_test/wms/wms-application/build/libs/ +dirPath=/home/www/deploy/wms85std_test/wms-modules/wms-system/build/libs/ serverName=wms85std_test cmd=$1 @@ -112,8 +125,8 @@ startServer() { 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 ./wms-application-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8004 >>/dev/null 2>&1 & $echoSuffix" - java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./wms-application-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8004 >>/dev/null 2>&1 & + echo -e "$echoPrefix java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./wms-system-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8004 >>/dev/null 2>&1 & $echoSuffix" + java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./wms-system-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles --server.port=8004 >>/dev/null 2>&1 & echo "$serverName 启动成功!" else echo "$serverName 正在运行..."