From 5d323be14d0d68122125038b2fc210161f8afb7f Mon Sep 17 00:00:00 2001
From: root <953994191@qq.com>
Date: Fri, 26 Sep 2025 08:06:27 +0000
Subject: [PATCH] =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E7=89=88=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 38 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 84ae4e5..60776b4 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -3,34 +3,31 @@ on: [push]
 
 jobs:
   build-and-deploy:
-    # 使用包含 Maven 的 Docker 镜像
     container:
-      image: maven:3.8.6-openjdk-17  # 使用官方 Maven 镜像，包含 JDK 17
+      image: maven:3.8.6-openjdk-17
+      options: --pull=always
       
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest  # 使用更稳定的标签
+    
     steps:
-      # 1. 检出代码
       - name: 检出代码
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
 
-      # 2. 设置 Java 环境（在容器中可能不需要，因为镜像已包含）
-      - name: 设置 JDK 17
-        uses: actions/setup-java@v4
+      - name: 缓存 Maven 依赖
+        uses: actions/cache@v3
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
 
-      # 3. 使用 Maven 打包（现在 mvn 命令可用）
       - name: 使用 Maven 打包
         run: mvn clean package -DskipTests
 
-      # 4. 构建 Docker 镜像
+      - name: 验证构建结果
+        run: ls -la target/*.jar
+
       - name: 构建 Docker 镜像
         run: docker build -t light-delivery-app:latest .
 
-      # 5. 部署到服务器（保持不变）
       - name: 部署到服务器
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
@@ -39,22 +36,15 @@ jobs:
           mkdir -p ~/.ssh
           echo "$SSH_PRIVATE_KEY" > ~/.ssh/deploy_key
           chmod 600 ~/.ssh/deploy_key
-          echo -e "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null" > ~/.ssh/config
+          ssh-keyscan $SERVER_IP >> ~/.ssh/known_hosts
           
           ssh -i ~/.ssh/deploy_key root@$SERVER_IP '
-            echo "开始部署应用..."
             docker stop light-delivery-container || true
             docker rm light-delivery-container || true
             docker run -d \
               --name light-delivery-container \
-              --restart unless-stopped \
-              -p 443:443 \
-              -p 80:80 \
+              -p 443:443 -p 80:80 \
               -v /etc/ssl/certs:/etc/ssl/certs:ro \
               -e KEY_STORE_PASSWORD="$(cat /etc/ssl/certs/keyStorePass.txt)" \
               light-delivery-app:latest
-              
-            echo "部署完成，清理旧镜像..."
-            docker image prune -f
-          '
-          echo "✅ 应用部署成功！"
\ No newline at end of file
+          '
\ No newline at end of file