diff --git a/hua_wei_yun/04wms-ztf-test.sh b/hua_wei_yun/04wms-ztf-test.sh index 2889b09..1daad38 100644 --- a/hua_wei_yun/04wms-ztf-test.sh +++ b/hua_wei_yun/04wms-ztf-test.sh @@ -74,6 +74,32 @@ pullCode() { } buildCode() { + # 构建 wms-ui-pc + if [ "${needBuild[1]}" != "0" ]; then + echo -e "$echoPrefix cd $codePath/wms-ui-pc $echoSuffix" + cd "$codePath/wms-ui-pc" + echo -e "$echoPrefix yarn $echoSuffix" + yarn + echo -e "$echoPrefix yarn link yvan-vue $echoSuffix" + yarn link yvan-vue + echo "" + else + echo "wms-ui-pc 文件未变化" + fi + + # 构建 wms-ui-mobile + if [ "${needBuild[2]}" != "0" ]; then + echo -e "$echoPrefix cd $codePath/wms-ui-mobile $echoSuffix" + cd "$codePath/wms-ui-mobile" + echo -e "$echoPrefix yarn $echoSuffix" + yarn + echo -e "$echoPrefix link yvan-vue-mobile $echoSuffix" + link yvan-vue-mobile + echo "" + else + echo "wms-ui-mobile 文件未变化" + fi + # 构建 java echo -e "$echoPrefix cd $codePath $echoSuffix" cd $codePath @@ -176,17 +202,30 @@ logs() { } deployYvanUI() { - bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/00base/11yvan-vue.sh) pull - bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/00base/12yvan-vue-mobile.sh) pull + bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/00base/11yvan-vue.sh) deploy + bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/00base/12yvan-vue-mobile.sh) deploy +} + +startPcUi() { + echo -e "$echoPrefix cd $codePath/wms-ui-pc $echoSuffix" + cd "$codePath/wms-ui-pc" + + +} + +startMobileUi() { + echo -e "$echoPrefix cd $codePath/wms-ui-mobile $echoSuffix" + cd "$codePath/wms-ui-mobile" + } pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'` -# 操作参数: pull build deploy restart start stop kill log logs +# 操作参数: pull build deploy restart start stop kill log logs startPc startMobile if [ "$cmd" == "pull" ];then deployYvanUI deployPull if [ -z $pid ];then - echo "$serverName 未运行 | 输入操作参数: pull build deploy restart start stop kill log logs" + echo "$serverName 未运行 | 输入操作参数: pull build deploy restart start stop kill log logs startPc startMobile" fi elif [ "$cmd" == "build" ];then deployYvanUI @@ -204,12 +243,16 @@ elif [ "$cmd" == "stop" ] || [ "$cmd" == "kill" ];then stopServer $pid elif [ "$cmd" == "log" ] || [ "$cmd" == "logs" ];then logs +elif [ "$cmd" == "startPc" ];then + startPcUi +elif [ "$cmd" == "startMobile" ];then + startMobileUi else if [ -z $pid ];then - echo "$serverName 未运行 | 输入操作参数: pull build deploy restart start stop kill log logs" + echo "$serverName 未运行 | 输入操作参数: pull build deploy restart start stop kill log logs startPc startMobile" echo "查看日志: tail -F $logPath -n 100" else - echo "输入操作参数: pull build deploy restart start stop kill log logs" + echo "输入操作参数: pull build deploy restart start stop kill log logs startPc startMobile" echo "pid=$pid | $serverName 正在运行... | 查看日志: tail -F $logPath -n 100" fi fi