TanWenyan/leaudit-platform-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

紧急修复：客户端改为调用Remix API routes，不再直接调用Dify API

Browse Source 
根本问题：客户端代码直接调用Dify API（12980端口），绕过了服务端代理

修改内容：
1. app/config/api-config.ts
   - 添加独立的 difyBaseUrl 配置（指向外网 nas.7bm.co:8000）
   - 导出 DIFY_BASE_URL 供服务端使用

2. app/config/chat.ts
   - 移除直接Dify API配置（NEXT_PUBLIC_API_URL, APP_ID, API_KEY）
   - 移除 generateUserId 函数
   - API_URL 改为 '/api'（指向Remix API routes）

3. app/services/api.client.ts
   - 所有fetch调用改为相对路径 /api/*
   - 移除所有 Authorization 头（服务端自动处理JWT）
   - 移除所有 user 参数传递（服务端从JWT提取）
   - credentials 改为 'include' 以携带cookie

4. app/services/dify-client.server.ts
   - 使用 DIFY_BASE_URL 替代 API_BASE_URL

5. app/utils/dify-test.client.ts
   - 测试函数改为调用Remix API routes

调用链路：
客户端 → /api/* → Remix API routes → dify-client.server.ts → FastAPI /dify → Dify

解决问题：
- ✅ 不再直接调用 nas.7bm.co:12980（Dify端口）
- ✅ 统一通过 nas.7bm.co:8000/dify（FastAPI代理）
- ✅ 所有请求都经过JWT认证
- ✅ user字段由后端自动管理

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Wenyan
2025-10-30 11:25:37 +08:00
parent 63acabccc9
commit cf6e9c2421
5 changed files with 62 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/api-config.ts
+9 -1
View File
@@ -7,6 +7,8 @@
interface ApiConfig { interface ApiConfig {
// 主API基础URL // 主API基础URL
baseUrl: string; baseUrl: string;
// Dify对话服务URL（独立配置，使用外网地址）
difyBaseUrl: string;
// 文档服务URL // 文档服务URL
documentUrl: string; documentUrl: string;
// 文档上传API URL // 文档上传API URL
@@ -123,6 +125,7 @@ const configs: Record<string, ApiConfig> = {
// 开发环境 // 开发环境
development: { development: {
baseUrl: 'http://172.16.0.55:8000', baseUrl: 'http://172.16.0.55:8000',
difyBaseUrl: 'http://nas.7bm.co:8000', // Dify对话服务使用外网地址
documentUrl: 'http://172.16.0.55:8000/docauditai/', documentUrl: 'http://172.16.0.55:8000/docauditai/',
uploadUrl: 'http://172.16.0.55:8000/admin/documents', uploadUrl: 'http://172.16.0.55:8000/admin/documents',
oauth: { oauth: {
@@ -137,6 +140,7 @@ const configs: Record<string, ApiConfig> = {
// 测试环境 // 测试环境
testing: { testing: {
baseUrl: 'http://nas.7bm.co:8873', baseUrl: 'http://nas.7bm.co:8873',
difyBaseUrl: 'http://nas.7bm.co:8000', // Dify对话服务使用外网地址
documentUrl: 'http://nas.7bm.co:8873/docauditai/', documentUrl: 'http://nas.7bm.co:8873/docauditai/',
uploadUrl: 'http://nas.7bm.co:8873/admin/documents', uploadUrl: 'http://nas.7bm.co:8873/admin/documents',
oauth: { oauth: {
@@ -152,6 +156,8 @@ const configs: Record<string, ApiConfig> = {
production: { production: {
// postgrest // postgrest
baseUrl: 'http://10.79.97.17:8000', baseUrl: 'http://10.79.97.17:8000',
// Dify对话服务使用外网地址
difyBaseUrl: 'http://nas.7bm.co:8000',
// minio // minio
documentUrl: 'http://10.76.244.156:9000/docauditai/', documentUrl: 'http://10.76.244.156:9000/docauditai/',
// 文件上传 // 文件上传
@@ -171,6 +177,7 @@ const configs: Record<string, ApiConfig> = {
// 备用配置 (可以根据需要添加更多环境) // 备用配置 (可以根据需要添加更多环境)
staging: { staging: {
baseUrl: 'http://172.16.0.119:9000/admin', baseUrl: 'http://172.16.0.119:9000/admin',
difyBaseUrl: 'http://nas.7bm.co:8000', // Dify对话服务使用外网地址
documentUrl: 'http://nas.7bm.co:9000/docauditai/', documentUrl: 'http://nas.7bm.co:9000/docauditai/',
uploadUrl: 'http://172.16.0.119:8000/admin/documents/upload', uploadUrl: 'http://172.16.0.119:8000/admin/documents/upload',
oauth: { oauth: {
@@ -344,7 +351,8 @@ export const apiConfig = getCurrentConfig();
// 导出具体的配置项，方便使用 // 导出具体的配置项，方便使用
export const { export const {
baseUrl: API_BASE_URL, baseUrl: API_BASE_URL,
documentUrl: DOCUMENT_URL, difyBaseUrl: DIFY_BASE_URL,
documentUrl: DOCUMENT_URL,
uploadUrl: UPLOAD_URL, uploadUrl: UPLOAD_URL,
oauth: OAUTH_CONFIG oauth: OAUTH_CONFIG
} = apiConfig; } = apiConfig;
app/config/chat.ts
+9 -37
View File
@@ -28,47 +28,19 @@ const extractAppId = (appUrl: string): string => {
return appUrl; return appUrl;
}; };
// 获取Dify API配置 // 获取Remix API路由的基础URL（客户端调用服务端API routes）
const getDifyApiUrl = () => { // 注意：客户端不再直接调用Dify API，而是调用Remix的API routes
return getEnvVar('NEXT_PUBLIC_API_URL', 'https://api.dify.ai/v1'); // 服务端的API routes会通过dify-client.server.ts代理到FastAPI，再到Dify
}; const getApiBaseUrl = () => {
// 客户端使用相对路径调用Remix API routes
const getAppId = () => { return '/api';
const rawAppId = getEnvVar('NEXT_PUBLIC_APP_ID', '');
const extractedAppId = extractAppId(rawAppId);
// console.log('🔧 Chat Config Debug:', {
// rawAppId,
// extractedAppId,
// difyApiUrl: getDifyApiUrl(),
// hasApiKey: !!getEnvVar('NEXT_PUBLIC_APP_KEY', ''),
// });
return extractedAppId;
};
// 生成用户ID (模拟服务端逻辑)
const generateUserId = () => {
const appId = getAppId();
// 生成或获取会话ID (可以使用localStorage或其他方式)
let sessionId = '';
if (typeof window !== 'undefined') {
sessionId = localStorage.getItem('dify_session_id') || '';
if (!sessionId) {
sessionId = 'sess_' + Math.random().toString(36).substring(2, 15);
localStorage.setItem('dify_session_id', sessionId);
}
}
return `user_${appId}:${sessionId}`;
}; };
// 聊天应用配置 // 聊天应用配置
export const CHAT_CONFIG = { export const CHAT_CONFIG = {
// API相关配置 - 直接使用Dify API // API相关配置 - 调用Remix API routes（不再直接调用Dify）
API_URL: getDifyApiUrl(), // 客户端 → /api/* routes → dify-client.server.ts → FastAPI /dify → Dify
APP_ID: getAppId(), API_URL: getApiBaseUrl(),
API_KEY: getEnvVar('NEXT_PUBLIC_APP_KEY', ''),
// 用户生成函数
generateUserId,
// 应用信息 // 应用信息
APP_INFO: { APP_INFO: {
app/services/api.client.ts
+29 -59
View File
@@ -3,13 +3,15 @@ import type { Feedbacktype, ThoughtItem, VisionFile, MessageEnd, MessageReplace
import { unicodeToChar } from '../utils/chat-utils'; import { unicodeToChar } from '../utils/chat-utils';
// 基础请求选项 // 基础请求选项
// 注意：客户端调用Remix API routes，不需要手动添加Authorization
// Remix会通过session自动处理JWT认证
const baseOptions = { const baseOptions = {
method: 'GET', method: 'GET',
mode: 'cors' as RequestMode, mode: 'cors' as RequestMode,
credentials: 'omit' as RequestCredentials, credentials: 'include' as RequestCredentials, // 改为include以携带cookie
headers: new Headers({ headers: new Headers({
'Content-Type': ContentType.json, 'Content-Type': ContentType.json,
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`, // 移除Authorization头，由服务端自动处理
}), }),
redirect: 'follow' as RequestRedirect, redirect: 'follow' as RequestRedirect,
}; };
@@ -322,22 +324,14 @@ const handleStream = (
const baseFetch = (url: string, fetchOptions: any, needAllResponseContent: boolean = false) => { const baseFetch = (url: string, fetchOptions: any, needAllResponseContent: boolean = false) => {
const options = Object.assign({}, baseOptions, fetchOptions); const options = Object.assign({}, baseOptions, fetchOptions);
// 直接构建Dify API URL // 调用Remix API routes（如 /api/conversations）
// 服务端会通过session获取JWT并调用FastAPI代理
const urlWithPrefix = `${CHAT_CONFIG.API_URL}/${url.replace(/^\//, '')}`; const urlWithPrefix = `${CHAT_CONFIG.API_URL}/${url.replace(/^\//, '')}`;
// 确保Authorization头存在
if (CHAT_CONFIG.API_KEY && options.headers) {
options.headers['Authorization'] = `Bearer ${CHAT_CONFIG.API_KEY}`;
}
const { body } = options; const { body } = options;
if (body && typeof body === 'object') { if (body && typeof body === 'object') {
// 为所有请求添加user参数 // 不再添加user参数，服务端会从JWT自动提取
const bodyWithUser = { options.body = JSON.stringify(body);
...body,
user: CHAT_CONFIG.generateUserId(),
};
options.body = JSON.stringify(bodyWithUser);
} }
return fetch(urlWithPrefix, options) return fetch(urlWithPrefix, options)
@@ -453,7 +447,7 @@ export const ssePost = (
method: 'POST', method: 'POST',
}, fetchOptions); }, fetchOptions);
// 直接构建Dify API URL // 调用Remix API routes（如 /api/chat-messages）
const urlWithPrefix = `${CHAT_CONFIG.API_URL}/${url.replace(/^\//, '')}`; const urlWithPrefix = `${CHAT_CONFIG.API_URL}/${url.replace(/^\//, '')}`;
const controller = new AbortController(); const controller = new AbortController();
@@ -464,19 +458,15 @@ export const ssePost = (
...options.headers, ...options.headers,
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': ContentType.stream, 'Accept': ContentType.stream,
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`, // 移除Authorization头，由服务端自动处理
}; };
options.signal = controller.signal; options.signal = controller.signal;
const { body } = options; const { body } = options;
if (body && typeof body === 'object') { if (body && typeof body === 'object') {
// 为SSE请求添加user参数 // 不再添加user参数，服务端会从JWT自动提取
const bodyWithUser = { options.body = JSON.stringify(body);
...body,
user: CHAT_CONFIG.generateUserId(),
};
options.body = JSON.stringify(bodyWithUser);
} }
return fetch(urlWithPrefix, options) return fetch(urlWithPrefix, options)
@@ -534,18 +524,14 @@ export const ssePost = (
* ``` * ```
*/ */
export const fetchConversations = async () => { export const fetchConversations = async () => {
const user = CHAT_CONFIG.generateUserId();
const params = new URLSearchParams({ const params = new URLSearchParams({
user,
limit: '100', limit: '100',
first_id: '', // 不再传递user参数，服务端会从JWT自动提取
}); });
return fetch(`${CHAT_CONFIG.API_URL}/conversations?${params}`, { return fetch(`${CHAT_CONFIG.API_URL}/conversations?${params}`, {
method: 'GET', method: 'GET',
headers: { credentials: 'include', // 携带cookie
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
},
}).then(res => { }).then(res => {
if (!res.ok) { if (!res.ok) {
throw new Error(`Failed to fetch conversations: ${res.status}`); throw new Error(`Failed to fetch conversations: ${res.status}`);
@@ -578,19 +564,14 @@ export const fetchConversations = async () => {
* ``` * ```
*/ */
export const fetchChatList = async (conversationId: string) => { export const fetchChatList = async (conversationId: string) => {
const user = CHAT_CONFIG.generateUserId();
const params = new URLSearchParams({ const params = new URLSearchParams({
user,
conversation_id: conversationId, conversation_id: conversationId,
limit: '20', // 不再传递user参数，服务端会从JWT自动提取
last_id: '',
}); });
return fetch(`${CHAT_CONFIG.API_URL}/messages?${params}`, { return fetch(`${CHAT_CONFIG.API_URL}/messages?${params}`, {
method: 'GET', method: 'GET',
headers: { credentials: 'include', // 携带cookie
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
},
}).then(res => { }).then(res => {
if (!res.ok) { if (!res.ok) {
throw new Error(`Failed to fetch chat list: ${res.status}`); throw new Error(`Failed to fetch chat list: ${res.status}`);
@@ -625,9 +606,7 @@ export const fetchChatList = async (conversationId: string) => {
export const fetchAppParams = async () => { export const fetchAppParams = async () => {
return fetch(`${CHAT_CONFIG.API_URL}/parameters`, { return fetch(`${CHAT_CONFIG.API_URL}/parameters`, {
method: 'GET', method: 'GET',
headers: { credentials: 'include', // 携带cookie
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
},
}).then(res => { }).then(res => {
if (!res.ok) { if (!res.ok) {
throw new Error(`Failed to fetch app params: ${res.status}`); throw new Error(`Failed to fetch app params: ${res.status}`);
@@ -668,12 +647,9 @@ export const updateFeedback = async ({ url, body }: { url: string; body: Feedbac
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
}, },
body: JSON.stringify({ credentials: 'include', // 携带cookie
...body, body: JSON.stringify(body), // 不再添加user参数
user: CHAT_CONFIG.generateUserId(),
}),
}).then(res => { }).then(res => {
if (!res.ok) { if (!res.ok) {
throw new Error(`Failed to update feedback: ${res.status}`); throw new Error(`Failed to update feedback: ${res.status}`);
@@ -707,11 +683,11 @@ export const generateConversationName = async (id: string) => {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
}, },
credentials: 'include', // 携带cookie
body: JSON.stringify({ body: JSON.stringify({
auto_generate: true, auto_generate: true,
user: CHAT_CONFIG.generateUserId(), // 不再添加user参数
}), }),
}).then(res => { }).then(res => {
if (!res.ok) { if (!res.ok) {
@@ -751,12 +727,12 @@ export const renameConversation = async (id: string, name: string, autoGenerate:
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
}, },
credentials: 'include', // 携带cookie
body: JSON.stringify({ body: JSON.stringify({
name: autoGenerate ? undefined : name, name: autoGenerate ? undefined : name,
auto_generate: autoGenerate, auto_generate: autoGenerate,
user: CHAT_CONFIG.generateUserId(), // 不再添加user参数
}), }),
}).then(res => { }).then(res => {
if (!res.ok) { if (!res.ok) {
@@ -790,11 +766,9 @@ export const deleteConversation = async (id: string) => {
method: 'DELETE', method: 'DELETE',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
}, },
body: JSON.stringify({ credentials: 'include', // 携带cookie
user: CHAT_CONFIG.generateUserId(), // 不再发送body和user参数
}),
}).then(res => { }).then(res => {
if (!res.ok) { if (!res.ok) {
throw new Error(`Failed to delete conversation: ${res.status}`); throw new Error(`Failed to delete conversation: ${res.status}`);
@@ -861,16 +835,12 @@ export const upload = (fetchOptions: any): Promise<any> => {
for (const key in options.headers) for (const key in options.headers)
xhr.setRequestHeader(key, options.headers[key]); xhr.setRequestHeader(key, options.headers[key]);
if (CHAT_CONFIG.API_KEY) { // 不再手动添加Authorization头，由服务端处理
xhr.setRequestHeader('Authorization', `Bearer ${CHAT_CONFIG.API_KEY}`);
}
// 添加user参数到formData // 不再添加user参数到formData
if (options.data instanceof FormData) { // 服务端会从JWT自动提取
options.data.append('user', CHAT_CONFIG.generateUserId());
}
xhr.withCredentials = false; // 改为false，因为直接调用Dify API xhr.withCredentials = true; // 改为true以携带cookie
xhr.onreadystatechange = function () { xhr.onreadystatechange = function () {
if (xhr.readyState === 4) { if (xhr.readyState === 4) {
if (xhr.status === 200) if (xhr.status === 200)
app/services/dify-client.server.ts
+3 -3
View File
@@ -1,4 +1,4 @@
import { API_BASE_URL } from '~/config/api-config'; import { DIFY_BASE_URL } from '~/config/api-config';
// 获取环境变量的服务端函数 // 获取环境变量的服务端函数
const getServerEnvVar = (name: string, defaultValue: string = '') => { const getServerEnvVar = (name: string, defaultValue: string = '') => {
@@ -14,8 +14,8 @@ const getServerEnvVar = (name: string, defaultValue: string = '') => {
// Dify API 客户端配置 // Dify API 客户端配置
// 注意：现在通过 FastAPI 后端的 /dify 路由代理访问 Dify，使用 JWT 认证 // 注意：现在通过 FastAPI 后端的 /dify 路由代理访问 Dify，使用 JWT 认证
const DIFY_CONFIG = { const DIFY_CONFIG = {
// API_URL 指向 FastAPI 后端的 /dify 路由 // API_URL 指向 FastAPI 后端的 /dify 路由（使用外网地址 nas.7bm.co:8000）
API_URL: `${API_BASE_URL}/dify`, API_URL: `${DIFY_BASE_URL}/dify`,
// API_KEY 保留用于配置验证（实际不再使用，改用JWT） // API_KEY 保留用于配置验证（实际不再使用，改用JWT）
API_KEY: getServerEnvVar('NEXT_PUBLIC_APP_KEY', ''), API_KEY: getServerEnvVar('NEXT_PUBLIC_APP_KEY', ''),
APP_ID: (() => { APP_ID: (() => {
app/utils/dify-test.client.ts
+12 -22
View File
@@ -1,33 +1,26 @@
import { CHAT_CONFIG } from '../config/chat'; import { CHAT_CONFIG } from '../config/chat';
/** /**
* 测试Dify API连接 * 测试Dify API连接（通过Remix API routes代理）
* 这个文件可以用来调试和测试前端直接调用Dify API的功能 * 这个文件用于测试前端调用Remix API routes，再由服务端转发到Dify
*/ */
export const testDifyConnection = async () => { export const testDifyConnection = async () => {
console.log('🔧 Dify Configuration:', { console.log('🔧 API Configuration:', {
apiUrl: CHAT_CONFIG.API_URL, apiUrl: CHAT_CONFIG.API_URL,
appId: CHAT_CONFIG.APP_ID, note: '客户端现在调用Remix API routes，不再直接调用Dify',
hasApiKey: !!CHAT_CONFIG.API_KEY,
apiKeyPreview: CHAT_CONFIG.API_KEY ? `${CHAT_CONFIG.API_KEY.substring(0, 10)}...` : 'No API Key',
}); });
if (!CHAT_CONFIG.API_URL || !CHAT_CONFIG.APP_ID || !CHAT_CONFIG.API_KEY) { if (!CHAT_CONFIG.API_URL) {
console.error('❌ Dify配置不完整，请检查环境变量'); console.error('❌ API配置不完整');
return false; return false;
} }
const user = CHAT_CONFIG.generateUserId();
console.log('👤 Generated User ID:', user);
try { try {
// 测试获取应用参数 // 测试获取应用参数（通过Remix API route）
console.log('📋 测试获取应用参数...'); console.log('📋 测试获取应用参数...');
const response = await fetch(`${CHAT_CONFIG.API_URL}/parameters`, { const response = await fetch(`${CHAT_CONFIG.API_URL}/parameters`, {
method: 'GET', method: 'GET',
headers: { credentials: 'include', // 携带cookie以通过JWT认证
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
},
}); });
if (!response.ok) { if (!response.ok) {
@@ -40,19 +33,16 @@ export const testDifyConnection = async () => {
const data = await response.json(); const data = await response.json();
console.log('✅ 成功获取应用参数:', data); console.log('✅ 成功获取应用参数:', data);
// 测试获取会话列表 // 测试获取会话列表（通过Remix API route）
console.log('💬 测试获取会话列表...'); console.log('💬 测试获取会话列表...');
const params = new URLSearchParams({ const params = new URLSearchParams({
user,
limit: '10', limit: '10',
first_id: '', // 不再传递user参数，服务端会从JWT自动提取
}); });
const conversationsResponse = await fetch(`${CHAT_CONFIG.API_URL}/conversations?${params}`, { const conversationsResponse = await fetch(`${CHAT_CONFIG.API_URL}/conversations?${params}`, {
method: 'GET', method: 'GET',
headers: { credentials: 'include', // 携带cookie
'Authorization': `Bearer ${CHAT_CONFIG.API_KEY}`,
},
}); });
if (!conversationsResponse.ok) { if (!conversationsResponse.ok) {
@@ -68,7 +58,7 @@ export const testDifyConnection = async () => {
return true; return true;
} catch (error) { } catch (error) {
console.error('❌ 测试Dify连接时发生错误:', error); console.error('❌ 测试API连接时发生错误:', error);
return false; return false;
} }
}; };