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

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