From ab86c04315edcce1fed76102dc7c5c9c2988b724 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 11 Apr 2026 17:53:04 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=AE=A1=E6=9F=A5=E5=8F=8D=E9=A6=88:=20=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=BC=95=E5=8F=B7+=E7=AE=80=E5=8C=96grep=20-c?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Agent-Logs-Url: https://github.com/qinfendebingshuo/guanghulab/sessions/df402ed1-c1de-4642-a531-fcb3331e1c05

Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com>
---
 .github/workflows/deploy-to-zhuyuan-server.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-to-zhuyuan-server.yml b/.github/workflows/deploy-to-zhuyuan-server.yml
index 19e02bb8..25b53057 100644
--- a/.github/workflows/deploy-to-zhuyuan-server.yml
+++ b/.github/workflows/deploy-to-zhuyuan-server.yml
@@ -436,7 +436,7 @@ jobs:
           echo ""
           echo "═══ DNS 诊断 ═══"
           SERVER_IP="43.134.16.246"
-          for DOMAIN in ${ZY_DOMAIN_MAIN} ${ZY_DOMAIN_ALIAS} ${ZY_DOMAIN_PREVIEW} ${ZY_FACE_DOMAIN}; do
+          for DOMAIN in "${ZY_DOMAIN_MAIN}" "${ZY_DOMAIN_ALIAS}" "${ZY_DOMAIN_PREVIEW}" "${ZY_FACE_DOMAIN}"; do
             if [ -n "$DOMAIN" ] && [ "$DOMAIN" != "_" ]; then
               RESOLVED=$(dig +short "$DOMAIN" A 2>/dev/null | head -1)
               if [ -z "$RESOLVED" ]; then
@@ -453,7 +453,8 @@ jobs:
           # Nginx 配置诊断 · 检查 server_name 冲突
           echo ""
           echo "═══ Nginx 诊断 ═══"
-          sudo nginx -T 2>&1 | grep -c "conflicting server name" | xargs -I{} echo "Nginx server_name 冲突数: {}"
+          CONFLICT_COUNT=$(sudo nginx -T 2>&1 | grep -c "conflicting server name" || true)
+          echo "Nginx server_name 冲突数: $CONFLICT_COUNT"
           echo "当前启用的站点配置:"
           ls -la /etc/nginx/sites-enabled/ 2>/dev/null || echo "(无 sites-enabled 目录)"
           echo "═══════════════════"
@@ -545,7 +546,7 @@ jobs:
         run: |
           echo "═══ DNS 域名解析诊断 ═══"
           SERVER_IP="43.134.16.246"
-          for DOMAIN in $ZY_DOMAIN_MAIN $ZY_DOMAIN_ALIAS $ZY_DOMAIN_PREVIEW $ZY_FACE_DOMAIN; do
+          for DOMAIN in "$ZY_DOMAIN_MAIN" "$ZY_DOMAIN_ALIAS" "$ZY_DOMAIN_PREVIEW" "$ZY_FACE_DOMAIN"; do
             if [ -n "$DOMAIN" ] && [ "$DOMAIN" != "_" ]; then
               RESOLVED=$(dig +short "$DOMAIN" A 2>/dev/null | head -1)
               if [ -z "$RESOLVED" ]; then