From ea09c73f2be2c91b0c547a523fea2070c6a9ce37 Mon Sep 17 00:00:00 2001
From: jxw <j2570852518@gmail.com>
Date: Thu, 22 Oct 2026 15:42:38 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=B8=85=E7=90=86=E6=97=A7?=
 =?UTF-8?q?=20blog-mysql=20=E5=AE=B9=E5=99=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yaml | 3 +++
 deploy.sh                    | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 7824980..6796eb1 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -15,6 +15,9 @@ jobs:
       - name: Build and Restart Docker Containers
         run: |
           echo "🚀 [CI/CD] 检测到代码更新，开始执行自动部署..."
+          # 清理此前遗留的独立 blog-mysql 容器（若存在）
+          docker stop blog-mysql 2>/dev/null || true
+          docker rm blog-mysql 2>/dev/null || true
           docker compose down
           docker compose up -d --build
           echo "✅ [CI/CD] 容器重构完成，最新版本已上线！"
diff --git a/deploy.sh b/deploy.sh
index d3ec630..c074bd2 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -11,12 +11,16 @@ if [ -d ".git" ]; then
     git pull origin main || true
 fi
 
-# 2. 重新编译后端与前端容器
+# 2. 清理旧的独立 blog-mysql 容器（改用 1Panel 现有 MySQL）
+docker stop blog-mysql 2>/dev/null || true
+docker rm blog-mysql 2>/dev/null || true
+
+# 3. 重新编译后端与前端容器
 echo "🐳 [Docker] 重新构建并运行全栈容器..."
 docker compose down
 docker compose up -d --build
 
-# 3. 检查服务健康状态
+# 4. 检查服务健康状态
 echo "⏳ [HealthCheck] 等待服务启动..."
 sleep 3
 docker ps --filter "name=blog-"