xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-07 08:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: sse对话样式优化

Browse Source
This commit is contained in:
ageerle
2025-04-29 11:44:47 +08:00
parent dc6d00f0fc
commit b1ff44df4b
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/listener/SSEEventSourceListener.java
View File

@@ -12,6 +12,7 @@ import okhttp3.sse.EventSource;
import okhttp3.sse.EventSourceListener; import okhttp3.sse.EventSourceListener;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.ruoyi.chat.service.chat.IChatCostService; import org.ruoyi.chat.service.chat.IChatCostService;
import org.ruoyi.chat.util.SSEUtil;
import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse; import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
import org.ruoyi.common.chat.request.ChatRequest; import org.ruoyi.common.chat.request.ChatRequest;
import org.ruoyi.common.core.utils.SpringUtils; import org.ruoyi.common.core.utils.SpringUtils;
@@ -84,10 +85,10 @@ public class SSEEventSourceListener extends EventSourceListener {
modelName = completionResponse.getModel(); modelName = completionResponse.getModel();
} }
stringBuffer.append(content); stringBuffer.append(content);
emitter.send(content); emitter.send(data);
} }
} catch (Exception e) { } catch (Exception e) {
emitter.completeWithError(e); log.error(e.getMessage(), e);
} }
} }

3
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java
View File

@@ -11,6 +11,7 @@ import org.ruoyi.chat.enums.ChatModeType;
import org.ruoyi.chat.service.chat.IChatCostService; import org.ruoyi.chat.service.chat.IChatCostService;
import org.ruoyi.chat.service.chat.ISseService; import org.ruoyi.chat.service.chat.ISseService;
import org.ruoyi.chat.util.IpUtil; import org.ruoyi.chat.util.IpUtil;
import org.ruoyi.chat.util.SSEUtil;
import org.ruoyi.common.chat.config.LocalCache; import org.ruoyi.common.chat.config.LocalCache;
import org.ruoyi.common.chat.entity.Tts.TextToSpeech; import org.ruoyi.common.chat.entity.Tts.TextToSpeech;
import org.ruoyi.common.chat.entity.chat.ChatCompletion; import org.ruoyi.common.chat.entity.chat.ChatCompletion;
@@ -88,7 +89,7 @@ public class SseServiceImpl implements ISseService {
switchModelAndHandle(chatRequest,sseEmitter); switchModelAndHandle(chatRequest,sseEmitter);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
sseEmitter.completeWithError(e); SSEUtil.sendErrorEvent(sseEmitter,e.getMessage());
} }
return sseEmitter; return sseEmitter;
} }

5
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/util/SSEUtil.java
View File

@@ -21,11 +21,8 @@ public class SSEUtil {
* @param errorMessage 错误信息 * @param errorMessage 错误信息
*/ */
public static void sendErrorEvent(ResponseBodyEmitter sseEmitter, String errorMessage) { public static void sendErrorEvent(ResponseBodyEmitter sseEmitter, String errorMessage) {
SseEmitter.SseEventBuilder event = SseEmitter.event()
.name("error")
.data(errorMessage);
try { try {
sseEmitter.send(event); sseEmitter.send(errorMessage);
} catch (IOException e) { } catch (IOException e) {
log.error("SSE发送失败: {}", e.getMessage()); log.error("SSE发送失败: {}", e.getMessage());
} }