From 2dd1117e514f46ad2a111546e591c5e9bd6f2ef7 Mon Sep 17 00:00:00 2001
From: Daniel <danielghost@163.com>
Date: Sun, 8 Mar 2026 17:37:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run.sh       | 15 ++++++++-------
 start-api.sh | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/run.sh b/run.sh
index b8dfe24..5945f59 100644
--- a/run.sh
+++ b/run.sh
@@ -10,6 +10,7 @@
 
 set -e
 cd "$(dirname "$0")"
+ROOT="$(pwd)"
 API_PORT="${PORT:-5599}"
 export PORT="$API_PORT"
 
@@ -54,21 +55,21 @@ _kill_port() {
 }
 _kill_port
 
-# 后台启动 API：优先 pm2，否则 nohup
+# 后台启动 API：优先 pm2，否则 nohup（ROOT 与 PORT 已在上方定义）
 if [ -n "$USE_PM2" ] && command -v pm2 >/dev/null 2>&1; then
   echo "[run.sh] 使用 pm2 启动 API（端口 ${API_PORT}）..."
-  (cd server && npm install --no-audit --no-fund --silent && pm2 delete view-airtep-api 2>/dev/null; true)
-  (cd server && pm2 start index.js --name view-airtep-api)
+  (cd "$ROOT/server" && npm install --no-audit --no-fund --silent && pm2 delete view-airtep-api 2>/dev/null; true)
+  (cd "$ROOT/server" && PORT="$API_PORT" pm2 start index.js --name view-airtep-api)
   pm2 save 2>/dev/null || true
   echo "[run.sh] API 已由 pm2 托管。查看: pm2 list / pm2 logs view-airtep-api"
 elif command -v nohup >/dev/null 2>&1; then
   echo "[run.sh] 使用 nohup 后台启动 API（端口 ${API_PORT}）..."
-  mkdir -p logs
-  nohup bash start-api.sh >> logs/api.log 2>&1 &
-  echo "[run.sh] API 已在后台运行。查看日志: tail -f logs/api.log"
+  mkdir -p "$ROOT/logs"
+  nohup bash "$ROOT/start-api.sh" >> "$ROOT/logs/api.log" 2>&1 &
+  echo "[run.sh] API 已在后台运行。查看日志: tail -f $ROOT/logs/api.log"
 else
   echo "[run.sh] 前台启动 API（Ctrl+C 会停止服务）..."
-  exec bash start-api.sh
+  exec bash "$ROOT/start-api.sh"
 fi
 
 echo "[run.sh] 部署完成。前端静态在 dist/，API 端口 ${API_PORT}。"
diff --git a/start-api.sh b/start-api.sh
index f69f4fd..3a777cd 100644
--- a/start-api.sh
+++ b/start-api.sh
@@ -8,6 +8,22 @@ cd "$(dirname "$0")/server"
 PORT="${PORT:-5599}"
 export PORT
 
+# 释放端口，避免 EADDRINUSE（上次未退出或多次启动）
+if command -v lsof >/dev/null 2>&1; then
+  pids=$(lsof -t -i ":$PORT" 2>/dev/null) || true
+  if [ -n "$pids" ]; then
+    echo "[720yun-offline-api] 停止占用端口 ${PORT} 的进程: $pids"
+    echo "$pids" | xargs kill 2>/dev/null || true
+    sleep 1
+  fi
+elif command -v fuser >/dev/null 2>&1; then
+  if fuser -n tcp "$PORT" >/dev/null 2>&1; then
+    echo "[720yun-offline-api] 停止占用端口 ${PORT} 的进程..."
+    fuser -k "$PORT/tcp" 2>/dev/null || true
+    sleep 1
+  fi
+fi
+
 echo "[720yun-offline-api] 安装依赖..."
 npm install --no-audit --no-fund