From 2208396ee4164c9de67ae039b0719e886b831912 Mon Sep 17 00:00:00 2001 From: A Date: Sat, 27 Sep 2025 23:39:47 +0800 Subject: [PATCH] =?UTF-8?q?fixup!=20=E6=94=AF=E6=8C=81=20GROK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/ai/framework/ai/config/AiAutoConfiguration.java | 1 - .../module/ai/framework/ai/config/YudaoAiProperties.java | 1 - .../module/ai/framework/ai/core/model/grok/GrokChatModel.java | 3 +-- .../main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java | 4 +++- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java index 9518da0531..fc965c7074 100644 --- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java +++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java @@ -309,6 +309,5 @@ public class AiAutoConfiguration { .toolCallingManager(getToolCallingManager()) .build(); return new DouBaoChatModel(openAiChatModel); - } } \ No newline at end of file diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java index 82341ccfe8..986c24c18c 100644 --- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java +++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java @@ -174,7 +174,6 @@ public class YudaoAiProperties { } - @Data public static class WebSearch { diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/grok/GrokChatModel.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/grok/GrokChatModel.java index 7e886bd6f3..06eed2504f 100644 --- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/grok/GrokChatModel.java +++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/grok/GrokChatModel.java @@ -19,8 +19,7 @@ public class GrokChatModel implements ChatModel { public static final String BASE_URL = "https://api.x.ai"; public static final String COMPLETE_PATH = "/v1/chat/completions"; - - public static final String MODEL_DEFAULT = "grok-4-fast-reasoning\n"; + public static final String MODEL_DEFAULT = "grok-4-fast-reasoning"; /** * 兼容 OpenAI 接口，进行复用 diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java index 4bff9db83a..ccda6a3955 100644 --- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java +++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java @@ -65,7 +65,6 @@ public class AiUtils { case MOONSHOT: return MoonshotChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) .toolCallbacks(toolCallbacks).toolContext(toolContext).build(); - case GROK: case OPENAI: case GEMINI: // 复用 OpenAI 客户端 case BAI_CHUAN: // 复用 OpenAI 客户端 @@ -80,6 +79,9 @@ public class AiUtils { case OLLAMA: return OllamaOptions.builder().model(model).temperature(temperature).numPredict(maxTokens) .toolCallbacks(toolCallbacks).toolContext(toolContext).build(); + case GROK: + return OpenAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) + .toolCallbacks(toolCallbacks).toolContext(toolContext).build(); default: throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform)); }