diff --git a/.github/workflows/deploy-to-zhuyuan-server.yml b/.github/workflows/deploy-to-zhuyuan-server.yml index ec112bee..19e02bb8 100644 --- a/.github/workflows/deploy-to-zhuyuan-server.yml +++ b/.github/workflows/deploy-to-zhuyuan-server.yml @@ -228,6 +228,7 @@ jobs: env: ZY_DOMAIN_MAIN: ${{ secrets.ZY_DOMAIN_MAIN }} ZY_DOMAIN_PREVIEW: ${{ secrets.ZY_DOMAIN_PREVIEW }} + ZY_DOMAIN_ALIAS: ${{ secrets.ZY_DOMAIN_ALIAS }} ZY_FACE_DOMAIN: ${{ secrets.ZY_FACE_DOMAIN }} run: | # PM2 配置 @@ -244,6 +245,14 @@ jobs: echo "⚠️ ZY_DOMAIN_MAIN 未配置,使用IP访问" sed -i "s/ZY_DOMAIN_MAIN_PLACEHOLDER//g" /tmp/zhuyuan-sovereign.conf fi + # 域名别名 (guanghulab.com 等) — 与主域名共享同一 server block + if [ -n "$ZY_DOMAIN_ALIAS" ]; then + sed -i "s/ZY_DOMAIN_ALIAS_PLACEHOLDER/$ZY_DOMAIN_ALIAS/g" /tmp/zhuyuan-sovereign.conf + echo "✅ 域名别名已注入: $ZY_DOMAIN_ALIAS" + else + # 未配置别名时移除占位符 + sed -i "s/ZY_DOMAIN_ALIAS_PLACEHOLDER//g" /tmp/zhuyuan-sovereign.conf + fi if [ -n "$ZY_DOMAIN_PREVIEW" ]; then sed -i "s/ZY_DOMAIN_PREVIEW_PLACEHOLDER/$ZY_DOMAIN_PREVIEW/g" /tmp/zhuyuan-sovereign.conf echo "✅ 预览域名已注入: $ZY_DOMAIN_PREVIEW" @@ -306,6 +315,10 @@ jobs: ZY_NOTION_TOKEN: ${{ secrets.ZY_NOTION_TOKEN }} ZY_CN_LLM_RELAY_HOST: ${{ secrets.ZY_CN_LLM_RELAY_HOST }} ZY_CN_LLM_RELAY_KEY: ${{ secrets.ZY_CN_LLM_RELAY_KEY }} + ZY_DOMAIN_MAIN: ${{ secrets.ZY_DOMAIN_MAIN }} + ZY_DOMAIN_ALIAS: ${{ secrets.ZY_DOMAIN_ALIAS }} + ZY_DOMAIN_PREVIEW: ${{ secrets.ZY_DOMAIN_PREVIEW }} + ZY_FACE_DOMAIN: ${{ secrets.ZY_FACE_DOMAIN }} run: | COMMIT_SHA="${{ github.sha }}" REF_NAME="${{ github.ref_name }}" @@ -419,6 +432,32 @@ jobs: curl -sf http://localhost:3801/api/health && echo "✅ 预览进程已上线 (3801)" || echo "❌ 预览进程启动失败 (3801) · 若 ZY_DOMAIN_PREVIEW 域名指向此端口则该域名可能502" curl -sf http://localhost:3100/health && echo "✅ MCP Server已上线 (3100)" || echo "❌ MCP Server启动失败 (3100)" + # DNS 诊断 · 检查域名是否指向本服务器 + 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 + if [ -n "$DOMAIN" ] && [ "$DOMAIN" != "_" ]; then + RESOLVED=$(dig +short "$DOMAIN" A 2>/dev/null | head -1) + if [ -z "$RESOLVED" ]; then + echo "❌ DNS 未解析: $DOMAIN (无A记录·网站不可达)" + elif [ "$RESOLVED" = "$SERVER_IP" ]; then + echo "✅ DNS 正确: $DOMAIN → $RESOLVED" + else + echo "⚠️ DNS 错误: $DOMAIN → $RESOLVED (应为 $SERVER_IP)" + fi + fi + done + echo "═══════════════════" + + # Nginx 配置诊断 · 检查 server_name 冲突 + echo "" + echo "═══ Nginx 诊断 ═══" + sudo nginx -T 2>&1 | grep -c "conflicting server name" | xargs -I{} echo "Nginx server_name 冲突数: {}" + echo "当前启用的站点配置:" + ls -la /etc/nginx/sites-enabled/ 2>/dev/null || echo "(无 sites-enabled 目录)" + echo "═══════════════════" + # 记录部署操作 curl -sf -X POST http://localhost:3800/api/operations \ -H "Content-Type: application/json" \ @@ -448,6 +487,11 @@ jobs: ssh-keyscan -H ${{ secrets.ZY_SERVER_HOST }} >> ~/.ssh/known_hosts 2>/dev/null - name: 💚 执行健康检查 + env: + ZY_DOMAIN_MAIN: ${{ secrets.ZY_DOMAIN_MAIN }} + ZY_DOMAIN_ALIAS: ${{ secrets.ZY_DOMAIN_ALIAS }} + ZY_DOMAIN_PREVIEW: ${{ secrets.ZY_DOMAIN_PREVIEW }} + ZY_FACE_DOMAIN: ${{ secrets.ZY_FACE_DOMAIN }} run: | ssh -i ~/.ssh/zy_key \ ${{ secrets.ZY_SERVER_USER }}@${{ secrets.ZY_SERVER_HOST }} << 'HEALTH_CMD' @@ -473,6 +517,10 @@ jobs: echo "§5 Nginx 状态:" systemctl is-active nginx && echo "Nginx: 运行中" || echo "Nginx: 已停止" + echo "Nginx server_name 冲突检测:" + sudo nginx -T 2>&1 | grep "conflicting server name" || echo " 无冲突 ✅" + echo "启用的站点配置:" + ls /etc/nginx/sites-enabled/ 2>/dev/null || echo " (无 sites-enabled 目录)" echo "" echo "§6 应用健康:" @@ -488,6 +536,29 @@ jobs: HEALTH_CMD + - name: 🌐 DNS 域名解析检查 + env: + ZY_DOMAIN_MAIN: ${{ secrets.ZY_DOMAIN_MAIN }} + ZY_DOMAIN_ALIAS: ${{ secrets.ZY_DOMAIN_ALIAS }} + ZY_DOMAIN_PREVIEW: ${{ secrets.ZY_DOMAIN_PREVIEW }} + ZY_FACE_DOMAIN: ${{ secrets.ZY_FACE_DOMAIN }} + 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 + if [ -n "$DOMAIN" ] && [ "$DOMAIN" != "_" ]; then + RESOLVED=$(dig +short "$DOMAIN" A 2>/dev/null | head -1) + if [ -z "$RESOLVED" ]; then + echo "❌ $DOMAIN → 无法解析 (无A记录·网站不可达)" + elif [ "$RESOLVED" = "$SERVER_IP" ]; then + echo "✅ $DOMAIN → $RESOLVED" + else + echo "⚠️ $DOMAIN → $RESOLVED (应为 $SERVER_IP · DNS配置错误!)" + fi + fi + done + echo "═══════════════════" + # ═══ §4 一键推送: 预览站 → 主站 ═══ promote: name: 🚀 预览站→主站 一键推送 diff --git a/server/nginx/zhuyuan-sovereign.conf b/server/nginx/zhuyuan-sovereign.conf index 6807c5b3..d3bf9e7a 100644 --- a/server/nginx/zhuyuan-sovereign.conf +++ b/server/nginx/zhuyuan-sovereign.conf @@ -17,13 +17,15 @@ # ═══════════════════════════════════════════════════════════ # ─── §1 主域名 · 正式对外网站 ─── -# 部署时由 deploy workflow 自动将 ZY_DOMAIN_MAIN_PLACEHOLDER 替换为实际域名 -# 替换源: GitHub Secrets → ZY_DOMAIN_MAIN +# 部署时由 deploy workflow 自动将占位符替换为实际域名 +# 替换源: GitHub Secrets → ZY_DOMAIN_MAIN / ZY_DOMAIN_ALIAS # ⚠️ 重要: guanghulab.online 必须配置为 ZY_DOMAIN_MAIN(不是 ZY_DOMAIN_PREVIEW) # 否则 /api/* 请求会被路由到 §2 预览站的 3801 端口而非 3800 → 导致 502 +# ⚠️ DNS: 所有配置的域名 A 记录必须指向 43.134.16.246 (ZY-SVR-002) +# guanghulab.com 当前指向错误IP · 需要冰朔在域名注册商修改 A 记录 server { listen 80 default_server; - server_name ZY_DOMAIN_MAIN_PLACEHOLDER 43.134.16.246 localhost 127.0.0.1; + server_name ZY_DOMAIN_MAIN_PLACEHOLDER ZY_DOMAIN_ALIAS_PLACEHOLDER 43.134.16.246; # ─── 安全头 ─── add_header X-Frame-Options "SAMEORIGIN" always; diff --git a/server/zhuyuan-server-profile.json b/server/zhuyuan-server-profile.json index 37700815..263aaf78 100644 --- a/server/zhuyuan-server-profile.json +++ b/server/zhuyuan-server-profile.json @@ -31,11 +31,19 @@ "dual_domain_architecture": { "description": "双域名架构 · 所有部署先到预览站验证→冰朔确认后一键推送到主站", "main_domain": { - "status": "待冰朔提供域名", + "status": "✅ 已配置·需修复DNS", "secret_name": "ZY_DOMAIN_MAIN", "purpose": "语言驱动操作系统正式对外网站", "site_root": "/opt/zhuyuan/sites/production", - "port": 3800 + "port": 3800, + "dns_note": "ZY_DOMAIN_MAIN 的 A 记录必须指向 43.134.16.246" + }, + "domain_alias": { + "domain": "guanghulab.com", + "status": "❌ DNS指向错误IP(43.154.96.49)·需修改A记录到43.134.16.246", + "secret_name": "ZY_DOMAIN_ALIAS", + "purpose": "品牌域名·与主域名共享同一server block", + "dns_required": "A 记录 → 43.134.16.246 (ZY-SVR-002)" }, "preview_domain": { "domain": "guanghulab.online", @@ -70,7 +78,7 @@ "access_requirements": { "ssh_key": { "status": "待确认", - "instruction": "冰朔,以下GitHub Secrets是部署到服务器的关键配置。\n如果之前已配置过,无需重复操作。如未配置,请添加:\n1. ZY_SERVER_HOST = 43.134.16.246\n2. ZY_SERVER_USER = root\n3. ZY_SERVER_KEY = SSH私钥内容 (PEM格式)\n4. ZY_SERVER_PATH = /opt/zhuyuan\n5. ZY_DOMAIN_PREVIEW = guanghulab.online\n6. ZY_DOMAIN_MAIN = 主域名 (后续准备好时配置)\n\n操作编号:ZY-SVR-SETUP-001\n操作人:冰朔 TCS-0002∞\n\n验证方法:铸渊可在 GitHub Actions 中手动触发 deploy-to-zhuyuan-server.yml → action=health-check 来测试SSH连接是否正常。", + "instruction": "冰朔,以下GitHub Secrets是部署到服务器的关键配置。\n如果之前已配置过,无需重复操作。如未配置,请添加:\n1. ZY_SERVER_HOST = 43.134.16.246\n2. ZY_SERVER_USER = root\n3. ZY_SERVER_KEY = SSH私钥内容 (PEM格式)\n4. ZY_SERVER_PATH = /opt/zhuyuan\n5. ZY_DOMAIN_PREVIEW = guanghulab.online\n6. ZY_DOMAIN_MAIN = 主域名 (已配置)\n7. ZY_DOMAIN_ALIAS = guanghulab.com (品牌域名·与主域名共享server block)\n\n⚠️ 紧急DNS修复:\nguanghulab.com A记录当前指向 43.154.96.49 (错误IP)\n请在域名注册商将 guanghulab.com A记录修改为 43.134.16.246\n\n操作编号:ZY-SVR-SETUP-001\n操作人:冰朔 TCS-0002∞\n\n验证方法:铸渊可在 GitHub Actions 中手动触发 deploy-to-zhuyuan-server.yml → action=health-check 来测试SSH连接是否正常。", "request_id": "ZY-SVR-SETUP-001" } },