|
|
|
@ -8,126 +8,135 @@ echoSuffix="\033[0m" |
|
|
|
codePath=/home/www/deploy/wms8_prod |
|
|
|
serverUrl=http://127.0.0.1:8082 |
|
|
|
|
|
|
|
# 更新代码 |
|
|
|
echo -e "$echoPrefix cd $codePath $echoSuffix" |
|
|
|
cd $codePath |
|
|
|
echo -e "$echoPrefix git checkout . $echoSuffix" |
|
|
|
git checkout . |
|
|
|
echo -e "$echoPrefix git pull $echoSuffix" |
|
|
|
git pull |
|
|
|
deploy() { |
|
|
|
# 更新代码 |
|
|
|
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 +1%H%M%S | sed -e 's/^[[:space:]]*//') |
|
|
|
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" |
|
|
|
# 读取版本号 |
|
|
|
major='1' |
|
|
|
minor=$(date +%Y%m%d) |
|
|
|
patch=$(date +1%H%M%S | sed -e 's/^[[:space:]]*//') |
|
|
|
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 "" |
|
|
|
echo "###--代码更新完成--------------------------------------------------------------------------###" |
|
|
|
echo "" |
|
|
|
|
|
|
|
# 编译 |
|
|
|
bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/00base/02yvan-ext-mobile.sh) pull |
|
|
|
# 编译 |
|
|
|
bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/00base/02yvan-ext-mobile.sh) pull |
|
|
|
|
|
|
|
echo -e "$echoPrefix cd $codePath/wms-biz/pda-client/ $echoSuffix" |
|
|
|
cd $codePath/wms-biz/pda-client/ |
|
|
|
echo -e "$echoPrefix yarn build $echoSuffix" |
|
|
|
yarn build |
|
|
|
echo -e "$echoPrefix cd $codePath/wms-biz/pda-client/ $echoSuffix" |
|
|
|
cd $codePath/wms-biz/pda-client/ |
|
|
|
echo -e "$echoPrefix yarn build $echoSuffix" |
|
|
|
yarn build |
|
|
|
|
|
|
|
echo "###--编译完成-----------------------------------------------------------------------------###" |
|
|
|
echo "" |
|
|
|
echo "###--编译完成-----------------------------------------------------------------------------###" |
|
|
|
echo "" |
|
|
|
|
|
|
|
# 创建打包文件夹 |
|
|
|
echo -e "$echoPrefix rm -rf $codePath/tmp $echoSuffix" |
|
|
|
rm -rf $codePath/tmp |
|
|
|
# 创建打包文件夹 |
|
|
|
echo -e "$echoPrefix rm -rf $codePath/tmp $echoSuffix" |
|
|
|
rm -rf $codePath/tmp |
|
|
|
|
|
|
|
echo -e "$echoPrefix mkdir -p $codePath/tmp/web/static $echoSuffix" |
|
|
|
mkdir -p $codePath/tmp/web/static |
|
|
|
echo -e "$echoPrefix mkdir -p $codePath/tmp/web/static $echoSuffix" |
|
|
|
mkdir -p $codePath/tmp/web/static |
|
|
|
|
|
|
|
echo -e "$echoPrefix mkdir -p $codePath/tmp/web/node_modules/tslib $echoSuffix" |
|
|
|
mkdir -p $codePath/tmp/web/node_modules/tslib |
|
|
|
echo -e "$echoPrefix mkdir -p $codePath/tmp/web/node_modules/tslib $echoSuffix" |
|
|
|
mkdir -p $codePath/tmp/web/node_modules/tslib |
|
|
|
|
|
|
|
echo -e "$echoPrefix mkdir -p $codePath/tmp/web/m_node_modules/yvan-ext-mobile $echoSuffix" |
|
|
|
mkdir -p $codePath/tmp/web/m_node_modules/yvan-ext-mobile |
|
|
|
echo -e "$echoPrefix mkdir -p $codePath/tmp/web/m_node_modules/yvan-ext-mobile $echoSuffix" |
|
|
|
mkdir -p $codePath/tmp/web/m_node_modules/yvan-ext-mobile |
|
|
|
|
|
|
|
echo -e "$echoPrefix mkdir -p $codePath/tmp/web/mobile-assets $echoSuffix" |
|
|
|
mkdir -p $codePath/tmp/web/mobile-assets |
|
|
|
echo -e "$echoPrefix mkdir -p $codePath/tmp/web/mobile-assets $echoSuffix" |
|
|
|
mkdir -p $codePath/tmp/web/mobile-assets |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/dist_pda/ $codePath/tmp/web/dist_pda $echoSuffix" |
|
|
|
cp -r $codePath/dist_pda/ $codePath/tmp/web/dist_pda |
|
|
|
echo -e "$echoPrefix cp -r $codePath/dist_pda/ $codePath/tmp/web/dist_pda $echoSuffix" |
|
|
|
cp -r $codePath/dist_pda/ $codePath/tmp/web/dist_pda |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/require.js $codePath/tmp/web/static/require.js $echoSuffix" |
|
|
|
cp -r $codePath/public/static/require.js $codePath/tmp/web/static/require.js |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/require.js $codePath/tmp/web/static/require.js $echoSuffix" |
|
|
|
cp -r $codePath/public/static/require.js $codePath/tmp/web/static/require.js |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/m_require_config.js $codePath/tmp/web/m_require_config.js $echoSuffix" |
|
|
|
cp -r $codePath/public/m_require_config.js $codePath/tmp/web/m_require_config.js |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/m_require_config.js $codePath/tmp/web/m_require_config.js $echoSuffix" |
|
|
|
cp -r $codePath/public/m_require_config.js $codePath/tmp/web/m_require_config.js |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/m_common.css $codePath/tmp/web/m_common.css $echoSuffix" |
|
|
|
cp -r $codePath/public/m_common.css $codePath/tmp/web/m_common.css |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/m_common.css $codePath/tmp/web/m_common.css $echoSuffix" |
|
|
|
cp -r $codePath/public/m_common.css $codePath/tmp/web/m_common.css |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/m.html $codePath/tmp/web/index.html $echoSuffix" |
|
|
|
cp -r $codePath/public/m.html $codePath/tmp/web/index.html |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/m.html $codePath/tmp/web/index.html $echoSuffix" |
|
|
|
cp -r $codePath/public/m.html $codePath/tmp/web/index.html |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/require-css $codePath/tmp/web/static/require-css $echoSuffix" |
|
|
|
cp -r $codePath/public/static/require-css $codePath/tmp/web/static/require-css |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/require-css $codePath/tmp/web/static/require-css $echoSuffix" |
|
|
|
cp -r $codePath/public/static/require-css $codePath/tmp/web/static/require-css |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/polyfill $codePath/tmp/web/static/polyfill $echoSuffix" |
|
|
|
cp -r $codePath/public/static/polyfill $codePath/tmp/web/static/polyfill |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/polyfill $codePath/tmp/web/static/polyfill $echoSuffix" |
|
|
|
cp -r $codePath/public/static/polyfill $codePath/tmp/web/static/polyfill |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/jquery $codePath/tmp/web/static/jquery $echoSuffix" |
|
|
|
cp -r $codePath/public/static/jquery $codePath/tmp/web/static/jquery |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/jquery $codePath/tmp/web/static/jquery $echoSuffix" |
|
|
|
cp -r $codePath/public/static/jquery $codePath/tmp/web/static/jquery |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/font-awesome $codePath/tmp/web/static/font-awesome $echoSuffix" |
|
|
|
cp -r $codePath/public/static/font-awesome $codePath/tmp/web/static/font-awesome |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/font-awesome $codePath/tmp/web/static/font-awesome $echoSuffix" |
|
|
|
cp -r $codePath/public/static/font-awesome $codePath/tmp/web/static/font-awesome |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/iconfont $codePath/tmp/web/static/iconfont $echoSuffix" |
|
|
|
cp -r $codePath/public/static/iconfont $codePath/tmp/web/static/iconfont |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/iconfont $codePath/tmp/web/static/iconfont $echoSuffix" |
|
|
|
cp -r $codePath/public/static/iconfont $codePath/tmp/web/static/iconfont |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/bootstrap $codePath/tmp/web/static/bootstrap $echoSuffix" |
|
|
|
cp -r $codePath/public/static/bootstrap $codePath/tmp/web/static/bootstrap |
|
|
|
echo -e "$echoPrefix cp -r $codePath/public/static/bootstrap $codePath/tmp/web/static/bootstrap $echoSuffix" |
|
|
|
cp -r $codePath/public/static/bootstrap $codePath/tmp/web/static/bootstrap |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/tslib/tslib.js $codePath/tmp/web/node_modules/tslib/tslib.js $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/tslib/tslib.js $codePath/tmp/web/node_modules/tslib/tslib.js |
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/tslib/tslib.js $codePath/tmp/web/node_modules/tslib/tslib.js $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/tslib/tslib.js $codePath/tmp/web/node_modules/tslib/tslib.js |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/dist $codePath/tmp/web/m_node_modules/yvan-ext-mobile/dist $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/dist $codePath/tmp/web/m_node_modules/yvan-ext-mobile/dist |
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/dist $codePath/tmp/web/m_node_modules/yvan-ext-mobile/dist $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/dist $codePath/tmp/web/m_node_modules/yvan-ext-mobile/dist |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/packages $codePath/tmp/web/mobile-assets/packages $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/packages $codePath/tmp/web/mobile-assets/packages |
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/packages $codePath/tmp/web/mobile-assets/packages $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/packages $codePath/tmp/web/mobile-assets/packages |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/modern $codePath/tmp/web/mobile-assets/modern $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/modern $codePath/tmp/web/mobile-assets/modern |
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/modern $codePath/tmp/web/mobile-assets/modern $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/modern $codePath/tmp/web/mobile-assets/modern |
|
|
|
|
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/ext-modern-all-debug.js $codePath/tmp/web/mobile-assets/ext-modern-all-debug.js $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/ext-modern-all-debug.js $codePath/tmp/web/mobile-assets/ext-modern-all-debug.js |
|
|
|
echo -e "$echoPrefix cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/ext-modern-all-debug.js $codePath/tmp/web/mobile-assets/ext-modern-all-debug.js $echoSuffix" |
|
|
|
cp -r $codePath/wms-biz/pda-client/node_modules/yvan-ext-mobile/assets/ext-7.4/ext-modern-all-debug.js $codePath/tmp/web/mobile-assets/ext-modern-all-debug.js |
|
|
|
|
|
|
|
echo -e "$echoPrefix cd $codePath/tmp $echoSuffix" |
|
|
|
cd $codePath/tmp |
|
|
|
echo -e "$echoPrefix zip -r web.zip web $echoSuffix" |
|
|
|
zip -r web.zip web |
|
|
|
echo -e "$echoPrefix cd $codePath/tmp $echoSuffix" |
|
|
|
cd $codePath/tmp |
|
|
|
echo -e "$echoPrefix zip -r web.zip web $echoSuffix" |
|
|
|
zip -r web.zip web |
|
|
|
|
|
|
|
echo "###--打包完成-----------------------------------------------------------------------------###" |
|
|
|
echo "" |
|
|
|
echo "###--打包完成-----------------------------------------------------------------------------###" |
|
|
|
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}') |
|
|
|
# 上传文件 |
|
|
|
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) |
|
|
|
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 "" |
|
|
|
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 "" |
|
|
|
# 还原文件 |
|
|
|
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/01dongying_guokang/04pda-prod.sh) [cmd profiles] |
|
|
|
cmd=$1 |
|
|
|
if [ "$cmd" == "deploy" ];then |
|
|
|
deploy |
|
|
|
else |
|
|
|
echo "使用 deploy 命名打包pda" |
|
|
|
fi |
|
|
|
|
|
|
|
# bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/01dongying_guokang/04pda-prod.sh) [cmd] |
|
|
|
|
