From d796da91467933b9277b90bc604738ef83836232 Mon Sep 17 00:00:00 2001
From: Doubleyin <953994191@qq.com>
Date: Tue, 14 Oct 2025 03:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 83 ++++++++++++-------------------------
 1 file changed, 27 insertions(+), 56 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index bc3f732..274c38d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -16,6 +16,30 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: 检查现有环境
+        run: |
+          echo "=== 环境检查 ==="
+          command -v mvn && mvn --version || echo "Maven 未安装"
+          command -v java && java -version || echo "Java 未安装"
+          command -v docker && docker --version || echo "Docker 未安装"
+
+      - name: 从本地文件安装 JDK 17
+        run: |
+          echo "安装 JDK..."
+          if [ -f "/opt/jdk-dist/openjdk-17.0.2_linux-x64_bin.tar.gz" ]; then
+            echo "使用本地 JDK 文件"
+            cp "/opt/jdk-dist/openjdk-17.0.2_linux-x64_bin.tar.gz" jdk.tar.gz
+          else
+            echo "从网络下载 JDK"
+            wget http://192.168.171.223:8082/openjdk-17.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz
+          fi
+          
+          sudo mkdir -p /opt/java
+          sudo tar -xzf jdk.tar.gz -C /opt/java --strip-components=1
+          echo "JAVA_HOME=/opt/java" >> $GITHUB_ENV
+          echo "/opt/java/bin" >> $GITHUB_PATH
+          rm -f jdk.tar.gz
+
       - name: 设置 Maven
         uses: actions/setup-java@v4.2.1
         with:
@@ -23,65 +47,12 @@ jobs:
           java-version: '17'
           cache: 'maven'
 
-      - name: 从本地文件安装 JDK 17
-        run: |
-          echo "=== 详细文件检查 ==="
-          echo "当前目录: $(pwd)"
-          echo "用户: $(whoami)"
-          
-          # 详细检查文件系统
-          echo "检查 /opt/ 目录:"
-          ls -la /opt/ 2>/dev/null || echo "/opt/ 目录不存在"
-          
-          echo "检查 /opt/jdk-dist/ 目录:"
-          ls -la /opt/jdk-dist/ 2>/dev/null || echo "/opt/jdk-dist/ 目录不存在"
-          
-          echo "检查具体文件:"
-          if [ -f "/opt/jdk-dist/openjdk-17.0.2_linux-x64_bin.tar.gz" ]; then
-            echo " 文件存在!"
-            ls -la "/opt/jdk-dist/openjdk-17.0.2_linux-x64_bin.tar.gz"
-            file_size=$(stat -c%s "/opt/jdk-dist/openjdk-17.0.2_linux-x64_bin.tar.gz")
-            echo "文件大小: $file_size 字节"
-            
-            echo "复制文件..."
-            cp "/opt/jdk-dist/openjdk-17.0.2_linux-x64_bin.tar.gz" jdk.tar.gz
-          else
-            echo " 文件不存在!"
-            echo " 本地文件不存在，回退到下载"
-            wget http://192.168.171.223:8082/openjdk-17.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz
-          fi
-          
-          echo "安装 JDK..."
-          sudo mkdir -p /opt/java
-          sudo tar -xzf jdk.tar.gz -C /opt/java --strip-components=1
-          
-          echo "JAVA_HOME=/opt/java" >> $GITHUB_ENV
-          echo "/opt/java/bin" >> $GITHUB_PATH
-          rm -f jdk.tar.gz
-          echo " JDK 安装完成"
-
-      - name: 验证 Java 安装
-        run: |
-          echo "验证 Java 安装:"
-          java -version
-          javac -version
-          echo "JAVA_HOME: $JAVA_HOME"
-          echo "PATH: $PATH"
-
       - name: 验证环境
         run: |
-          echo "Runner 工作目录: $(pwd)"
-          echo "Docker 信息:"
-          docker --version
-          if ! docker info >/dev/null 2>&1; then
-            echo "❌ Docker 守护进程不可访问"
-            exit 1
-          else
-            echo "✅ Docker 守护进程可访问"
-            docker info
-          fi
-          echo "Maven 信息:"
+          echo " 环境验证成功:"
+          java -version
           mvn --version
+          docker --version
 
       - name: 缓存 Maven 依赖
         uses: actions/cache@v3