Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zlt2000
microservices-platform
提交
f2430b7b
microservices-platform
项目概览
zlt2000
/
microservices-platform
9 个月 前同步成功
通知
16
Star
4
Fork
3
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
microservices-platform
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f2430b7b
编写于
1月 28, 2021
作者:
zlt2000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
升级依赖
上级
91d14784
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
53 addition
and
39 deletion
+53
-39
pom.xml
pom.xml
+19
-32
zlt-business/search-center/search-server/pom.xml
zlt-business/search-center/search-server/pom.xml
+5
-0
zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java
...m/central/search/service/impl/AggregationServiceImpl.java
+2
-2
zlt-business/user-center/pom.xml
zlt-business/user-center/pom.xml
+5
-0
zlt-commons/zlt-elasticsearch-spring-boot-starter/src/main/java/com/central/es/config/RestAutoConfigure.java
...rc/main/java/com/central/es/config/RestAutoConfigure.java
+4
-4
zlt-demo/sharding-jdbc-demo/src/main/resources/application.yml
...emo/sharding-jdbc-demo/src/main/resources/application.yml
+3
-1
zlt-gateway/zuul-gateway/pom.xml
zlt-gateway/zuul-gateway/pom.xml
+5
-0
zlt-monitor/log-center/pom.xml
zlt-monitor/log-center/pom.xml
+5
-0
zlt-uaa/pom.xml
zlt-uaa/pom.xml
+5
-0
未找到文件。
pom.xml
浏览文件 @
f2430b7b
...
@@ -13,9 +13,9 @@
...
@@ -13,9 +13,9 @@
<maven.compiler.target>
1.8
</maven.compiler.target>
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<java.version>
8
</java.version>
<java.version>
8
</java.version>
<spring-cloud-alibaba-dependencies.version>
2.2.
3.RELEASE
</spring-cloud-alibaba-dependencies.version>
<spring-cloud-alibaba-dependencies.version>
2.2.
5.RC1
</spring-cloud-alibaba-dependencies.version>
<spring-boot-dependencies.version>
2.
2.10
.RELEASE
</spring-boot-dependencies.version>
<spring-boot-dependencies.version>
2.
3.8
.RELEASE
</spring-boot-dependencies.version>
<spring-cloud-dependencies.version>
Hoxton.SR
8
</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>
Hoxton.SR
9
</spring-cloud-dependencies.version>
<commons-collections4.version>
4.4
</commons-collections4.version>
<commons-collections4.version>
4.4
</commons-collections4.version>
<swagger.version>
2.9.2
</swagger.version>
<swagger.version>
2.9.2
</swagger.version>
<swagger.ui.version>
1.8.7
</swagger.ui.version>
<swagger.ui.version>
1.8.7
</swagger.ui.version>
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<sharding-sphere.version>
3.1.0
</sharding-sphere.version>
<sharding-sphere.version>
3.1.0
</sharding-sphere.version>
<security-oauth2.version>
2.3.8.RELEASE
</security-oauth2.version>
<security-oauth2.version>
2.3.8.RELEASE
</security-oauth2.version>
<security-jwt.version>
1.1.0.RELEASE
</security-jwt.version>
<security-jwt.version>
1.1.0.RELEASE
</security-jwt.version>
<redisson-starter.version>
3.1
1.5
</redisson-starter.version>
<redisson-starter.version>
3.1
4.1
</redisson-starter.version>
<easyCaptcha.version>
1.6.2
</easyCaptcha.version>
<easyCaptcha.version>
1.6.2
</easyCaptcha.version>
<hutool.version>
5.1.4
</hutool.version>
<hutool.version>
5.1.4
</hutool.version>
<mybatis-plus-boot-starter.version>
3.4.0
</mybatis-plus-boot-starter.version>
<mybatis-plus-boot-starter.version>
3.4.0
</mybatis-plus-boot-starter.version>
...
@@ -35,21 +35,23 @@
...
@@ -35,21 +35,23 @@
<qiniu-java-sdk>
7.2.28
</qiniu-java-sdk>
<qiniu-java-sdk>
7.2.28
</qiniu-java-sdk>
<easypoi.version>
4.1.3
</easypoi.version>
<easypoi.version>
4.1.3
</easypoi.version>
<poi.version>
4.1.1
</poi.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>
<velocity.version>
1.7
</velocity.version>
<commons-configuration2.version>
2.7
</commons-configuration2.version>
<commons-configuration2.version>
2.7
</commons-configuration2.version>
<txlcn.version>
5.0.2.RELEASE
</txlcn.version>
<txlcn.version>
5.0.2.RELEASE
</txlcn.version>
<fastdfs-client.version>
1.27.2
</fastdfs-client.version>
<fastdfs-client.version>
1.27.2
</fastdfs-client.version>
<userAgent.version>
1.21
</userAgent.version>
<userAgent.version>
1.21
</userAgent.version>
<transmittable.version>
2.1
1.5
</transmittable.version>
<transmittable.version>
2.1
2.0
</transmittable.version>
<banner.version>
1.0.2
</banner.version>
<banner.version>
1.0.2
</banner.version>
<commons-beanutils.version>
1.9.4
</commons-beanutils.version>
<commons-beanutils.version>
1.9.4
</commons-beanutils.version>
<spring-social-security.version>
1.1.6.RELEASE
</spring-social-security.version>
<spring-social-security.version>
1.1.6.RELEASE
</spring-social-security.version>
<commons-io.version>
2.6
</commons-io.version>
<commons-io.version>
2.6
</commons-io.version>
<servlet-api.version>
4.0.1
</servlet-api.version>
<servlet-api.version>
4.0.1
</servlet-api.version>
<spring-data-elasticsearch.version>
3.2.10.RELEASE
</spring-data-elasticsearch.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>
<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>
<docker-maven-plugin.version>
1.2.2
</docker-maven-plugin.version>
<sonar.exclusions>
zlt-job/**/*, zlt-register/**/*, zlt-web/**/*
</sonar.exclusions>
<sonar.exclusions>
zlt-job/**/*, zlt-register/**/*, zlt-web/**/*
</sonar.exclusions>
<docker.baseImage>
openjdk:8-jre-alpine
</docker.baseImage>
<docker.baseImage>
openjdk:8-jre-alpine
</docker.baseImage>
...
@@ -189,31 +191,6 @@
...
@@ -189,31 +191,6 @@
<version>
${redisson-starter.version}
</version>
<version>
${redisson-starter.version}
</version>
</dependency>
</dependency>
<!-- swagger -->
<!-- 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>
<dependency>
<groupId>
com.github.zlt2000
</groupId>
<groupId>
com.github.zlt2000
</groupId>
<artifactId>
swagger-butler-core
</artifactId>
<artifactId>
swagger-butler-core
</artifactId>
...
@@ -363,6 +340,16 @@
...
@@ -363,6 +340,16 @@
<artifactId>
knife4j-micro-spring-boot-starter
</artifactId>
<artifactId>
knife4j-micro-spring-boot-starter
</artifactId>
<version>
${knife4j.version}
</version>
<version>
${knife4j.version}
</version>
</dependency>
</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>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
...
...
zlt-business/search-center/search-server/pom.xml
浏览文件 @
f2430b7b
...
@@ -60,6 +60,11 @@
...
@@ -60,6 +60,11 @@
<groupId>
io.micrometer
</groupId>
<groupId>
io.micrometer
</groupId>
<artifactId>
micrometer-registry-prometheus
</artifactId>
<artifactId>
micrometer-registry-prometheus
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.hibernate
</groupId>
<artifactId>
hibernate-validator
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<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 {
...
@@ -152,7 +152,7 @@ public class AggregationServiceImpl implements IAggregationService {
//时区相差8小时
//时区相差8小时
.
timeZone
(
ZoneId
.
of
(
CommonConstant
.
TIME_ZONE_GMT8
))
.
timeZone
(
ZoneId
.
of
(
CommonConstant
.
TIME_ZONE_GMT8
))
.
minDocCount
(
0L
)
.
minDocCount
(
0L
)
.
extendedBounds
(
new
Extended
Bounds
(
.
extendedBounds
(
new
Long
Bounds
(
curDateTime
.
minusDays
(
1
).
format
(
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
DATETIME_FORMAT
)),
curDateTime
.
minusDays
(
1
).
format
(
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
DATETIME_FORMAT
)),
curDateTime
.
format
(
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
DATETIME_FORMAT
))
curDateTime
.
format
(
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
DATETIME_FORMAT
))
))
))
...
@@ -178,7 +178,7 @@ public class AggregationServiceImpl implements IAggregationService {
...
@@ -178,7 +178,7 @@ public class AggregationServiceImpl implements IAggregationService {
//时区相差8小时
//时区相差8小时
.
timeZone
(
ZoneId
.
of
(
CommonConstant
.
TIME_ZONE_GMT8
))
.
timeZone
(
ZoneId
.
of
(
CommonConstant
.
TIME_ZONE_GMT8
))
.
minDocCount
(
0L
)
.
minDocCount
(
0L
)
.
extendedBounds
(
new
Extended
Bounds
(
.
extendedBounds
(
new
Long
Bounds
(
localDate
.
minusDays
(
6
).
format
(
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
DATE_FORMAT
)),
localDate
.
minusDays
(
6
).
format
(
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
DATE_FORMAT
)),
localDate
.
format
(
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
DATE_FORMAT
))
localDate
.
format
(
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
DATE_FORMAT
))
))
))
...
...
zlt-business/user-center/pom.xml
浏览文件 @
f2430b7b
...
@@ -76,6 +76,11 @@
...
@@ -76,6 +76,11 @@
<groupId>
org.springframework.social
</groupId>
<groupId>
org.springframework.social
</groupId>
<artifactId>
spring-social-security
</artifactId>
<artifactId>
spring-social-security
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.hibernate
</groupId>
<artifactId>
hibernate-validator
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<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;
...
@@ -8,8 +8,8 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
import
org.elasticsearch.client.RestClientBuilder
;
import
org.elasticsearch.client.RestClientBuilder
;
import
org.elasticsearch.client.RestHighLevelClient
;
import
org.elasticsearch.client.RestHighLevelClient
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.elasticsearch.
rest.RestClientBuilderCustomizer
;
import
org.springframework.boot.autoconfigure.elasticsearch.
ElasticsearchRestClientProperties
;
import
org.springframework.boot.autoconfigure.elasticsearch.
rest.RestClientProperties
;
import
org.springframework.boot.autoconfigure.elasticsearch.
RestClientBuilderCustomizer
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.boot.context.properties.PropertyMapper
;
import
org.springframework.boot.context.properties.PropertyMapper
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
...
@@ -28,7 +28,7 @@ import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
...
@@ -28,7 +28,7 @@ import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
public
class
RestAutoConfigure
{
public
class
RestAutoConfigure
{
@Bean
@Bean
public
RestClientBuilderCustomizer
restClientBuilderCustomizer
(
RestClientPoolProperties
poolProperties
public
RestClientBuilderCustomizer
restClientBuilderCustomizer
(
RestClientPoolProperties
poolProperties
,
RestClientProperties
restProperties
)
{
,
Elasticsearch
RestClientProperties
restProperties
)
{
return
(
builder
)
->
{
return
(
builder
)
->
{
setRequestConfig
(
builder
,
poolProperties
);
setRequestConfig
(
builder
,
poolProperties
);
...
@@ -51,7 +51,7 @@ public class RestAutoConfigure {
...
@@ -51,7 +51,7 @@ public class RestAutoConfigure {
/**
/**
* 异步httpclient连接数配置
* 异步httpclient连接数配置
*/
*/
private
void
setHttpClientConfig
(
RestClientBuilder
builder
,
RestClientPoolProperties
poolProperties
,
RestClientProperties
restProperties
){
private
void
setHttpClientConfig
(
RestClientBuilder
builder
,
RestClientPoolProperties
poolProperties
,
Elasticsearch
RestClientProperties
restProperties
){
builder
.
setHttpClientConfigCallback
(
httpClientBuilder
->
{
builder
.
setHttpClientConfigCallback
(
httpClientBuilder
->
{
httpClientBuilder
.
setMaxConnTotal
(
poolProperties
.
getMaxConnectNum
())
httpClientBuilder
.
setMaxConnTotal
(
poolProperties
.
getMaxConnectNum
())
.
setMaxConnPerRoute
(
poolProperties
.
getMaxConnectPerRoute
());
.
setMaxConnPerRoute
(
poolProperties
.
getMaxConnectPerRoute
());
...
...
zlt-demo/sharding-jdbc-demo/src/main/resources/application.yml
浏览文件 @
f2430b7b
...
@@ -6,10 +6,12 @@ spring:
...
@@ -6,10 +6,12 @@ spring:
active
:
sharding-databases
active
:
sharding-databases
application
:
application
:
name
:
sharding-jdbc-demo
name
:
sharding-jdbc-demo
main
:
allow-bean-definition-overriding
:
true
zlt
:
zlt
:
datasource
:
datasource
:
ip
:
192.168.28.13
1
ip
:
192.168.28.13
0
username
:
root
username
:
root
password
:
1q2w3e4r
password
:
1q2w3e4r
...
...
zlt-gateway/zuul-gateway/pom.xml
浏览文件 @
f2430b7b
...
@@ -99,6 +99,11 @@
...
@@ -99,6 +99,11 @@
<artifactId>
spring-boot-configuration-processor
</artifactId>
<artifactId>
spring-boot-configuration-processor
</artifactId>
<optional>
true
</optional>
<optional>
true
</optional>
</dependency>
</dependency>
<dependency>
<groupId>
org.hibernate
</groupId>
<artifactId>
hibernate-validator
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
zlt-monitor/log-center/pom.xml
浏览文件 @
f2430b7b
...
@@ -47,6 +47,11 @@
...
@@ -47,6 +47,11 @@
<groupId>
io.micrometer
</groupId>
<groupId>
io.micrometer
</groupId>
<artifactId>
micrometer-registry-prometheus
</artifactId>
<artifactId>
micrometer-registry-prometheus
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.hibernate
</groupId>
<artifactId>
hibernate-validator
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
zlt-uaa/pom.xml
浏览文件 @
f2430b7b
...
@@ -88,6 +88,11 @@
...
@@ -88,6 +88,11 @@
<groupId>
io.micrometer
</groupId>
<groupId>
io.micrometer
</groupId>
<artifactId>
micrometer-registry-prometheus
</artifactId>
<artifactId>
micrometer-registry-prometheus
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.hibernate
</groupId>
<artifactId>
hibernate-validator
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录