From f521a97d731008ab86966acf085f236888d9a9d1 Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Wed, 11 May 2022 21:23:18 +0800
Subject: [PATCH] =?UTF-8?q?pre-deploy-pad.sh=20pda=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-yn/pre-deploy-pad.sh | 52 +++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/yxt-yn/pre-deploy-pad.sh b/yxt-yn/pre-deploy-pad.sh
index e873017..25f56cd 100644
--- a/yxt-yn/pre-deploy-pad.sh
+++ b/yxt-yn/pre-deploy-pad.sh
@@ -35,13 +35,6 @@ yarn build
 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 -e "$echoPrefix rm -rf $codePath/tmp $echoSuffix"
 rm -rf $codePath/tmp
@@ -114,32 +107,23 @@ zip -r web.zip web
 echo "###--打包完成-----------------------------------------------------------------------------###"
 echo ""
 
-# serverUrl
-
-
-#http://10.0.30.220:8100/file/upload
-#{"success":true,"msg":"操作成功","data":"/upload/2022/2022-05/2022-05-11/b6d1bfa0-35a2-4c4f-8004-0bf1f016bade.zip"}
-#
-#http://10.0.30.220:8100/api/com/galaxis/wms/sys/app_version/AppVersion@newAppVersion
-#{
-#  "args": [
-#    {
-#      "app_version_d": "22",
-#      "app_code": "PDA_WEB",
-#      "app_name": "PDA_WEB",
-#      "major": 1,
-#      "minor": 1,
-#      "patch": 12,
-#      "file_path": "/upload/2022/2022-05/2022-05-11/b6d1bfa0-35a2-4c4f-8004-0bf1f016bade.zip",
-#      "create_by": "3",
-#      "create_at": "2022-05-11 20:02:51",
-#      "update_by": "3",
-#      "update_at": "2022-05-11 20:02:51",
-#      "app_version": "1.1.12",
-#      "id": "extModel1526-1",
-#      "file": null
-#    }
-#  ]
-#}
+# 读取版本号
+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)
+filePath=$(echo $res_json | awk -F '"' '{print $10}')
+
+req_json='{"args":[{"app_code":"PDA_WEB","app_name":"PDA_WEB","major":'$major',"minor":'$minor',"patch":'$patch',"file_path":"'$filePath'","app_version":"'$$version'"}]}'
+res_json=$(curl -H "Content-type: application/json" -X POST -d "$req_json" $serverUrl/api/com/galaxis/wms/sys/app_version/AppVersion@newAppVersion)
+
+echo -e "$echoPrefix $res_json $echoSuffix"
+echo ""
 
 # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/yxt-yn/pre-deploy-pad.sh) [cmd profiles]