From 09d3c4a46e1b67415a716251acea7a1c592c8af7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 09:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260811' into dev_business
---
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java
index 86b307a..fd2c3d9 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java
@@ -7,22 +7,20 @@
import cn.hutool.extra.spring.SpringUtil;
import cn.iocoder.yudao.module.ai.enums.model.AiPlatformEnum;
import cn.iocoder.yudao.module.ai.framework.ai.config.AiAutoConfiguration;
+import cn.iocoder.yudao.module.ai.framework.ai.config.YudaoAiProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.ai.chat.model.ChatModel;
-import org.springframework.ai.embedding.BatchingStrategy;
import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.ai.embedding.TokenCountBatchingStrategy;
import org.springframework.ai.openai.OpenAiChatModel;
import org.springframework.ai.vectorstore.VectorStore;
import org.springframework.ai.vectorstore.milvus.MilvusVectorStore;
-import org.springframework.ai.vectorstore.milvus.autoconfigure.MilvusServiceClientProperties;
-import org.springframework.ai.vectorstore.milvus.autoconfigure.MilvusVectorStoreProperties;
import java.util.Map;
/**
* AI Model 妯″瀷宸ュ巶瀹炵幇绫�
*
- * 浣跨敤 OpenAI 鍏煎鎺ュ彛瀵规帴閫氫箟鍗冮棶 + Milvus 鍚戦噺瀛樺偍
+ * 浣跨敤 OpenAI 鍏煎鎺ュ彛瀵规帴閫氫箟鍗冮棶 + 鍙厤缃悜閲忓瓨鍌紙Milvus锛�
*/
@Slf4j
public class AiModelFactoryImpl implements AiModelFactory {
@@ -61,7 +59,6 @@
public VectorStore getOrCreateVectorStore(Class<? extends VectorStore> type,
EmbeddingModel embeddingModel,
Map<String, Class<?>> metadataFields) {
- // metadataFields 鍙備笌缂撳瓨 key锛岀‘淇濅笉鍚岀煡璇嗗簱浣跨敤涓嶅悓閰嶇疆鏃朵笉浼氬鐢�
String cacheKey = buildCacheKey(VectorStore.class, embeddingModel, type, metadataFields.hashCode());
return Singleton.get(cacheKey, (Func0<VectorStore>) () -> {
if (type == MilvusVectorStore.class) {
@@ -72,20 +69,20 @@
}
private MilvusVectorStore buildMilvusVectorStore(EmbeddingModel embeddingModel) {
- MilvusVectorStoreProperties serverProperties = SpringUtil.getBean(MilvusVectorStoreProperties.class);
- MilvusServiceClientProperties clientProperties = SpringUtil.getBean(MilvusServiceClientProperties.class);
+ YudaoAiProperties aiProperties = SpringUtil.getBean(YudaoAiProperties.class);
+ YudaoAiProperties.VectorStore.Milvus milvusConfig = aiProperties.getVectorStore().getMilvus();
var connectParam = io.milvus.param.ConnectParam.newBuilder()
- .withHost(clientProperties.getHost())
- .withPort(clientProperties.getPort())
- .withDatabaseName(serverProperties.getDatabaseName())
+ .withHost(milvusConfig.getHost())
+ .withPort(milvusConfig.getPort())
+ .withDatabaseName(milvusConfig.getDatabaseName())
.build();
var milvusClient = new io.milvus.client.MilvusServiceClient(connectParam);
MilvusVectorStore vectorStore = MilvusVectorStore.builder(milvusClient, embeddingModel)
- .databaseName(serverProperties.getDatabaseName())
- .collectionName(serverProperties.getCollectionName())
- .initializeSchema(serverProperties.isInitializeSchema())
+ .databaseName(milvusConfig.getDatabaseName())
+ .collectionName(milvusConfig.getCollectionName())
+ .initializeSchema(milvusConfig.isInitializeSchema())
.batchingStrategy(new TokenCountBatchingStrategy())
.build();
try {
--
Gitblit v1.9.3