From 068e469f323cfe0c59741b8f974d7cc65fd6a90f Mon Sep 17 00:00:00 2001
From: huertian <huertian@qq.com>
Date: Wed, 8 Jan 2025 19:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 42 +++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 33d2bc5..07f8fc6 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      # 1️⃣ 检出代码
-      - name: 🛠️ 检出代码
+      # 1️⃣ 检测代码
+      - name: 🛠️ 检测代码
         uses: actions/checkout@v3
 
       # 2️⃣ 设置 Java 环境
@@ -24,26 +24,46 @@ jobs:
       # 3️⃣ 构建 Spring Boot 项目
       - name: 📦 构建 Spring Boot 项目
         run: |
+          echo "开始构建项目..."
           ./mvnw clean package -DskipTests
-          ls target/*.jar
+          echo "构建完成，列出目标目录中的 JAR 文件："
+          ls -lh target/
 
       # 4️⃣ 部署到服务器
       - name: 🚀 部署到服务器
         env:
           DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }} # SSH 私钥
         run: |
-          # 配置 SSH 🔑
+          echo "开始配置 SSH..."
           echo "$DEPLOY_KEY" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
           ssh-keyscan -H 8.137.89.177 >> ~/.ssh/known_hosts
 
-          # 上传 JAR 包到服务器 📤
-          scp target/jinduguanli-0.0.1-SNAPSHOT.jar root@8.137.89.177:/huertian/app.jar
+          echo "开始上传 JAR 包到服务器..."
+          scp -v target/jinduguanli-0.0.1-SNAPSHOT.jar root@8.137.89.177:/huertian/app.jar || {
+            echo "❌ 上传 JAR 包失败！请检查路径和文件名。"
+            exit 1
+          }
 
-          # 在服务器上重启应用 🔄
+          echo "开始在服务器上重启应用..."
           ssh root@8.137.89.177 << 'EOF'
-            cd /huertian
-            pkill -f 'java -jar' || true
-            nohup java -jar app.jar --spring.config.location=/huertian/application.yml> /huertian/log/app.log 2>&1 &
-            exit
+            echo "进入部署目录..."
+            cd /huertian || {
+              echo "❌ 目标目录不存在！请检查 /huertian 是否正确。"
+              exit 1
+            }
+            echo "停止旧的应用进程..."
+            pkill -f 'java -jar' || echo "没有运行的旧进程。"
+
+            echo "启动新的应用进程..."
+            nohup java -jar app.jar --spring.config.location=/huertian/application.yml > /huertian/log/app.log 2>&1 &
+            echo "✅ 应用已启动！"
           EOF
+
+      # 5️⃣ 检查应用是否成功启动
+      - name: 🔍 检查应用状态
+        run: |
+          echo "检查服务器上的应用是否启动..."
+          ssh root@8.137.89.177 "ps -ef | grep 'java -jar' | grep -v grep || echo '❌ 应用未启动！请检查日志。'"
+          echo "查看最近的日志输出："
+          ssh root@8.137.89.177 "tail -n 20 /huertian/log/app.log"