fix: 更新SSH连接方式,使用密码替代SSH密钥
- 在`deploy-admin.yml`和`deploy-frontend.yml`中,将SSH连接方式从使用密钥改为使用密码,确保兼容性。 - 更新前端健康检查脚本,增强文件存在性检查,提升可靠性。 此更改优化了SSH连接的安全性和健康检查的准确性。
This commit is contained in:
@ -142,7 +142,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
host: ${{ secrets.ALIYUN_IP }}
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
username: ${{ secrets.ALIYUN_USER_NAME }}
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
password: ${{ secrets.ALIYUN_PWD }}
|
||||||
port: 22
|
port: 22
|
||||||
source: "admin/admin-dist.tar.gz"
|
source: "admin/admin-dist.tar.gz"
|
||||||
target: "/tmp/"
|
target: "/tmp/"
|
||||||
@ -152,7 +152,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
host: ${{ secrets.ALIYUN_IP }}
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
username: ${{ secrets.ALIYUN_USER_NAME }}
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
password: ${{ secrets.ALIYUN_PWD }}
|
||||||
port: 22
|
port: 22
|
||||||
script: |
|
script: |
|
||||||
echo "🚀 开始部署管理后台..."
|
echo "🚀 开始部署管理后台..."
|
||||||
@ -186,7 +186,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
host: ${{ secrets.ALIYUN_IP }}
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
username: ${{ secrets.ALIYUN_USER_NAME }}
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
password: ${{ secrets.ALIYUN_PWD }}
|
||||||
port: 22
|
port: 22
|
||||||
script: |
|
script: |
|
||||||
echo "🔍 执行健康检查..."
|
echo "🔍 执行健康检查..."
|
||||||
|
|||||||
@ -107,11 +107,10 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
host: ${{ secrets.ALIYUN_IP }}
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
username: ${{ secrets.ALIYUN_USER_NAME }}
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
password: ${{ secrets.ALIYUN_PWD }}
|
||||||
port: 22
|
port: 22
|
||||||
source: "frontend/out/*"
|
source: "frontend/out/"
|
||||||
target: "/home/gitea/www/photography/"
|
target: "/home/gitea/www/photography/"
|
||||||
strip_components: 2
|
|
||||||
rm: true
|
rm: true
|
||||||
|
|
||||||
- name: 🔧 设置文件权限
|
- name: 🔧 设置文件权限
|
||||||
@ -119,7 +118,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
host: ${{ secrets.ALIYUN_IP }}
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
username: ${{ secrets.ALIYUN_USER_NAME }}
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
password: ${{ secrets.ALIYUN_PWD }}
|
||||||
port: 22
|
port: 22
|
||||||
script: |
|
script: |
|
||||||
echo "🔧 设置文件权限..."
|
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 {} \;
|
find /home/gitea/www/photography -type f \( -name '*.html' -o -name '*.js' -o -name '*.css' -o -name '*.json' \) -exec chmod 644 {} \;
|
||||||
|
|
||||||
# 重新加载 Caddy
|
# 重新加载 Caddy
|
||||||
|
if command -v sudo &> /dev/null; then
|
||||||
sudo systemctl reload caddy
|
sudo systemctl reload caddy
|
||||||
|
else
|
||||||
|
systemctl reload caddy || true
|
||||||
|
fi
|
||||||
|
|
||||||
echo "✅ 前端部署完成!"
|
echo "✅ 前端部署完成!"
|
||||||
|
|
||||||
- name: 🔍 健康检查
|
- name: 🔍 健康检查
|
||||||
run: |
|
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 "🔍 执行健康检查..."
|
echo "🔍 执行健康检查..."
|
||||||
sleep 5
|
|
||||||
|
|
||||||
# 快速健康检查
|
# 检查文件是否存在
|
||||||
if curl -f -s -o /dev/null --max-time 10 https://photography.iriver.top; then
|
if [ -f '/home/gitea/www/photography/index.html' ]; then
|
||||||
echo "✅ 前端网站访问正常"
|
echo '✅ index.html 文件存在'
|
||||||
else
|
else
|
||||||
echo "⚠️ 前端网站访问异常,请手动检查"
|
echo '❌ index.html 文件不存在'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 快速检查
|
||||||
|
sleep 3
|
||||||
|
if curl -f -s -o /dev/null https://photography.iriver.top; then
|
||||||
|
echo '✅ 前端网站访问正常'
|
||||||
|
else
|
||||||
|
echo '⚠️ 前端网站访问异常,请手动检查'
|
||||||
fi
|
fi
|
||||||
Reference in New Issue
Block a user