From 6d319b13ad524d299f9f134a96187d2dd83513d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 5 Jun 2025 15:12:50 +0800 Subject: [PATCH] update easy-es 2.1.0 => 3.0.0 --- pom.xml | 2 +- .../spring/config/EasyEsConfiguration.java | 84 ------------------- .../config/GeneratorConfiguration.java | 27 ------ .../src/main/resources/application.yml | 2 + 4 files changed, 3 insertions(+), 112 deletions(-) delete mode 100644 ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/easyes/spring/config/EasyEsConfiguration.java delete mode 100644 ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/easyes/starter/config/GeneratorConfiguration.java diff --git a/pom.xml b/pom.xml index b221dff1..fb8b4bb8 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.42.0 1.18.36 7.4 - 2.1.0 + 3.0.0 9.3.0 1.80 1.4.8 diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/easyes/spring/config/EasyEsConfiguration.java b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/easyes/spring/config/EasyEsConfiguration.java deleted file mode 100644 index 0a6ecc61..00000000 --- a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/easyes/spring/config/EasyEsConfiguration.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.dromara.easyes.spring.config; - -import lombok.Setter; -import org.dromara.easyes.common.property.EasyEsDynamicProperties; -import org.dromara.easyes.common.property.EasyEsProperties; -import org.dromara.easyes.common.strategy.AutoProcessIndexStrategy; -import org.dromara.easyes.common.utils.RestHighLevelClientUtils; -import org.dromara.easyes.core.index.AutoProcessIndexNotSmoothlyStrategy; -import org.dromara.easyes.core.index.AutoProcessIndexSmoothlyStrategy; -import org.dromara.easyes.spring.factory.IndexStrategyFactory; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.util.Assert; - -import java.util.Map; - -/** - * @author MoJie - * @since 2.0 - */ -@Setter -@Configuration -@ConditionalOnProperty(value = "easy-es.enable", havingValue = "true") -public class EasyEsConfiguration implements InitializingBean { - - private EasyEsProperties easyEsProperties; - - private EasyEsDynamicProperties easyEsDynamicProperties; - - @Autowired - public EasyEsConfiguration(EasyEsProperties easyEsProperties, EasyEsDynamicProperties easyEsDynamicProperties) { - this.easyEsProperties = easyEsProperties; - this.easyEsDynamicProperties = easyEsDynamicProperties; - } - - @Override - public void afterPropertiesSet() throws Exception { - Assert.notNull(this.easyEsProperties, "easyEsProperties must is A bean. easy-es配置类必须给配置一个bean"); - } - - @Bean - public IndexStrategyFactory indexStrategyFactory() { - return new IndexStrategyFactory(); - } - - @Bean - public RestHighLevelClientUtils restHighLevelClientUtils() { - RestHighLevelClientUtils restHighLevelClientUtils = new RestHighLevelClientUtils(); - if (this.easyEsDynamicProperties == null) { - this.easyEsDynamicProperties = new EasyEsDynamicProperties(); - } - Map datasourceMap = this.easyEsDynamicProperties.getDatasource(); - if (datasourceMap.isEmpty()) { - // 设置默认数据源,兼容不使用多数据源配置场景的老用户使用习惯 - datasourceMap.put(RestHighLevelClientUtils.DEFAULT_DS, this.easyEsProperties); - } - for (String key : datasourceMap.keySet()) { - EasyEsProperties easyEsConfigProperties = datasourceMap.get(key); - RestHighLevelClientUtils.registerRestHighLevelClient(key, RestHighLevelClientUtils - .restHighLevelClient(easyEsConfigProperties)); - } - return restHighLevelClientUtils; - } - - /** - * 索引策略注册 - * - * @return {@link AutoProcessIndexStrategy} - * @author MoJie - */ - @Bean - public AutoProcessIndexStrategy autoProcessIndexSmoothlyStrategy() { - return new AutoProcessIndexSmoothlyStrategy(); - } - - @Bean - public AutoProcessIndexStrategy autoProcessIndexNotSmoothlyStrategy() { - return new AutoProcessIndexNotSmoothlyStrategy(); - } - -} diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/easyes/starter/config/GeneratorConfiguration.java b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/easyes/starter/config/GeneratorConfiguration.java deleted file mode 100644 index f5fa560e..00000000 --- a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/easyes/starter/config/GeneratorConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.dromara.easyes.starter.config; - -import org.dromara.easyes.core.config.GeneratorConfig; -import org.dromara.easyes.core.toolkit.Generator; -import org.elasticsearch.client.RestHighLevelClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Component; - -/** - * 代码生成注册 - * @author MoJie - * @since 2.0 - */ -@Component -@ConditionalOnProperty(value = "easy-es.enable", havingValue = "true") -public class GeneratorConfiguration extends Generator { - - @Autowired - private RestHighLevelClient client; - - @Override - public Boolean generate(GeneratorConfig config) { - super.generateEntity(config, this.client); - return Boolean.TRUE; - } -} diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml index 711df67d..4313f433 100644 --- a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml +++ b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml @@ -77,6 +77,8 @@ spring: easy-es: # 是否开启EE自动配置 enable: false + # 兼容模式 + compatible: true # es连接地址+端口 格式必须为ip:port,如果是集群则可用逗号隔开 address : localhost:9200 # 默认为http