zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将ragflow参数写道配置文件

Browse Source
This commit is contained in:
wuchunlei
2025-05-12 13:10:50 +08:00
parent 8f0ef33d52
commit 1ba1c6a418
5 changed files with 197 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
src/main/java/com/peanut/common/utils/RagFlowApiUtil.java
View File

@@ -1,13 +1,162 @@
package com.peanut.common.utils; package com.peanut.common.utils;
import com.alibaba.fastjson.JSONObject;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Flux;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component @Component
public class RagFlowApiUtil { public class RagFlowApiUtil {
@Value("${ragflow.url}")
private String url;
@Value("${ragflow.authorization}")
private String authorization;
//聊天助手列表
public R getChatAssistants(String chatId) throws Exception{
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpGet get = new HttpGet(url+"/api/v1/chats?id="+chatId);
get.setHeader("Authorization", authorization);
get.setHeader("Content-Type", "application/json;chartset=utf-8");
CloseableHttpResponse response = httpClient.execute(get);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode >= 400) {
throw new RuntimeException("API调用失败，状态码：" + statusCode);
}
HttpEntity responseEntity = response.getEntity();
String responseString = EntityUtils.toString(responseEntity, Consts.UTF_8);
JSONObject jsonObject = JSONObject.parseObject(responseString);
List<Map<String,Object>> list = new ArrayList();
if ("0".equals(jsonObject.get("code").toString())){
List l = jsonObject.getJSONArray("data");
for (Object o : l) {
Map<String,Object> map = new HashMap<>();
Map<String,Object> m = (Map<String,Object>)o;
map.put("id",m.get("id"));
map.put("name",m.get("name"));
list.add(map);
}
}
return R.ok().put("list",list);
}
//聊天助手下对话列表
public R getChats(Map<String,Object> params) throws Exception{
CloseableHttpClient httpClient = HttpClients.createDefault();
String chatId = params.get("chatId").toString();
String page = params.get("page").toString();
String pageSize = params.get("pageSize").toString();
String sessionId = params.get("sessionId").toString();
String userId = params.get("userId").toString();
HttpGet get = new HttpGet(url+"/api/v1/chats/"+chatId+"/sessions?page="+page+"&page_size="+pageSize+"&id="+sessionId+"&user_id="+userId);
get.setHeader("Authorization", authorization);
get.setHeader("Content-Type", "application/json;chartset=utf-8");
CloseableHttpResponse response = httpClient.execute(get);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode >= 400) {
throw new RuntimeException("API调用失败，状态码：" + statusCode);
}
HttpEntity responseEntity = response.getEntity();
String responseString = EntityUtils.toString(responseEntity, Consts.UTF_8);
JSONObject jsonObject = JSONObject.parseObject(responseString);
List<Map<String,Object>> list = new ArrayList();
if ("0".equals(jsonObject.get("code").toString())){
List l = jsonObject.getJSONArray("data");
for (Object o : l) {
Map<String,Object> map = new HashMap<>();
Map<String,Object> m = (Map<String,Object>)o;
map.put("id",m.get("id"));
map.put("name",m.get("name"));
map.put("messages",m.get("messages"));
list.add(map);
}
}
return R.ok().put("list",list);
}
//创建会话
public String createChat(Map<String,Object> params) throws Exception{
CloseableHttpClient httpClient = HttpClients.createDefault();
String chatId = params.get("chatId").toString();
Map<String, Object> entity = new HashMap<>();
entity.put("name", params.get("name").toString());
entity.put("user_id", params.get("userId").toString());
HttpPost post = new HttpPost(url+"/api/v1/chats/"+chatId+"/sessions");
post.setHeader("Authorization", authorization);
post.setHeader("Content-Type", "application/json;chartset=utf-8");
post.setEntity(new StringEntity(JSONObject.toJSONString(entity),"utf-8"));
CloseableHttpResponse response = httpClient.execute(post);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode >= 400) {
throw new RuntimeException("API调用失败，状态码：" + statusCode);
}
HttpEntity responseEntity = response.getEntity();
String responseString = EntityUtils.toString(responseEntity, Consts.UTF_8);
JSONObject jsonObject = JSONObject.parseObject(responseString);
if ("0".equals(jsonObject.get("code").toString())){
return ((JSONObject)jsonObject.get("data")).get("id").toString();
}
return "";
}
//与助手聊天
public R chatToAssistant(Map<String,Object> params) throws Exception{
CloseableHttpClient httpClient = HttpClients.createDefault();
String chatId = params.get("chatId").toString();
Map<String, Object> entity = new HashMap<>();
entity.put("question", params.get("question").toString());
entity.put("session_id", params.get("sessionId").toString());
entity.put("user_id", params.get("userId").toString());
HttpPost post = new HttpPost(url+"/api/v1/chats/"+chatId+"/completions");
post.setHeader("Authorization", authorization);
post.setHeader("Content-Type", "application/json;chartset=utf-8");
post.setEntity(new StringEntity(JSONObject.toJSONString(entity),"utf-8"));
CloseableHttpResponse response = httpClient.execute(post);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode >= 400) {
throw new RuntimeException("API调用失败，状态码：" + statusCode);
}
HttpEntity responseEntity = response.getEntity();
String responseString = EntityUtils.toString(responseEntity, Consts.UTF_8);
return R.ok().put("res",responseString);
}
//与助手聊天流式
public Flux<String> chatToAssistantStream(Map<String,Object> params) {
try {
String chatId = params.get("chatId").toString();
Map<String, Object> entity = new HashMap<>();
entity.put("question", params.get("question").toString());
entity.put("stream", true);
entity.put("session_id", params.get("sessionId").toString());
entity.put("user_id", params.get("userId").toString());
return WebClient.create().post()
.uri(url+"/api/v1/chats/"+chatId+"/completions")
.header("Authorization", authorization)
.header("Content-Type", "application/json;chartset=utf-8")
.bodyValue(JSONObject.toJSONString(entity))
.retrieve()
.bodyToFlux(String.class);
}catch (Exception e){
e.printStackTrace();
}
return null;
}
} }

16
src/main/java/com/peanut/config/AsyncConfig.java
View File

@@ -2,11 +2,13 @@ package com.peanut.config;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ThreadPoolExecutor;
@Configuration @Configuration
@EnableAsync @EnableAsync
@@ -21,4 +23,18 @@ public class AsyncConfig implements AsyncConfigurer {
executor.initialize(); executor.initialize();
return executor; return executor;
} }
@Bean("fluxTaskExecutor")
public AsyncTaskExecutor fluxTaskExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(Runtime.getRuntime().availableProcessors() * 2); // CPU密集型建议值
executor.setMaxPoolSize(50);
executor.setQueueCapacity(100);
executor.setThreadNamePrefix("flux-exec-");
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
executor.initialize();
return executor;
}
} }

14
src/main/java/com/peanut/modules/app/config/WebMvcConfig.java
View File

@@ -11,12 +11,16 @@ package com.peanut.modules.app.config;
import com.peanut.modules.app.interceptor.AuthorizationInterceptor; import com.peanut.modules.app.interceptor.AuthorizationInterceptor;
import com.peanut.modules.app.resolver.LoginUserHandlerMethodArgumentResolver; import com.peanut.modules.app.resolver.LoginUserHandlerMethodArgumentResolver;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor;
/** /**
* MVC配置 * MVC配置
@@ -30,6 +34,15 @@ public class WebMvcConfig implements WebMvcConfigurer {
@Autowired @Autowired
private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver; private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver;
@Autowired
@Qualifier("fluxTaskExecutor")
private AsyncTaskExecutor taskExecutor;
@Override
public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
configurer.setTaskExecutor(taskExecutor);
configurer.setDefaultTimeout(30_000); // 超时时间设为30秒
}
@Override @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(authorizationInterceptor).addPathPatterns("/app/**"); registry.addInterceptor(authorizationInterceptor).addPathPatterns("/app/**");
@@ -39,4 +52,5 @@ public class WebMvcConfig implements WebMvcConfigurer {
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) { public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
argumentResolvers.add(loginUserHandlerMethodArgumentResolver); argumentResolvers.add(loginUserHandlerMethodArgumentResolver);
} }
} }

133
src/main/java/com/peanut/modules/common/controller/RagFlowApiController.java
View File

@@ -1,26 +1,14 @@
package com.peanut.modules.common.controller; package com.peanut.modules.common.controller;
import com.alibaba.fastjson.JSONObject;
import com.peanut.common.utils.R; import com.peanut.common.utils.R;
import com.peanut.common.utils.RagFlowApiUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.http.Consts; import org.springframework.beans.factory.annotation.Autowired;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
@Slf4j @Slf4j
@@ -28,130 +16,31 @@ import java.util.Map;
@RequestMapping("common/ragFlowApi") @RequestMapping("common/ragFlowApi")
public class RagFlowApiController { public class RagFlowApiController {
@Autowired
private RagFlowApiUtil ragFlowApiUtil;
//聊天助手列表
@RequestMapping("/getChatAssistants") @RequestMapping("/getChatAssistants")
public R getChatAssistants() throws Exception{ public R getChatAssistants() throws Exception{
CloseableHttpClient httpClient = HttpClients.createDefault(); return R.ok().put("list",ragFlowApiUtil.getChatAssistants(""));
HttpGet get = new HttpGet("http://125.39.141.154:81/api/v1/chats");
get.setHeader("Authorization", "Bearer ragflow-kyM2JjZWM4MjFiNDExZjA5MTgzOGE1Nm");
get.setHeader("Content-Type", "application/json;chartset=utf-8");
CloseableHttpResponse response = httpClient.execute(get);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode >= 400) {
throw new RuntimeException("API调用失败，状态码：" + statusCode);
}
HttpEntity responseEntity = response.getEntity();
String responseString = EntityUtils.toString(responseEntity, Consts.UTF_8);
JSONObject jsonObject = JSONObject.parseObject(responseString);
List<Map<String,Object>> list = new ArrayList();
if ("0".equals(jsonObject.get("code").toString())){
List l = jsonObject.getJSONArray("data");
for (Object o : l) {
Map<String,Object> map = new HashMap<>();
Map<String,Object> m = (Map<String,Object>)o;
map.put("id",m.get("id"));
map.put("name",m.get("name"));
list.add(map);
}
}
return R.ok().put("list",list);
} }
//聊天助手下对话列表 //聊天助手下对话列表
@RequestMapping("/getChats") @RequestMapping("/getChats")
public R getChats(@RequestBody Map<String,Object> params) throws Exception{ public R getChats(@RequestBody Map<String,Object> params) throws Exception{
CloseableHttpClient httpClient = HttpClients.createDefault(); return R.ok().put("list",ragFlowApiUtil.getChats(params));
String chatId = params.get("chatId").toString();
String page = params.get("page").toString();
String pageSize = params.get("pageSize").toString();
String sessionId = params.get("sessionId").toString();
String userId = params.get("userId").toString();
HttpGet get = new HttpGet("http://125.39.141.154:81/api/v1/chats/"+chatId+"/sessions?page="+page+"&page_size="+pageSize+"&id="+sessionId+"&user_id="+userId);
get.setHeader("Authorization", "Bearer ragflow-kyM2JjZWM4MjFiNDExZjA5MTgzOGE1Nm");
get.setHeader("Content-Type", "application/json;chartset=utf-8");
CloseableHttpResponse response = httpClient.execute(get);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode >= 400) {
throw new RuntimeException("API调用失败，状态码：" + statusCode);
}
HttpEntity responseEntity = response.getEntity();
String responseString = EntityUtils.toString(responseEntity, Consts.UTF_8);
JSONObject jsonObject = JSONObject.parseObject(responseString);
List<Map<String,Object>> list = new ArrayList();
if ("0".equals(jsonObject.get("code").toString())){
List l = jsonObject.getJSONArray("data");
for (Object o : l) {
Map<String,Object> map = new HashMap<>();
Map<String,Object> m = (Map<String,Object>)o;
map.put("id",m.get("id"));
map.put("name",m.get("name"));
map.put("messages",m.get("messages"));
list.add(map);
}
}
return R.ok().put("list",list);
} }
//创建会话 //创建会话
@RequestMapping("/createChat") @RequestMapping("/createChat")
public R createChat(@RequestBody Map<String,Object> params) throws Exception{ public R createChat(@RequestBody Map<String,Object> params) throws Exception{
CloseableHttpClient httpClient = HttpClients.createDefault(); return R.ok().put("id",ragFlowApiUtil.createChat(params));
String chatId = params.get("chatId").toString();
Map<String, Object> entity = new HashMap<>();
entity.put("name", params.get("name").toString());
entity.put("user_id", params.get("userId").toString());
HttpPost post = new HttpPost("http://125.39.141.154:81/api/v1/chats/"+chatId+"/sessions");
post.setHeader("Authorization", "Bearer ragflow-kyM2JjZWM4MjFiNDExZjA5MTgzOGE1Nm");
post.setHeader("Content-Type", "application/json;chartset=utf-8");
post.setEntity(new StringEntity(JSONObject.toJSONString(entity),"utf-8"));
CloseableHttpResponse response = httpClient.execute(post);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode >= 400) {
throw new RuntimeException("API调用失败，状态码：" + statusCode);
}
HttpEntity responseEntity = response.getEntity();
String responseString = EntityUtils.toString(responseEntity, Consts.UTF_8);
return R.ok().put("res",responseString);
}
//与助手聊天
@RequestMapping("/chatToAssistant")
public R chatToAssistant(@RequestBody Map<String,Object> params) throws Exception{
CloseableHttpClient httpClient = HttpClients.createDefault();
String chatId = params.get("chatId").toString();
Map<String, Object> entity = new HashMap<>();
entity.put("question", params.get("question").toString());
entity.put("session_id", params.get("sessionId").toString());
entity.put("user_id", params.get("userId").toString());
HttpPost post = new HttpPost("http://125.39.141.154:81/api/v1/chats/"+chatId+"/completions");
post.setHeader("Authorization", "Bearer ragflow-kyM2JjZWM4MjFiNDExZjA5MTgzOGE1Nm");
post.setHeader("Content-Type", "application/json;chartset=utf-8");
post.setEntity(new StringEntity(JSONObject.toJSONString(entity),"utf-8"));
CloseableHttpResponse response = httpClient.execute(post);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode >= 400) {
throw new RuntimeException("API调用失败，状态码：" + statusCode);
}
HttpEntity responseEntity = response.getEntity();
String responseString = EntityUtils.toString(responseEntity, Consts.UTF_8);
return R.ok().put("res",responseString);
} }
//与助手聊天流式 //与助手聊天流式
@RequestMapping(value = "/chatToAssistantStream", produces = MediaType.TEXT_EVENT_STREAM_VALUE) @RequestMapping(value = "/chatToAssistantStream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public Flux<String> chatToAssistantStream(@RequestBody Map<String,Object> params) { public Flux<String> chatToAssistantStream(@RequestBody Map<String,Object> params){
String chatId = params.get("chatId").toString(); return ragFlowApiUtil.chatToAssistantStream(params);
Map<String, Object> entity = new HashMap<>();
entity.put("question", params.get("question").toString());
entity.put("stream", true);
entity.put("session_id", params.get("sessionId").toString());
entity.put("user_id", params.get("userId").toString());
return WebClient.create().post()
.uri("http://125.39.141.154:81/api/v1/chats/"+chatId+"/completions")
.header("Authorization", "Bearer ragflow-kyM2JjZWM4MjFiNDExZjA5MTgzOGE1Nm")
.header("Content-Type", "application/json;chartset=utf-8")
.bodyValue(JSONObject.toJSONString(entity))
.retrieve()
.bodyToFlux(String.class);//输出格式
} }

8
src/main/resources/application.yml
View File

@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
spring: spring:
# 环境 dev/dev1|test|prod # 环境 dev/dev1|test|prod
profiles: profiles:
active: dev1 active: dev
# jackson时间格式化 # jackson时间格式化
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
@@ -20,6 +20,7 @@ spring:
multipart: multipart:
max-file-size: 1000MB max-file-size: 1000MB
max-request-size: 1000MB max-request-size: 1000MB
enabled: true enabled: true
mvc: mvc:
throw-exception-if-no-handler-found: true throw-exception-if-no-handler-found: true
@@ -86,3 +87,8 @@ express:
expAreaName: 南开 expAreaName: 南开
address: 秋泽园149号顺丰 address: 秋泽园149号顺丰
ragflow:
url: http://125.39.141.154:81
authorization: Bearer ragflow-kyM2JjZWM4MjFiNDExZjA5MTgzOGE1Nm