From b54dcab82ac5ef94b48e99a39d21caebbde9de40 Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Sat, 14 May 2022 16:53:37 +0800
Subject: [PATCH] pre-deploy-pda.sh

---
 yxt-yn/pre-deploy-pda.sh  |  3 ++-
 yxt-yn/prod-deploy-pda.sh | 29 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/yxt-yn/pre-deploy-pda.sh b/yxt-yn/pre-deploy-pda.sh
index 35b8896..c331b22 100644
--- a/yxt-yn/pre-deploy-pda.sh
+++ b/yxt-yn/pre-deploy-pda.sh
@@ -16,7 +16,7 @@ git checkout .
 echo -e "$echoPrefix git pull $echoSuffix"
 git pull
 
-# 读取版本号 #time=`date +%Y-%m-%d.%H-%M`
+# 读取版本号
 major='1'
 minor=$(date +%Y%m%d)
 patch=$(date +%H%M%S)
@@ -130,6 +130,7 @@ echo -e "$echoPrefix cd $codePath $echoSuffix"
 cd $codePath
 echo -e "$echoPrefix git checkout . $echoSuffix"
 git checkout .
+echo -e "$echoPrefix 版本号信息: version=$version, major=$major, minor=$minor, patch=$patch $echoSuffix"
 echo ""
 
 # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/yxt-yn/pre-deploy-pda.sh) [cmd profiles]
diff --git a/yxt-yn/prod-deploy-pda.sh b/yxt-yn/prod-deploy-pda.sh
index 7341888..0c6efe6 100644
--- a/yxt-yn/prod-deploy-pda.sh
+++ b/yxt-yn/prod-deploy-pda.sh
@@ -8,16 +8,23 @@ echoSuffix="\033[0m"
 codePath=/home/www/deploy/wms8_prod
 serverUrl=http://10.0.30.220:8100
 
-# 进入代码文件夹
+# 更新代码
 echo -e "$echoPrefix cd $codePath $echoSuffix"
 cd $codePath
-
-# 更新代码
 echo -e "$echoPrefix git checkout . $echoSuffix"
 git checkout .
 echo -e "$echoPrefix git pull $echoSuffix"
 git pull
 
+# 读取版本号
+major='1'
+minor=$(date +%Y%m%d)
+patch=$(date +%H%M%S)
+version="$major.$minor.$patch"
+echo -e "$echoPrefix sed -i 's/__WebAppVersion__/$version/g' $codePath/wms-biz/pda-client/src/app.js $echoSuffix"
+sed -i "s/__WebAppVersion__/$version/g" $codePath/wms-biz/pda-client/src/app.js
+echo -e "$echoPrefix 版本号信息: version=$version, major=$major, minor=$minor, patch=$patch $echoSuffix"
+
 echo "###--代码更新完成--------------------------------------------------------------------------###"
 echo ""
 
@@ -107,14 +114,6 @@ zip -r web.zip web
 echo "###--打包完成-----------------------------------------------------------------------------###"
 echo ""
 
-# 读取版本号
-version=$(cat $codePath/wms-biz/pda-client/src/app.js | grep window.JSInterface.setWebAppVersion | awk -F '"' '{print $2}')
-major=$(echo $version | awk -F '.' '{print $1}')
-minor=$(echo $version | awk -F '.' '{print $2}')
-patch=$(echo $version | awk -F '.' '{print $3}')
-echo -e "$echoPrefix 版本号信息: version=$version, major=$major, minor=$minor, patch=$patch $echoSuffix"
-echo ""
-
 # 上传文件
 echo -e "$echoPrefix curl -X POST -F 'file=@$codePath/tmp/web.zip' $serverUrl/file/upload $echoSuffix"
 res_json=$(curl -X POST -F 'file=@'$codePath'/tmp/web.zip' $serverUrl/file/upload)
@@ -126,4 +125,12 @@ res_json=$(curl -H "Content-type: application/json" -X POST -d "$req_json" $serv
 echo -e "$echoPrefix $res_json $echoSuffix"
 echo ""
 
+# 还原文件
+echo -e "$echoPrefix cd $codePath $echoSuffix"
+cd $codePath
+echo -e "$echoPrefix git checkout . $echoSuffix"
+git checkout .
+echo -e "$echoPrefix 版本号信息: version=$version, major=$major, minor=$minor, patch=$patch $echoSuffix"
+echo ""
+
 # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/yxt-yn/prod-deploy-pda.sh) [cmd profiles]