Merge remote-tracking branch 'origin/master'

wms8/build.sh

@@ -8,6 +8,7 @@ gitUrlArr=(
   "http://git.yvanui.com/jztd/yvan-ext.git"
   "www@git.yvanui.com:lizhiwei/yvan-framework.git"
   "http://git.galaxis.yvanui.com/wms8/wms-core.git"
+  "www@git.yvanui.com:jztd/yvan-ext-mobile.git"
 )
 
 branchArr=(
@@ -15,24 +16,28 @@ branchArr=(
   "master"
   "master"
   "master"
+  "master"
 )
 positionArr=(
   "."
   "yvan-ext"
   "yvan-framework"
   "wms-core"
+  "yvan-ext-mobile"
 )
 # 是否需要构建，-1：自动；0：不需要；1：需要
 needBuild=(
-"-1"
-"-1"
-"-1"
-"-1"
+"1"
+"1"
+"1"
+"1"
+"1"
 )
 
 echoPrefix="\033[36m+"
 echoSuffix="\033[0m"
 
+# 强制覆盖本地的代码 git fetch --all &&  git reset --hard origin/master
 isChange="1"                # 仓库是否发生变化，0：未变化；非0：变化
 pullCode() {
   # Usage: pullCode "codePath" "gitUrl" "branch" "position"
@@ -95,6 +100,21 @@ buildCode() {
     echo "yvan-ext 文件未变化"
   fi
 
+  # 构建 yvan-ext-mobile
+  if [ "${needBuild[4]}" != "0" ]; then
+    echo -e "$echoPrefix cd $codePath/yvan-ext-mobile $echoSuffix"
+    cd "$codePath/yvan-ext-mobile"
+    echo -e "$echoPrefix yarn $echoSuffix"
+    yarn
+    echo -e "$echoPrefix yarn link $echoSuffix"
+    yarn link
+    echo -e "$echoPrefix yarn build $echoSuffix"
+    yarn build
+    echo ""
+  else
+    echo "yvan-ext-mobile 文件未变化"
+  fi
+
   # 构建 wms-biz/bundle
   if [ "${needBuild[0]}" != "0" ]; then
     echo -e "$echoPrefix cd $codePath/wms-biz/bundle $echoSuffix"
@@ -110,6 +130,21 @@ buildCode() {
     echo "wms-biz/bundle 文件未变化"
   fi
 
+  # 构建 wms-biz/pda-client
+  if [ "${needBuild[0]}" != "0" ]; then
+    echo -e "$echoPrefix cd $codePath/wms-biz/pda-client $echoSuffix"
+    cd "$codePath/wms-biz/pda-client"
+    echo -e "$echoPrefix yarn $echoSuffix"
+    yarn
+    echo -e "$echoPrefix yarn link yvan-ext-mobile $echoSuffix"
+    yarn link yvan-ext-mobile
+    echo -e "$echoPrefix yarn build $echoSuffix"
+    yarn build
+    echo ""
+  else
+    echo "wms-biz/pda-client 文件未变化"
+  fi
+
   # 构建 java
   echo -e "$echoPrefix cd $codePath $echoSuffix"
   cd $codePath