From fb868f5b705a98b869ce7789ef93b19c5f611820 Mon Sep 17 00:00:00 2001 From: code2tan <495140477@qq.com> Date: Tue, 4 Jun 2024 23:11:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E5=91=BD=E5=90=8Dstarter?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重命名starter配置对象,并移动到config目录 --- .../MilvusPropertiesConfiguration.java} | 6 +++--- .../org/dromara/milvus/plus/service/MilvusInit.java | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) rename milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/{entity/MilvusProperties.java => config/MilvusPropertiesConfiguration.java} (84%) diff --git a/milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/entity/MilvusProperties.java b/milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/config/MilvusPropertiesConfiguration.java similarity index 84% rename from milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/entity/MilvusProperties.java rename to milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/config/MilvusPropertiesConfiguration.java index 62a7f8b..8e612cf 100644 --- a/milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/entity/MilvusProperties.java +++ b/milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/config/MilvusPropertiesConfiguration.java @@ -1,4 +1,4 @@ -package org.dromara.milvus.plus.entity; +package org.dromara.milvus.plus.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -10,9 +10,9 @@ import java.util.List; * @author xgc **/ @Data -@ConfigurationProperties(prefix = "milvus") @Component -public class MilvusProperties { +@ConfigurationProperties(prefix = "milvus") +public class MilvusPropertiesConfiguration { private boolean enable; private String uri; private String dbName; diff --git a/milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/service/MilvusInit.java b/milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/service/MilvusInit.java index 5dcefbf..c1f4216 100644 --- a/milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/service/MilvusInit.java +++ b/milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/service/MilvusInit.java @@ -1,7 +1,8 @@ package org.dromara.milvus.plus.service; import io.milvus.v2.client.MilvusClientV2; -import org.dromara.milvus.plus.entity.MilvusProperties; +import org.dromara.milvus.plus.config.MilvusPropertiesConfiguration; +import org.dromara.milvus.plus.model.MilvusProperties; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -14,15 +15,16 @@ import javax.annotation.PreDestroy; public class MilvusInit extends AbstractMilvusClientBuilder { @Autowired - private MilvusProperties milvusProperties; + private MilvusPropertiesConfiguration milvusPropertiesConfiguration; + private MilvusClientV2 client; // Spring会调用这个方法来初始化client @PostConstruct public void initialize() { - org.dromara.milvus.plus.model.MilvusProperties milvusProperties1 = new org.dromara.milvus.plus.model.MilvusProperties(); - BeanUtils.copyProperties(milvusProperties, milvusProperties1); - super.setProperties(milvusProperties1); + MilvusProperties milvusProperties = new MilvusProperties(); + BeanUtils.copyProperties(milvusPropertiesConfiguration, milvusProperties); + super.setProperties(milvusProperties); super.initialize(); client = getClient(); }