区分开发65 和测试160环境启动脚本

README.md

@@ -114,6 +114,8 @@ public Result<TaskVO> 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
 ```
 
 

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 "=== 重启操作完成 ==="

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 "=== 重启操作完成 ==="

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 &
 
 
 

capability/src/main/resources/bin/restart.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-# Spring Boot 项目重启脚本
-
-echo "=== 开始重启项目 ==="
-# 调用停止脚本
-./stop.sh
-# 调用启动脚本
-./start.sh
-echo "=== 重启操作完成 ==="

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 &
+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 &

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 &

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 &
 
 

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 &

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 &

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 &
 

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 &
 

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