From a5ccbadbd651a1f7b458f3d50c003f5c55ec22ca Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 11 Apr 2026 11:14:05 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=8A=E5=A4=A9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD:=20API=E5=AF=86=E9=92=A5=E6=B3=A8=E5=85=A5=E4=B8=BB?= =?UTF-8?q?=E5=BA=94=E7=94=A8=20+=20Nginx=E8=B7=AF=E7=94=B1=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20+=20=E8=81=8A=E5=A4=A9UI=E6=94=BE=E5=A4=A7=E5=B1=85?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 核心修复: 1. 部署工作流: 为主应用写入.env.app (含LLM API密钥) 2. PM2配置: 加载.env.app环境变量到主应用进程 3. 聊天引擎: /api/chat 优先使用 domestic-llm-gateway (四路自动降级) 4. Nginx: /api/chat 路由到主应用3800 (原来路由到不存在的3721) 5. 前端UI: 聊天面板放大居中 + 背景遮罩 + 增大超时至60秒 Agent-Logs-Url: https://github.com/qinfendebingshuo/guanghulab/sessions/5a0f8fc3-ded6-4e1f-8c98-b1e59f82aad6 Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com> --- .../workflows/deploy-to-zhuyuan-server.yml | 12 +++++ docs/index.html | 47 ++++++++++++------- server/app/server.js | 28 +++++++---- server/ecosystem.config.js | 37 ++++++++++++++- server/nginx/zhuyuan-sovereign.conf | 10 ++-- 5 files changed, 102 insertions(+), 32 deletions(-) diff --git a/.github/workflows/deploy-to-zhuyuan-server.yml b/.github/workflows/deploy-to-zhuyuan-server.yml index 3b0e280d..b116508e 100644 --- a/.github/workflows/deploy-to-zhuyuan-server.yml +++ b/.github/workflows/deploy-to-zhuyuan-server.yml @@ -316,6 +316,18 @@ jobs: # 安装依赖 npm install --production 2>&1 + # ─── 写入主应用环境变量配置 ─── + echo "NODE_ENV=production" > /opt/zhuyuan/app/.env.app + echo "PORT=3800" >> /opt/zhuyuan/app/.env.app + echo "ZY_ROOT=/opt/zhuyuan" >> /opt/zhuyuan/app/.env.app + echo "ZY_SITE_MODE=production" >> /opt/zhuyuan/app/.env.app + echo "ZY_DEEPSEEK_API_KEY=${ZY_DEEPSEEK_API_KEY}" >> /opt/zhuyuan/app/.env.app + echo "ZY_QIANWEN_API_KEY=${ZY_QIANWEN_API_KEY}" >> /opt/zhuyuan/app/.env.app + echo "ZY_KIMI_API_KEY=${ZY_KIMI_API_KEY}" >> /opt/zhuyuan/app/.env.app + echo "ZY_QINGYAN_API_KEY=${ZY_QINGYAN_API_KEY}" >> /opt/zhuyuan/app/.env.app + echo "ZY_NOTION_TOKEN=${ZY_NOTION_TOKEN}" >> /opt/zhuyuan/app/.env.app + chmod 600 /opt/zhuyuan/app/.env.app + # 复制Nginx配置 sudo cp /opt/zhuyuan/config/nginx/zhuyuan-sovereign.conf /etc/nginx/sites-available/zhuyuan.conf sudo ln -sf /etc/nginx/sites-available/zhuyuan.conf /etc/nginx/sites-enabled/zhuyuan.conf diff --git a/docs/index.html b/docs/index.html index 7b8b137c..621b704f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -237,31 +237,34 @@ label{display:block;font-size:12px;color:var(--dim);margin-bottom:4px;font-weigh .chat-fab.editor-mode:hover{opacity:1;transform:scale(1.1)} /* ═══ Chat Panel ═══ */ -.chat-p{position:fixed;bottom:calc(76px + var(--sb));right:14px;z-index:50;width:min(360px,calc(100vw - 28px));height:min(440px,calc(100vh - 120px));height:min(440px,calc(100dvh - 120px));background:rgba(5,8,22,.82);border:1px solid rgba(110,168,254,.1);border-radius:var(--r);display:flex;flex-direction:column;transform:scale(.9) translateY(14px);opacity:0;pointer-events:none;transition:all .22s cubic-bezier(.4,0,.2,1);box-shadow:0 16px 64px rgba(0,0,0,.6);backdrop-filter:blur(24px);-webkit-backdrop-filter:blur(24px)} -.chat-p.open{transform:scale(1) translateY(0);opacity:1;pointer-events:auto} -@media(max-width:480px){.chat-p{bottom:0;right:0;left:0;width:100%;height:calc(100vh - 48px);height:calc(100dvh - 48px);border-radius:var(--r) var(--r) 0 0;padding-bottom:var(--sb)}} -.chat-hd{padding:10px 14px;border-bottom:1px solid var(--border);display:flex;align-items:center;gap:8px;flex-shrink:0} -.chat-av{width:32px;height:32px;border-radius:50%;background:linear-gradient(135deg,var(--accent),var(--accent2));display:flex;align-items:center;justify-content:center;font-size:16px;flex-shrink:0} -.chat-nm{font-weight:600;font-size:13px} -.chat-sb{font-size:10px;color:var(--dim)} -.chat-tg{margin-left:auto;font-size:9px;padding:2px 6px;background:var(--bg2);border:1px solid var(--border);border-radius:20px;color:var(--dim);font-family:var(--m)} -.chat-ms{flex:1;overflow-y:auto;padding:12px;display:flex;flex-direction:column;gap:8px;-webkit-overflow-scrolling:touch} -.cm{max-width:82%;padding:8px 12px;border-radius:var(--r);font-size:13px;line-height:1.6;word-break:break-word} +.chat-p{position:fixed;top:50%;left:50%;z-index:50;width:min(520px,calc(100vw - 40px));height:min(640px,calc(100vh - 80px));height:min(640px,calc(100dvh - 80px));background:rgba(5,8,22,.92);border:1px solid rgba(110,168,254,.15);border-radius:16px;display:flex;flex-direction:column;transform:translate(-50%,-50%) scale(.9);opacity:0;pointer-events:none;transition:all .25s cubic-bezier(.4,0,.2,1);box-shadow:0 24px 80px rgba(0,0,0,.7),0 0 60px rgba(110,168,254,.08);backdrop-filter:blur(28px);-webkit-backdrop-filter:blur(28px)} +.chat-p.open{transform:translate(-50%,-50%) scale(1);opacity:1;pointer-events:auto} +@media(max-width:560px){.chat-p{top:auto;left:0;bottom:0;width:100%;height:calc(100vh - 48px);height:calc(100dvh - 48px);border-radius:16px 16px 0 0;transform:translateY(100%);padding-bottom:var(--sb)}.chat-p.open{transform:translateY(0)}} +@media(min-width:900px){.chat-p{width:min(600px,calc(100vw - 80px));height:min(720px,calc(100vh - 80px))}} +.chat-hd{padding:14px 18px;border-bottom:1px solid var(--border);display:flex;align-items:center;gap:10px;flex-shrink:0} +.chat-av{width:38px;height:38px;border-radius:50%;background:linear-gradient(135deg,var(--accent),var(--accent2));display:flex;align-items:center;justify-content:center;font-size:18px;flex-shrink:0} +.chat-nm{font-weight:600;font-size:15px} +.chat-sb{font-size:11px;color:var(--dim)} +.chat-tg{margin-left:auto;font-size:10px;padding:3px 8px;background:var(--bg2);border:1px solid var(--border);border-radius:20px;color:var(--dim);font-family:var(--m)} +.chat-ms{flex:1;overflow-y:auto;padding:16px;display:flex;flex-direction:column;gap:10px;-webkit-overflow-scrolling:touch} +.cm{max-width:85%;padding:10px 14px;border-radius:var(--r);font-size:14px;line-height:1.7;word-break:break-word} .cm.u{align-self:flex-end;background:var(--accent);color:#fff;border-bottom-right-radius:4px} .cm.b{align-self:flex-start;background:var(--bg2);border:1px solid var(--border);border-bottom-left-radius:4px} -.cm.s{align-self:center;background:none;color:var(--muted);font-size:10px;padding:2px} -.cm-m{display:flex;gap:5px;margin-top:4px;font-size:9px;color:var(--muted)} -.ct{font-size:11px;color:var(--dim);padding:4px 12px} +.cm.s{align-self:center;background:none;color:var(--muted);font-size:11px;padding:2px} +.cm-m{display:flex;gap:5px;margin-top:6px;font-size:10px;color:var(--muted)} +.ct{font-size:12px;color:var(--dim);padding:6px 16px} .ct span{animation:bk 1.4s infinite;font-size:14px} .ct span:nth-child(2){animation-delay:.2s} .ct span:nth-child(3){animation-delay:.4s} @keyframes bk{0%,100%{opacity:.2}50%{opacity:1}} -.chat-in{padding:10px;border-top:1px solid var(--border);display:flex;gap:6px;flex-shrink:0} -.cin{flex:1;padding:8px 10px;background:var(--bg2);border:1px solid var(--border);border-radius:var(--r);color:var(--text);font-size:14px;outline:none;font-family:var(--f);-webkit-appearance:none} +.chat-in{padding:12px 14px;border-top:1px solid var(--border);display:flex;gap:8px;flex-shrink:0} +.cin{flex:1;padding:10px 14px;background:var(--bg2);border:1px solid var(--border);border-radius:var(--r);color:var(--text);font-size:15px;outline:none;font-family:var(--f);-webkit-appearance:none} .cin:focus{border-color:var(--accent)} -.csnd{width:36px;height:36px;border-radius:50%;background:var(--accent);border:none;color:#fff;font-size:14px;cursor:pointer;display:flex;align-items:center;justify-content:center;flex-shrink:0;transition:all .2s} +.csnd{width:40px;height:40px;border-radius:50%;background:var(--accent);border:none;color:#fff;font-size:16px;cursor:pointer;display:flex;align-items:center;justify-content:center;flex-shrink:0;transition:all .2s} .csnd:hover{background:var(--accent2)} .csnd:disabled{opacity:.3} +.chat-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.5);z-index:49;opacity:0;pointer-events:none;transition:opacity .25s} +.chat-overlay.open{opacity:1;pointer-events:auto} /* ═══ Three-Column Home Layout (Device Agent driven) ═══ */ .home-grid{display:grid;grid-template-columns:var(--da-grid, 1fr);gap:var(--da-gap, 12px);padding:var(--da-pad, 12px);max-width:1200px;margin:0 auto;align-content:start} @@ -1398,6 +1401,9 @@ label{display:block;font-size:12px;color:var(--dim);margin-bottom:4px;font-weigh + +
+
@@ -2209,6 +2215,7 @@ var chatFab=document.getElementById('chatFab'); var chatP=document.getElementById('chatP'); var chatIn=document.getElementById('chatIn'); var chatMs=document.getElementById('chatMs'); +var chatOverlay=document.getElementById('chatOverlay'); var mCalls=0; chatFab.onclick=null; // Overridden by draggable FAB code below @@ -2326,7 +2333,7 @@ async function send(){ // 用户没配Key或调用失败 → 尝试后端 if(!replied){ try{ - var res=await fetch('/api/chat',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({message:msg,userId:usr.id}),signal:AbortSignal.timeout(6000)}); + var res=await fetch('/api/chat',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({message:msg,userId:usr.id}),signal:AbortSignal.timeout(60000)}); var data=await res.json();hideTyp(); if(data.message){ replied=true; @@ -2751,6 +2758,7 @@ checkConn();setInterval(checkConn,30000); var origToggle=function(){ chatOpen=!chatOpen; chatP.classList.toggle('open',chatOpen); + chatOverlay.classList.toggle('open',chatOpen); fab.classList.toggle('on',chatOpen); fab.textContent=chatOpen?'✕':'💬'; if(chatOpen)setTimeout(function(){chatIn.focus()},200); @@ -2759,6 +2767,10 @@ checkConn();setInterval(checkConn,30000); if(hasMoved){hasMoved=false;return} origToggle(); }; + // Click overlay to close chat + chatOverlay.onclick=function(){ + if(chatOpen)origToggle(); + }; })(); /* ════════════════════════════════════════ @@ -3178,6 +3190,7 @@ window.chatQuick = function(cmd){ if(!chatOpen){ chatOpen = true; chatP.classList.add('open'); + chatOverlay.classList.add('open'); chatFab.classList.add('on'); chatFab.textContent = '✕'; } diff --git a/server/app/server.js b/server/app/server.js index b09d97c5..ef877da8 100644 --- a/server/app/server.js +++ b/server/app/server.js @@ -259,6 +259,8 @@ app.post('/api/operations', (req, res) => { // ═══════════════════════════════════════════════════════════ // ─── 人格体对话 ─── +// 优先使用国内模型智能网关(支持四路自动降级) +// 降级顺序: domesticGateway → chatEngine → 离线回复 app.post('/api/chat', async (req, res) => { try { const { message, userId } = req.body; @@ -268,22 +270,30 @@ app.post('/api/chat', async (req, res) => { const sessionId = userId || `guest-${req.ip.replace(/[.:]/g, '-')}`; + // 优先用国内模型智能网关(读取 ZY_DEEPSEEK_API_KEY 等独立密钥) + if (domesticGateway) { + const result = await domesticGateway.chat(sessionId, message); + return res.json({ ...result, sessionId }); + } + + // 降级到通用聊天引擎 if (chatEngine) { const result = await chatEngine.chat(sessionId, message); - res.json({ + return res.json({ success: true, ...result, sessionId }); - } else { - res.json({ - success: true, - message: '💫 铸渊正在唤醒中...聊天引擎尚未加载。', - model: 'offline', - tier: 'free', - sessionId - }); } + + // 所有引擎都不可用 + res.json({ + success: true, + message: '💫 铸渊正在唤醒中...聊天引擎尚未加载。请稍后再试。', + model: 'offline', + tier: 'free', + sessionId + }); } catch (err) { res.status(500).json({ error: true, message: err.message }); } diff --git a/server/ecosystem.config.js b/server/ecosystem.config.js index 4659e80c..61d02e08 100644 --- a/server/ecosystem.config.js +++ b/server/ecosystem.config.js @@ -5,6 +5,37 @@ * 架构: 双域名 · 主站(3800) + 预览站(3801) * 守护: 铸渊 · ICE-GL-ZY001 */ +const fs = require('fs'); +const path = require('path'); + +/** + * 加载 .env 文件为对象 + */ +function loadEnvFile(filePath) { + const env = {}; + try { + if (fs.existsSync(filePath)) { + const lines = fs.readFileSync(filePath, 'utf-8').split('\n'); + for (const line of lines) { + const trimmed = line.trim(); + if (!trimmed || trimmed.startsWith('#')) continue; + const idx = trimmed.indexOf('='); + if (idx > 0) { + const key = trimmed.substring(0, idx).trim(); + const val = trimmed.substring(idx + 1).trim(); + env[key] = val; + } + } + } + } catch (e) { + console.error(`加载环境变量文件失败: ${filePath} - ${e.message}`); + } + return env; +} + +// 加载主应用环境变量(包含LLM API密钥) +const appEnv = loadEnvFile(path.join(__dirname, '.env.app')); + module.exports = { apps: [ { @@ -19,7 +50,8 @@ module.exports = { NODE_ENV: 'production', PORT: 3800, ZY_ROOT: '/opt/zhuyuan', - ZY_SITE_MODE: 'production' + ZY_SITE_MODE: 'production', + ...appEnv }, log_file: '/opt/zhuyuan/data/logs/pm2-combined.log', error_file: '/opt/zhuyuan/data/logs/pm2-error.log', @@ -40,7 +72,8 @@ module.exports = { NODE_ENV: 'production', PORT: 3801, ZY_ROOT: '/opt/zhuyuan', - ZY_SITE_MODE: 'preview' + ZY_SITE_MODE: 'preview', + ...appEnv }, log_file: '/opt/zhuyuan/data/logs/pm2-preview-combined.log', error_file: '/opt/zhuyuan/data/logs/pm2-preview-error.log', diff --git a/server/nginx/zhuyuan-sovereign.conf b/server/nginx/zhuyuan-sovereign.conf index 9848a7f1..781ecadd 100644 --- a/server/nginx/zhuyuan-sovereign.conf +++ b/server/nginx/zhuyuan-sovereign.conf @@ -78,9 +78,11 @@ server { if ($request_method = OPTIONS) { return 204; } } - # ─── AI 聊天 API 代理 (端口 3721) · SSE 流式 ─── + # ─── AI 聊天 API (端口 3800) · 主应用直接处理 ─── + # 聊天请求由主应用的 domestic-llm-gateway 智能路由处理 + # 支持 DeepSeek/千问/Moonshot/智谱 四路自动降级 location /api/chat { - proxy_pass http://127.0.0.1:3721/api/chat; + proxy_pass http://127.0.0.1:3800/api/chat; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -240,9 +242,9 @@ server { proxy_read_timeout 86400; } - # ─── AI 聊天 API 代理 (端口 3721) · 共享主站 ─── + # ─── AI 聊天 API (端口 3801) · 预览站共享主应用聊天引擎 ─── location /api/chat { - proxy_pass http://127.0.0.1:3721/api/chat; + proxy_pass http://127.0.0.1:3801/api/chat; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header Connection "";