From fb093bac088760540a70c0fb2b7c57494cc89644 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 16 Oct 2025 10:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A8=A1=E5=9E=8B=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=BC=82=E5=B8=B8=E8=BE=93=E5=87=BA=E6=B6=88=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=B6=88=E6=81=AF=E8=BF=94=E5=9B=9E=E7=BB=99?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=EF=BC=88=E4=BB=85=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/cms/ai/config/WebClientThinkConfig.java | 2 +- .../modules/cms/ai/service/CmsAiChatService.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java index 7fe193a8..1050c481 100644 --- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java +++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.cms.ai.config; +import com.jeesite.common.lang.StringUtils; import com.jeesite.common.mapper.JsonMapper; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java index 5e563720..6c836497 100644 --- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java +++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java @@ -7,6 +7,7 @@ package com.jeesite.modules.cms.ai.service; import com.jeesite.common.cache.CacheUtils; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; +import com.jeesite.common.config.Global; import com.jeesite.common.idgen.IdGen; import com.jeesite.common.lang.DateUtils; import com.jeesite.common.lang.StringUtils; @@ -152,7 +153,7 @@ public class CmsAiChatService extends BaseService { return spec.stream() .chatResponse() .doOnNext(response -> { - if (response.getResult() != null && StringUtils.isNotBlank(response.getResult().getOutput().getText())) { + if (StringUtils.isNotBlank(response.getResult().getOutput().getText())) { AssistantMessage assistantMessage = (AssistantMessage)request.getAttribute("assistantMessage"); AssistantMessage currAssistantMessage = response.getResult().getOutput(); if (assistantMessage == null) { @@ -176,8 +177,12 @@ public class CmsAiChatService extends BaseService { }) .onErrorResume(error -> { String errorMessage = error.getMessage(); - if (error instanceof WebClientResponseException webClientError) { - errorMessage = webClientError.getResponseBodyAsString(); + if (Global.getPropertyToBoolean("error.page.printErrorInfo", "true")){ + if (error instanceof WebClientResponseException webClientError) { + errorMessage = webClientError.getResponseBodyAsString(); + } else if (error.getCause() instanceof WebClientResponseException webClientError) { + errorMessage = webClientError.getResponseBodyAsString(); + } } AssistantMessage assistantMessage = new AssistantMessage(errorMessage); chatMemory.add(conversationId, assistantMessage);