|
|
@ -28,6 +28,52 @@ needBuild=( |
|
|
echoPrefix="\033[36m+" |
|
|
echoPrefix="\033[36m+" |
|
|
echoSuffix="\033[0m" |
|
|
echoSuffix="\033[0m" |
|
|
|
|
|
|
|
|
|
|
|
isChange="1" # 仓库是否发生变化,0:未变化;非0:变化 |
|
|
|
|
|
pullCode() { |
|
|
|
|
|
# Usage: pullCode "codePath" "gitUrl" "branch" "position" |
|
|
|
|
|
path=$1 # 代码保存路径 |
|
|
|
|
|
gitUrl=$2 # git仓库地址 |
|
|
|
|
|
branch=${3:-"master"} # git分支 |
|
|
|
|
|
position=${4:-""} # 使用“.”clone到当前文件夹 |
|
|
|
|
|
isChange="1" |
|
|
|
|
|
# 创建文件夹 |
|
|
|
|
|
if [ ! -d "$path" ]; then |
|
|
|
|
|
echo -e "$echoPrefix mkdir -p $path $echoSuffix" |
|
|
|
|
|
mkdir -p $path |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# git clone |
|
|
|
|
|
echo -e "$echoPrefix cd $path $echoSuffix" |
|
|
|
|
|
cd $path |
|
|
|
|
|
if [ "`ls -A $path`" == "" ] || [ ! -d "$path/$position" ] || [ "`ls -A $path/$position`" = "" ]; then |
|
|
|
|
|
echo -e "$echoPrefix git clone $gitUrl $position $echoSuffix" |
|
|
|
|
|
git clone $gitUrl $position |
|
|
|
|
|
isChange="2" |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# 进入文件夹,切换分支,git pull |
|
|
|
|
|
if [ "$position" != "" ]; then |
|
|
|
|
|
echo -e "$echoPrefix cd $position $echoSuffix" |
|
|
|
|
|
cd $position |
|
|
|
|
|
fi |
|
|
|
|
|
echo -e "$echoPrefix git checkout $branch $echoSuffix" |
|
|
|
|
|
git checkout $branch |
|
|
|
|
|
echo -e "$echoPrefix git pull $echoSuffix" |
|
|
|
|
|
if [ "`git pull`" == "Already up-to-date." ] && [ $isChange == "1" ]; then |
|
|
|
|
|
isChange="0" |
|
|
|
|
|
fi |
|
|
|
|
|
echo "" |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
for ((idx=0; idx<${#gitUrlArr[@]}; idx++)); do |
|
|
|
|
|
pullCode $codePath ${gitUrlArr[idx]} ${branchArr[idx]} ${positionArr[idx]} |
|
|
|
|
|
if [ "${needBuild[idx]}" == "-1" ]; then |
|
|
|
|
|
needBuild[idx]=$isChange |
|
|
|
|
|
fi |
|
|
|
|
|
done |
|
|
|
|
|
echo "###--代码更新完成--------------------------------------------------------------------------###" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
buildCode() { |
|
|
buildCode() { |
|
|
# 构建 yvan-ext |
|
|
# 构建 yvan-ext |
|
|
if [ "${needBuild[1]}" != "0" ]; then |
|
|
if [ "${needBuild[1]}" != "0" ]; then |
|
|
@ -67,170 +113,54 @@ buildCode() { |
|
|
echo "" |
|
|
echo "" |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
deployPush() { |
|
|
buildCode |
|
|
# 更新push git |
|
|
echo "###--代码构建完成--------------------------------------------------------------------------###" |
|
|
pullCode $pushPath $pushGitUrl "master" "." |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis/ent/build/libs |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete --exclude '.git/' --exclude 'client/' --exclude 'dist/' --exclude '*-javadoc.jar' --exclude '*-sources.jar' $codePath/lmis/ent/build/libs/ $pushPath/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete --exclude '.git/' --exclude 'client/' --exclude 'dist/' --exclude '*-javadoc.jar' --exclude '*-sources.jar' "$codePath/lmis/ent/build/libs/" "$pushPath/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis/client/tsconfig.json |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete --include 'tsconfig.json' --exclude '/*' $codePath/lmis/client/ $pushPath/client/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete --include 'tsconfig.json' --exclude '/*' "$codePath/lmis/client/" "$pushPath/client/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis/client/node_modules |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete --exclude 'yvan-ext/' $codePath/lmis/client/node_modules/ $pushPath/client/node_modules/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete --exclude 'yvan-ext' "$codePath/lmis/client/node_modules/" "$pushPath/client/node_modules/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis/client/public |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete $codePath/lmis/client/public/ $pushPath/client/public/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete "$codePath/lmis/client/public/" "$pushPath/client/public/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 yvan-ext |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete --include 'assets/' --include 'build/' --include 'dist/' --exclude '/*' $codePath/yvan-ext/ $pushPath/client/node_modules/yvan-ext/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete --include 'assets/' --include 'build/' --include 'dist/' --exclude '/*' "$codePath/yvan-ext/" "$pushPath/client/node_modules/yvan-ext/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis/dist |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete $codePath/lmis/dist/ $pushPath/dist/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete "$codePath/lmis/dist/" "$pushPath/dist/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 提交文件 |
|
|
|
|
|
echo -e "$echoPrefix cd $pushPath $echoSuffix" |
|
|
|
|
|
cd "$pushPath" |
|
|
|
|
|
if [ -n "$(git config user.name)" ]; then |
|
|
|
|
|
echo -e "$echoPrefix git config user.name 'bot' $echoSuffix" |
|
|
|
|
|
git config user.name 'bot' |
|
|
|
|
|
echo -e "$echoPrefix git config user.email 'bot@git.com' $echoSuffix" |
|
|
|
|
|
git config user.email 'bot@git.com' |
|
|
|
|
|
fi |
|
|
|
|
|
echo -e "$echoPrefix git add -A $echoSuffix" |
|
|
|
|
|
git add -A |
|
|
|
|
|
if [ -n "$(git status -s)" ]; then |
|
|
|
|
|
echo -e "$echoPrefix git commit -am 自动deploy提交 $echoSuffix" |
|
|
|
|
|
git commit -am "自动deploy提交" |
|
|
|
|
|
echo -e "$echoPrefix git push origin master $echoSuffix" |
|
|
|
|
|
git push origin master |
|
|
|
|
|
else |
|
|
|
|
|
echo "文件未变化不需要push" |
|
|
|
|
|
fi |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
#--------------------------------------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
|
|
|
# 更新push git |
|
|
|
|
|
pullCode $pushPath_2 $pushGitUrl_2 "master" "." |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis-report-system/app/build/libs |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete --exclude '.git/' --exclude 'client/' --exclude 'dist/' --exclude '*-javadoc.jar' --exclude '*-sources.jar' $codePath/lmis-report-system/app/build/libs/ $pushPath_2/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete --exclude '.git/' --exclude 'client/' --exclude 'dist/' --exclude '*-javadoc.jar' --exclude '*-sources.jar' "$codePath/lmis-report-system/app/build/libs/" "$pushPath_2/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis-report-system/client/tsconfig.json |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete --include 'tsconfig.json' --exclude '/*' $codePath/lmis-report-system/client/ $pushPath_2/client/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete --include 'tsconfig.json' --exclude '/*' "$codePath/lmis-report-system/client/" "$pushPath_2/client/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis-report-system/client/node_modules |
|
|
|
|
|
echo -e "$echoPrefix rsync -av --delete --exclude 'yvan-ext/' $codePath/lmis-report-system/client/node_modules/ $pushPath_2/client/node_modules/ $echoSuffix" |
|
|
|
|
|
rsync -av --delete --exclude 'yvan-ext' "$codePath/lmis-report-system/client/node_modules/" "$pushPath_2/client/node_modules/" |
|
|
|
|
|
echo "" |
|
|
echo "" |
|
|
|
|
|
|
|
|
# 同步 lmis-report-system/client/public |
|
|
logPath=/data3/thinkingwms_nohup.log |
|
|
echo -e "$echoPrefix rsync -av --delete $codePath/lmis-report-system/client/public/ $pushPath_2/client/public/ $echoSuffix" |
|
|
dirPath=/data3/yvan-framework/thinkingwms-ui/thinkingwms-backend/build/libs/ |
|
|
rsync -av --delete "$codePath/lmis-report-system/client/public/" "$pushPath_2/client/public/" |
|
|
serverName=dsl_thinkingwms_ui |
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 yvan-ext |
|
|
cmd=$1 |
|
|
echo -e "$echoPrefix rsync -av --delete --include 'assets/' --include 'build/' --include 'dist/' --exclude '/*' $codePath/yvan-ext/ $pushPath_2/client/node_modules/yvan-ext/ $echoSuffix" |
|
|
profiles=${2:-"test"} |
|
|
rsync -av --delete --include 'assets/' --include 'build/' --include 'dist/' --exclude '/*' "$codePath/yvan-ext/" "$pushPath_2/client/node_modules/yvan-ext/" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
# 同步 lmis-report-system/dist |
|
|
#------------------------------------------------------------------- |
|
|
echo -e "$echoPrefix rsync -av --delete $codePath/lmis-report-system/dist/ $pushPath_2/dist/ $echoSuffix" |
|
|
JAVA_MEM_OPTS=" -DappName=${serverName} -server -Xmx2g -Xms2g" |
|
|
rsync -av --delete "$codePath/lmis-report-system/dist/" "$pushPath_2/dist/" |
|
|
DATABASE_OPTS=" -Ddatabase.codeset=ISO-8859-1 -Ddatabase.logging=false" |
|
|
echo "" |
|
|
JAVA_OPTS_EXT=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dapplication.codeset=UTF-8 -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Shanghai" |
|
|
|
|
|
#------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
# 提交文件 |
|
|
startServer() { |
|
|
echo -e "$echoPrefix cd $pushPath_2 $echoSuffix" |
|
|
pid=$1 |
|
|
cd "$pushPath_2" |
|
|
if [ -z $pid ];then |
|
|
if [ -n "$(git config user.name)" ]; then |
|
|
echo -e "$echoPrefix cd $dirPath $echoSuffix" |
|
|
echo -e "$echoPrefix git config user.name 'bot' $echoSuffix" |
|
|
cd $dirPath |
|
|
git config user.name 'bot' |
|
|
echo -e "$echoPrefix java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./thinkingwms-backend-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles >$logPath 2>&1 & $echoSuffix" |
|
|
echo -e "$echoPrefix git config user.email 'bot@git.com' $echoSuffix" |
|
|
java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./thinkingwms-backend-0.0.0-SNAPSHOT.jar --spring.profiles.active=global,$profiles >$logPath 2>&1 & |
|
|
git config user.email 'bot@git.com' |
|
|
echo "$serverName 启动成功!" |
|
|
fi |
|
|
|
|
|
echo -e "$echoPrefix git add -A $echoSuffix" |
|
|
|
|
|
git add -A |
|
|
|
|
|
if [ -n "$(git status -s)" ]; then |
|
|
|
|
|
echo -e "$echoPrefix git commit -am 自动deploy提交 $echoSuffix" |
|
|
|
|
|
git commit -am "自动deploy提交" |
|
|
|
|
|
echo -e "$echoPrefix git push origin master $echoSuffix" |
|
|
|
|
|
git push origin master |
|
|
|
|
|
else |
|
|
else |
|
|
echo "文件未变化不需要push" |
|
|
echo "$serverName 正在运行..." |
|
|
fi |
|
|
fi |
|
|
echo "" |
|
|
echo "查看日志: tail -F $logPath -n 100" |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
isChange="1" # 仓库是否发生变化,0:未变化;非0:变化 |
|
|
stopServer() { |
|
|
pullCode() { |
|
|
pid=$1 |
|
|
# Usage: pullCode "codePath" "gitUrl" "branch" "position" |
|
|
if [ -z $pid ];then |
|
|
path=$1 # 代码保存路径 |
|
|
echo "$serverName 未运行" |
|
|
gitUrl=$2 # git仓库地址 |
|
|
else |
|
|
branch=${3:-"master"} # git分支 |
|
|
echo -e "$echoPrefix ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print \$2}' | xargs kill $echoSuffix" |
|
|
position=${4:-""} # 使用“.”clone到当前文件夹 |
|
|
ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}' | xargs kill |
|
|
isChange="1" |
|
|
echo "$serverName 已停止!" |
|
|
# 创建文件夹 |
|
|
|
|
|
if [ ! -d "$path" ]; then |
|
|
|
|
|
echo -e "$echoPrefix mkdir -p $path $echoSuffix" |
|
|
|
|
|
mkdir -p $path |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# git clone |
|
|
|
|
|
echo -e "$echoPrefix cd $path $echoSuffix" |
|
|
|
|
|
cd $path |
|
|
|
|
|
if [ "`ls -A $path`" == "" ] || [ ! -d "$path/$position" ] || [ "`ls -A $path/$position`" = "" ]; then |
|
|
|
|
|
echo -e "$echoPrefix git clone $gitUrl $position $echoSuffix" |
|
|
|
|
|
git clone $gitUrl $position |
|
|
|
|
|
isChange="2" |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# 进入文件夹,切换分支,git pull |
|
|
|
|
|
if [ "$position" != "" ]; then |
|
|
|
|
|
echo -e "$echoPrefix cd $position $echoSuffix" |
|
|
|
|
|
cd $position |
|
|
|
|
|
fi |
|
|
|
|
|
echo -e "$echoPrefix git checkout $branch $echoSuffix" |
|
|
|
|
|
git checkout $branch |
|
|
|
|
|
echo -e "$echoPrefix git pull $echoSuffix" |
|
|
|
|
|
if [ "`git pull`" == "Already up-to-date." ] && [ $isChange == "1" ]; then |
|
|
|
|
|
isChange="0" |
|
|
|
|
|
fi |
|
|
fi |
|
|
echo "" |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
for ((idx=0; idx<${#gitUrlArr[@]}; idx++)); do |
|
|
pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'` |
|
|
pullCode $codePath ${gitUrlArr[idx]} ${branchArr[idx]} ${positionArr[idx]} |
|
|
if [ ! -z $pid ];then |
|
|
if [ "${needBuild[idx]}" == "-1" ]; then |
|
|
stopServer $pid |
|
|
needBuild[idx]=$isChange |
|
|
sleep 3s |
|
|
fi |
|
|
fi |
|
|
done |
|
|
startServer |
|
|
echo "###--代码更新完成--------------------------------------------------------------------------###" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
buildCode |
|
|
|
|
|
echo "###--代码构建完成--------------------------------------------------------------------------###" |
|
|
|
|
|
echo "" |
|
|
|
|
|
|
|
|
|
|
|
#deployPush |
|
|
|
|
|
#echo "###--文件推送完成--------------------------------------------------------------------------###" |
|
|
|
|
|
#echo "" |
|
|
|
|
|
|
|
|
|
|
|
# bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/dsl/build.sh) |
|
|
# bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/dsl/build.sh) |
|
|
|
|
|
|
|
|
|