diff --git a/.github/workflows/deploy-to-zhuyuan-server.yml b/.github/workflows/deploy-to-zhuyuan-server.yml index ec112bee..e73f351c 100644 --- a/.github/workflows/deploy-to-zhuyuan-server.yml +++ b/.github/workflows/deploy-to-zhuyuan-server.yml @@ -306,6 +306,9 @@ 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_PREVIEW: ${{ secrets.ZY_DOMAIN_PREVIEW }} + ZY_FACE_DOMAIN: ${{ secrets.ZY_FACE_DOMAIN }} run: | COMMIT_SHA="${{ github.sha }}" REF_NAME="${{ github.ref_name }}" @@ -419,6 +422,51 @@ 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_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 "═══════════════════" + + # LLM API 密钥诊断 · 检查聊天功能所需密钥 + echo "" + echo "═══ 聊天API密钥诊断 ═══" + LLM_KEY_COUNT=0 + for KEY_NAME in ZY_DEEPSEEK_API_KEY ZY_QIANWEN_API_KEY ZY_KIMI_API_KEY ZY_QINGYAN_API_KEY; do + if grep -q "${KEY_NAME}=.\{6,\}" /opt/zhuyuan/app/.env.app 2>/dev/null; then + echo "✅ ${KEY_NAME}: 已配置" + LLM_KEY_COUNT=$((LLM_KEY_COUNT + 1)) + else + echo "❌ ${KEY_NAME}: 未配置或为空 · 人格体对话功能受影响" + fi + done + echo "可用国内模型数: ${LLM_KEY_COUNT}/4" + if [ "$LLM_KEY_COUNT" -eq 0 ]; then + echo "⚠️ 警告: 所有国内模型API密钥未配置 · 聊天功能将不可用" + fi + echo "═══════════════════" + + # Nginx 配置诊断 · 检查 server_name 冲突 + echo "" + echo "═══ Nginx 诊断 ═══" + 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 "═══════════════════" + # 记录部署操作 curl -sf -X POST http://localhost:3800/api/operations \ -H "Content-Type: application/json" \ @@ -448,6 +496,10 @@ 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_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 +525,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 +544,28 @@ jobs: HEALTH_CMD + - name: 🌐 DNS 域名解析检查 + env: + ZY_DOMAIN_MAIN: ${{ secrets.ZY_DOMAIN_MAIN }} + 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_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/app/server.js b/server/app/server.js index 731d729a..94b0d92a 100644 --- a/server/app/server.js +++ b/server/app/server.js @@ -278,7 +278,11 @@ app.post('/api/chat', async (req, res) => { if (domesticGateway) { try { const result = await domesticGateway.chat(sessionId, message); - return res.json({ ...result, sessionId }); + // 网关返回成功才使用其结果，否则降级到通用聊天引擎 + if (result && result.success !== false) { + return res.json({ ...result, sessionId }); + } + console.warn(`[聊天网关] 国内模型网关返回失败: ${result?.message || '未知'} · 降级到通用引擎`); } catch (gwErr) { console.error(`[聊天网关] 国内模型网关异常: ${gwErr.message}`); // 降级到通用聊天引擎 diff --git a/server/nginx/zhuyuan-sovereign.conf b/server/nginx/zhuyuan-sovereign.conf index 6807c5b3..e8deac4f 100644 --- a/server/nginx/zhuyuan-sovereign.conf +++ b/server/nginx/zhuyuan-sovereign.conf @@ -17,13 +17,14 @@ # ═══════════════════════════════════════════════════════════ # ─── §1 主域名 · 正式对外网站 ─── -# 部署时由 deploy workflow 自动将 ZY_DOMAIN_MAIN_PLACEHOLDER 替换为实际域名 +# 部署时由 deploy workflow 自动将占位符替换为实际域名 # 替换源: GitHub Secrets → ZY_DOMAIN_MAIN # ⚠️ 重要: guanghulab.online 必须配置为 ZY_DOMAIN_MAIN（不是 ZY_DOMAIN_PREVIEW） # 否则 /api/* 请求会被路由到 §2 预览站的 3801 端口而非 3800 → 导致 502 +# ⚠️ guanghulab.com 是ICP备案域名，部署在国内广州服务器(ZY-SVR-004)，不在这里配置 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 43.134.16.246; # ─── 安全头 ─── add_header X-Frame-Options "SAMEORIGIN" always; diff --git a/server/proxy/config/server-registry.json b/server/proxy/config/server-registry.json index deb86434..7cee0e17 100644 --- a/server/proxy/config/server-registry.json +++ b/server/proxy/config/server-registry.json @@ -106,6 +106,25 @@ "user": "ZY_SVR_AWEN_USER" }, "notes": "Awen下载完整仓库后部署·铸渊主控自动唤醒" + }, + { + "id": "ZY-SVR-004", + "name": "国内备案服务器", + "role": "ICP备案挂载+人格体备用大脑", + "location": "Guangzhou, China (广州七区)", + "ipv4": "43.139.217.141", + "spec": "2核2G", + "status": "active", + "services": [ + "nginx (ICP备案落地页·guanghulab.com)", + "备用大脑 (不涉及国外模型调用)" + ], + "github_secrets": { + "host": "ZY_CN_SERVER_HOST", + "key": "ZY_CN_SERVER_KEY", + "user": "ZY_CN_SERVER_USER" + }, + "notes": "ICP备案域名guanghulab.com必须指向此服务器·冰朔实名大陆服务器" } ], "cn_domain": { diff --git a/server/zhuyuan-server-profile.json b/server/zhuyuan-server-profile.json index 37700815..877abdb0 100644 --- a/server/zhuyuan-server-profile.json +++ b/server/zhuyuan-server-profile.json @@ -31,11 +31,12 @@ "dual_domain_architecture": { "description": "双域名架构 · 所有部署先到预览站验证→冰朔确认后一键推送到主站", "main_domain": { - "status": "待冰朔提供域名", + "status": "✅ 已配置", "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" }, "preview_domain": { "domain": "guanghulab.online", @@ -70,7 +71,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 = 主域名 (已配置)\n\n⚠️ guanghulab.com 是ICP备案域名:\n → DNS A记录必须指向 43.139.217.141 (广州 ZY-SVR-004)\n → 不是新加坡服务器! 由 deploy-cn-landing.yml 单独部署\n\n⚠️ 聊天功能:\n 需要配置 ZY_DEEPSEEK_API_KEY / ZY_QIANWEN_API_KEY / ZY_KIMI_API_KEY / ZY_QINGYAN_API_KEY\n 至少配置一个密钥才能启用人格体对话\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" } },