From 1fb00625b005ca53bc6583a52b8b68f49ffb4aaa Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Wed, 14 Jun 2023 10:53:44 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E4=BC=98=E5=8C=96=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taoyao-signal-server/docs/assembly/prd.xml | 98 +++++++++++----------- taoyao-signal-server/docs/bin/deploy.sh | 22 ++--- taoyao-signal-server/docs/bin/startup.sh | 13 +-- taoyao-signal-server/docs/bin/stop.sh | 11 ++- taoyao-signal-server/docs/bin/wait.sh | 37 ++++---- 5 files changed, 95 insertions(+), 86 deletions(-) diff --git a/taoyao-signal-server/docs/assembly/prd.xml b/taoyao-signal-server/docs/assembly/prd.xml index 88de6eb..ddea538 100644 --- a/taoyao-signal-server/docs/assembly/prd.xml +++ b/taoyao-signal-server/docs/assembly/prd.xml @@ -1,61 +1,61 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> - prd + prd - - zip - + + zip + - false + false - - - ${taoyao.maven.basedir}/docs - ./ - - README.md - - - - ${taoyao.maven.basedir}/docs/bin - bin - 0755 - true - - - src/main/resources - config - true - - *.yml - *.properties - - - - src/main/resources - config - + + + ${taoyao.maven.basedir}/docs + ./ + + README.md + + + + ${taoyao.maven.basedir}/docs/bin + bin + 0755 + true + + + src/main/resources + config + true + + *.yml + *.properties + + + + src/main/resources + config + *.cer *.jks *.p12 *.pfx - - - - target - logs - - **/* - - - + + + + target + logs + + **/* + + + - - - lib - - + + + lib + + diff --git a/taoyao-signal-server/docs/bin/deploy.sh b/taoyao-signal-server/docs/bin/deploy.sh index 791abac..7633fd8 100644 --- a/taoyao-signal-server/docs/bin/deploy.sh +++ b/taoyao-signal-server/docs/bin/deploy.sh @@ -1,5 +1,9 @@ #!/bin/bash +######################### +# 部署任务 # +######################### + # 进入目录 base=$(readlink -f $(dirname $0)) cd $base @@ -7,20 +11,16 @@ echo "环境目录：$base" echo "当前目录：$(pwd)" # 更新代码 -if [ -z "$gited" ]; then - echo "更新代码：${project.artifactId}-${project.version}" - git pull -fi +echo "更新代码：${project.artifactId}-${project.version}" +git pull # 编译代码 -if [ -z "$mvned" ]; then - echo "编译代码：${project.artifactId}-${project.version}" - mvn clean package -D skipTests -P ${profile} -# 指定编译模块以及依赖 +echo "编译代码：${project.artifactId}-${project.version}" +mvn clean package -D skipTests -P ${profile} +# 编译指定模块以及依赖 # mvn clean package -pl "${project.groupId}:${project.artifactId}" -am -D skipTests -P ${profile} -fi -# 删除文件：注意不要删除日志 +# 删除文件 rm -rf $base/deploy/bin rm -rf $base/deploy/lib rm -rf $base/deploy/config @@ -37,4 +37,4 @@ cp -rf ${project.basedir}/target/${project.artifactId}-${project.version}/* $bas # 启动服务 echo "启动项目：${project.artifactId}-${project.version}" sudo systemctl restart taoyao-signal-server -systemctl status taoyao-signal-server +sudo systemctl status taoyao-signal-server diff --git a/taoyao-signal-server/docs/bin/startup.sh b/taoyao-signal-server/docs/bin/startup.sh index e8f8312..6d1c08b 100644 --- a/taoyao-signal-server/docs/bin/startup.sh +++ b/taoyao-signal-server/docs/bin/startup.sh @@ -1,19 +1,24 @@ #!/bin/bash +######################### +# 开始任务 # +######################### + # 启动目录 bin=$(readlink -f $(dirname $0)) base=${bin%/*} cd $base -echo "启动目录：$base" +echo "环境目录：$base" +echo "启动目录：$(pwd)" -# 结束任务 +# Java运行环境 if [ ! -f "/.dockerenv" ]; then - # Java运行环境 JAVA=$(which java) if [ -z "$JAVA" ] ; then echo "必须安装${java.version}+JDK" exit 1 fi + # 结束任务 bash bin/stop.sh else JAVA="java" @@ -30,10 +35,8 @@ echo "启动参数：$JAVA_OPTS" # 启动应用 echo "启动应用：${project.artifactId}-${project.version}" if [ ! -f "/.dockerenv" ]; then - # 其他启动 nohup $JAVA $JAVA_OPTS -jar $base/lib/${project.artifactId}-${project.version}.jar > /dev/null 2>&1 & else - # 使用docker启动：后台启动不能查看控制台的信息 $JAVA $JAVA_OPTS -jar $base/lib/${project.artifactId}-${project.version}.jar fi diff --git a/taoyao-signal-server/docs/bin/stop.sh b/taoyao-signal-server/docs/bin/stop.sh index f6e0418..7100aa0 100644 --- a/taoyao-signal-server/docs/bin/stop.sh +++ b/taoyao-signal-server/docs/bin/stop.sh @@ -1,8 +1,11 @@ #!/bin/bash -# 结束任务 +######################### +# 结束任务 # +######################### + killIndex=0 -processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk '{print $2}') +processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk "{print $2}") if [ ! -z "$processId" ]; then echo "关闭应用：${project.artifactId}-${project.version} - $processId" while [ ! -z "$processId" ] @@ -12,13 +15,13 @@ if [ ! -z "$processId" ]; then # 优雅关机 kill -15 $processId elif [ $killIndex -ge 10 ]; then - echo -n '强制关闭' # 强制关机 + echo -n "强制关闭" kill -9 $processId fi sleep 1 killIndex=$((killIndex+1)) - processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk '{print $2}') + processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk "{print $2}") done echo "" fi diff --git a/taoyao-signal-server/docs/bin/wait.sh b/taoyao-signal-server/docs/bin/wait.sh index e2d4ef9..1afe0ce 100644 --- a/taoyao-signal-server/docs/bin/wait.sh +++ b/taoyao-signal-server/docs/bin/wait.sh @@ -1,37 +1,40 @@ #!/bin/bash -# 休眠一秒：等待后台任务调度 -sleep 1 +######################### +# 等待任务 # +######################### -# 等待任务 -startTime=$(date +%s) -processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk '{print $2}') -processPortNumber=0 +# 休眠一秒：等待后台任务调度 +sleep 2 +aTime=$(date +%s) +processCt=0 +processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk "{print $2}") if [ ! -z "$processId" ]; then + echo "等待应用：${project.artifactId}-${project.version} - $processId" waitIndex=0 - processPortNumber=$(netstat -anop | grep $processId | grep LISTEN | wc -l) - while [ $waitIndex -le 120 ] && [ ! -z "$processId" ] && [ $processPortNumber -lt 1 ] + processCt=$(netstat -anop | grep $processId | grep LISTEN | wc -l) + while [ ! -z "$processId" ] && [ $processCt -lt 1 ] && [ $waitIndex -le 120 ] do sleep 1 waitIndex=$((waitIndex+1)) - processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk '{print $2}') + processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk "{print $2}") if [ ! -z "$processId" ]; then - processPortNumber=$(netstat -anop | grep $processId | grep LISTEN | wc -l) + processCt=$(netstat -anop | grep $processId | grep LISTEN | wc -l) else - processPortNumber=0 + processCt=0 fi echo -n "." done echo "" fi -if [ $processPortNumber -lt 1 ]; then - echo -e "\033[31m启动失败：${project.artifactId}-${project.version}\033[0m" +if [ $processCt -lt 1 ]; then + echo -e "\033[31m启动失败：${project.artifactId}-${project.version} - $processId\033[0m" bash bin/stop.sh exit 0 else - finishTime=$(date +%s) - processTime=$((finishTime-startTime)) + zTime=$(date +%s) + cTime=$((finishTime-aTime)) echo -e "\033[32m启动成功：${project.artifactId}-${project.version} - $processId\033[0m" - echo "启动端口：$(netstat -anop | grep $processId | grep LISTEN | awk '{print $4}')" - echo "启动耗时：$processTime S" + echo "启动端口：$(netstat -anop | grep $processId | grep LISTEN | awk "{print $4}")" + echo "启动耗时：$cTime S" fi