diff --git a/pom.xml b/pom.xml index 52a79b4..288ba11 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,10 @@ 1.18.38 + true + + -parameters + diff --git a/src/main/java/com/huangge1199/aiagent/Service/impl/InvokeServiceImpl.java b/src/main/java/com/huangge1199/aiagent/Service/impl/InvokeServiceImpl.java index 8929e36..b6cf7a1 100644 --- a/src/main/java/com/huangge1199/aiagent/Service/impl/InvokeServiceImpl.java +++ b/src/main/java/com/huangge1199/aiagent/Service/impl/InvokeServiceImpl.java @@ -18,6 +18,7 @@ import jakarta.annotation.Resource; import org.springframework.ai.chat.messages.AssistantMessage; import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.ollama.OllamaChatModel; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -34,9 +35,11 @@ public class InvokeServiceImpl implements InvokeService { private String baiLianKey; @Resource + @Qualifier("dashscopeChatModel") private DashScopeChatModel dashscopeChatModel; @Resource + @Qualifier("ollamaChatModel") private OllamaChatModel ollamaChatModel; @Override diff --git a/src/main/java/com/huangge1199/aiagent/config/ChatModelConfig.java b/src/main/java/com/huangge1199/aiagent/config/ChatModelConfig.java new file mode 100644 index 0000000..1ac5d5a --- /dev/null +++ b/src/main/java/com/huangge1199/aiagent/config/ChatModelConfig.java @@ -0,0 +1,31 @@ +package com.huangge1199.aiagent.config; + +import org.springframework.ai.chat.model.ChatModel; +import org.springframework.ai.ollama.OllamaChatModel; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +/** + * ChatModelConfig + * + * @author huangge1199 + * @since 2025/5/17 12:48:28 + */ +@Configuration +public class ChatModelConfig { + + // 选择DashScope作为默认模型 +// @Bean +// @Primary +// public ChatModel primaryChatModel(DashScopeChatModel dashscopeChatModel) { +// return dashscopeChatModel; +// } + + // 或者选择Ollama: + @Bean + @Primary + public ChatModel primaryChatModel(OllamaChatModel ollamaChatModel) { + return ollamaChatModel; + } +}