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