From 369c90c9ee914b8a408c11674c086744775d48ed Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 30 Mar 2026 14:36:51 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSSH=E5=AF=86=E9=92=A5?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E5=AE=89=E5=85=A8=E6=80=A7=C2=B7=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8env=E5=8F=98=E9=87=8F+=E5=AE=8C=E6=95=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E9=AA=8C=E8=AF=81=C2=B7=E4=BF=AE=E5=A4=8Ddeploy=20YAM?=
 =?UTF-8?q?L=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Agent-Logs-Url: https://github.com/qinfendebingshuo/guanghulab/sessions/fe52b677-fd2b-4179-bb74-be570d9e15ba

Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com>
---
 .github/workflows/deploy-to-cn-server.yml     | 16 ++++++++----
 .../workflows/deploy-to-zhuyuan-server.yml    | 25 +++++++++++++------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/deploy-to-cn-server.yml b/.github/workflows/deploy-to-cn-server.yml
index 713f4e9f..fa2206ab 100644
--- a/.github/workflows/deploy-to-cn-server.yml
+++ b/.github/workflows/deploy-to-cn-server.yml
@@ -46,12 +46,14 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: 🔐 配置SSH
+        env:
+          SSH_KEY: ${{ secrets.ZY_CN_SERVER_KEY }}
         run: |
           mkdir -p ~/.ssh
-          printf '%s\n' "${{ secrets.ZY_CN_SERVER_KEY }}" > ~/.ssh/zy_cn_key
+          echo "$SSH_KEY" > ~/.ssh/zy_cn_key
           chmod 600 ~/.ssh/zy_cn_key
-          if head -1 ~/.ssh/zy_cn_key | grep -q "BEGIN"; then
-            echo "✅ SSH私钥格式正确"
+          if head -1 ~/.ssh/zy_cn_key | grep -q "BEGIN" && tail -1 ~/.ssh/zy_cn_key | grep -q "END"; then
+            echo "✅ SSH私钥格式正确（BEGIN/END标记完整）"
           else
             echo "❌ SSH私钥格式异常 — 请检查 GitHub Secrets 中 ZY_CN_SERVER_KEY 的内容"
             exit 1
@@ -91,9 +93,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: 🔐 配置SSH
+        env:
+          SSH_KEY: ${{ secrets.ZY_CN_SERVER_KEY }}
         run: |
           mkdir -p ~/.ssh
-          printf '%s\n' "${{ secrets.ZY_CN_SERVER_KEY }}" > ~/.ssh/zy_cn_key
+          echo "$SSH_KEY" > ~/.ssh/zy_cn_key
           chmod 600 ~/.ssh/zy_cn_key
           ssh-keyscan -H ${{ secrets.ZY_CN_SERVER_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
 
@@ -164,9 +168,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: 🔐 配置SSH
+        env:
+          SSH_KEY: ${{ secrets.ZY_CN_SERVER_KEY }}
         run: |
           mkdir -p ~/.ssh
-          printf '%s\n' "${{ secrets.ZY_CN_SERVER_KEY }}" > ~/.ssh/zy_cn_key
+          echo "$SSH_KEY" > ~/.ssh/zy_cn_key
           chmod 600 ~/.ssh/zy_cn_key
           ssh-keyscan -H ${{ secrets.ZY_CN_SERVER_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
 
diff --git a/.github/workflows/deploy-to-zhuyuan-server.yml b/.github/workflows/deploy-to-zhuyuan-server.yml
index dcdf972a..66d4e5a0 100644
--- a/.github/workflows/deploy-to-zhuyuan-server.yml
+++ b/.github/workflows/deploy-to-zhuyuan-server.yml
@@ -50,14 +50,15 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: 🔐 配置SSH
+        env:
+          SSH_KEY: ${{ secrets.ZY_SERVER_KEY }}
         run: |
           mkdir -p ~/.ssh
-          # 写入私钥（支持多种格式）
-          printf '%s\n' "${{ secrets.ZY_SERVER_KEY }}" > ~/.ssh/zy_key
+          echo "$SSH_KEY" > ~/.ssh/zy_key
           chmod 600 ~/.ssh/zy_key
-          # 验证私钥格式
-          if head -1 ~/.ssh/zy_key | grep -q "BEGIN"; then
-            echo "✅ SSH私钥格式正确"
+          # 验证私钥格式完整性
+          if head -1 ~/.ssh/zy_key | grep -q "BEGIN" && tail -1 ~/.ssh/zy_key | grep -q "END"; then
+            echo "✅ SSH私钥格式正确（BEGIN/END标记完整）"
           else
             echo "❌ SSH私钥格式异常 — 请检查 GitHub Secrets 中 ZY_SERVER_KEY 的内容"
             echo "   应以 '-----BEGIN' 开头，以 '-----END' 结尾"
@@ -116,11 +117,15 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: 🔐 配置SSH
+        env:
+          SSH_KEY: ${{ secrets.ZY_SERVER_KEY }}
         run: |
           mkdir -p ~/.ssh
-          printf '%s\n' "${{ secrets.ZY_SERVER_KEY }}" > ~/.ssh/zy_key
+          echo "$SSH_KEY" > ~/.ssh/zy_key
           chmod 600 ~/.ssh/zy_key
           ssh-keyscan -H ${{ secrets.ZY_SERVER_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
+
+      - name: 📦 同步应用代码
         run: |
           # 确定部署目标: preview (默认) 或 production
           TARGET="${{ github.event.inputs.deploy_target || 'preview' }}"
@@ -198,9 +203,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: 🔐 配置SSH
+        env:
+          SSH_KEY: ${{ secrets.ZY_SERVER_KEY }}
         run: |
           mkdir -p ~/.ssh
-          printf '%s\n' "${{ secrets.ZY_SERVER_KEY }}" > ~/.ssh/zy_key
+          echo "$SSH_KEY" > ~/.ssh/zy_key
           chmod 600 ~/.ssh/zy_key
           ssh-keyscan -H ${{ secrets.ZY_SERVER_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
 
@@ -254,9 +261,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: 🔐 配置SSH
+        env:
+          SSH_KEY: ${{ secrets.ZY_SERVER_KEY }}
         run: |
           mkdir -p ~/.ssh
-          printf '%s\n' "${{ secrets.ZY_SERVER_KEY }}" > ~/.ssh/zy_key
+          echo "$SSH_KEY" > ~/.ssh/zy_key
           chmod 600 ~/.ssh/zy_key
           ssh-keyscan -H ${{ secrets.ZY_SERVER_HOST }} >> ~/.ssh/known_hosts 2>/dev/null