From 375fbbe3754e985ad7ff0f806bc87b45d6f485af Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 15 May 2025 11:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/cms/ai/config/WebClientThinkConfig.java      | 4 ++--
 .../modules/cms/ai/properties/CmsAiProperties.java       | 9 +++++++++
 .../jeesite/modules/cms/ai/service/CmsAiChatService.java | 3 +++
 3 files changed, 14 insertions(+), 2 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 1111817c..c2b6a48a 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
@@ -92,7 +92,7 @@ public class WebClientThinkConfig {
 								}
 								String reasoningContent = (String) delta.get("reasoning_content");
 								String content = (String) delta.get("content");
-								if (StringUtils.isNotBlank(reasoningContent)) {
+								if (StringUtils.isNotBlank(reasoningContent) && StringUtils.isBlank(content)) {
 									if (!thinkingFlag.get()) {
 										thinkingFlag.set(true);
 										delta.put("content", "<think>\n" + reasoningContent);
@@ -102,7 +102,7 @@ public class WebClientThinkConfig {
 								} else {
 									if (thinkingFlag.get()) {
 										thinkingFlag.set(false);
-										delta.put("content", "</think>" + (content == null ? "" : content));
+										delta.put("content", "</think>\n" + (content == null ? "" : content));
 									}
 								}
 							}
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
index 07646b90..8adaf470 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
@@ -5,10 +5,19 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties("spring.ai")
 public class CmsAiProperties {
 
+	/**
+	 * 是否启用 Tool calling 工具调用
+	 */
 	private Boolean toolCalls = false;
 
+	/**
+	 * 默认系统提示词
+	 */
 	private String defaultSystem = "";
 
+	/**
+	 * 默认问题模板格式
+	 */
 	private String defaultPromptTemplate = "";
 
 	public Boolean getToolCalls() {
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 fb2da442..00da4636 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
@@ -59,6 +59,9 @@ public class CmsAiChatService extends BaseService {
 	 * @author ThinkGem
 	 */
 	public List<Message> getChatMessage(String conversationId) {
+		if (StringUtils.isBlank(conversationId)) {
+			return List.of();
+		}
         return chatMemory.get(conversationId);
 	}