From f2430b7b6a9fdcf752ac3db1d738a5fed0cd5c20 Mon Sep 17 00:00:00 2001 From: zlt2000 Date: Thu, 28 Jan 2021 21:03:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 51 +++++++------------ .../search-center/search-server/pom.xml | 5 ++ .../service/impl/AggregationServiceImpl.java | 4 +- zlt-business/user-center/pom.xml | 5 ++ .../central/es/config/RestAutoConfigure.java | 8 +-- .../src/main/resources/application.yml | 4 +- zlt-gateway/zuul-gateway/pom.xml | 5 ++ zlt-monitor/log-center/pom.xml | 5 ++ zlt-uaa/pom.xml | 5 ++ 9 files changed, 53 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index 5a47c1f..cd1c187 100644 --- a/pom.xml +++ b/pom.xml @@ -13,9 +13,9 @@ 1.8 UTF-8 8 - 2.2.3.RELEASE - 2.2.10.RELEASE - Hoxton.SR8 + 2.2.5.RC1 + 2.3.8.RELEASE + Hoxton.SR9 4.4 2.9.2 1.8.7 @@ -27,7 +27,7 @@ 3.1.0 2.3.8.RELEASE 1.1.0.RELEASE - 3.11.5 + 3.14.1 1.6.2 5.1.4 3.4.0 @@ -35,21 +35,23 @@ 7.2.28 4.1.3 4.1.1 - 2.2.4 + 2.3.1 1.7 2.7 5.0.2.RELEASE 1.27.2 1.21 - 2.11.5 + 2.12.0 1.0.2 1.9.4 1.1.6.RELEASE 2.6 4.0.1 3.2.10.RELEASE - 7.8.0 + 7.10.2 2.0.5 + 6.2.0.Final + 2.7.8 1.2.2 zlt-job/**/*, zlt-register/**/*, zlt-web/**/* openjdk:8-jre-alpine @@ -189,31 +191,6 @@ ${redisson-starter.version} - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.springfox - springfox-bean-validators - ${swagger.version} - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - com.github.xiaoymin - swagger-bootstrap-ui - ${swagger.ui.version} - - - com.zyplayer - swagger-mg-ui - ${swagger.mg.ui.version} - com.github.zlt2000 swagger-butler-core @@ -363,6 +340,16 @@ knife4j-micro-spring-boot-starter ${knife4j.version} + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + + + org.apache.dubbo + dubbo + ${dubbo.version} + org.springframework.boot diff --git a/zlt-business/search-center/search-server/pom.xml b/zlt-business/search-center/search-server/pom.xml index 12817f2..ca3af72 100644 --- a/zlt-business/search-center/search-server/pom.xml +++ b/zlt-business/search-center/search-server/pom.xml @@ -60,6 +60,11 @@ io.micrometer micrometer-registry-prometheus + + + org.hibernate + hibernate-validator + diff --git a/zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java b/zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java index b0ec5ec..32a6f08 100644 --- a/zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java +++ b/zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java @@ -152,7 +152,7 @@ public class AggregationServiceImpl implements IAggregationService { //时区相差8小时 .timeZone(ZoneId.of(CommonConstant.TIME_ZONE_GMT8)) .minDocCount(0L) - .extendedBounds(new ExtendedBounds( + .extendedBounds(new LongBounds( curDateTime.minusDays(1).format(DateTimeFormatter.ofPattern(CommonConstant.DATETIME_FORMAT)), curDateTime.format(DateTimeFormatter.ofPattern(CommonConstant.DATETIME_FORMAT)) )) @@ -178,7 +178,7 @@ public class AggregationServiceImpl implements IAggregationService { //时区相差8小时 .timeZone(ZoneId.of(CommonConstant.TIME_ZONE_GMT8)) .minDocCount(0L) - .extendedBounds(new ExtendedBounds( + .extendedBounds(new LongBounds( localDate.minusDays(6).format(DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT)), localDate.format(DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT)) )) diff --git a/zlt-business/user-center/pom.xml b/zlt-business/user-center/pom.xml index a6d0d42..3be8cc9 100644 --- a/zlt-business/user-center/pom.xml +++ b/zlt-business/user-center/pom.xml @@ -76,6 +76,11 @@ org.springframework.social spring-social-security + + + org.hibernate + hibernate-validator + diff --git a/zlt-commons/zlt-elasticsearch-spring-boot-starter/src/main/java/com/central/es/config/RestAutoConfigure.java b/zlt-commons/zlt-elasticsearch-spring-boot-starter/src/main/java/com/central/es/config/RestAutoConfigure.java index 6249e9b..4071183 100644 --- a/zlt-commons/zlt-elasticsearch-spring-boot-starter/src/main/java/com/central/es/config/RestAutoConfigure.java +++ b/zlt-commons/zlt-elasticsearch-spring-boot-starter/src/main/java/com/central/es/config/RestAutoConfigure.java @@ -8,8 +8,8 @@ import org.apache.http.impl.client.BasicCredentialsProvider; import org.elasticsearch.client.RestClientBuilder; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientBuilderCustomizer; -import org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientProperties; +import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientProperties; +import org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCustomizer; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.PropertyMapper; import org.springframework.context.annotation.Bean; @@ -28,7 +28,7 @@ import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; public class RestAutoConfigure { @Bean public RestClientBuilderCustomizer restClientBuilderCustomizer(RestClientPoolProperties poolProperties - , RestClientProperties restProperties) { + , ElasticsearchRestClientProperties restProperties) { return (builder) -> { setRequestConfig(builder, poolProperties); @@ -51,7 +51,7 @@ public class RestAutoConfigure { /** * 异步httpclient连接数配置 */ - private void setHttpClientConfig(RestClientBuilder builder, RestClientPoolProperties poolProperties, RestClientProperties restProperties){ + private void setHttpClientConfig(RestClientBuilder builder, RestClientPoolProperties poolProperties, ElasticsearchRestClientProperties restProperties){ builder.setHttpClientConfigCallback(httpClientBuilder -> { httpClientBuilder.setMaxConnTotal(poolProperties.getMaxConnectNum()) .setMaxConnPerRoute(poolProperties.getMaxConnectPerRoute()); diff --git a/zlt-demo/sharding-jdbc-demo/src/main/resources/application.yml b/zlt-demo/sharding-jdbc-demo/src/main/resources/application.yml index 836cbdd..4701cd5 100644 --- a/zlt-demo/sharding-jdbc-demo/src/main/resources/application.yml +++ b/zlt-demo/sharding-jdbc-demo/src/main/resources/application.yml @@ -6,10 +6,12 @@ spring: active: sharding-databases application: name: sharding-jdbc-demo + main: + allow-bean-definition-overriding: true zlt: datasource: - ip: 192.168.28.131 + ip: 192.168.28.130 username: root password: 1q2w3e4r diff --git a/zlt-gateway/zuul-gateway/pom.xml b/zlt-gateway/zuul-gateway/pom.xml index 4947d00..56ea43f 100644 --- a/zlt-gateway/zuul-gateway/pom.xml +++ b/zlt-gateway/zuul-gateway/pom.xml @@ -99,6 +99,11 @@ spring-boot-configuration-processor true + + + org.hibernate + hibernate-validator + diff --git a/zlt-monitor/log-center/pom.xml b/zlt-monitor/log-center/pom.xml index d8108b0..61f3faa 100644 --- a/zlt-monitor/log-center/pom.xml +++ b/zlt-monitor/log-center/pom.xml @@ -47,6 +47,11 @@ io.micrometer micrometer-registry-prometheus + + + org.hibernate + hibernate-validator + diff --git a/zlt-uaa/pom.xml b/zlt-uaa/pom.xml index f93189b..29e23c5 100644 --- a/zlt-uaa/pom.xml +++ b/zlt-uaa/pom.xml @@ -88,6 +88,11 @@ io.micrometer micrometer-registry-prometheus + + + org.hibernate + hibernate-validator + -- GitLab