diff --git a/easy-es-annotation/pom.xml b/easy-es-annotation/pom.xml index 660e22b4..bd3c1472 100644 --- a/easy-es-annotation/pom.xml +++ b/easy-es-annotation/pom.xml @@ -7,7 +7,7 @@ cn.easy-es easy-es-parent - 0.9.21 + 0.9.30 ../easy-es-parent @@ -18,4 +18,10 @@ 8 + + + cn.easy-es + easy-es-common + + \ No newline at end of file diff --git a/easy-es-core/src/main/java/cn/easyes/core/anno/HighLightMappingField.java b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/HighLightMappingField.java similarity index 77% rename from easy-es-core/src/main/java/cn/easyes/core/anno/HighLightMappingField.java rename to easy-es-annotation/src/main/java/cn/easyes/annotation/anno/HighLightMappingField.java index b36c17e8..5bdebb1d 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/anno/HighLightMappingField.java +++ b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/HighLightMappingField.java @@ -1,4 +1,4 @@ -package cn.easyes.core.anno; +package cn.easyes.annotation.anno; import java.lang.annotation.ElementType; @@ -16,9 +16,9 @@ import java.lang.annotation.Target; @TableField(exist = false) public @interface HighLightMappingField { /** - * 高亮字段对应源数据库表字段 + * 指定的高亮字段名称 * - * @return 高亮返回字段名 + * @return 高亮字段名称 */ String value(); } diff --git a/easy-es-extension/src/main/java/cn/easyes/extension/anno/Intercepts.java b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/Intercepts.java similarity index 87% rename from easy-es-extension/src/main/java/cn/easyes/extension/anno/Intercepts.java rename to easy-es-annotation/src/main/java/cn/easyes/annotation/anno/Intercepts.java index df011335..a36b5134 100644 --- a/easy-es-extension/src/main/java/cn/easyes/extension/anno/Intercepts.java +++ b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/Intercepts.java @@ -1,4 +1,4 @@ -package cn.easyes.extension.anno; +package cn.easyes.annotation.anno; import java.lang.annotation.*; diff --git a/easy-es-extension/src/main/java/cn/easyes/extension/anno/Signature.java b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/Signature.java similarity index 95% rename from easy-es-extension/src/main/java/cn/easyes/extension/anno/Signature.java rename to easy-es-annotation/src/main/java/cn/easyes/annotation/anno/Signature.java index f423ebe4..596a88c2 100644 --- a/easy-es-extension/src/main/java/cn/easyes/extension/anno/Signature.java +++ b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/Signature.java @@ -1,4 +1,4 @@ -package cn.easyes.extension.anno; +package cn.easyes.annotation.anno; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/easy-es-core/src/main/java/cn/easyes/core/anno/TableField.java b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableField.java similarity index 87% rename from easy-es-core/src/main/java/cn/easyes/core/anno/TableField.java rename to easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableField.java index 512fad10..6a78135e 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/anno/TableField.java +++ b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableField.java @@ -1,9 +1,9 @@ -package cn.easyes.core.anno; +package cn.easyes.annotation.anno; -import cn.easyes.core.enums.Analyzer; -import cn.easyes.core.enums.FieldStrategy; -import cn.easyes.core.enums.FieldType; -import cn.easyes.core.params.DefaultNestedClass; +import cn.easyes.annotation.assist.DefaultNestedClass; +import cn.easyes.common.enums.Analyzer; +import cn.easyes.common.enums.FieldStrategy; +import cn.easyes.common.enums.FieldType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easy-es-core/src/main/java/cn/easyes/core/anno/TableId.java b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableId.java similarity index 88% rename from easy-es-core/src/main/java/cn/easyes/core/anno/TableId.java rename to easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableId.java index dbfea002..e995a518 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/anno/TableId.java +++ b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableId.java @@ -1,6 +1,6 @@ -package cn.easyes.core.anno; +package cn.easyes.annotation.anno; -import cn.easyes.core.enums.IdType; +import cn.easyes.common.enums.IdType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easy-es-core/src/main/java/cn/easyes/core/anno/TableName.java b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableName.java similarity index 93% rename from easy-es-core/src/main/java/cn/easyes/core/anno/TableName.java rename to easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableName.java index aec8aed0..38474f0e 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/anno/TableName.java +++ b/easy-es-annotation/src/main/java/cn/easyes/annotation/anno/TableName.java @@ -1,6 +1,6 @@ -package cn.easyes.core.anno; +package cn.easyes.annotation.anno; -import cn.easyes.core.constants.BaseEsConstants; +import cn.easyes.common.constants.BaseEsConstants; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/DefaultNestedClass.java b/easy-es-annotation/src/main/java/cn/easyes/annotation/assist/DefaultNestedClass.java similarity index 76% rename from easy-es-core/src/main/java/cn/easyes/core/params/DefaultNestedClass.java rename to easy-es-annotation/src/main/java/cn/easyes/annotation/assist/DefaultNestedClass.java index c6c97080..30e9db36 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/DefaultNestedClass.java +++ b/easy-es-annotation/src/main/java/cn/easyes/annotation/assist/DefaultNestedClass.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.annotation.assist; /** * 默认嵌套类 diff --git a/easy-es-boot-starter/pom.xml b/easy-es-boot-starter/pom.xml index 283a639e..1df3c612 100644 --- a/easy-es-boot-starter/pom.xml +++ b/easy-es-boot-starter/pom.xml @@ -5,7 +5,7 @@ easy-es-parent cn.easy-es - 0.9.21 + 0.9.30 ../easy-es-parent 4.0.0 @@ -21,16 +21,6 @@ cn.easy-es easy-es-core - 0.9.21 - - - cn.easy-es - easy-es-extension - 0.9.21 - - - commons-codec - commons-codec org.springframework.boot diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/config/EasyEsConfigProperties.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/config/EasyEsConfigProperties.java similarity index 98% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/config/EasyEsConfigProperties.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/config/EasyEsConfigProperties.java index fad8786e..3c5393dc 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/config/EasyEsConfigProperties.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/config/EasyEsConfigProperties.java @@ -1,4 +1,4 @@ -package cn.easyes.autoconfig.config; +package cn.easyes.starter.config; import cn.easyes.core.config.GlobalConfig; import lombok.Data; diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/config/EsAutoConfiguration.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/config/EsAutoConfiguration.java similarity index 95% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/config/EsAutoConfiguration.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/config/EsAutoConfiguration.java index 0b0ce905..08df2cc8 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/config/EsAutoConfiguration.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/config/EsAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.easyes.autoconfig.config; +package cn.easyes.starter.config; -import cn.easyes.core.toolkit.ExceptionUtils; -import cn.easyes.core.toolkit.StringUtils; +import cn.easyes.common.utils.ExceptionUtils; +import cn.easyes.common.utils.StringUtils; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; @@ -20,8 +20,8 @@ import org.springframework.context.annotation.Configuration; import java.util.*; -import static cn.easyes.core.constants.BaseEsConstants.COLON; -import static cn.easyes.core.constants.BaseEsConstants.DEFAULT_SCHEMA; +import static cn.easyes.common.constants.BaseEsConstants.COLON; +import static cn.easyes.common.constants.BaseEsConstants.DEFAULT_SCHEMA; /** * es自动配置 diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/factory/IndexStrategyFactory.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/factory/IndexStrategyFactory.java similarity index 89% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/factory/IndexStrategyFactory.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/factory/IndexStrategyFactory.java index 8bd141a6..203b9bad 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/factory/IndexStrategyFactory.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/factory/IndexStrategyFactory.java @@ -1,10 +1,10 @@ -package cn.easyes.autoconfig.factory; +package cn.easyes.starter.factory; -import cn.easyes.autoconfig.config.EasyEsConfigProperties; -import cn.easyes.autoconfig.service.AutoProcessIndexService; -import cn.easyes.core.enums.ProcessIndexStrategyEnum; -import cn.easyes.core.toolkit.ExceptionUtils; +import cn.easyes.starter.config.EasyEsConfigProperties; +import cn.easyes.starter.service.AutoProcessIndexService; +import cn.easyes.common.enums.ProcessIndexStrategyEnum; +import cn.easyes.common.utils.ExceptionUtils; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/ClassPathMapperScanner.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/ClassPathMapperScanner.java similarity index 98% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/ClassPathMapperScanner.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/register/ClassPathMapperScanner.java index 1bc19ae4..7ede4716 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/ClassPathMapperScanner.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/ClassPathMapperScanner.java @@ -1,7 +1,7 @@ -package cn.easyes.autoconfig.register; +package cn.easyes.starter.register; +import cn.easyes.common.utils.ArrayUtils; import cn.easyes.core.conditions.interfaces.BaseEsMapper; -import cn.easyes.core.toolkit.ArrayUtils; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/annotation/EsMapperScan.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/EsMapperScan.java similarity index 77% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/annotation/EsMapperScan.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/register/EsMapperScan.java index 4517e26f..27d46fcb 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/annotation/EsMapperScan.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/EsMapperScan.java @@ -1,7 +1,6 @@ -package cn.easyes.autoconfig.annotation; +package cn.easyes.starter.register; -import cn.easyes.autoconfig.register.MapperScannerRegister; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/MapperFactoryBean.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperFactoryBean.java similarity index 85% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/MapperFactoryBean.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperFactoryBean.java index bc7f7898..be74b34e 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/MapperFactoryBean.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperFactoryBean.java @@ -1,19 +1,19 @@ -package cn.easyes.autoconfig.register; +package cn.easyes.starter.register; -import cn.easyes.autoconfig.config.EasyEsConfigProperties; -import cn.easyes.autoconfig.factory.IndexStrategyFactory; -import cn.easyes.autoconfig.service.AutoProcessIndexService; +import cn.easyes.annotation.anno.Intercepts; +import cn.easyes.common.enums.ProcessIndexStrategyEnum; +import cn.easyes.common.utils.LogUtils; +import cn.easyes.common.utils.TypeUtils; import cn.easyes.core.cache.BaseCache; import cn.easyes.core.cache.GlobalConfigCache; import cn.easyes.core.config.GlobalConfig; -import cn.easyes.core.enums.ProcessIndexStrategyEnum; import cn.easyes.core.proxy.EsMapperProxy; -import cn.easyes.core.toolkit.LogUtils; -import cn.easyes.core.toolkit.TypeUtils; -import cn.easyes.extension.anno.Intercepts; -import cn.easyes.extension.plugins.Interceptor; -import cn.easyes.extension.plugins.InterceptorChain; -import cn.easyes.extension.plugins.InterceptorChainHolder; +import cn.easyes.extension.context.Interceptor; +import cn.easyes.extension.context.InterceptorChain; +import cn.easyes.extension.context.InterceptorChainHolder; +import cn.easyes.starter.config.EasyEsConfigProperties; +import cn.easyes.starter.factory.IndexStrategyFactory; +import cn.easyes.starter.service.AutoProcessIndexService; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Autowired; @@ -73,7 +73,7 @@ public class MapperFactoryBean implements FactoryBean { AutoProcessIndexService autoProcessIndexService = indexStrategyFactory .getByStrategyType(globalConfig.getProcessIndexMode().getStrategyType()); autoProcessIndexService.processIndexAsync(entityClass, client); - }else { + } else { LogUtils.info("===> manual index mode activated"); } return interceptorChain.pluginAll(t); diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/MapperScannerRegister.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperScannerRegister.java similarity index 91% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/MapperScannerRegister.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperScannerRegister.java index da008568..6abd3891 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/register/MapperScannerRegister.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperScannerRegister.java @@ -1,7 +1,6 @@ -package cn.easyes.autoconfig.register; +package cn.easyes.starter.register; -import cn.easyes.autoconfig.annotation.EsMapperScan; -import cn.easyes.core.toolkit.LogUtils; +import cn.easyes.common.utils.LogUtils; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.EnvironmentAware; import org.springframework.context.ResourceLoaderAware; @@ -18,7 +17,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import static cn.easyes.core.constants.BaseEsConstants.ENABLE_PREFIX; +import static cn.easyes.common.constants.BaseEsConstants.ENABLE_PREFIX; /** * 注册bean @@ -28,6 +27,7 @@ import static cn.easyes.core.constants.BaseEsConstants.ENABLE_PREFIX; public class MapperScannerRegister implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware { private ResourceLoader resourceLoader; private Environment environment; + @Override public void setResourceLoader(ResourceLoader resourceLoader) { this.resourceLoader = resourceLoader; @@ -36,7 +36,7 @@ public class MapperScannerRegister implements ImportBeanDefinitionRegistrar, Res @Override public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { Boolean enable = Optional.ofNullable(environment.getProperty(ENABLE_PREFIX)).map(Boolean::parseBoolean).orElse(Boolean.TRUE); - if (!enable){ + if (!enable) { LogUtils.info("===> Easy-Es is not enabled"); return; } diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/AutoProcessIndexService.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/service/AutoProcessIndexService.java similarity index 93% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/AutoProcessIndexService.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/service/AutoProcessIndexService.java index 28b8aa92..c29d005f 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/AutoProcessIndexService.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/service/AutoProcessIndexService.java @@ -1,4 +1,4 @@ -package cn.easyes.autoconfig.service; +package cn.easyes.starter.service; import org.elasticsearch.client.RestHighLevelClient; diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/impl/AutoProcessIndexNotSmoothlyServiceImpl.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/service/impl/AutoProcessIndexNotSmoothlyServiceImpl.java similarity index 89% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/impl/AutoProcessIndexNotSmoothlyServiceImpl.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/service/impl/AutoProcessIndexNotSmoothlyServiceImpl.java index b26b439f..243d773f 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/impl/AutoProcessIndexNotSmoothlyServiceImpl.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/service/impl/AutoProcessIndexNotSmoothlyServiceImpl.java @@ -1,13 +1,13 @@ -package cn.easyes.autoconfig.service.impl; +package cn.easyes.starter.service.impl; -import cn.easyes.autoconfig.service.AutoProcessIndexService; -import cn.easyes.core.common.EntityInfo; -import cn.easyes.core.enums.ProcessIndexStrategyEnum; -import cn.easyes.core.params.CreateIndexParam; -import cn.easyes.core.params.EsIndexInfo; +import cn.easyes.common.enums.ProcessIndexStrategyEnum; +import cn.easyes.common.utils.LogUtils; +import cn.easyes.core.biz.CreateIndexParam; +import cn.easyes.core.biz.EntityInfo; +import cn.easyes.core.biz.EsIndexInfo; import cn.easyes.core.toolkit.EntityInfoHelper; import cn.easyes.core.toolkit.IndexUtils; -import cn.easyes.core.toolkit.LogUtils; +import cn.easyes.starter.service.AutoProcessIndexService; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/impl/AutoProcessIndexSmoothlyServiceImpl.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/service/impl/AutoProcessIndexSmoothlyServiceImpl.java similarity index 91% rename from easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/impl/AutoProcessIndexSmoothlyServiceImpl.java rename to easy-es-boot-starter/src/main/java/cn/easyes/starter/service/impl/AutoProcessIndexSmoothlyServiceImpl.java index 68c0d72e..1c6e588f 100644 --- a/easy-es-boot-starter/src/main/java/cn/easyes/autoconfig/service/impl/AutoProcessIndexSmoothlyServiceImpl.java +++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/service/impl/AutoProcessIndexSmoothlyServiceImpl.java @@ -1,20 +1,20 @@ -package cn.easyes.autoconfig.service.impl; +package cn.easyes.starter.service.impl; -import cn.easyes.autoconfig.service.AutoProcessIndexService; -import cn.easyes.core.common.EntityInfo; -import cn.easyes.core.enums.ProcessIndexStrategyEnum; -import cn.easyes.core.params.CreateIndexParam; -import cn.easyes.core.params.EsIndexInfo; +import cn.easyes.common.enums.ProcessIndexStrategyEnum; +import cn.easyes.common.utils.LogUtils; +import cn.easyes.core.biz.CreateIndexParam; +import cn.easyes.core.biz.EntityInfo; +import cn.easyes.core.biz.EsIndexInfo; import cn.easyes.core.toolkit.EntityInfoHelper; import cn.easyes.core.toolkit.IndexUtils; -import cn.easyes.core.toolkit.LogUtils; +import cn.easyes.starter.service.AutoProcessIndexService; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; -import static cn.easyes.core.constants.BaseEsConstants.S1_SUFFIX; -import static cn.easyes.core.constants.BaseEsConstants.SO_SUFFIX; +import static cn.easyes.common.constants.BaseEsConstants.S1_SUFFIX; +import static cn.easyes.common.constants.BaseEsConstants.SO_SUFFIX; /** * 自动平滑托管索引实现类,本框架默认模式,过程零停机,数据会自动转移至新索引 diff --git a/easy-es-boot-starter/src/main/resources/META-INF/spring.factories b/easy-es-boot-starter/src/main/resources/META-INF/spring.factories index 347a8e5b..17287b0e 100644 --- a/easy-es-boot-starter/src/main/resources/META-INF/spring.factories +++ b/easy-es-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,6 +1,6 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.easyes.autoconfig.config.EsAutoConfiguration,\ - cn.easyes.autoconfig.factory.IndexStrategyFactory,\ - cn.easyes.autoconfig.service.impl.AutoProcessIndexSmoothlyServiceImpl,\ - cn.easyes.autoconfig.service.impl.AutoProcessIndexNotSmoothlyServiceImpl + cn.easyes.starter.config.EsAutoConfiguration,\ + cn.easyes.starter.factory.IndexStrategyFactory,\ + cn.easyes.starter.service.impl.AutoProcessIndexSmoothlyServiceImpl,\ + cn.easyes.starter.service.impl.AutoProcessIndexNotSmoothlyServiceImpl diff --git a/easy-es-common/pom.xml b/easy-es-common/pom.xml new file mode 100644 index 00000000..cac73f54 --- /dev/null +++ b/easy-es-common/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + cn.easy-es + easy-es-parent + 0.9.30 + ../easy-es-parent + + + easy-es-common + + + 8 + 8 + + + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + + + org.elasticsearch + elasticsearch + + + com.alibaba + fastjson + + + commons-codec + commons-codec + + + org.projectlombok + lombok + + + + \ No newline at end of file diff --git a/easy-es-core/src/main/java/cn/easyes/core/constants/BaseEsConstants.java b/easy-es-common/src/main/java/cn/easyes/common/constants/BaseEsConstants.java similarity index 99% rename from easy-es-core/src/main/java/cn/easyes/core/constants/BaseEsConstants.java rename to easy-es-common/src/main/java/cn/easyes/common/constants/BaseEsConstants.java index e97c0f7f..54ed528f 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/constants/BaseEsConstants.java +++ b/easy-es-common/src/main/java/cn/easyes/common/constants/BaseEsConstants.java @@ -1,4 +1,4 @@ -package cn.easyes.core.constants; +package cn.easyes.common.constants; /** * EasyEs的常量 diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/AggregationTypeEnum.java b/easy-es-common/src/main/java/cn/easyes/common/enums/AggregationTypeEnum.java similarity index 91% rename from easy-es-core/src/main/java/cn/easyes/core/enums/AggregationTypeEnum.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/AggregationTypeEnum.java index 7757f40b..dbdacd91 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/AggregationTypeEnum.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/AggregationTypeEnum.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; /** * 聚合枚举 diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/Analyzer.java b/easy-es-common/src/main/java/cn/easyes/common/enums/Analyzer.java similarity index 91% rename from easy-es-core/src/main/java/cn/easyes/core/enums/Analyzer.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/Analyzer.java index 1aac59a7..43bce887 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/Analyzer.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/Analyzer.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; import lombok.AllArgsConstructor; diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/BaseEsParamTypeEnum.java b/easy-es-common/src/main/java/cn/easyes/common/enums/BaseEsParamTypeEnum.java similarity index 95% rename from easy-es-core/src/main/java/cn/easyes/core/enums/BaseEsParamTypeEnum.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/BaseEsParamTypeEnum.java index 58c7e54b..4df338f0 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/BaseEsParamTypeEnum.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/BaseEsParamTypeEnum.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/EsAttachTypeEnum.java b/easy-es-common/src/main/java/cn/easyes/common/enums/EsAttachTypeEnum.java similarity index 98% rename from easy-es-core/src/main/java/cn/easyes/core/enums/EsAttachTypeEnum.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/EsAttachTypeEnum.java index 0f007041..69940de7 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/EsAttachTypeEnum.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/EsAttachTypeEnum.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/EsQueryTypeEnum.java b/easy-es-common/src/main/java/cn/easyes/common/enums/EsQueryTypeEnum.java similarity index 97% rename from easy-es-core/src/main/java/cn/easyes/core/enums/EsQueryTypeEnum.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/EsQueryTypeEnum.java index ad05a224..8454ae3c 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/EsQueryTypeEnum.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/EsQueryTypeEnum.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/FieldStrategy.java b/easy-es-common/src/main/java/cn/easyes/common/enums/FieldStrategy.java similarity index 91% rename from easy-es-core/src/main/java/cn/easyes/core/enums/FieldStrategy.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/FieldStrategy.java index 077aa2a1..f73b4d17 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/FieldStrategy.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/FieldStrategy.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; /** * 字段策略枚举 diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/FieldType.java b/easy-es-common/src/main/java/cn/easyes/common/enums/FieldType.java similarity index 97% rename from easy-es-core/src/main/java/cn/easyes/core/enums/FieldType.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/FieldType.java index 09924ab2..dfc28d54 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/FieldType.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/FieldType.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/IdType.java b/easy-es-common/src/main/java/cn/easyes/common/enums/IdType.java similarity index 90% rename from easy-es-core/src/main/java/cn/easyes/core/enums/IdType.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/IdType.java index b50908e4..553a1ff7 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/IdType.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/IdType.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; /** * 主键类型枚举 diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/JdkDataTypeEnum.java b/easy-es-common/src/main/java/cn/easyes/common/enums/JdkDataTypeEnum.java similarity index 96% rename from easy-es-core/src/main/java/cn/easyes/core/enums/JdkDataTypeEnum.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/JdkDataTypeEnum.java index f9a5b8ce..6b959434 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/JdkDataTypeEnum.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/JdkDataTypeEnum.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/JoinTypeEnum.java b/easy-es-common/src/main/java/cn/easyes/common/enums/JoinTypeEnum.java similarity index 84% rename from easy-es-core/src/main/java/cn/easyes/core/enums/JoinTypeEnum.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/JoinTypeEnum.java index a2af557f..b8ed599c 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/JoinTypeEnum.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/JoinTypeEnum.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; /** * 嵌套及父子类型枚举 diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/ProcessIndexStrategyEnum.java b/easy-es-common/src/main/java/cn/easyes/common/enums/ProcessIndexStrategyEnum.java similarity index 93% rename from easy-es-core/src/main/java/cn/easyes/core/enums/ProcessIndexStrategyEnum.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/ProcessIndexStrategyEnum.java index ebc0fd1f..bb8a1bda 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/ProcessIndexStrategyEnum.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/ProcessIndexStrategyEnum.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/enums/RefreshPolicy.java b/easy-es-common/src/main/java/cn/easyes/common/enums/RefreshPolicy.java similarity index 94% rename from easy-es-core/src/main/java/cn/easyes/core/enums/RefreshPolicy.java rename to easy-es-common/src/main/java/cn/easyes/common/enums/RefreshPolicy.java index f224046b..941ae181 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/enums/RefreshPolicy.java +++ b/easy-es-common/src/main/java/cn/easyes/common/enums/RefreshPolicy.java @@ -1,4 +1,4 @@ -package cn.easyes.core.enums; +package cn.easyes.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/exception/EasyEsException.java b/easy-es-common/src/main/java/cn/easyes/common/exception/EasyEsException.java similarity index 92% rename from easy-es-core/src/main/java/cn/easyes/core/exception/EasyEsException.java rename to easy-es-common/src/main/java/cn/easyes/common/exception/EasyEsException.java index f2b04c55..c1d4baf7 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/exception/EasyEsException.java +++ b/easy-es-common/src/main/java/cn/easyes/common/exception/EasyEsException.java @@ -1,4 +1,4 @@ -package cn.easyes.core.exception; +package cn.easyes.common.exception; /** * EasyEs异常类 diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/SFunction.java b/easy-es-common/src/main/java/cn/easyes/common/params/SFunction.java similarity index 82% rename from easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/SFunction.java rename to easy-es-common/src/main/java/cn/easyes/common/params/SFunction.java index 260511c1..829d5ee3 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/SFunction.java +++ b/easy-es-common/src/main/java/cn/easyes/common/params/SFunction.java @@ -1,4 +1,4 @@ -package cn.easyes.core.conditions.interfaces; +package cn.easyes.common.params; import java.io.Serializable; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/ArrayUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/ArrayUtils.java similarity index 94% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/ArrayUtils.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/ArrayUtils.java index c5866a6f..eb52b640 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/ArrayUtils.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/ArrayUtils.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; /** * array工具类 diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/Assert.java b/easy-es-common/src/main/java/cn/easyes/common/utils/Assert.java similarity index 97% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/Assert.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/Assert.java index 8f873cff..d7dc8050 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/Assert.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/Assert.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; import java.util.Collection; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/ClassUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/ClassUtils.java similarity index 97% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/ClassUtils.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/ClassUtils.java index 19008e36..6c6c4e5a 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/ClassUtils.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/ClassUtils.java @@ -1,5 +1,5 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; import java.util.Arrays; import java.util.List; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/CollectionUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/CollectionUtils.java similarity index 96% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/CollectionUtils.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/CollectionUtils.java index 1d6fa8b1..a201983b 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/CollectionUtils.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/CollectionUtils.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; import java.util.Collection; import java.util.Map; diff --git a/easy-es-extension/src/main/java/cn/easyes/extension/utils/ExceptionUtil.java b/easy-es-common/src/main/java/cn/easyes/common/utils/ExceptionUtil.java similarity index 95% rename from easy-es-extension/src/main/java/cn/easyes/extension/utils/ExceptionUtil.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/ExceptionUtil.java index bba6af7c..b9b281b0 100644 --- a/easy-es-extension/src/main/java/cn/easyes/extension/utils/ExceptionUtil.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package cn.easyes.extension.utils; +package cn.easyes.common.utils; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.UndeclaredThrowableException; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/ExceptionUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/ExceptionUtils.java similarity index 92% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/ExceptionUtils.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/ExceptionUtils.java index 5ce6af3e..666bda62 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/ExceptionUtils.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/ExceptionUtils.java @@ -1,7 +1,7 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; -import cn.easyes.core.exception.EasyEsException; +import cn.easyes.common.exception.EasyEsException; /** * 异常辅助工具类 diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/FastJsonUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/FastJsonUtils.java similarity index 96% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/FastJsonUtils.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/FastJsonUtils.java index c626049f..c49c6905 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/FastJsonUtils.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/FastJsonUtils.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; import com.alibaba.fastjson.serializer.SimplePropertyPreFilter; import lombok.AccessLevel; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/LogUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/LogUtils.java similarity index 97% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/LogUtils.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/LogUtils.java index 4487f5fb..fa1a9d83 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/LogUtils.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/LogUtils.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/MyOptional.java b/easy-es-common/src/main/java/cn/easyes/common/utils/MyOptional.java similarity index 98% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/MyOptional.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/MyOptional.java index 48464175..6b68ff05 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/MyOptional.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/MyOptional.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; import java.util.Objects; import java.util.function.Function; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/ReflectionKit.java b/easy-es-common/src/main/java/cn/easyes/common/utils/ReflectionKit.java similarity index 99% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/ReflectionKit.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/ReflectionKit.java index 87abfb95..2c1e5c59 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/ReflectionKit.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/ReflectionKit.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/StringUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/StringUtils.java similarity index 99% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/StringUtils.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/StringUtils.java index a0975610..a6db267f 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/StringUtils.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; /** * 字符串工具类 diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/TypeUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/TypeUtils.java similarity index 97% rename from easy-es-core/src/main/java/cn/easyes/core/toolkit/TypeUtils.java rename to easy-es-common/src/main/java/cn/easyes/common/utils/TypeUtils.java index c1b9f709..6d565b36 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/TypeUtils.java +++ b/easy-es-common/src/main/java/cn/easyes/common/utils/TypeUtils.java @@ -1,4 +1,4 @@ -package cn.easyes.core.toolkit; +package cn.easyes.common.utils; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/easy-es-core/pom.xml b/easy-es-core/pom.xml index b64cc728..fceae5e9 100644 --- a/easy-es-core/pom.xml +++ b/easy-es-core/pom.xml @@ -7,7 +7,7 @@ cn.easy-es easy-es-parent - 0.9.21 + 0.9.30 ../easy-es-parent @@ -20,20 +20,8 @@ - org.projectlombok - lombok - - - org.elasticsearch.client - elasticsearch-rest-high-level-client - - - org.elasticsearch - elasticsearch - - - com.alibaba - fastjson + cn.easy-es + easy-es-extension org.springframework.boot diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/AggregationParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/AggregationParam.java similarity index 84% rename from easy-es-core/src/main/java/cn/easyes/core/params/AggregationParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/AggregationParam.java index f9aefceb..3567d153 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/AggregationParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/AggregationParam.java @@ -1,6 +1,6 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; -import cn.easyes.core.enums.AggregationTypeEnum; +import cn.easyes.common.enums.AggregationTypeEnum; import lombok.Data; /** diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/BaseEsParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/BaseEsParam.java similarity index 99% rename from easy-es-core/src/main/java/cn/easyes/core/params/BaseEsParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/BaseEsParam.java index 0cfefa83..dc487631 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/BaseEsParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/BaseEsParam.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; import lombok.Builder; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/CreateIndexParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/CreateIndexParam.java similarity index 96% rename from easy-es-core/src/main/java/cn/easyes/core/params/CreateIndexParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/CreateIndexParam.java index b20edb82..bd67db86 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/CreateIndexParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/CreateIndexParam.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/common/EntityFieldInfo.java b/easy-es-core/src/main/java/cn/easyes/core/biz/EntityFieldInfo.java similarity index 92% rename from easy-es-core/src/main/java/cn/easyes/core/common/EntityFieldInfo.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/EntityFieldInfo.java index 5d30cb11..95578ff9 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/common/EntityFieldInfo.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/EntityFieldInfo.java @@ -1,11 +1,11 @@ -package cn.easyes.core.common; +package cn.easyes.core.biz; -import cn.easyes.core.anno.TableField; +import cn.easyes.annotation.anno.TableField; import cn.easyes.core.config.GlobalConfig; -import cn.easyes.core.enums.Analyzer; -import cn.easyes.core.enums.FieldStrategy; +import cn.easyes.common.enums.Analyzer; +import cn.easyes.common.enums.FieldStrategy; +import cn.easyes.common.enums.FieldType; import com.alibaba.fastjson.serializer.NameFilter; -import cn.easyes.core.enums.FieldType; import lombok.AccessLevel; import lombok.Data; import lombok.Getter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/common/EntityInfo.java b/easy-es-core/src/main/java/cn/easyes/core/biz/EntityInfo.java similarity index 97% rename from easy-es-core/src/main/java/cn/easyes/core/common/EntityInfo.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/EntityInfo.java index 7edba4e1..c359919a 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/common/EntityInfo.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/EntityInfo.java @@ -1,10 +1,10 @@ -package cn.easyes.core.common; +package cn.easyes.core.biz; -import cn.easyes.core.constants.BaseEsConstants; +import cn.easyes.common.constants.BaseEsConstants; import com.alibaba.fastjson.PropertyNamingStrategy; import com.alibaba.fastjson.parser.deserializer.ExtraProcessor; import com.alibaba.fastjson.serializer.SerializeFilter; -import cn.easyes.core.enums.IdType; +import cn.easyes.common.enums.IdType; import lombok.Data; import lombok.experimental.Accessors; diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/EsIndexInfo.java b/easy-es-core/src/main/java/cn/easyes/core/biz/EsIndexInfo.java similarity index 94% rename from easy-es-core/src/main/java/cn/easyes/core/params/EsIndexInfo.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/EsIndexInfo.java index 7d9f3621..623e6d49 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/EsIndexInfo.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/EsIndexInfo.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/EsIndexParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/EsIndexParam.java similarity index 88% rename from easy-es-core/src/main/java/cn/easyes/core/params/EsIndexParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/EsIndexParam.java index 732f0c36..e315fa2e 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/EsIndexParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/EsIndexParam.java @@ -1,6 +1,6 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; -import cn.easyes.core.enums.Analyzer; +import cn.easyes.common.enums.Analyzer; import lombok.Data; /** diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/EsUpdateParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/EsUpdateParam.java similarity index 88% rename from easy-es-core/src/main/java/cn/easyes/core/params/EsUpdateParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/EsUpdateParam.java index 65dc6431..19d73696 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/EsUpdateParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/EsUpdateParam.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/GeoParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/GeoParam.java similarity index 97% rename from easy-es-core/src/main/java/cn/easyes/core/params/GeoParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/GeoParam.java index b36d8f23..03f65189 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/GeoParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/GeoParam.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; import lombok.Builder; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/HighLightParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/HighLightParam.java similarity index 93% rename from easy-es-core/src/main/java/cn/easyes/core/params/HighLightParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/HighLightParam.java index 2b4857ea..b39475b6 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/HighLightParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/HighLightParam.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/OrCount.java b/easy-es-core/src/main/java/cn/easyes/core/biz/OrCount.java similarity index 90% rename from easy-es-core/src/main/java/cn/easyes/core/params/OrCount.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/OrCount.java index 94dde9ff..bc168fc1 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/OrCount.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/OrCount.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/common/OrderByParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/OrderByParam.java similarity index 90% rename from easy-es-core/src/main/java/cn/easyes/core/common/OrderByParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/OrderByParam.java index 15bb534a..a217d51b 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/common/OrderByParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/OrderByParam.java @@ -1,4 +1,4 @@ -package cn.easyes.core.common; +package cn.easyes.core.biz; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/common/PageInfo.java b/easy-es-core/src/main/java/cn/easyes/core/biz/PageInfo.java similarity index 99% rename from easy-es-core/src/main/java/cn/easyes/core/common/PageInfo.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/PageInfo.java index a894b886..691deefc 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/common/PageInfo.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/PageInfo.java @@ -1,4 +1,4 @@ -package cn.easyes.core.common; +package cn.easyes.core.biz; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/easy-es-core/src/main/java/cn/easyes/core/common/PageSerializable.java b/easy-es-core/src/main/java/cn/easyes/core/biz/PageSerializable.java similarity index 95% rename from easy-es-core/src/main/java/cn/easyes/core/common/PageSerializable.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/PageSerializable.java index c1d8dd33..582709ac 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/common/PageSerializable.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/PageSerializable.java @@ -1,4 +1,4 @@ -package cn.easyes.core.common; +package cn.easyes.core.biz; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/easy-es-core/src/main/java/cn/easyes/core/params/SortParam.java b/easy-es-core/src/main/java/cn/easyes/core/biz/SortParam.java similarity index 91% rename from easy-es-core/src/main/java/cn/easyes/core/params/SortParam.java rename to easy-es-core/src/main/java/cn/easyes/core/biz/SortParam.java index cc23322b..06bf3b69 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/params/SortParam.java +++ b/easy-es-core/src/main/java/cn/easyes/core/biz/SortParam.java @@ -1,4 +1,4 @@ -package cn.easyes.core.params; +package cn.easyes.core.biz; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/easy-es-core/src/main/java/cn/easyes/core/cache/BaseCache.java b/easy-es-core/src/main/java/cn/easyes/core/cache/BaseCache.java index dc654fac..06642c08 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/cache/BaseCache.java +++ b/easy-es-core/src/main/java/cn/easyes/core/cache/BaseCache.java @@ -1,10 +1,10 @@ package cn.easyes.core.cache; import cn.easyes.core.conditions.BaseEsMapperImpl; -import cn.easyes.core.constants.BaseEsConstants; -import cn.easyes.core.toolkit.CollectionUtils; +import cn.easyes.common.constants.BaseEsConstants; +import cn.easyes.common.utils.CollectionUtils; import cn.easyes.core.toolkit.EntityInfoHelper; -import cn.easyes.core.toolkit.ExceptionUtils; +import cn.easyes.common.utils.ExceptionUtils; import cn.easyes.core.toolkit.FieldUtils; import org.elasticsearch.client.RestHighLevelClient; diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractChainWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractChainWrapper.java index fdd5dee4..1a412c33 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractChainWrapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractChainWrapper.java @@ -1,7 +1,7 @@ package cn.easyes.core.conditions; +import cn.easyes.core.biz.OrderByParam; import cn.easyes.core.conditions.interfaces.*; -import cn.easyes.core.common.OrderByParam; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.ShapeRelation; diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractLambdaQueryWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractLambdaQueryWrapper.java index 83251b8a..744ecf19 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractLambdaQueryWrapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractLambdaQueryWrapper.java @@ -1,6 +1,6 @@ package cn.easyes.core.conditions; -import cn.easyes.core.conditions.interfaces.SFunction; +import cn.easyes.common.params.SFunction; /** * 抽象Lambda表达式父类 diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractLambdaUpdateWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractLambdaUpdateWrapper.java index f11a6a74..f62c5929 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractLambdaUpdateWrapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractLambdaUpdateWrapper.java @@ -1,6 +1,6 @@ package cn.easyes.core.conditions; -import cn.easyes.core.conditions.interfaces.SFunction; +import cn.easyes.common.params.SFunction; /** * 抽象Lambda表达式父类 diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractWrapper.java index 61933a8b..9364b46a 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractWrapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/AbstractWrapper.java @@ -1,10 +1,9 @@ package cn.easyes.core.conditions; -import cn.easyes.core.common.OrderByParam; +import cn.easyes.common.enums.*; +import cn.easyes.common.utils.*; +import cn.easyes.core.biz.*; import cn.easyes.core.conditions.interfaces.*; -import cn.easyes.core.enums.*; -import cn.easyes.core.params.*; -import cn.easyes.core.toolkit.*; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.ShapeRelation; @@ -18,10 +17,10 @@ import java.util.*; import java.util.function.BiPredicate; import java.util.function.Function; -import static cn.easyes.core.enums.BaseEsParamTypeEnum.*; -import static cn.easyes.core.enums.EsAttachTypeEnum.*; -import static cn.easyes.core.enums.EsQueryTypeEnum.*; -import static cn.easyes.core.enums.JoinTypeEnum.*; +import static cn.easyes.common.enums.BaseEsParamTypeEnum.*; +import static cn.easyes.common.enums.EsAttachTypeEnum.*; +import static cn.easyes.common.enums.EsQueryTypeEnum.*; +import static cn.easyes.common.enums.JoinTypeEnum.*; /** * 抽象Lambda表达式父类 diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/BaseEsMapperImpl.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/BaseEsMapperImpl.java index 506b0af7..c362f3c9 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/BaseEsMapperImpl.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/BaseEsMapperImpl.java @@ -1,18 +1,17 @@ package cn.easyes.core.conditions; +import cn.easyes.common.constants.BaseEsConstants; +import cn.easyes.common.enums.FieldStrategy; +import cn.easyes.common.enums.IdType; +import cn.easyes.common.utils.*; +import cn.easyes.core.biz.*; import cn.easyes.core.cache.BaseCache; import cn.easyes.core.cache.GlobalConfigCache; -import cn.easyes.core.common.EntityFieldInfo; -import cn.easyes.core.common.EntityInfo; -import cn.easyes.core.common.PageInfo; import cn.easyes.core.conditions.interfaces.BaseEsMapper; -import cn.easyes.core.constants.BaseEsConstants; -import cn.easyes.core.enums.FieldStrategy; -import cn.easyes.core.enums.IdType; -import cn.easyes.core.params.CreateIndexParam; -import cn.easyes.core.params.EsIndexParam; -import cn.easyes.core.params.EsUpdateParam; -import cn.easyes.core.toolkit.*; +import cn.easyes.core.toolkit.EntityInfoHelper; +import cn.easyes.core.toolkit.FieldUtils; +import cn.easyes.core.toolkit.IndexUtils; +import cn.easyes.core.toolkit.PageHelper; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializeFilter; diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsIndexWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsIndexWrapper.java index af225c24..4cc96d85 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsIndexWrapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsIndexWrapper.java @@ -1,11 +1,11 @@ package cn.easyes.core.conditions; +import cn.easyes.common.enums.Analyzer; +import cn.easyes.common.enums.FieldType; +import cn.easyes.common.params.SFunction; +import cn.easyes.common.utils.StringUtils; +import cn.easyes.core.biz.EsIndexParam; import cn.easyes.core.conditions.interfaces.Index; -import cn.easyes.core.conditions.interfaces.SFunction; -import cn.easyes.core.enums.Analyzer; -import cn.easyes.core.enums.FieldType; -import cn.easyes.core.params.EsIndexParam; -import cn.easyes.core.toolkit.StringUtils; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.settings.Settings; diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsQueryWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsQueryWrapper.java index a69c03e5..5131ed34 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsQueryWrapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsQueryWrapper.java @@ -1,12 +1,8 @@ package cn.easyes.core.conditions; -import cn.easyes.core.common.EntityFieldInfo; +import cn.easyes.common.params.SFunction; +import cn.easyes.core.biz.*; import cn.easyes.core.conditions.interfaces.Query; -import cn.easyes.core.conditions.interfaces.SFunction; -import cn.easyes.core.params.AggregationParam; -import cn.easyes.core.params.BaseEsParam; -import cn.easyes.core.params.HighLightParam; -import cn.easyes.core.params.SortParam; import cn.easyes.core.toolkit.EntityInfoHelper; import org.elasticsearch.action.search.SearchRequest; diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsUpdateWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsUpdateWrapper.java index 4f375300..e8f672fe 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsUpdateWrapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/LambdaEsUpdateWrapper.java @@ -1,9 +1,9 @@ package cn.easyes.core.conditions; -import cn.easyes.core.conditions.interfaces.SFunction; +import cn.easyes.common.params.SFunction; +import cn.easyes.core.biz.BaseEsParam; +import cn.easyes.core.biz.EsUpdateParam; import cn.easyes.core.conditions.interfaces.Update; -import cn.easyes.core.params.BaseEsParam; -import cn.easyes.core.params.EsUpdateParam; import org.elasticsearch.action.search.SearchRequest; import java.util.ArrayList; @@ -19,6 +19,7 @@ public class LambdaEsUpdateWrapper extends AbstractLambdaUpdateWrapper, SFunction> { List updateParamList; + /** * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity) */ diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/Wrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/Wrapper.java index db4a3ff6..1f9a2083 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/Wrapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/Wrapper.java @@ -10,6 +10,7 @@ import org.elasticsearch.action.search.SearchRequest; public abstract class Wrapper { /** * 获取查询条件 待优化 + * * @return 查询条件 */ protected abstract SearchRequest getSearchRequest(); diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/WrapperProcessor.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/WrapperProcessor.java index 98f71aa9..039eb1c9 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/WrapperProcessor.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/WrapperProcessor.java @@ -1,14 +1,16 @@ package cn.easyes.core.conditions; -import cn.easyes.core.config.GlobalConfig; +import cn.easyes.common.enums.AggregationTypeEnum; +import cn.easyes.common.utils.ArrayUtils; +import cn.easyes.common.utils.CollectionUtils; +import cn.easyes.common.utils.MyOptional; +import cn.easyes.common.utils.StringUtils; +import cn.easyes.core.biz.*; import cn.easyes.core.cache.GlobalConfigCache; -import cn.easyes.core.common.EntityInfo; -import cn.easyes.core.enums.AggregationTypeEnum; -import cn.easyes.core.params.AggregationParam; -import cn.easyes.core.params.BaseEsParam; -import cn.easyes.core.params.GeoParam; -import cn.easyes.core.params.OrCount; -import cn.easyes.core.toolkit.*; +import cn.easyes.core.config.GlobalConfig; +import cn.easyes.core.toolkit.EntityInfoHelper; +import cn.easyes.core.toolkit.EsQueryTypeUtil; +import cn.easyes.core.toolkit.FieldUtils; import lombok.NoArgsConstructor; import lombok.SneakyThrows; import org.elasticsearch.index.query.*; @@ -22,9 +24,9 @@ import org.elasticsearch.search.sort.SortOrder; import java.util.*; -import static cn.easyes.core.constants.BaseEsConstants.*; -import static cn.easyes.core.enums.BaseEsParamTypeEnum.*; -import static cn.easyes.core.enums.EsAttachTypeEnum.*; +import static cn.easyes.common.constants.BaseEsConstants.*; +import static cn.easyes.common.enums.BaseEsParamTypeEnum.*; +import static cn.easyes.common.enums.EsAttachTypeEnum.*; /** * 核心 wrpeer处理类 diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/BaseEsMapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/BaseEsMapper.java index 0aafc09d..48d9ad41 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/BaseEsMapper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/BaseEsMapper.java @@ -3,7 +3,7 @@ package cn.easyes.core.conditions.interfaces; import cn.easyes.core.conditions.LambdaEsIndexWrapper; import cn.easyes.core.conditions.LambdaEsQueryWrapper; import cn.easyes.core.conditions.LambdaEsUpdateWrapper; -import cn.easyes.core.common.PageInfo; +import cn.easyes.core.biz.PageInfo; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollRequest; diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Compare.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Compare.java index 2acb77dd..542939d2 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Compare.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Compare.java @@ -9,7 +9,7 @@ import java.util.Arrays; import java.util.Map; import java.util.function.BiPredicate; -import static cn.easyes.core.constants.BaseEsConstants.*; +import static cn.easyes.common.constants.BaseEsConstants.*; /** * 比较相关 diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Func.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Func.java index 2538bfce..594eaffe 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Func.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Func.java @@ -1,7 +1,7 @@ package cn.easyes.core.conditions.interfaces; -import cn.easyes.core.common.OrderByParam; -import cn.easyes.core.constants.BaseEsConstants; +import cn.easyes.common.constants.BaseEsConstants; +import cn.easyes.core.biz.OrderByParam; import cn.easyes.core.toolkit.FieldUtils; import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.sort.SortOrder; diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Geo.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Geo.java index 37e8fe10..2d6935f3 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Geo.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Geo.java @@ -1,7 +1,7 @@ package cn.easyes.core.conditions.interfaces; -import cn.easyes.core.toolkit.CollectionUtils; -import cn.easyes.core.toolkit.ExceptionUtils; +import cn.easyes.common.utils.CollectionUtils; +import cn.easyes.common.utils.ExceptionUtils; import cn.easyes.core.toolkit.FieldUtils; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.ShapeRelation; @@ -13,7 +13,7 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import static cn.easyes.core.constants.BaseEsConstants.DEFAULT_BOOST; +import static cn.easyes.common.constants.BaseEsConstants.DEFAULT_BOOST; /** * 地理位置 diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Index.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Index.java index 12619ec3..8324d31a 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Index.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Index.java @@ -1,7 +1,7 @@ package cn.easyes.core.conditions.interfaces; -import cn.easyes.core.enums.Analyzer; -import cn.easyes.core.enums.FieldType; +import cn.easyes.common.enums.Analyzer; +import cn.easyes.common.enums.FieldType; import cn.easyes.core.toolkit.FieldUtils; import org.elasticsearch.common.settings.Settings; diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Join.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Join.java index d02d69bc..1246a0c1 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Join.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Join.java @@ -1,8 +1,5 @@ package cn.easyes.core.conditions.interfaces; -import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.index.query.QueryBuilder; - import java.io.Serializable; /** diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Query.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Query.java index 1ee68504..129f46b8 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Query.java +++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/interfaces/Query.java @@ -1,6 +1,6 @@ package cn.easyes.core.conditions.interfaces; -import cn.easyes.core.common.EntityFieldInfo; +import cn.easyes.core.biz.EntityFieldInfo; import cn.easyes.core.toolkit.FieldUtils; import java.io.Serializable; diff --git a/easy-es-core/src/main/java/cn/easyes/core/config/GlobalConfig.java b/easy-es-core/src/main/java/cn/easyes/core/config/GlobalConfig.java index 6cf71454..b3b443bb 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/config/GlobalConfig.java +++ b/easy-es-core/src/main/java/cn/easyes/core/config/GlobalConfig.java @@ -1,13 +1,13 @@ package cn.easyes.core.config; -import cn.easyes.core.enums.ProcessIndexStrategyEnum; -import cn.easyes.core.enums.FieldStrategy; -import cn.easyes.core.enums.IdType; -import cn.easyes.core.enums.RefreshPolicy; +import cn.easyes.common.enums.FieldStrategy; +import cn.easyes.common.enums.IdType; +import cn.easyes.common.enums.ProcessIndexStrategyEnum; +import cn.easyes.common.enums.RefreshPolicy; import lombok.Data; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import static cn.easyes.core.constants.BaseEsConstants.EMPTY_STR; +import static cn.easyes.common.constants.BaseEsConstants.EMPTY_STR; /** * easy-es全局置项 diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/EntityInfoHelper.java b/easy-es-core/src/main/java/cn/easyes/core/toolkit/EntityInfoHelper.java index 92438904..44c5e967 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/EntityInfoHelper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/toolkit/EntityInfoHelper.java @@ -1,20 +1,24 @@ package cn.easyes.core.toolkit; +import cn.easyes.annotation.anno.HighLightMappingField; +import cn.easyes.annotation.anno.TableField; +import cn.easyes.annotation.anno.TableId; +import cn.easyes.annotation.anno.TableName; +import cn.easyes.annotation.assist.DefaultNestedClass; +import cn.easyes.common.enums.IdType; +import cn.easyes.common.utils.ClassUtils; +import cn.easyes.common.utils.FastJsonUtils; +import cn.easyes.common.utils.ReflectionKit; +import cn.easyes.common.utils.StringUtils; +import cn.easyes.core.biz.EntityFieldInfo; +import cn.easyes.core.biz.EntityInfo; +import cn.easyes.core.cache.BaseCache; +import cn.easyes.core.cache.GlobalConfigCache; import cn.easyes.core.config.GlobalConfig; import com.alibaba.fastjson.parser.deserializer.ExtraProcessor; import com.alibaba.fastjson.serializer.NameFilter; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.SimplePropertyPreFilter; -import cn.easyes.core.anno.HighLightMappingField; -import cn.easyes.core.anno.TableField; -import cn.easyes.core.anno.TableId; -import cn.easyes.core.anno.TableName; -import cn.easyes.core.cache.BaseCache; -import cn.easyes.core.cache.GlobalConfigCache; -import cn.easyes.core.common.EntityFieldInfo; -import cn.easyes.core.common.EntityInfo; -import cn.easyes.core.enums.IdType; -import cn.easyes.core.params.DefaultNestedClass; import lombok.Getter; import java.lang.reflect.Field; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/EsQueryTypeUtil.java b/easy-es-core/src/main/java/cn/easyes/core/toolkit/EsQueryTypeUtil.java index 68383d01..c7a0746e 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/EsQueryTypeUtil.java +++ b/easy-es-core/src/main/java/cn/easyes/core/toolkit/EsQueryTypeUtil.java @@ -1,9 +1,13 @@ package cn.easyes.core.toolkit; +import cn.easyes.common.constants.BaseEsConstants; +import cn.easyes.common.enums.EsAttachTypeEnum; +import cn.easyes.common.enums.EsQueryTypeEnum; +import cn.easyes.common.enums.JoinTypeEnum; +import cn.easyes.common.utils.StringUtils; +import cn.easyes.core.biz.BaseEsParam; +import cn.easyes.core.biz.EntityInfo; import cn.easyes.core.config.GlobalConfig; -import cn.easyes.core.common.EntityInfo; -import cn.easyes.core.enums.JoinTypeEnum; -import cn.easyes.core.params.BaseEsParam; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.index.query.*; import org.elasticsearch.join.query.HasChildQueryBuilder; @@ -13,10 +17,6 @@ import java.util.Collection; import java.util.List; import java.util.Objects; -import static cn.easyes.core.constants.BaseEsConstants.*; -import static cn.easyes.core.enums.EsAttachTypeEnum.*; -import static cn.easyes.core.enums.EsQueryTypeEnum.*; - /** * 核心 查询参数封装工具类 *

@@ -51,30 +51,30 @@ public class EsQueryTypeUtil { } // 封装查询参数 - if (Objects.equals(queryType, TERM_QUERY.getType())) { + if (Objects.equals(queryType, EsQueryTypeEnum.TERM_QUERY.getType())) { // 封装精确查询参数 TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(field, value).boost(boost); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, termQueryBuilder); - } else if (Objects.equals(queryType, TERMS_QUERY.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.TERMS_QUERY.getType())) { // 此处兼容由or转入shouldList的in参数 Collection values = Objects.isNull(value) ? model.getValues() : (Collection) value; TermsQueryBuilder termsQueryBuilder = QueryBuilders.termsQuery(field, values).boost(boost); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, termsQueryBuilder); - } else if (Objects.equals(queryType, MATCH_PHASE.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.MATCH_PHASE.getType())) { // 封装模糊分词查询参数(分词必须按原关键词顺序) MatchPhraseQueryBuilder matchPhraseQueryBuilder = QueryBuilders.matchPhraseQuery(field, value).boost(boost); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, matchPhraseQueryBuilder); - } else if (Objects.equals(queryType, MATCH_PHRASE_PREFIX.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.MATCH_PHRASE_PREFIX.getType())) { MatchPhrasePrefixQueryBuilder matchPhrasePrefixQueryBuilder = QueryBuilders.matchPhrasePrefixQuery(field, value) .maxExpansions((Integer) model.getExt()).boost(boost); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, matchPhrasePrefixQueryBuilder); - } else if (Objects.equals(queryType, PREFIX_QUERY.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.PREFIX_QUERY.getType())) { PrefixQueryBuilder prefixQueryBuilder = QueryBuilders.prefixQuery(field, value.toString()).boost(boost); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, prefixQueryBuilder); - } else if (Objects.equals(queryType, QUERY_STRING_QUERY.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.QUERY_STRING_QUERY.getType())) { QueryStringQueryBuilder queryStringQueryBuilder = QueryBuilders.queryStringQuery(value.toString()).boost(boost); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, queryStringQueryBuilder); - } else if (Objects.equals(queryType, MATCH_QUERY.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.MATCH_QUERY.getType())) { // 封装模糊分词查询参数(可无序) MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(field, value).boost(boost); if (StringUtils.isBlank(path)) { @@ -82,7 +82,7 @@ public class EsQueryTypeUtil { } else { // 嵌套类型 if (JoinTypeEnum.NESTED.equals(model.getExt())) { - matchQueryBuilder = QueryBuilders.matchQuery(path + PATH_FIELD_JOIN + field, value).boost(boost); + matchQueryBuilder = QueryBuilders.matchQuery(path + BaseEsConstants.PATH_FIELD_JOIN + field, value).boost(boost); NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery(model.getPath(), matchQueryBuilder, (ScoreMode) model.getScoreMode()); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, nestedQueryBuilder); } else if (JoinTypeEnum.HAS_CHILD.equals(model.getExt())) { @@ -93,31 +93,31 @@ public class EsQueryTypeUtil { setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, hasParentQueryBuilder); } } - } else if (Objects.equals(queryType, RANGE_QUERY.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.RANGE_QUERY.getType())) { // 封装范围查询参数 RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(field).boost(boost); - if (Objects.equals(originalAttachType, GT.getType())) { + if (Objects.equals(originalAttachType, EsAttachTypeEnum.GT.getType())) { rangeQueryBuilder.gt(value); - } else if (Objects.equals(originalAttachType, LT.getType())) { + } else if (Objects.equals(originalAttachType, EsAttachTypeEnum.LT.getType())) { rangeQueryBuilder.lt(value); - } else if (Objects.equals(originalAttachType, GE.getType())) { + } else if (Objects.equals(originalAttachType, EsAttachTypeEnum.GE.getType())) { rangeQueryBuilder.gte(value); - } else if (Objects.equals(originalAttachType, LE.getType())) { + } else if (Objects.equals(originalAttachType, EsAttachTypeEnum.LE.getType())) { rangeQueryBuilder.lte(value); } setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, rangeQueryBuilder); - } else if (Objects.equals(queryType, EXISTS_QUERY.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.EXISTS_QUERY.getType())) { // 封装是否存在查询参数 ExistsQueryBuilder existsQueryBuilder = QueryBuilders.existsQuery(field).boost(boost); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, existsQueryBuilder); - } else if (Objects.equals(queryType, WILDCARD_QUERY.getType())) { + } else if (Objects.equals(queryType, EsQueryTypeEnum.WILDCARD_QUERY.getType())) { String query; - if (Objects.equals(attachType, LIKE_LEFT.getType())) { - query = WILDCARD_SIGN + value; - } else if (Objects.equals(attachType, LIKE_RIGHT.getType())) { - query = value + WILDCARD_SIGN; + if (Objects.equals(attachType, EsAttachTypeEnum.LIKE_LEFT.getType())) { + query = BaseEsConstants.WILDCARD_SIGN + value; + } else if (Objects.equals(attachType, EsAttachTypeEnum.LIKE_RIGHT.getType())) { + query = value + BaseEsConstants.WILDCARD_SIGN; } else { - query = WILDCARD_SIGN + value + WILDCARD_SIGN; + query = BaseEsConstants.WILDCARD_SIGN + value + BaseEsConstants.WILDCARD_SIGN; } WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery(field, query).boost(boost); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, wildcardQueryBuilder); @@ -140,12 +140,12 @@ public class EsQueryTypeUtil { */ public static void addQueryByType(BoolQueryBuilder boolQueryBuilder, Integer queryType, Integer attachType, boolean enableMust2Filter, List fields, Object value, Object ext, Integer minShouldMatch, Float boost) { - if (Objects.equals(queryType, MULTI_MATCH_QUERY.getType())) { + if (Objects.equals(queryType, EsQueryTypeEnum.MULTI_MATCH_QUERY.getType())) { MultiMatchQueryBuilder multiMatchQueryBuilder = QueryBuilders.multiMatchQuery(value, fields.toArray(new String[0])).boost(boost); if (ext instanceof Operator) { Operator operator = (Operator) ext; multiMatchQueryBuilder.operator(operator); - multiMatchQueryBuilder.minimumShouldMatch(minShouldMatch + PERCENT); + multiMatchQueryBuilder.minimumShouldMatch(minShouldMatch + BaseEsConstants.PERCENT); } setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, multiMatchQueryBuilder); } @@ -165,7 +165,7 @@ public class EsQueryTypeUtil { */ public static void addQueryByType(BoolQueryBuilder boolQueryBuilder, Integer queryType, Integer attachType, boolean enableMust2Filter, String field, Object leftValue, Object rightValue, Float boost) { - if (Objects.equals(queryType, INTERVAL_QUERY.getType())) { + if (Objects.equals(queryType, EsQueryTypeEnum.INTERVAL_QUERY.getType())) { RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(field).boost(boost); rangeQueryBuilder.gte(leftValue).lte(rightValue); setQueryBuilder(boolQueryBuilder, attachType, enableMust2Filter, rangeQueryBuilder); @@ -182,22 +182,22 @@ public class EsQueryTypeUtil { */ private static void setQueryBuilder(BoolQueryBuilder boolQueryBuilder, Integer attachType, boolean enableMust2Filter, QueryBuilder queryBuilder) { - boolean must = Objects.equals(attachType, MUST.getType()) || Objects.equals(attachType, GT.getType()) - || Objects.equals(attachType, LT.getType()) || Objects.equals(attachType, GE.getType()) - || Objects.equals(attachType, LE.getType()) || Objects.equals(attachType, IN.getType()) - || Objects.equals(attachType, BETWEEN.getType()) || Objects.equals(attachType, EXISTS.getType()) - || Objects.equals(attachType, LIKE_LEFT.getType()) || Objects.equals(attachType, LIKE_RIGHT.getType()); - boolean mustNot = Objects.equals(attachType, MUST_NOT.getType()) || Objects.equals(attachType, NOT_IN.getType()) - || Objects.equals(attachType, NOT_EXISTS.getType()) || Objects.equals(attachType, NOT_BETWEEN.getType()); + boolean must = Objects.equals(attachType, EsAttachTypeEnum.MUST.getType()) || Objects.equals(attachType, EsAttachTypeEnum.GT.getType()) + || Objects.equals(attachType, EsAttachTypeEnum.LT.getType()) || Objects.equals(attachType, EsAttachTypeEnum.GE.getType()) + || Objects.equals(attachType, EsAttachTypeEnum.LE.getType()) || Objects.equals(attachType, EsAttachTypeEnum.IN.getType()) + || Objects.equals(attachType, EsAttachTypeEnum.BETWEEN.getType()) || Objects.equals(attachType, EsAttachTypeEnum.EXISTS.getType()) + || Objects.equals(attachType, EsAttachTypeEnum.LIKE_LEFT.getType()) || Objects.equals(attachType, EsAttachTypeEnum.LIKE_RIGHT.getType()); + boolean mustNot = Objects.equals(attachType, EsAttachTypeEnum.MUST_NOT.getType()) || Objects.equals(attachType, EsAttachTypeEnum.NOT_IN.getType()) + || Objects.equals(attachType, EsAttachTypeEnum.NOT_EXISTS.getType()) || Objects.equals(attachType, EsAttachTypeEnum.NOT_BETWEEN.getType()); if (must) { if (enableMust2Filter) { boolQueryBuilder.filter(queryBuilder); } else { boolQueryBuilder.must(queryBuilder); } - } else if (Objects.equals(attachType, FILTER.getType())) { + } else if (Objects.equals(attachType, EsAttachTypeEnum.FILTER.getType())) { boolQueryBuilder.filter(queryBuilder); - } else if (Objects.equals(attachType, SHOULD.getType())) { + } else if (Objects.equals(attachType, EsAttachTypeEnum.SHOULD.getType())) { boolQueryBuilder.should(queryBuilder); } else if (mustNot) { boolQueryBuilder.mustNot(queryBuilder); diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/FieldUtils.java b/easy-es-core/src/main/java/cn/easyes/core/toolkit/FieldUtils.java index 8be31c43..ad2aef62 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/FieldUtils.java +++ b/easy-es-core/src/main/java/cn/easyes/core/toolkit/FieldUtils.java @@ -1,9 +1,10 @@ package cn.easyes.core.toolkit; -import cn.easyes.core.conditions.interfaces.SFunction; -import cn.easyes.core.config.GlobalConfig; +import cn.easyes.common.constants.BaseEsConstants; +import cn.easyes.common.params.SFunction; +import cn.easyes.common.utils.StringUtils; import cn.easyes.core.cache.GlobalConfigCache; -import cn.easyes.core.constants.BaseEsConstants; +import cn.easyes.core.config.GlobalConfig; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/IndexUtils.java b/easy-es-core/src/main/java/cn/easyes/core/toolkit/IndexUtils.java index 8b94aabe..5e42040b 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/IndexUtils.java +++ b/easy-es-core/src/main/java/cn/easyes/core/toolkit/IndexUtils.java @@ -1,16 +1,16 @@ package cn.easyes.core.toolkit; +import cn.easyes.common.constants.BaseEsConstants; +import cn.easyes.common.enums.Analyzer; +import cn.easyes.common.enums.FieldType; +import cn.easyes.common.enums.JdkDataTypeEnum; +import cn.easyes.common.utils.CollectionUtils; +import cn.easyes.common.utils.ExceptionUtils; +import cn.easyes.common.utils.LogUtils; +import cn.easyes.common.utils.StringUtils; +import cn.easyes.core.biz.*; import cn.easyes.core.cache.GlobalConfigCache; -import cn.easyes.core.common.EntityFieldInfo; -import cn.easyes.core.common.EntityInfo; import cn.easyes.core.config.GlobalConfig; -import cn.easyes.core.constants.BaseEsConstants; -import cn.easyes.core.enums.Analyzer; -import cn.easyes.core.enums.FieldType; -import cn.easyes.core.enums.JdkDataTypeEnum; -import cn.easyes.core.params.CreateIndexParam; -import cn.easyes.core.params.EsIndexInfo; -import cn.easyes.core.params.EsIndexParam; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.elasticsearch.action.admin.indices.alias.Alias; @@ -34,7 +34,6 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.function.BiFunction; -import static cn.easyes.core.constants.BaseEsConstants.*; /** * 索引工具类 @@ -154,7 +153,7 @@ public class IndexUtils { IndicesAliasesRequest.AliasActions aliasActions = new IndicesAliasesRequest.AliasActions(IndicesAliasesRequest.AliasActions.Type.ADD); aliasActions.index(indexName); - aliasActions.alias(DEFAULT_ALIAS); + aliasActions.alias(BaseEsConstants.DEFAULT_ALIAS); indicesAliasesRequest.addAliasAction(aliasActions); try { client.indices().updateAliases(indicesAliasesRequest, RequestOptions.DEFAULT); @@ -176,8 +175,8 @@ public class IndexUtils { ReindexRequest reindexRequest = new ReindexRequest(); reindexRequest.setSourceIndices(oldIndexName); reindexRequest.setDestIndex(releaseIndexName); - reindexRequest.setDestOpType(DEFAULT_DEST_OP_TYPE); - reindexRequest.setConflicts(DEFAULT_CONFLICTS); + reindexRequest.setDestOpType(BaseEsConstants.DEFAULT_DEST_OP_TYPE); + reindexRequest.setConflicts(BaseEsConstants.DEFAULT_CONFLICTS); reindexRequest.setRefresh(Boolean.TRUE); try { BulkByScrollResponse response = client.reindex(reindexRequest, RequestOptions.DEFAULT); @@ -207,7 +206,7 @@ public class IndexUtils { .flatMap(aliases -> Optional.ofNullable(aliases.get(indexName))) .ifPresent(aliasMetadataList -> aliasMetadataList.forEach(aliasMetadata -> { - if (DEFAULT_ALIAS.equals(aliasMetadata.alias())) { + if (BaseEsConstants.DEFAULT_ALIAS.equals(aliasMetadata.alias())) { esIndexInfo.setHasDefaultAlias(Boolean.TRUE); } })); @@ -216,10 +215,10 @@ public class IndexUtils { Optional.ofNullable(getIndexResponse.getSettings()) .flatMap(settingsMap -> Optional.ofNullable(settingsMap.get(indexName))) .ifPresent(p -> { - String shardsNumStr = p.get(SHARDS_NUM_KEY); + String shardsNumStr = p.get(BaseEsConstants.SHARDS_NUM_KEY); Optional.ofNullable(shardsNumStr) .ifPresent(s -> esIndexInfo.setShardsNum(Integer.parseInt(s))); - String replicasNumStr = p.get(REPLICAS_NUM_KEY); + String replicasNumStr = p.get(BaseEsConstants.REPLICAS_NUM_KEY); Optional.ofNullable(replicasNumStr) .ifPresent(r -> esIndexInfo.setReplicasNum(Integer.parseInt(r))); }); @@ -310,7 +309,7 @@ public class IndexUtils { indexParamList.forEach(indexParam -> { Map info = new HashMap<>(); - Optional.ofNullable(indexParam.getDateFormat()).ifPresent(format -> info.put(FORMAT, indexParam.getDateFormat())); + Optional.ofNullable(indexParam.getDateFormat()).ifPresent(format -> info.put(BaseEsConstants.FORMAT, indexParam.getDateFormat())); info.put(BaseEsConstants.TYPE, indexParam.getFieldType()); // 设置分词器 if (FieldType.TEXT.getType().equals(indexParam.getFieldType())) { @@ -344,9 +343,9 @@ public class IndexUtils { */ public static boolean changeAliasAtomic(RestHighLevelClient client, String oldIndexName, String releaseIndexName) { IndicesAliasesRequest.AliasActions addIndexAction = new IndicesAliasesRequest.AliasActions( - IndicesAliasesRequest.AliasActions.Type.ADD).index(releaseIndexName).alias(DEFAULT_ALIAS); + IndicesAliasesRequest.AliasActions.Type.ADD).index(releaseIndexName).alias(BaseEsConstants.DEFAULT_ALIAS); IndicesAliasesRequest.AliasActions removeAction = new IndicesAliasesRequest.AliasActions( - IndicesAliasesRequest.AliasActions.Type.REMOVE).index(oldIndexName).alias(DEFAULT_ALIAS); + IndicesAliasesRequest.AliasActions.Type.REMOVE).index(oldIndexName).alias(BaseEsConstants.DEFAULT_ALIAS); IndicesAliasesRequest indicesAliasesRequest = new IndicesAliasesRequest(); indicesAliasesRequest.addAliasAction(addIndexAction); @@ -487,7 +486,7 @@ public class IndexUtils { // 重试 看加了后缀的_s0 和_s1是否存在 for (int i = 0; i <= 1; i++) { - String retryIndexName = entityInfo.getIndexName() + S_SUFFIX + i; + String retryIndexName = entityInfo.getIndexName() + BaseEsConstants.S_SUFFIX + i; exists = IndexUtils.existsIndex(client, retryIndexName); if (exists) { entityInfo.setRetrySuccessIndexName(retryIndexName); @@ -513,14 +512,14 @@ public class IndexUtils { } try { // 尝试获取分布式锁 - boolean lock = LockUtils.tryLock(client, entityClass.getSimpleName().toLowerCase(), LOCK_MAX_RETRY); + boolean lock = LockUtils.tryLock(client, entityClass.getSimpleName().toLowerCase(), BaseEsConstants.LOCK_MAX_RETRY); if (!lock) { LogUtils.warn("retry get distribute lock failed, please check whether other resources have been preempted or deadlocked"); return Boolean.FALSE; } return biFunction.apply(entityClass, client); } finally { - LockUtils.release(client, entityClass.getSimpleName().toLowerCase(), LOCK_MAX_RETRY); + LockUtils.release(client, entityClass.getSimpleName().toLowerCase(), BaseEsConstants.LOCK_MAX_RETRY); } }).exceptionally((throwable) -> { Optional.ofNullable(throwable).ifPresent(e -> LogUtils.error("process index exception", e.toString())); diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/LockUtils.java b/easy-es-core/src/main/java/cn/easyes/core/toolkit/LockUtils.java index 98d44019..b4f427e2 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/LockUtils.java +++ b/easy-es-core/src/main/java/cn/easyes/core/toolkit/LockUtils.java @@ -1,5 +1,6 @@ package cn.easyes.core.toolkit; +import cn.easyes.common.constants.BaseEsConstants; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.action.index.IndexRequest; @@ -15,8 +16,6 @@ import org.elasticsearch.search.builder.SearchSourceBuilder; import java.io.IOException; -import static cn.easyes.core.constants.BaseEsConstants.*; - /** * 基于es写的轻量级分布式锁,仅供框架内部使用,可避免引入redis/zk等其它依赖 *

@@ -50,11 +49,11 @@ public class LockUtils { IndexUtils.createEmptyIndex(client, LOCK_INDEX); } - if (maxRetry <= ZERO) { + if (maxRetry <= BaseEsConstants.ZERO) { return Boolean.FALSE; } - if (getCount(client, idValue) > ZERO) { + if (getCount(client, idValue) > BaseEsConstants.ZERO) { try { Thread.sleep(WAIT_SECONDS / maxRetry); } catch (InterruptedException e) { @@ -76,7 +75,7 @@ public class LockUtils { private static boolean createLock(RestHighLevelClient client, String idValue) { IndexRequest indexRequest = new IndexRequest(LOCK_INDEX); indexRequest.id(idValue); - indexRequest.source(DISTRIBUTED_LOCK_TIP_JSON, XContentType.JSON); + indexRequest.source(BaseEsConstants.DISTRIBUTED_LOCK_TIP_JSON, XContentType.JSON); IndexResponse response; try { response = client.index(indexRequest, RequestOptions.DEFAULT); @@ -98,7 +97,7 @@ public class LockUtils { public synchronized static boolean release(RestHighLevelClient client, String idValue, Integer maxRetry) { DeleteRequest deleteRequest = new DeleteRequest(LOCK_INDEX); deleteRequest.id(idValue); - if (maxRetry <= ZERO) { + if (maxRetry <= BaseEsConstants.ZERO) { return Boolean.FALSE; } @@ -150,7 +149,7 @@ public class LockUtils { response = client.search(searchRequest, RequestOptions.DEFAULT); } catch (IOException e) { e.printStackTrace(); - return ONE; + return BaseEsConstants.ONE; } return (int) response.getHits().getTotalHits().value; } diff --git a/easy-es-core/src/main/java/cn/easyes/core/toolkit/PageHelper.java b/easy-es-core/src/main/java/cn/easyes/core/toolkit/PageHelper.java index 7ed0f235..e885c57f 100644 --- a/easy-es-core/src/main/java/cn/easyes/core/toolkit/PageHelper.java +++ b/easy-es-core/src/main/java/cn/easyes/core/toolkit/PageHelper.java @@ -1,6 +1,6 @@ package cn.easyes.core.toolkit; -import cn.easyes.core.common.PageInfo; +import cn.easyes.core.biz.PageInfo; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/easy-es-extension/pom.xml b/easy-es-extension/pom.xml index 21ec4160..aa96d6d8 100644 --- a/easy-es-extension/pom.xml +++ b/easy-es-extension/pom.xml @@ -7,7 +7,7 @@ cn.easy-es easy-es-parent - 0.9.21 + 0.9.30 ../easy-es-parent @@ -18,4 +18,11 @@ 8 + + + cn.easy-es + easy-es-annotation + + + \ No newline at end of file diff --git a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/Interceptor.java b/easy-es-extension/src/main/java/cn/easyes/extension/context/Interceptor.java similarity index 81% rename from easy-es-extension/src/main/java/cn/easyes/extension/plugins/Interceptor.java rename to easy-es-extension/src/main/java/cn/easyes/extension/context/Interceptor.java index 6e3f0cb5..674f9ce2 100644 --- a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/Interceptor.java +++ b/easy-es-extension/src/main/java/cn/easyes/extension/context/Interceptor.java @@ -1,4 +1,6 @@ -package cn.easyes.extension.plugins; +package cn.easyes.extension.context; + +import cn.easyes.extension.plugins.Plugin; /** *

diff --git a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/InterceptorChain.java b/easy-es-extension/src/main/java/cn/easyes/extension/context/InterceptorChain.java similarity index 96% rename from easy-es-extension/src/main/java/cn/easyes/extension/plugins/InterceptorChain.java rename to easy-es-extension/src/main/java/cn/easyes/extension/context/InterceptorChain.java index 202770f3..ce7ca0d3 100644 --- a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/InterceptorChain.java +++ b/easy-es-extension/src/main/java/cn/easyes/extension/context/InterceptorChain.java @@ -1,4 +1,4 @@ -package cn.easyes.extension.plugins; +package cn.easyes.extension.context; import java.util.ArrayList; import java.util.Collections; diff --git a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/InterceptorChainHolder.java b/easy-es-extension/src/main/java/cn/easyes/extension/context/InterceptorChainHolder.java similarity index 95% rename from easy-es-extension/src/main/java/cn/easyes/extension/plugins/InterceptorChainHolder.java rename to easy-es-extension/src/main/java/cn/easyes/extension/context/InterceptorChainHolder.java index 5d88ffaa..6056e233 100644 --- a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/InterceptorChainHolder.java +++ b/easy-es-extension/src/main/java/cn/easyes/extension/context/InterceptorChainHolder.java @@ -1,4 +1,4 @@ -package cn.easyes.extension.plugins; +package cn.easyes.extension.context; /** * interceptorChain上下文 diff --git a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/Invocation.java b/easy-es-extension/src/main/java/cn/easyes/extension/context/Invocation.java similarity index 95% rename from easy-es-extension/src/main/java/cn/easyes/extension/plugins/Invocation.java rename to easy-es-extension/src/main/java/cn/easyes/extension/context/Invocation.java index 8bebff44..3b87cfdd 100644 --- a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/Invocation.java +++ b/easy-es-extension/src/main/java/cn/easyes/extension/context/Invocation.java @@ -1,4 +1,4 @@ -package cn.easyes.extension.plugins; +package cn.easyes.extension.context; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/Plugin.java b/easy-es-extension/src/main/java/cn/easyes/extension/plugins/Plugin.java index 6a2ddec5..e7744415 100644 --- a/easy-es-extension/src/main/java/cn/easyes/extension/plugins/Plugin.java +++ b/easy-es-extension/src/main/java/cn/easyes/extension/plugins/Plugin.java @@ -1,9 +1,11 @@ package cn.easyes.extension.plugins; -import cn.easyes.extension.anno.Intercepts; -import cn.easyes.extension.anno.Signature; -import cn.easyes.extension.utils.ExceptionUtil; +import cn.easyes.annotation.anno.Intercepts; +import cn.easyes.annotation.anno.Signature; +import cn.easyes.common.utils.ExceptionUtil; +import cn.easyes.extension.context.Interceptor; +import cn.easyes.extension.context.Invocation; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/easy-es-parent/pom.xml b/easy-es-parent/pom.xml index e048c601..9d3e8ed3 100644 --- a/easy-es-parent/pom.xml +++ b/easy-es-parent/pom.xml @@ -6,7 +6,7 @@ cn.easy-es easy-es-parent - 0.9.21 + 0.9.30 easy-es-parent easy use for elastic search @@ -20,10 +20,11 @@ - ../easy-es-core ../easy-es-boot-starter + ../easy-es-core ../easy-es-extension ../easy-es-annotation + ../easy-es-common @@ -38,6 +39,31 @@ + + cn.easy-es + easy-es-boot-starter + ${version} + + + cn.easy-es + easy-es-core + ${version} + + + cn.easy-es + easy-es-extension + ${version} + + + cn.easy-es + easy-es-common + ${version} + + + cn.easy-es + easy-es-annotation + ${version} + org.projectlombok lombok diff --git a/easy-es-sample/pom.xml b/easy-es-sample/pom.xml index 2fda621e..9dbf9f1a 100644 --- a/easy-es-sample/pom.xml +++ b/easy-es-sample/pom.xml @@ -9,7 +9,7 @@ easy-es cn.easy-es - 0.9.21 + 0.9.30 @@ -21,7 +21,6 @@ cn.easy-es easy-es-boot-starter - 0.9.21 org.springframework.boot @@ -31,19 +30,5 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - - - org.apache.commons - commons-lang3 - test - - - junit - junit - test - \ No newline at end of file diff --git a/easy-es-sample/src/main/java/cn/easyes/sample/EasyEsApplication.java b/easy-es-sample/src/main/java/cn/easyes/sample/EasyEsApplication.java index 6e9e71fa..d77246ca 100644 --- a/easy-es-sample/src/main/java/cn/easyes/sample/EasyEsApplication.java +++ b/easy-es-sample/src/main/java/cn/easyes/sample/EasyEsApplication.java @@ -1,6 +1,6 @@ package cn.easyes.sample; -import cn.easyes.autoconfig.annotation.EsMapperScan; +import cn.easyes.starter.register.EsMapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * Copyright © 2021 xpc1024 All Rights Reserved **/ @SpringBootApplication -@EsMapperScan("com.xpc.easyes.sample.mapper") +@EsMapperScan("cn.easyes.sample.mapper") public class EasyEsApplication { public static void main(String[] args) { SpringApplication.run(EasyEsApplication.class, args); diff --git a/easy-es-sample/src/main/java/cn/easyes/sample/controller/TestController.java b/easy-es-sample/src/main/java/cn/easyes/sample/controller/SampleController.java similarity index 90% rename from easy-es-sample/src/main/java/cn/easyes/sample/controller/TestController.java rename to easy-es-sample/src/main/java/cn/easyes/sample/controller/SampleController.java index 3effa9b9..9a4c1935 100644 --- a/easy-es-sample/src/main/java/cn/easyes/sample/controller/TestController.java +++ b/easy-es-sample/src/main/java/cn/easyes/sample/controller/SampleController.java @@ -18,11 +18,26 @@ import java.util.List; * Copyright © 2021 xpc1024 All Rights Reserved **/ @RestController -public class TestController { +public class SampleController { @Resource private DocumentMapper documentMapper; + /** + * 初始化插入数据,默认开启自动挡,自动挡模式下,索引会自动创建及更新. 若未开启自动挡,则在此步骤前需先调用创建索引API完成索引创建 + * + * @return + */ + @GetMapping("insert") + public Integer insert() { + Document document = new Document(); + document.setTitle("测试1"); + document.setContent("测试内容1"); + document.setCreator("老汉"); + document.setGmtCreate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + return documentMapper.insert(document); + } + /** * 演示根据标题精确查询文章 * 例如title传值为 我真帅,那么在当前配置的索引下,所有标题为'我真帅'的文章都会被查询出来 @@ -39,15 +54,6 @@ public class TestController { return documentMapper.selectList(wrapper); } - @GetMapping("insert") - public Integer insert(){ - Document document = new Document(); - document.setTitle("测试1"); - document.setContent("测试内容1"); - document.setCreator("老汉"); - document.setGmtCreate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - return documentMapper.insert(document); - } /** * 演示根据title删除文章，同时会被 DeleteInterceptor 拦截，执行逻辑删除 diff --git a/easy-es-sample/src/main/java/cn/easyes/sample/entity/Document.java b/easy-es-sample/src/main/java/cn/easyes/sample/entity/Document.java index ce56a8b4..5d089f2a 100644 --- a/easy-es-sample/src/main/java/cn/easyes/sample/entity/Document.java +++ b/easy-es-sample/src/main/java/cn/easyes/sample/entity/Document.java @@ -1,18 +1,16 @@ package cn.easyes.sample.entity; -import cn.easyes.core.anno.HighLightMappingField; -import cn.easyes.core.anno.TableField; -import cn.easyes.core.anno.TableId; -import cn.easyes.core.anno.TableName; -import cn.easyes.core.enums.Analyzer; -import cn.easyes.core.enums.FieldStrategy; -import cn.easyes.core.enums.FieldType; -import cn.easyes.core.enums.IdType; +import cn.easyes.annotation.anno.HighLightMappingField; +import cn.easyes.annotation.anno.TableField; +import cn.easyes.annotation.anno.TableId; +import cn.easyes.annotation.anno.TableName; +import cn.easyes.common.enums.Analyzer; +import cn.easyes.common.enums.FieldStrategy; +import cn.easyes.common.enums.FieldType; +import cn.easyes.common.enums.IdType; import lombok.Data; import lombok.experimental.Accessors; -import java.util.List; - /** * es 数据模型 *

@@ -76,9 +74,4 @@ public class Document { * 文档点赞数 */ private Integer starNum; - /** - * 嵌套类型 注意,务必像下面示例一样指定类型为nested及其nested class,否则会导致框架无法正常运行 - */ - @TableField(fieldType = FieldType.NESTED, nestedClass = User.class) - private List users; } diff --git a/easy-es-sample/src/main/java/cn/easyes/sample/interceptor/DeleteInterceptor.java b/easy-es-sample/src/main/java/cn/easyes/sample/interceptor/DeleteInterceptor.java deleted file mode 100644 index 7ce57dc4..00000000 --- a/easy-es-sample/src/main/java/cn/easyes/sample/interceptor/DeleteInterceptor.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.easyes.sample.interceptor; - -import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import cn.easyes.core.conditions.interfaces.BaseEsMapper; -import cn.easyes.extension.anno.Intercepts; -import cn.easyes.extension.anno.Signature; -import cn.easyes.extension.plugins.Interceptor; -import cn.easyes.extension.plugins.Invocation; -import org.springframework.stereotype.Component; - -/** - *

- * 统一逻辑删除拦截器 demo - *

- * - * @author lilu - * @since 2022/3/4 - */ -@Intercepts( - { - // 只是个例子，如果要实现这个功能还需要拦截更多的方法 - @Signature(type = BaseEsMapper.class, method = "delete", args = {LambdaEsQueryWrapper.class}), - } -) -@Component -public class DeleteInterceptor implements Interceptor { - - @Override - public Object intercept(Invocation invocation) throws Throwable { - // 统一逻辑删除拦截 - System.out.println("啊啊啊，我拦截到了删除，禁止直接删除"); - // 这里直接改为update逻辑删除,代码省略... - return 0; - } - -} diff --git a/easy-es-sample/src/main/java/cn/easyes/sample/interceptor/QueryInterceptor.java b/easy-es-sample/src/main/java/cn/easyes/sample/interceptor/QueryInterceptor.java deleted file mode 100644 index f53ff30b..00000000 --- a/easy-es-sample/src/main/java/cn/easyes/sample/interceptor/QueryInterceptor.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.easyes.sample.interceptor; - -import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import cn.easyes.core.conditions.interfaces.BaseEsMapper; -import cn.easyes.extension.anno.Intercepts; -import cn.easyes.extension.anno.Signature; -import cn.easyes.extension.plugins.Interceptor; -import cn.easyes.extension.plugins.Invocation; -import cn.easyes.sample.entity.GeneralBean; - -/** - *

- * 统一查询拦截器 demo - *

- * - * @author lilu - * @since 2022/3/4 - */ -@Intercepts( - { - @Signature(type = BaseEsMapper.class, method = "selectList", args = {LambdaEsQueryWrapper.class}), - } -) -//@Component -public class QueryInterceptor implements Interceptor { - - @Override - public Object intercept(Invocation invocation) throws Throwable { - System.out.println("啊啊啊，我拦截到了查询，统一增加查询条件"); - // 查询条件中统一加入逻辑删除状态为未删除 - Object[] args = invocation.getArgs(); - LambdaEsQueryWrapper arg = (LambdaEsQueryWrapper) args[0]; - arg.eq(GeneralBean::getExistStatus, true); - return invocation.proceed(); - } - -} diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/select/SearchTest.java b/easy-es-sample/src/test/java/cn/easyes/sample/test/select/SearchTest.java deleted file mode 100644 index d9d12ae6..00000000 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/select/SearchTest.java +++ /dev/null @@ -1,112 +0,0 @@ -package cn.easyes.sample.test.select; - -import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.search.SearchScrollRequest; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.search.Scroll; -import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.sort.SortOrder; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * 滚动查询测试 - * - * @author tudou - *

- * Copyright © 2022 xpc1024 All Rights Reserved - **/ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = TestEasyEsApplication.class) -public class SearchTest { - @Resource - private DocumentMapper documentMapper; - //测试的总条数 - private static final int TOTAL_COUNT = 30; - String indexName = Document.class.getSimpleName().toLowerCase(); - - /** - * 测试数据 - */ - @Test - public void testInsertBatch() { - List documentList = new ArrayList<>(); - for (int i = 0; i < TOTAL_COUNT; i++) { - Document document = new Document(); - document.setId("scroll" + i); - document.setTitle("老李"); - document.setStarNum(i); - documentList.add(document); - } - int successCount = documentMapper.insertBatch(documentList); - System.out.println(successCount); - assertEquals(successCount, TOTAL_COUNT); - } - - /** - * 滚动查询 - * - * @throws IOException io异常 - */ - @Test - public void testScrollSearch() throws IOException { - // 测试根据条件查询 - String title = "老李"; - int pageSize = 20; - LambdaEsQueryWrapper wrapper = new LambdaEsQueryWrapper<>(); - wrapper.eq(Document::getTitle, title).from(0).size(pageSize); - SearchSourceBuilder searchSourceBuilder = documentMapper.getSearchSourceBuilder(wrapper); - SearchRequest searchRequest = new SearchRequest(indexName); - // 此处的searchSourceBuilder由上面EE构建而来,我们继续对其追加排序参数 - searchSourceBuilder.sort("starNum", SortOrder.DESC); - searchSourceBuilder.sort("_id", SortOrder.DESC); - searchRequest.source(searchSourceBuilder); - //这句代码就是设置游标查询和过期时间，1m就是1分钟之内scrollId有效 - Scroll scroll = new Scroll(TimeValue.timeValueMinutes(1)); - SearchRequest request = new SearchRequest(indexName); - request.scroll(scroll); - request.source(searchSourceBuilder); - SearchResponse response = documentMapper.search(request, RequestOptions.DEFAULT); - //System.out.println(JSON.toJSONString(response)); - SearchHits hits = response.getHits(); - String scrollId = response.getScrollId(); - - SearchHit[] searchHits = hits.getHits(); - int totalResultCount = 0; - int firstResultCount = searchHits.length; - assertEquals(firstResultCount, pageSize); - //什么时候结束查询？当查询结果数量小于第一次查询执行的 size时，结束查询。 - while (searchHits != null && searchHits.length > 0) { - totalResultCount += searchHits.length; - //这里面保存的是上一次的排序结果，对应的是上面searchSourceBuilder.sort的顺序 - Object[] sortValues = searchHits[0].getSortValues(); - //注意这里是searchAfter - searchSourceBuilder.searchAfter(sortValues); - SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId); - scrollRequest.scroll(scroll); - response = documentMapper.scroll(scrollRequest, RequestOptions.DEFAULT); - scrollId = response.getScrollId(); - searchHits = response.getHits().getHits(); - } - assertEquals(totalResultCount, TOTAL_COUNT); - System.out.println("firstResultCount:" + firstResultCount + ",totalResultCount:" + totalResultCount); - } - -} diff --git a/easy-es-test/pom.xml b/easy-es-test/pom.xml new file mode 100644 index 00000000..ba6949fb --- /dev/null +++ b/easy-es-test/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + + easy-es + cn.easy-es + 0.9.30 + + + easy-es-test + + + 8 + 8 + + + + + cn.easy-es + easy-es-boot-starter + + + org.springframework.boot + spring-boot-starter-test + + + org.apache.commons + commons-lang3 + test + + + junit + junit + test + + + + \ No newline at end of file diff --git a/easy-es-test/src/main/java/cn/easyes/test/entity/Document.java b/easy-es-test/src/main/java/cn/easyes/test/entity/Document.java new file mode 100644 index 00000000..018b6ced --- /dev/null +++ b/easy-es-test/src/main/java/cn/easyes/test/entity/Document.java @@ -0,0 +1,84 @@ +package cn.easyes.test.entity; + +import cn.easyes.annotation.anno.HighLightMappingField; +import cn.easyes.annotation.anno.TableField; +import cn.easyes.annotation.anno.TableId; +import cn.easyes.annotation.anno.TableName; +import cn.easyes.common.enums.Analyzer; +import cn.easyes.common.enums.FieldStrategy; +import cn.easyes.common.enums.FieldType; +import cn.easyes.common.enums.IdType; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * es 数据模型 + *

+ * Copyright © 2021 xpc1024 All Rights Reserved + **/ +@Data +@Accessors(chain = true) +@TableName(shardsNum = 3, replicasNum = 2, keepGlobalPrefix = true) +public class Document { + /** + * es中的唯一id,如果你想自定义es中的id为你提供的id,比如MySQL中的id,请将注解中的type指定为customize或直接在全局配置文件中指定,如此id便支持任意数据类型) + */ + @TableId(type = IdType.CUSTOMIZE) + private String id; + /** + * 文档标题,不指定类型默认被创建为keyword类型,可进行精确查询 + */ + private String title; + /** + * 文档内容,指定了类型及存储/查询分词器 + */ + @TableField(fieldType = FieldType.TEXT, analyzer = Analyzer.IK_SMART, searchAnalyzer = Analyzer.IK_MAX_WORD) + private String content; + /** + * 作者 加@TableField注解,并指明strategy = FieldStrategy.NOT_EMPTY 表示更新的时候的策略为 创建者不为空字符串时才更新 + */ + @TableField(strategy = FieldStrategy.NOT_EMPTY) + private String creator; + /** + * 创建时间 + */ + @TableField(fieldType = FieldType.DATE, dateFormat = "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis") + private String gmtCreate; + /** + * es中实际不存在的字段,但模型中加了,为了不和es映射,可以在此类型字段上加上 注解@TableField,并指明exist=false + */ + @TableField(exist = false) + private String notExistsField; + /** + * 地理位置经纬度坐标 例如: "40.13933715136454,116.63441990026217" + */ + @TableField(fieldType = FieldType.GEO_POINT) + private String location; + /** + * 图形(例如圆心,矩形) + */ + @TableField(fieldType = FieldType.GEO_SHAPE) + private String geoLocation; + /** + * 自定义字段名称 + */ + @TableField(value = "wu-la", fieldType = FieldType.TEXT, analyzer = Analyzer.IK_SMART, searchAnalyzer = Analyzer.IK_SMART) + private String customField; + + /** + * 高亮返回值被映射的字段 + */ + @HighLightMappingField("content") + private String highlightContent; + /** + * 文档点赞数 + */ + private Integer starNum; + /** + * 嵌套类型 注意,务必像下面示例一样指定类型为nested及其nested class,否则会导致框架无法正常运行 + */ + @TableField(fieldType = FieldType.NESTED, nestedClass = User.class) + private List users; +} diff --git a/easy-es-sample/src/main/java/cn/easyes/sample/entity/Faq.java b/easy-es-test/src/main/java/cn/easyes/test/entity/Faq.java similarity index 84% rename from easy-es-sample/src/main/java/cn/easyes/sample/entity/Faq.java rename to easy-es-test/src/main/java/cn/easyes/test/entity/Faq.java index 06480d07..0022abf6 100644 --- a/easy-es-sample/src/main/java/cn/easyes/sample/entity/Faq.java +++ b/easy-es-test/src/main/java/cn/easyes/test/entity/Faq.java @@ -1,7 +1,7 @@ -package cn.easyes.sample.entity; +package cn.easyes.test.entity; -import cn.easyes.core.anno.TableField; -import cn.easyes.core.anno.TableName; +import cn.easyes.annotation.anno.TableField; +import cn.easyes.annotation.anno.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/easy-es-sample/src/main/java/cn/easyes/sample/entity/GeneralBean.java b/easy-es-test/src/main/java/cn/easyes/test/entity/GeneralBean.java similarity index 86% rename from easy-es-sample/src/main/java/cn/easyes/sample/entity/GeneralBean.java rename to easy-es-test/src/main/java/cn/easyes/test/entity/GeneralBean.java index 63965b65..282bca4f 100644 --- a/easy-es-sample/src/main/java/cn/easyes/sample/entity/GeneralBean.java +++ b/easy-es-test/src/main/java/cn/easyes/test/entity/GeneralBean.java @@ -1,4 +1,4 @@ -package cn.easyes.sample.entity; +package cn.easyes.test.entity; import lombok.Data; diff --git a/easy-es-sample/src/main/java/cn/easyes/sample/entity/User.java b/easy-es-test/src/main/java/cn/easyes/test/entity/User.java similarity index 81% rename from easy-es-sample/src/main/java/cn/easyes/sample/entity/User.java rename to easy-es-test/src/main/java/cn/easyes/test/entity/User.java index f23a2195..67f639ec 100644 --- a/easy-es-sample/src/main/java/cn/easyes/sample/entity/User.java +++ b/easy-es-test/src/main/java/cn/easyes/test/entity/User.java @@ -1,7 +1,7 @@ -package cn.easyes.sample.entity; +package cn.easyes.test.entity; -import cn.easyes.core.anno.TableField; -import cn.easyes.core.enums.FieldType; +import cn.easyes.annotation.anno.TableField; +import cn.easyes.common.enums.FieldType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/easy-es-test/src/main/java/cn/easyes/test/mapper/DocumentMapper.java b/easy-es-test/src/main/java/cn/easyes/test/mapper/DocumentMapper.java new file mode 100644 index 00000000..8e8722b3 --- /dev/null +++ b/easy-es-test/src/main/java/cn/easyes/test/mapper/DocumentMapper.java @@ -0,0 +1,12 @@ +package cn.easyes.test.mapper; + +import cn.easyes.core.conditions.interfaces.BaseEsMapper; +import cn.easyes.test.entity.Document; + +/** + * mapper 相当于Mybatis-plus的mapper + *

+ * Copyright © 2021 xpc1024 All Rights Reserved + **/ +public interface DocumentMapper extends BaseEsMapper { +} diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/TestEasyEsApplication.java b/easy-es-test/src/test/java/cn/easyes/test/TestEasyEsApplication.java similarity index 75% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/TestEasyEsApplication.java rename to easy-es-test/src/test/java/cn/easyes/test/TestEasyEsApplication.java index 11153250..37ad1a1c 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/TestEasyEsApplication.java +++ b/easy-es-test/src/test/java/cn/easyes/test/TestEasyEsApplication.java @@ -1,6 +1,6 @@ -package cn.easyes.sample.test; +package cn.easyes.test; -import cn.easyes.autoconfig.annotation.EsMapperScan; +import cn.easyes.starter.register.EsMapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * Copyright © 2021 xpc1024 All Rights Reserved **/ @SpringBootApplication -@EsMapperScan("cn.easyes.sample.mapper") +@EsMapperScan("cn.easyes.test.mapper") public class TestEasyEsApplication { public static void main(String[] args) { SpringApplication.run(TestEasyEsApplication.class, args); diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/agg/AggTest.java b/easy-es-test/src/test/java/cn/easyes/test/agg/AggTest.java similarity index 90% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/agg/AggTest.java rename to easy-es-test/src/test/java/cn/easyes/test/agg/AggTest.java index b94c5e32..60bc5155 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/agg/AggTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/agg/AggTest.java @@ -1,10 +1,10 @@ -package cn.easyes.sample.test.agg; +package cn.easyes.test.agg; -import cn.easyes.core.common.PageInfo; +import cn.easyes.core.biz.PageInfo; import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.mapper.DocumentMapper; import org.elasticsearch.action.search.SearchResponse; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/compare/CompareTest.java b/easy-es-test/src/test/java/cn/easyes/test/compare/CompareTest.java similarity index 92% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/compare/CompareTest.java rename to easy-es-test/src/test/java/cn/easyes/test/compare/CompareTest.java index 2b503fb8..b2225b00 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/compare/CompareTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/compare/CompareTest.java @@ -1,9 +1,9 @@ -package cn.easyes.sample.test.compare; +package cn.easyes.test.compare; import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.mapper.DocumentMapper; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.RequestOptions; @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import javax.annotation.Resource; import java.io.IOException; import java.util.List; @@ -30,7 +31,7 @@ import java.util.List; @RunWith(SpringRunner.class) @SpringBootTest(classes = TestEasyEsApplication.class) public class CompareTest { - @Autowired + @Resource private DocumentMapper documentMapper; @Autowired private RestHighLevelClient restHighLevelClient; diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/delete/DeleteTest.java b/easy-es-test/src/test/java/cn/easyes/test/delete/DeleteTest.java similarity index 91% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/delete/DeleteTest.java rename to easy-es-test/src/test/java/cn/easyes/test/delete/DeleteTest.java index ab7de88a..5e324396 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/delete/DeleteTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/delete/DeleteTest.java @@ -1,9 +1,9 @@ -package cn.easyes.sample.test.delete; +package cn.easyes.test.delete; import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.mapper.DocumentMapper; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/geo/GeoTest.java b/easy-es-test/src/test/java/cn/easyes/test/geo/GeoTest.java similarity index 96% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/geo/GeoTest.java rename to easy-es-test/src/test/java/cn/easyes/test/geo/GeoTest.java index 20ca3564..46fe1811 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/geo/GeoTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/geo/GeoTest.java @@ -1,9 +1,9 @@ -package cn.easyes.sample.test.geo; +package cn.easyes.test.geo; import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.mapper.DocumentMapper; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.ShapeRelation; import org.elasticsearch.common.unit.DistanceUnit; diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/high/HighTest.java b/easy-es-test/src/test/java/cn/easyes/test/high/HighTest.java similarity index 91% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/high/HighTest.java rename to easy-es-test/src/test/java/cn/easyes/test/high/HighTest.java index e0638b17..56a59036 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/high/HighTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/high/HighTest.java @@ -1,12 +1,12 @@ -package cn.easyes.sample.test.high; +package cn.easyes.test.high; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; -import com.alibaba.fastjson.JSON; -import cn.easyes.core.common.OrderByParam; -import cn.easyes.core.common.PageInfo; +import cn.easyes.core.biz.OrderByParam; +import cn.easyes.core.biz.PageInfo; import cn.easyes.core.conditions.LambdaEsQueryWrapper; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.mapper.DocumentMapper; +import com.alibaba.fastjson.JSON; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.script.Script; import org.elasticsearch.search.sort.ScriptSortBuilder; @@ -108,7 +108,7 @@ public class HighTest { } @Test - public void testHighlight(){ + public void testHighlight() { LambdaEsQueryWrapper wrapper = new LambdaEsQueryWrapper<>(); String keyword = "乌拉"; wrapper.match(Document::getCustomField, keyword); @@ -123,36 +123,36 @@ public class HighTest { public void testPageQuery() { LambdaEsQueryWrapper wrapper = new LambdaEsQueryWrapper<>(); wrapper.match(Document::getTitle, "老汉"); - PageInfo documentPageInfo = documentMapper.pageQuery(wrapper,1,10); + PageInfo documentPageInfo = documentMapper.pageQuery(wrapper, 1, 10); System.out.println(documentPageInfo); } @Test - public void testSortByScore(){ + public void testSortByScore() { LambdaEsQueryWrapper wrapper = new LambdaEsQueryWrapper<>(); - wrapper.match(Document::getContent,"技术"); + wrapper.match(Document::getContent, "技术"); wrapper.sortByScore(SortOrder.ASC); List documents = documentMapper.selectList(wrapper); System.out.println(documents); } @Test - public void testOrderByParams(){ + public void testOrderByParams() { // 此处假设此参数由前端通过xxQuery类传入,排序根据标题降序,根据内容升序 String jsonParam = "[{\"order\":\"title\",\"sort\":\"DESC\"},{\"order\":\"creator\",\"sort\":\"ASC\"}]"; List orderByParams = JSON.parseArray(jsonParam, OrderByParam.class); LambdaEsQueryWrapper wrapper = new LambdaEsQueryWrapper<>(); - wrapper.match(Document::getContent,"技术") + wrapper.match(Document::getContent, "技术") .orderBy(orderByParams); List documents = documentMapper.selectList(wrapper); System.out.println(documents); } @Test - public void testSort(){ + public void testSort() { // 测试复杂排序,SortBuilder的子类非常多,这里仅演示一种, 比如有用户提出需要随机获取数据 0.9.7+ LambdaEsQueryWrapper wrapper = new LambdaEsQueryWrapper<>(); - wrapper.match(Document::getContent,"技术"); + wrapper.match(Document::getContent, "技术"); Script script = new Script("Math.random()"); ScriptSortBuilder scriptSortBuilder = new ScriptSortBuilder(script, ScriptSortBuilder.ScriptSortType.NUMBER); wrapper.sort(scriptSortBuilder); diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/ignore/IgnoreTest.java b/easy-es-test/src/test/java/cn/easyes/test/ignore/IgnoreTest.java similarity index 99% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/ignore/IgnoreTest.java rename to easy-es-test/src/test/java/cn/easyes/test/ignore/IgnoreTest.java index 486812ac..e7fe22fa 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/ignore/IgnoreTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/ignore/IgnoreTest.java @@ -1,4 +1,4 @@ -package cn.easyes.sample.test.ignore; +package cn.easyes.test.ignore; /** * 框架开发过程中的一些测试 请忽略 diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/index/IndexTest.java b/easy-es-test/src/test/java/cn/easyes/test/index/IndexTest.java similarity index 94% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/index/IndexTest.java rename to easy-es-test/src/test/java/cn/easyes/test/index/IndexTest.java index 48cfe190..4318e007 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/index/IndexTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/index/IndexTest.java @@ -1,11 +1,11 @@ -package cn.easyes.sample.test.index; +package cn.easyes.test.index; +import cn.easyes.common.enums.Analyzer; +import cn.easyes.common.enums.FieldType; import cn.easyes.core.conditions.LambdaEsIndexWrapper; -import cn.easyes.core.enums.Analyzer; -import cn.easyes.core.enums.FieldType; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.mapper.DocumentMapper; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/insert/InsertTest.java b/easy-es-test/src/test/java/cn/easyes/test/insert/InsertTest.java similarity index 92% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/insert/InsertTest.java rename to easy-es-test/src/test/java/cn/easyes/test/insert/InsertTest.java index 0c582226..c29084f8 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/insert/InsertTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/insert/InsertTest.java @@ -1,10 +1,10 @@ -package cn.easyes.sample.test.insert; +package cn.easyes.test.insert; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.entity.Faq; -import cn.easyes.sample.entity.User; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.entity.Faq; +import cn.easyes.test.entity.User; +import cn.easyes.test.mapper.DocumentMapper; import org.elasticsearch.geometry.Point; import org.junit.Assert; import org.junit.Test; @@ -51,8 +51,8 @@ public class InsertTest { faqs.add(new Faq("问题2", "回答2")); Set faqs1 = new HashSet<>(); - faqs1.add(new Faq("问题3","回答3")); - faqs1.add(new Faq("问题4","回答4")); + faqs1.add(new Faq("问题3", "回答3")); + faqs1.add(new Faq("问题4", "回答4")); users.add(new User("用户1", 18, faqs)); users.add(new User("用户2", 19, faqs1)); document.setUsers(users); diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/nested/NestedTest.java b/easy-es-test/src/test/java/cn/easyes/test/nested/NestedTest.java similarity index 91% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/nested/NestedTest.java rename to easy-es-test/src/test/java/cn/easyes/test/nested/NestedTest.java index 816e8bf9..f64d6742 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/nested/NestedTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/nested/NestedTest.java @@ -1,12 +1,12 @@ -package cn.easyes.sample.test.nested; +package cn.easyes.test.nested; import cn.easyes.core.conditions.LambdaEsQueryWrapper; import cn.easyes.core.toolkit.FieldUtils; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.entity.Faq; -import cn.easyes.sample.entity.User; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.entity.Faq; +import cn.easyes.test.entity.User; +import cn.easyes.test.mapper.DocumentMapper; import org.elasticsearch.action.search.SearchResponse; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/performance/PerformanceTest.java b/easy-es-test/src/test/java/cn/easyes/test/performance/PerformanceTest.java similarity index 97% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/performance/PerformanceTest.java rename to easy-es-test/src/test/java/cn/easyes/test/performance/PerformanceTest.java index 0dd6de10..f94e5375 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/performance/PerformanceTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/performance/PerformanceTest.java @@ -1,10 +1,10 @@ -package cn.easyes.sample.test.performance; +package cn.easyes.test.performance; -import com.alibaba.fastjson.JSON; import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.mapper.DocumentMapper; +import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.StopWatch; import org.elasticsearch.action.bulk.BulkRequest; @@ -33,7 +33,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static cn.easyes.core.constants.BaseEsConstants.DEFAULT_SIZE; +import static cn.easyes.common.constants.BaseEsConstants.DEFAULT_SIZE; /** * 性能测试 diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/select/SelectTest.java b/easy-es-test/src/test/java/cn/easyes/test/select/SelectTest.java similarity index 97% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/select/SelectTest.java rename to easy-es-test/src/test/java/cn/easyes/test/select/SelectTest.java index bc42c60c..578a585d 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/select/SelectTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/select/SelectTest.java @@ -1,10 +1,10 @@ -package cn.easyes.sample.test.select; +package cn.easyes.test.select; import cn.easyes.core.conditions.LambdaEsQueryWrapper; import cn.easyes.core.toolkit.EsWrappers; -import cn.easyes.sample.entity.Document; -import cn.easyes.sample.mapper.DocumentMapper; -import cn.easyes.sample.test.TestEasyEsApplication; +import cn.easyes.test.TestEasyEsApplication; +import cn.easyes.test.entity.Document; +import cn.easyes.test.mapper.DocumentMapper; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/easy-es-sample/src/test/java/cn/easyes/sample/test/update/UpdateTest.java b/easy-es-test/src/test/java/cn/easyes/test/update/UpdateTest.java similarity index 95% rename from easy-es-sample/src/test/java/cn/easyes/sample/test/update/UpdateTest.java rename to easy-es-test/src/test/java/cn/easyes/test/update/UpdateTest.java index 9c9e23f8..533fe456 100644 --- a/easy-es-sample/src/test/java/cn/easyes/sample/test/update/UpdateTest.java +++ b/easy-es-test/src/test/java/cn/easyes/test/update/UpdateTest.java @@ -1,9 +1,9 @@ -package cn.easyes.sample.test.update; +package cn.easyes.test.update; import cn.easyes.core.conditions.LambdaEsUpdateWrapper; -import cn.easyes.sample.EasyEsApplication; import cn.easyes.sample.entity.Document; import cn.easyes.sample.mapper.DocumentMapper; +import cn.easyes.test.TestEasyEsApplication; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; @@ -25,7 +25,7 @@ import java.util.List; * Copyright © 2021 xpc1024 All Rights Reserved **/ @RunWith(SpringRunner.class) -@SpringBootTest(classes = EasyEsApplication.class) +@SpringBootTest(classes = TestEasyEsApplication.class) public class UpdateTest { @Resource private DocumentMapper documentMapper; diff --git a/easy-es-test/src/test/resources/application.yml b/easy-es-test/src/test/resources/application.yml new file mode 100644 index 00000000..bd5b9e1e --- /dev/null +++ b/easy-es-test/src/test/resources/application.yml @@ -0,0 +1,22 @@ +easy-es: + enable: true + address: 10.20.64.228:9200 + schema: http + username: elastic + password: WG7WVmuNMtM4GwNYkyWH + keep-alive-millis: 18000 + global-config: + process-index-mode: smoothly + async-process-index-blocking: true + print-dsl: true + db-config: + map-underscore-to-camel-case: true + # table-prefix: dev_ + id-type: customize + field-strategy: not_empty + refresh-policy: immediate + enable-track-total-hits: true + enable-must2-filter: true +#logging: +# level: +# tracer: trace diff --git a/pom.xml b/pom.xml index 08bdc1bf..fd5de25e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.easy-es easy-es - 0.9.21 + 0.9.30 easy-es easy use for elastic search @@ -14,6 +14,7 @@ easy-es-parent easy-es-sample + easy-es-test @@ -23,6 +24,11 @@ + + cn.easy-es + easy-es-boot-starter + ${version} + junit junit