From 84ca36b10bf423cdfe1eb67f23ac76e56142bf99 Mon Sep 17 00:00:00 2001 From: TomyS Date: Thu, 17 Sep 2026 17:14:37 +0800 Subject: [PATCH] =?UTF-8?q?chore(ci):=20SSH=E7=AB=AF=E5=8F=A3=E5=88=874822?= =?UTF-8?q?2=EF=BC=8822=E8=AE=A9=E7=BB=99=E8=9C=9C=E7=BD=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy-test.yml | 10 +++++----- .gitea/workflows/promote-prod.yml | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/deploy-test.yml b/.gitea/workflows/deploy-test.yml index c43a65d..0f6de8b 100644 --- a/.gitea/workflows/deploy-test.yml +++ b/.gitea/workflows/deploy-test.yml @@ -90,7 +90,7 @@ jobs: - name: Deploy to test env run: | set -e - SSH_CMD="ssh -i $HOME/.ssh/id_ed25519_deploy root@${{ secrets.CAPTCHA_TEST_HOST }}" + SSH_CMD="ssh -p 48222 -i $HOME/.ssh/id_ed25519_deploy root@${{ secrets.CAPTCHA_TEST_HOST }}" $SSH_CMD ' set -e echo "===== 拉取镜像 =====" @@ -107,12 +107,12 @@ jobs: mkdir -p /opt/tianai/web/tac ' # 上传前端 SDK 构建产物 - scp -i $HOME/.ssh/id_ed25519_deploy -r "$GITHUB_WORKSPACE/tac-dist/tac"/* \ + scp -P 48222 -i $HOME/.ssh/id_ed25519_deploy -r "$GITHUB_WORKSPACE/tac-dist/tac"/* \ root@${{ secrets.CAPTCHA_TEST_HOST }}:/opt/tianai/web/tac/ # 上传管理后台构建产物 mkdir -p /tmp/admin-dist cp -r "$GITHUB_WORKSPACE/admin-dist/"* /tmp/admin-dist/ - scp -i $HOME/.ssh/id_ed25519_deploy -r /tmp/admin-dist/* \ + scp -P 48222 -i $HOME/.ssh/id_ed25519_deploy -r /tmp/admin-dist/* \ root@${{ secrets.CAPTCHA_TEST_HOST }}:/opt/tianai/web/admin/ # 上传 nginx 配置 cat > /tmp/captcha-nginx.conf <<'NGINX_EOF' @@ -161,7 +161,7 @@ jobs: } } NGINX_EOF - scp -i $HOME/.ssh/id_ed25519_deploy /tmp/captcha-nginx.conf \ + scp -P 48222 -i $HOME/.ssh/id_ed25519_deploy /tmp/captcha-nginx.conf \ root@${{ secrets.CAPTCHA_TEST_HOST }}:/opt/tianai/web/nginx.conf $SSH_CMD ' echo "===== 重建 nginx 容器 =====" @@ -182,7 +182,7 @@ jobs: TEST_SITE_KEY: 6a062b70-c0b3-428e-8f1b-cca402e67ddd run: | set -e - SSH_CMD="ssh -i $HOME/.ssh/id_ed25519_deploy root@${{ secrets.CAPTCHA_TEST_HOST }}" + SSH_CMD="ssh -p 48222 -i $HOME/.ssh/id_ed25519_deploy root@${{ secrets.CAPTCHA_TEST_HOST }}" OK=0 CODE=000 for i in $(seq 1 24); do diff --git a/.gitea/workflows/promote-prod.yml b/.gitea/workflows/promote-prod.yml index 45fdb41..de8d475 100644 --- a/.gitea/workflows/promote-prod.yml +++ b/.gitea/workflows/promote-prod.yml @@ -41,17 +41,17 @@ jobs: run: | set -e SSH_KEY="$HOME/.ssh/id_ed25519_deploy" - ssh -i $SSH_KEY root@$TEST \ + ssh -p 48222 -i $SSH_KEY root@$TEST \ "docker pull $IMAGE:test >/dev/null && docker save $IMAGE:test | gzip > /tmp/tianai-promote.tar.gz && ls -la /tmp/tianai-promote.tar.gz" - scp -i $SSH_KEY root@$TEST:/tmp/tianai-promote.tar.gz /tmp/tianai-promote.tar.gz + scp -P 48222 -i $SSH_KEY root@$TEST:/tmp/tianai-promote.tar.gz /tmp/tianai-promote.tar.gz echo "镜像已下载到 runner" - name: Transfer to prod1 (runner → prod1) run: | set -e SSH_KEY="$HOME/.ssh/id_ed25519_deploy" - scp -i $SSH_KEY /tmp/tianai-promote.tar.gz root@$PROD:/tmp/ - ssh -i $SSH_KEY root@$TEST 'rm -f /tmp/tianai-promote.tar.gz' + scp -P 48222 -i $SSH_KEY /tmp/tianai-promote.tar.gz root@$PROD:/tmp/ + ssh -p 48222 -i $SSH_KEY root@$TEST 'rm -f /tmp/tianai-promote.tar.gz' rm -f /tmp/tianai-promote.tar.gz echo "镜像已传输到 prod1" @@ -59,7 +59,7 @@ jobs: run: | set -e SSH_KEY="$HOME/.ssh/id_ed25519_deploy" - ssh -i $SSH_KEY root@$PROD ' + ssh -p 48222 -i $SSH_KEY root@$PROD ' set -e echo "===== 备份当前生产镜像 =====" docker tag tianai-captcha-platform:latest tianai-captcha-platform:backup-$(date +%Y%m%d-%H%M) 2>/dev/null \ @@ -90,13 +90,13 @@ jobs: OK=0 CODE=000 for i in $(seq 1 24); do - CODE=$(ssh -i $SSH_KEY root@$PROD "curl -s -X POST 'http://127.0.0.1:18200/api/challenge/generate' -H 'X-Site-Key: $PROD_SITE_KEY'" | python3 -c "import json,sys; print(json.load(sys.stdin).get('code'))" 2>/dev/null || echo 000) + CODE=$(ssh -p 48222 -i $SSH_KEY root@$PROD "curl -s -X POST 'http://127.0.0.1:18200/api/challenge/generate' -H 'X-Site-Key: $PROD_SITE_KEY'" | python3 -c "import json,sys; print(json.load(sys.stdin).get('code'))" 2>/dev/null || echo 000) if [ "$CODE" = "200" ]; then OK=1; break; fi sleep 5 done if [ "$OK" != "1" ]; then echo "生产健康检查失败 (code=$CODE)" - ssh -i $SSH_KEY root@$PROD 'docker logs tianai-captcha --tail 30' || true + ssh -p 48222 -i $SSH_KEY root@$PROD 'docker logs tianai-captcha --tail 30' || true echo "如需回滚: ssh prod1 后执行 docker rm -f tianai-captcha 并用 backup-xxx 标签重建容器" exit 1 fi