From 632bdd23d664d8ebc621016eb6d0ed46290f1abd Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Sat, 31 Jan 2026 14:38:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC,=E8=A7=A3=E5=86=B3=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E5=8D=A0=E7=94=A8=E5=AF=BC=E8=87=B4=E9=87=8D=E5=90=AF=E6=85=A2?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重启前先停止服务并清理僵尸Java进程
- 确保端口5123释放后再启动
- 增加启动等待时间确保服务完全就绪

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 deploy_from_git.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/deploy_from_git.sh b/deploy_from_git.sh
index a80b7de..bd1f69e 100755
--- a/deploy_from_git.sh
+++ b/deploy_from_git.sh
@@ -71,11 +71,25 @@ echo -e "${BLUE}[4/6] 复制JAR文件...${NC}"
 cp target/designhub-backend-1.0.0.jar ${APP_DIR}/designhub.jar
 
 echo -e "${BLUE}[5/6] 重启服务...${NC}"
-systemctl restart designhub
+# 先停止服务
+systemctl stop designhub 2>/dev/null || true
+sleep 2
+# 确保端口5123没有被占用（清理僵尸Java进程）
+pkill -9 -f "designhub.jar" 2>/dev/null || true
+sleep 2
+# 确认端口已释放
+if ss -tlnp | grep -q ":5123"; then
+    echo "端口5123仍被占用，强制清理..."
+    fuser -k 5123/tcp 2>/dev/null || true
+    sleep 2
+fi
+# 重置失败状态并启动服务
+systemctl reset-failed designhub 2>/dev/null || true
+systemctl start designhub
 
 echo ""
 echo -e "${GREEN}等待服务启动...${NC}"
-sleep 5
+sleep 15
 
 echo ""
 echo -e "${BLUE}[6/6] 检查服务状态...${NC}"