diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 6608a60f..57797e62 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -27,7 +27,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://43.139.70.230:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: ruoyi-ai - password: eCaZ278N62k6fhYj + password: xx hikari: # 最大连接池数量 diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/MilvusVectorStore.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/MilvusVectorStore.java index c083ef47..82cd8960 100644 --- a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/MilvusVectorStore.java +++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/MilvusVectorStore.java @@ -41,13 +41,13 @@ public class MilvusVectorStore implements VectorStore{ @Resource private ConfigService configService; - @PostConstruct + // @PostConstruct public void loadConfig() { this.dimension = Integer.parseInt(configService.getConfigValue("milvus", "dimension")); this.collectionName = configService.getConfigValue("milvus", "collection"); } - @PostConstruct + //@PostConstruct public void init(){ String milvusHost = configService.getConfigValue("milvus", "host"); String milvausPort = configService.getConfigValue("milvus", "port"); diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/VectorStoreFactory.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/VectorStoreFactory.java index ae6e73c8..1cfb6b3a 100644 --- a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/VectorStoreFactory.java +++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/VectorStoreFactory.java @@ -1,39 +1,32 @@ package org.ruoyi.knowledge.chain.vectorstore; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.ruoyi.knowledge.domain.KnowledgeInfo; -import org.ruoyi.knowledge.domain.vo.KnowledgeInfoVo; -import org.ruoyi.knowledge.mapper.KnowledgeInfoMapper; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - @Component @Slf4j -@RequiredArgsConstructor public class VectorStoreFactory { + private final String type = "weaviate"; + private final WeaviateVectorStore weaviateVectorStore; private final MilvusVectorStore milvusVectorStore; - private final KnowledgeInfoMapper knowledgeInfoMapper; + public VectorStoreFactory(WeaviateVectorStore weaviateVectorStore, MilvusVectorStore milvusVectorStore) { + this.weaviateVectorStore = weaviateVectorStore; + this.milvusVectorStore = milvusVectorStore; + } public VectorStore getVectorStore(String kid){ - KnowledgeInfoVo knowledgeInfoVo = knowledgeInfoMapper.selectVoOne( - new LambdaQueryWrapper().eq(KnowledgeInfo::getKid,kid) - ); - String vectorModel = knowledgeInfoVo.getVector(); - if ("weaviate".equals(vectorModel)){ - return weaviateVectorStore; - }else if ("milvus".equals(vectorModel)){ - return milvusVectorStore; - } - return null; +// if ("weaviate".equals(type)){ +// return weaviateVectorStore; +// }else if ("milvus".equals(type)){ +// return milvusVectorStore; +// } +// +// return null; + return weaviateVectorStore; } }