Skip to content

microservices-platform
microservices-platform

zhangjian1949 / microservices-platform
与 Fork 源项目一致

Fork自 zlt2000 / microservices-platform

通知 6
Star 0
Fork 0
microservices-platform
microservices-platform

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 f2430b7b 编写于 作者: zlt2000's avatar zlt2000
浏览文件
操作

升级依赖

上级 91d14784
隐藏空白更改
内联 并排
Showing with 53 addition and 39 deletion
pom.xml
浏览文件 @ f2430b7b
......@@ -13,9 +13,9 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>8</java.version>
<spring-cloud-alibaba-dependencies.version>2.2.3.RELEASE</spring-cloud-alibaba-dependencies.version>
<spring-boot-dependencies.version>2.2.10.RELEASE</spring-boot-dependencies.version>
<spring-cloud-dependencies.version>Hoxton.SR8</spring-cloud-dependencies.version>
<spring-cloud-alibaba-dependencies.version>2.2.5.RC1</spring-cloud-alibaba-dependencies.version>
<spring-boot-dependencies.version>2.3.8.RELEASE</spring-boot-dependencies.version>
<spring-cloud-dependencies.version>Hoxton.SR9</spring-cloud-dependencies.version>
<commons-collections4.version>4.4</commons-collections4.version>
<swagger.version>2.9.2</swagger.version>
<swagger.ui.version>1.8.7</swagger.ui.version>
......@@ -27,7 +27,7 @@
<sharding-sphere.version>3.1.0</sharding-sphere.version>
<security-oauth2.version>2.3.8.RELEASE</security-oauth2.version>
<security-jwt.version>1.1.0.RELEASE</security-jwt.version>
<redisson-starter.version>3.11.5</redisson-starter.version>
<redisson-starter.version>3.14.1</redisson-starter.version>
<easyCaptcha.version>1.6.2</easyCaptcha.version>
<hutool.version>5.1.4</hutool.version>
<mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
......@@ -35,21 +35,23 @@
<qiniu-java-sdk>7.2.28</qiniu-java-sdk>
<easypoi.version>4.1.3</easypoi.version>
<poi.version>4.1.1</poi.version>
<spring-boot-admin.version>2.2.4</spring-boot-admin.version>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
<velocity.version>1.7</velocity.version>
<commons-configuration2.version>2.7</commons-configuration2.version>
<txlcn.version>5.0.2.RELEASE</txlcn.version>
<fastdfs-client.version>1.27.2</fastdfs-client.version>
<userAgent.version>1.21</userAgent.version>
<transmittable.version>2.11.5</transmittable.version>
<transmittable.version>2.12.0</transmittable.version>
<banner.version>1.0.2</banner.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<spring-social-security.version>1.1.6.RELEASE</spring-social-security.version>
<commons-io.version>2.6</commons-io.version>
<servlet-api.version>4.0.1</servlet-api.version>
<spring-data-elasticsearch.version>3.2.10.RELEASE</spring-data-elasticsearch.version>
<elasticsearch.version>7.8.0</elasticsearch.version>
<elasticsearch.version>7.10.2</elasticsearch.version>
<knife4j.version>2.0.5</knife4j.version>
<hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
<dubbo.version>2.7.8</dubbo.version>
<docker-maven-plugin.version>1.2.2</docker-maven-plugin.version>
<sonar.exclusions>zlt-job/**/*, zlt-register/**/*, zlt-web/**/*</sonar.exclusions>
<docker.baseImage>openjdk:8-jre-alpine</docker.baseImage>
......@@ -189,31 +191,6 @@
<version>${redisson-starter.version}</version>
</dependency>
<!-- swagger -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-bean-validators</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>${swagger.ui.version}</version>
</dependency>
<dependency>
<groupId>com.zyplayer</groupId>
<artifactId>swagger-mg-ui</artifactId>
<version>${swagger.mg.ui.version}</version>
</dependency>
<dependency>
<groupId>com.github.zlt2000</groupId>
<artifactId>swagger-butler-core</artifactId>
......@@ -363,6 +340,16 @@
<artifactId>knife4j-micro-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......
zlt-business/search-center/search-server/pom.xml
浏览文件 @ f2430b7b
......@@ -60,6 +60,11 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
</dependencies>
<build>
......
zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java
浏览文件 @ f2430b7b
......@@ -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))
))
......
zlt-business/user-center/pom.xml
浏览文件 @ f2430b7b
......@@ -76,6 +76,11 @@
<groupId>org.springframework.social</groupId>
<artifactId>spring-social-security</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
</dependencies>
<build>
......
zlt-commons/zlt-elasticsearch-spring-boot-starter/src/main/java/com/central/es/config/RestAutoConfigure.java
浏览文件 @ f2430b7b
......@@ -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());
......
zlt-demo/sharding-jdbc-demo/src/main/resources/application.yml
浏览文件 @ f2430b7b
......@@ -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
......
zlt-gateway/zuul-gateway/pom.xml
浏览文件 @ f2430b7b
......@@ -99,6 +99,11 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
</dependencies>
<build>
......
zlt-monitor/log-center/pom.xml
浏览文件 @ f2430b7b
......@@ -47,6 +47,11 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
</dependencies>
<build>
......
zlt-uaa/pom.xml
浏览文件 @ f2430b7b
......@@ -88,6 +88,11 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
</dependencies>
<build>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或