From 4a16a0901c55fd7814a6d8817103187dd3b229c2 Mon Sep 17 00:00:00 2001
From: xujiang <xujiang@boohee.com>
Date: Wed, 16 Jul 2025 18:10:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0SSH=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=9B=BF=E4=BB=A3SSH=E5=AF=86=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在`deploy-admin.yml`和`deploy-frontend.yml`中，将SSH连接方式从使用密钥改为使用密码，确保兼容性。
- 更新前端健康检查脚本，增强文件存在性检查，提升可靠性。

此更改优化了SSH连接的安全性和健康检查的准确性。
---
 .gitea/workflows/deploy-admin.yml    |  6 ++--
 .gitea/workflows/deploy-frontend.yml | 47 +++++++++++++++++++---------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/deploy-admin.yml b/.gitea/workflows/deploy-admin.yml
index ed16f05..115a55d 100644
--- a/.gitea/workflows/deploy-admin.yml
+++ b/.gitea/workflows/deploy-admin.yml
@@ -142,7 +142,7 @@ jobs:
         with:
           host: ${{ secrets.ALIYUN_IP }}
           username: ${{ secrets.ALIYUN_USER_NAME }}
-          key: ${{ secrets.ALIYUN_SSH_KEY }}
+          password: ${{ secrets.ALIYUN_PWD }}
           port: 22
           source: "admin/admin-dist.tar.gz"
           target: "/tmp/"
@@ -152,7 +152,7 @@ jobs:
         with:
           host: ${{ secrets.ALIYUN_IP }}
           username: ${{ secrets.ALIYUN_USER_NAME }}
-          key: ${{ secrets.ALIYUN_SSH_KEY }}
+          password: ${{ secrets.ALIYUN_PWD }}
           port: 22
           script: |
             echo "🚀 开始部署管理后台..."
@@ -186,7 +186,7 @@ jobs:
         with:
           host: ${{ secrets.ALIYUN_IP }}
           username: ${{ secrets.ALIYUN_USER_NAME }}
-          key: ${{ secrets.ALIYUN_SSH_KEY }}
+          password: ${{ secrets.ALIYUN_PWD }}
           port: 22
           script: |
             echo "🔍 执行健康检查..."
diff --git a/.gitea/workflows/deploy-frontend.yml b/.gitea/workflows/deploy-frontend.yml
index c5147f8..f7a9d78 100644
--- a/.gitea/workflows/deploy-frontend.yml
+++ b/.gitea/workflows/deploy-frontend.yml
@@ -107,11 +107,10 @@ jobs:
         with:
           host: ${{ secrets.ALIYUN_IP }}
           username: ${{ secrets.ALIYUN_USER_NAME }}
-          key: ${{ secrets.ALIYUN_SSH_KEY }}
+          password: ${{ secrets.ALIYUN_PWD }}
           port: 22
-          source: "frontend/out/*"
+          source: "frontend/out/"
           target: "/home/gitea/www/photography/"
-          strip_components: 2
           rm: true
 
       - name: 🔧 设置文件权限
@@ -119,7 +118,7 @@ jobs:
         with:
           host: ${{ secrets.ALIYUN_IP }}
           username: ${{ secrets.ALIYUN_USER_NAME }}
-          key: ${{ secrets.ALIYUN_SSH_KEY }}
+          password: ${{ secrets.ALIYUN_PWD }}
           port: 22
           script: |
             echo "🔧 设置文件权限..."
@@ -132,18 +131,36 @@ jobs:
             find /home/gitea/www/photography -type f \( -name '*.html' -o -name '*.js' -o -name '*.css' -o -name '*.json' \) -exec chmod 644 {} \;
             
             # 重新加载 Caddy
-            sudo systemctl reload caddy
+            if command -v sudo &> /dev/null; then
+              sudo systemctl reload caddy
+            else
+              systemctl reload caddy || true
+            fi
             
             echo "✅ 前端部署完成！"
 
       - name: 🔍 健康检查
-        run: |
-          echo "🔍 执行健康检查..."
-          sleep 5
-          
-          # 快速健康检查
-          if curl -f -s -o /dev/null --max-time 10 https://photography.iriver.top; then
-            echo "✅ 前端网站访问正常"
-          else
-            echo "⚠️ 前端网站访问异常，请手动检查"
-          fi
\ No newline at end of file
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          host: ${{ secrets.ALIYUN_IP }}
+          username: ${{ secrets.ALIYUN_USER_NAME }}
+          password: ${{ secrets.ALIYUN_PWD }}
+          port: 22
+          script: |
+            echo "🔍 执行健康检查..."
+            
+            # 检查文件是否存在
+            if [ -f '/home/gitea/www/photography/index.html' ]; then
+              echo '✅ index.html 文件存在'
+            else
+              echo '❌ index.html 文件不存在'
+              exit 1
+            fi
+            
+            # 快速检查
+            sleep 3
+            if curl -f -s -o /dev/null https://photography.iriver.top; then
+              echo '✅ 前端网站访问正常'
+            else
+              echo '⚠️ 前端网站访问异常，请手动检查'
+            fi
\ No newline at end of file