diff --git a/README.md b/README.md index 00e86278..38f47e51 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,8 @@ public Result getTask(@PathVariable @Min(1) Long taskId) { ```angular2html repomix --include "**/src/main/java/**/*.java,**/src/main/resources/**/*.yml,**/pom.xml" --style xml + +sed -i 's/\r$//' /home/app/*/*.sh ``` diff --git a/capability/src/main/resources/application-dev.yml b/capability/src/main/resources/application-dev-65.yml similarity index 100% rename from capability/src/main/resources/application-dev.yml rename to capability/src/main/resources/application-dev-65.yml diff --git a/capability/src/main/resources/bin/190/restart.sh b/capability/src/main/resources/bin/190/restart.sh index 2a8c0852..5cfa6ae2 100644 --- a/capability/src/main/resources/bin/190/restart.sh +++ b/capability/src/main/resources/bin/190/restart.sh @@ -1,9 +1,25 @@ #!/bin/bash # Spring Boot 项目重启脚本 +# 定义基础路径(公共参数) +BASE_DIR="/home/app/capability" + echo "=== 开始重启项目 ===" -# 调用停止脚本 -./stop.sh -# 调用启动脚本 -./start.sh -echo "=== 重启操作完成 ===" + +# 先停止服务 +if [ -f "${BASE_DIR}/stop.sh" ]; then + "${BASE_DIR}/stop.sh" +else + echo "错误:未找到停止脚本 ${BASE_DIR}/stop.sh" + exit 1 +fi + +# 再启动服务 +if [ -f "${BASE_DIR}/start.sh" ]; then + "${BASE_DIR}/start.sh" +else + echo "错误:未找到启动脚本 ${BASE_DIR}/start.sh" + exit 1 +fi + +echo "=== 重启操作完成 ===" \ No newline at end of file diff --git a/capability/src/main/resources/bin/log.sh b/capability/src/main/resources/bin/65/log.sh similarity index 100% rename from capability/src/main/resources/bin/log.sh rename to capability/src/main/resources/bin/65/log.sh diff --git a/capability/src/main/resources/bin/65/restart.sh b/capability/src/main/resources/bin/65/restart.sh new file mode 100644 index 00000000..5cfa6ae2 --- /dev/null +++ b/capability/src/main/resources/bin/65/restart.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Spring Boot 项目重启脚本 + +# 定义基础路径(公共参数) +BASE_DIR="/home/app/capability" + +echo "=== 开始重启项目 ===" + +# 先停止服务 +if [ -f "${BASE_DIR}/stop.sh" ]; then + "${BASE_DIR}/stop.sh" +else + echo "错误:未找到停止脚本 ${BASE_DIR}/stop.sh" + exit 1 +fi + +# 再启动服务 +if [ -f "${BASE_DIR}/start.sh" ]; then + "${BASE_DIR}/start.sh" +else + echo "错误:未找到启动脚本 ${BASE_DIR}/start.sh" + exit 1 +fi + +echo "=== 重启操作完成 ===" \ No newline at end of file diff --git a/capability/src/main/resources/bin/start.sh b/capability/src/main/resources/bin/65/start.sh similarity index 85% rename from capability/src/main/resources/bin/start.sh rename to capability/src/main/resources/bin/65/start.sh index f58cebbc..3508dbc5 100644 --- a/capability/src/main/resources/bin/start.sh +++ b/capability/src/main/resources/bin/65/start.sh @@ -42,7 +42,7 @@ fi echo "正在启动项目..." # 启动项目,保留控制台输出 -nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5001 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev-65 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5001 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & diff --git a/capability/src/main/resources/bin/startprod.sh b/capability/src/main/resources/bin/65/startprod.sh similarity index 100% rename from capability/src/main/resources/bin/startprod.sh rename to capability/src/main/resources/bin/65/startprod.sh diff --git a/capability/src/main/resources/bin/status.sh b/capability/src/main/resources/bin/65/status.sh similarity index 100% rename from capability/src/main/resources/bin/status.sh rename to capability/src/main/resources/bin/65/status.sh diff --git a/capability/src/main/resources/bin/stop.sh b/capability/src/main/resources/bin/65/stop.sh similarity index 100% rename from capability/src/main/resources/bin/stop.sh rename to capability/src/main/resources/bin/65/stop.sh diff --git a/capability/src/main/resources/bin/restart.sh b/capability/src/main/resources/bin/restart.sh deleted file mode 100644 index 2a8c0852..00000000 --- a/capability/src/main/resources/bin/restart.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# Spring Boot 项目重启脚本 - -echo "=== 开始重启项目 ===" -# 调用停止脚本 -./stop.sh -# 调用启动脚本 -./start.sh -echo "=== 重启操作完成 ===" diff --git a/data/src/main/resources/application-dev.yml b/data/src/main/resources/application-dev-65.yml similarity index 100% rename from data/src/main/resources/application-dev.yml rename to data/src/main/resources/application-dev-65.yml diff --git a/data/src/main/resources/bin/log.sh b/data/src/main/resources/bin/65/log.sh similarity index 100% rename from data/src/main/resources/bin/log.sh rename to data/src/main/resources/bin/65/log.sh diff --git a/data/src/main/resources/bin/restart.sh b/data/src/main/resources/bin/65/restart.sh similarity index 100% rename from data/src/main/resources/bin/restart.sh rename to data/src/main/resources/bin/65/restart.sh diff --git a/data/src/main/resources/bin/start.sh b/data/src/main/resources/bin/65/start.sh similarity index 85% rename from data/src/main/resources/bin/start.sh rename to data/src/main/resources/bin/65/start.sh index cdd31c2b..369f8ea9 100644 --- a/data/src/main/resources/bin/start.sh +++ b/data/src/main/resources/bin/65/start.sh @@ -42,4 +42,4 @@ fi # 启动项目 echo "正在启动项目..." -nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5002 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & \ No newline at end of file +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev-65 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5002 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & \ No newline at end of file diff --git a/data/src/main/resources/bin/startprod.sh b/data/src/main/resources/bin/65/startprod.sh similarity index 100% rename from data/src/main/resources/bin/startprod.sh rename to data/src/main/resources/bin/65/startprod.sh diff --git a/data/src/main/resources/bin/status.sh b/data/src/main/resources/bin/65/status.sh similarity index 100% rename from data/src/main/resources/bin/status.sh rename to data/src/main/resources/bin/65/status.sh diff --git a/data/src/main/resources/bin/stop.sh b/data/src/main/resources/bin/65/stop.sh similarity index 100% rename from data/src/main/resources/bin/stop.sh rename to data/src/main/resources/bin/65/stop.sh diff --git a/flowable/src/main/resources/application-dev.yml b/flowable/src/main/resources/application-dev-65.yml similarity index 100% rename from flowable/src/main/resources/application-dev.yml rename to flowable/src/main/resources/application-dev-65.yml diff --git a/flowable/src/main/resources/bin/log.sh b/flowable/src/main/resources/bin/65/log.sh similarity index 100% rename from flowable/src/main/resources/bin/log.sh rename to flowable/src/main/resources/bin/65/log.sh diff --git a/flowable/src/main/resources/bin/restart.sh b/flowable/src/main/resources/bin/65/restart.sh similarity index 100% rename from flowable/src/main/resources/bin/restart.sh rename to flowable/src/main/resources/bin/65/restart.sh diff --git a/flowable/src/main/resources/bin/start.sh b/flowable/src/main/resources/bin/65/start.sh similarity index 85% rename from flowable/src/main/resources/bin/start.sh rename to flowable/src/main/resources/bin/65/start.sh index 2d6c67a9..2527184c 100644 --- a/flowable/src/main/resources/bin/start.sh +++ b/flowable/src/main/resources/bin/65/start.sh @@ -42,4 +42,4 @@ fi # 启动项目 echo "正在启动项目..." -nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5003 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev-65 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5003 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & diff --git a/flowable/src/main/resources/bin/startprod.sh b/flowable/src/main/resources/bin/65/startprod.sh similarity index 100% rename from flowable/src/main/resources/bin/startprod.sh rename to flowable/src/main/resources/bin/65/startprod.sh diff --git a/flowable/src/main/resources/bin/status.sh b/flowable/src/main/resources/bin/65/status.sh similarity index 100% rename from flowable/src/main/resources/bin/status.sh rename to flowable/src/main/resources/bin/65/status.sh diff --git a/flowable/src/main/resources/bin/stop.sh b/flowable/src/main/resources/bin/65/stop.sh similarity index 100% rename from flowable/src/main/resources/bin/stop.sh rename to flowable/src/main/resources/bin/65/stop.sh diff --git a/gateway2/src/main/resources/application-dev.yml b/gateway2/src/main/resources/application-dev-65.yml similarity index 100% rename from gateway2/src/main/resources/application-dev.yml rename to gateway2/src/main/resources/application-dev-65.yml diff --git a/gateway2/src/main/resources/bin/log.sh b/gateway2/src/main/resources/bin/65/log.sh similarity index 100% rename from gateway2/src/main/resources/bin/log.sh rename to gateway2/src/main/resources/bin/65/log.sh diff --git a/gateway2/src/main/resources/bin/restart.sh b/gateway2/src/main/resources/bin/65/restart.sh similarity index 100% rename from gateway2/src/main/resources/bin/restart.sh rename to gateway2/src/main/resources/bin/65/restart.sh diff --git a/gateway2/src/main/resources/bin/start.sh b/gateway2/src/main/resources/bin/65/start.sh similarity index 91% rename from gateway2/src/main/resources/bin/start.sh rename to gateway2/src/main/resources/bin/65/start.sh index c284175f..d59ce663 100644 --- a/gateway2/src/main/resources/bin/start.sh +++ b/gateway2/src/main/resources/bin/65/start.sh @@ -43,6 +43,6 @@ fi # 启动项目 echo "正在启动项目..." -nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev-65 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & diff --git a/gateway2/src/main/resources/bin/startprod.sh b/gateway2/src/main/resources/bin/65/startprod.sh similarity index 100% rename from gateway2/src/main/resources/bin/startprod.sh rename to gateway2/src/main/resources/bin/65/startprod.sh diff --git a/gateway2/src/main/resources/bin/status.sh b/gateway2/src/main/resources/bin/65/status.sh similarity index 100% rename from gateway2/src/main/resources/bin/status.sh rename to gateway2/src/main/resources/bin/65/status.sh diff --git a/gateway2/src/main/resources/bin/stop.sh b/gateway2/src/main/resources/bin/65/stop.sh similarity index 100% rename from gateway2/src/main/resources/bin/stop.sh rename to gateway2/src/main/resources/bin/65/stop.sh diff --git a/pbs/src/main/resources/application-dev.yml b/pbs/src/main/resources/application-dev-65.yml similarity index 100% rename from pbs/src/main/resources/application-dev.yml rename to pbs/src/main/resources/application-dev-65.yml diff --git a/pbs/src/main/resources/bin/log.sh b/pbs/src/main/resources/bin/65/log.sh similarity index 100% rename from pbs/src/main/resources/bin/log.sh rename to pbs/src/main/resources/bin/65/log.sh diff --git a/pbs/src/main/resources/bin/restart.sh b/pbs/src/main/resources/bin/65/restart.sh similarity index 100% rename from pbs/src/main/resources/bin/restart.sh rename to pbs/src/main/resources/bin/65/restart.sh diff --git a/pbs/src/main/resources/bin/start.sh b/pbs/src/main/resources/bin/65/start.sh similarity index 85% rename from pbs/src/main/resources/bin/start.sh rename to pbs/src/main/resources/bin/65/start.sh index f1525085..e7ba50e2 100644 --- a/pbs/src/main/resources/bin/start.sh +++ b/pbs/src/main/resources/bin/65/start.sh @@ -42,4 +42,4 @@ fi # 启动项目 echo "正在启动项目..." -nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5004 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev-65 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5004 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & diff --git a/pbs/src/main/resources/bin/startprod.sh b/pbs/src/main/resources/bin/65/startprod.sh similarity index 100% rename from pbs/src/main/resources/bin/startprod.sh rename to pbs/src/main/resources/bin/65/startprod.sh diff --git a/pbs/src/main/resources/bin/status.sh b/pbs/src/main/resources/bin/65/status.sh similarity index 100% rename from pbs/src/main/resources/bin/status.sh rename to pbs/src/main/resources/bin/65/status.sh diff --git a/pbs/src/main/resources/bin/stop.sh b/pbs/src/main/resources/bin/65/stop.sh similarity index 100% rename from pbs/src/main/resources/bin/stop.sh rename to pbs/src/main/resources/bin/65/stop.sh diff --git a/project/src/main/resources/application-dev.yml b/project/src/main/resources/application-dev-65.yml similarity index 100% rename from project/src/main/resources/application-dev.yml rename to project/src/main/resources/application-dev-65.yml diff --git a/project/src/main/resources/bin/log.sh b/project/src/main/resources/bin/65/log.sh similarity index 100% rename from project/src/main/resources/bin/log.sh rename to project/src/main/resources/bin/65/log.sh diff --git a/project/src/main/resources/bin/restart.sh b/project/src/main/resources/bin/65/restart.sh similarity index 100% rename from project/src/main/resources/bin/restart.sh rename to project/src/main/resources/bin/65/restart.sh diff --git a/project/src/main/resources/bin/start.sh b/project/src/main/resources/bin/65/start.sh similarity index 85% rename from project/src/main/resources/bin/start.sh rename to project/src/main/resources/bin/65/start.sh index c82c4e65..260d37c5 100644 --- a/project/src/main/resources/bin/start.sh +++ b/project/src/main/resources/bin/65/start.sh @@ -42,4 +42,4 @@ fi echo "正在启动项目... " # 启动项目并保留控制台输出 -nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev-65 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & diff --git a/project/src/main/resources/bin/startprod.sh b/project/src/main/resources/bin/65/startprod.sh similarity index 100% rename from project/src/main/resources/bin/startprod.sh rename to project/src/main/resources/bin/65/startprod.sh diff --git a/project/src/main/resources/bin/status.sh b/project/src/main/resources/bin/65/status.sh similarity index 100% rename from project/src/main/resources/bin/status.sh rename to project/src/main/resources/bin/65/status.sh diff --git a/project/src/main/resources/bin/stop.sh b/project/src/main/resources/bin/65/stop.sh similarity index 100% rename from project/src/main/resources/bin/stop.sh rename to project/src/main/resources/bin/65/stop.sh diff --git a/system/src/main/resources/application-dev.yml b/system/src/main/resources/application-dev-65.yml similarity index 100% rename from system/src/main/resources/application-dev.yml rename to system/src/main/resources/application-dev-65.yml diff --git a/system/src/main/resources/bin/log.sh b/system/src/main/resources/bin/65/log.sh similarity index 100% rename from system/src/main/resources/bin/log.sh rename to system/src/main/resources/bin/65/log.sh diff --git a/system/src/main/resources/bin/restart.sh b/system/src/main/resources/bin/65/restart.sh similarity index 100% rename from system/src/main/resources/bin/restart.sh rename to system/src/main/resources/bin/65/restart.sh diff --git a/system/src/main/resources/bin/start.sh b/system/src/main/resources/bin/65/start.sh similarity index 85% rename from system/src/main/resources/bin/start.sh rename to system/src/main/resources/bin/65/start.sh index 43ae1540..e888ec8c 100644 --- a/system/src/main/resources/bin/start.sh +++ b/system/src/main/resources/bin/65/start.sh @@ -42,5 +42,5 @@ fi echo "正在启动项目..." # 启动项目,保留控制台输出 -nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5006 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev-65 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5006 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & diff --git a/system/src/main/resources/bin/startprod.sh b/system/src/main/resources/bin/65/startprod.sh similarity index 100% rename from system/src/main/resources/bin/startprod.sh rename to system/src/main/resources/bin/65/startprod.sh diff --git a/system/src/main/resources/bin/status.sh b/system/src/main/resources/bin/65/status.sh similarity index 100% rename from system/src/main/resources/bin/status.sh rename to system/src/main/resources/bin/65/status.sh diff --git a/system/src/main/resources/bin/stop.sh b/system/src/main/resources/bin/65/stop.sh similarity index 100% rename from system/src/main/resources/bin/stop.sh rename to system/src/main/resources/bin/65/stop.sh diff --git a/task/src/main/resources/application-dev.yml b/task/src/main/resources/application-dev-65.yml similarity index 100% rename from task/src/main/resources/application-dev.yml rename to task/src/main/resources/application-dev-65.yml diff --git a/task/src/main/resources/bin/log.sh b/task/src/main/resources/bin/65/log.sh similarity index 100% rename from task/src/main/resources/bin/log.sh rename to task/src/main/resources/bin/65/log.sh diff --git a/task/src/main/resources/bin/restart.sh b/task/src/main/resources/bin/65/restart.sh similarity index 100% rename from task/src/main/resources/bin/restart.sh rename to task/src/main/resources/bin/65/restart.sh diff --git a/task/src/main/resources/bin/start.sh b/task/src/main/resources/bin/65/start.sh similarity index 86% rename from task/src/main/resources/bin/start.sh rename to task/src/main/resources/bin/65/start.sh index ec8c51b9..1c8e4c2d 100644 --- a/task/src/main/resources/bin/start.sh +++ b/task/src/main/resources/bin/65/start.sh @@ -43,5 +43,5 @@ echo "正在启动项目..." echo "======================================================================" # 启动项目,保留控制台输出 -nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5007 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev-65 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5007 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & diff --git a/task/src/main/resources/bin/startprod.sh b/task/src/main/resources/bin/65/startprod.sh similarity index 100% rename from task/src/main/resources/bin/startprod.sh rename to task/src/main/resources/bin/65/startprod.sh diff --git a/task/src/main/resources/bin/status.sh b/task/src/main/resources/bin/65/status.sh similarity index 100% rename from task/src/main/resources/bin/status.sh rename to task/src/main/resources/bin/65/status.sh diff --git a/task/src/main/resources/bin/stop.sh b/task/src/main/resources/bin/65/stop.sh similarity index 50% rename from task/src/main/resources/bin/stop.sh rename to task/src/main/resources/bin/65/stop.sh index 1ce195c9..ca5f105b 100644 --- a/task/src/main/resources/bin/stop.sh +++ b/task/src/main/resources/bin/65/stop.sh @@ -1,30 +1,39 @@ #!/bin/bash -# Spring Boot 项目强制停止脚本 +# Spring Boot 项目停止脚本 JAR_NAME="task-0.0.1-SNAPSHOT.jar" -# 函数定义:获取运行中的进程ID + +# 函数定义 get_running_pid() { ps -ef | grep "${JAR_NAME}" | grep -v "grep" | awk '{print $2}' } -# 获取进程ID +# 停止服务 PID=$(get_running_pid) - -# 检查进程是否存在 if [ -z "${PID}" ]; then echo "项目未在运行中,无需停止" exit 0 fi -# 强制停止进程 -echo "正在强制停止项目... PID: ${PID}" +echo "正在停止项目... PID: ${PID}" +kill -15 "${PID}" + +WAIT=0 +while [ ${WAIT} -lt 10 ]; do + if [ -z "$(get_running_pid)" ]; then + echo "项目已优雅停止" + exit 0 + fi + sleep 1 + WAIT=$((WAIT + 1)) +done + +echo "优雅停止超时,强制终止进程... PID: ${PID}" kill -9 "${PID}" -# 检查是否成功停止 -sleep 5 +sleep 2 if [ -z "$(get_running_pid)" ]; then - echo "项目已强制停止成功" - exit 0 + echo "项目已强制停止" else echo "ERROR: 进程终止失败!请手动检查:ps -ef | grep ${JAR_NAME}" exit 1