From 3c89e81de80ec8f6f31f66261859b470c99e6219 Mon Sep 17 00:00:00 2001
From: lzh <sickone075@gmail.com>
Date: Thu, 18 Dec 2025 13:25:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=B9=E5=99=A8=E5=86=85=20=3D=2080?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=BF=E4=B8=BB=E6=9C=BA=20=3D=209090?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

映射 = -p 9090:80（把外部 9090 转发到内部 80）
---
 .gitea/workflows/deploy-web.yaml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/deploy-web.yaml b/.gitea/workflows/deploy-web.yaml
index c7e527ce2..02e487d78 100644
--- a/.gitea/workflows/deploy-web.yaml
+++ b/.gitea/workflows/deploy-web.yaml
@@ -55,8 +55,8 @@ jobs:
           IMAGE_NAME: 'aiot-web-antd'
           # 容器名称
           CONTAINER_NAME: aiot-web-antd
-          # 宿主机端口 (根据 1Panel 规划，这里假设为 8080)
-          HOST_PORT: 8080
+          # 宿主机端口
+          HOST_PORT: 9090
         run: |
           # --- 构建阶段 ---
           SHORT_SHA=$(git log -1 --format='%h')
@@ -78,6 +78,14 @@ jobs:
           docker stop $CONTAINER_NAME || true
           docker rm $CONTAINER_NAME || true
           
+          # 检查端口占用，如果有其他容器占用，先停止它
+          PORT_CONTAINER=$(docker ps --filter "publish=${HOST_PORT}" --format "{{.Names}}" | head -1)
+          if [ ! -z "$PORT_CONTAINER" ]; then
+            echo "⚠️  Port ${HOST_PORT} is occupied by container: $PORT_CONTAINER"
+            echo "Stopping conflicting container..."
+            docker stop $PORT_CONTAINER || true
+          fi
+          
           # 启动新容器
           # -d: 后台运行
           # --restart always: 开机自启