From 3053f3c6a8ea26d204e83e9f17a418d6928da5bc Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Tue, 16 Jun 2020 19:19:11 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- pom.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 1 deletions(-) diff --git a/pom.xml b/pom.xml index 1c6858c..18c965b 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ <swagger.mg.ui.version>1.0.6</swagger.mg.ui.version> <swagger.butler.version>2.0.1</swagger.butler.version> <commons-collections4.version>4.4</commons-collections4.version> - <fastjson.version>1.2.62</fastjson.version> + <fastjson.version>1.2.70</fastjson.version> <httpclient.version>4.5.6</httpclient.version> <modle-mapper.version>2.3.4</modle-mapper.version> <security-oauth2.version>2.4.0.RELEASE</security-oauth2.version> @@ -85,6 +85,7 @@ <javax.activatio.version>1.1.1</javax.activatio.version> <jaxb-runtime.version>2.3.0</jaxb-runtime.version> <jaxb-impl.version>2.3.0</jaxb-impl.version> + <zuul-ratelimit.version>2.0.4.RELEASE</zuul-ratelimit.version> <sonar.exclusions>kidgrow-jobs/**/* kidgrow-web/**/*</sonar.exclusions> <docker.baseImage>openjdk:8-jre-alpine</docker.baseImage> <docker.volumes>/tmp</docker.volumes> @@ -155,11 +156,42 @@ <version>${javax.activatio.version}</version> </dependency> <!-- jaxb模块引用 - end --> + <dependency> + <groupId>com.belerweb</groupId> + <artifactId>pinyin4j</artifactId> + <version>2.5.1</version> + </dependency> + <dependency> + <groupId>net.coobird</groupId> + <artifactId>thumbnailator</artifactId> + <version>0.4.11</version> + </dependency> + </dependencies> <dependencyManagement> <dependencies> <!-- 自定义 starter --> + <dependency> + <groupId>com.kidgrow</groupId> + <artifactId>kidgrow-plugin-sms-center-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.kidgrow</groupId> + <artifactId>kidgrow-plugin-sms-biz</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.kidgrow</groupId> + <artifactId>kidgrow-plugin-sms-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.kidgrow</groupId> + <artifactId>kidgrow-plugin-sms</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-config</artifactId> @@ -223,6 +255,21 @@ <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-usercenter-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.kidgrow</groupId> + <artifactId>kidgrow-opration-center-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.kidgrow</groupId> + <artifactId>kidgrow-opration-center-biz</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.kidgrow</groupId> + <artifactId>kidgrow-opration-center-server</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -350,6 +397,12 @@ <artifactId>mybatis-plus</artifactId> <version>${mybatis-plus-boot-starter.version}</version> </dependency> + <!--网关限流插件--> + <dependency> + <groupId>com.marcosbarbero.cloud</groupId> + <artifactId>spring-cloud-zuul-ratelimit</artifactId> + <version>${zuul-ratelimit.version}</version> + </dependency> <dependency> <groupId>p6spy</groupId> <artifactId>p6spy</artifactId> -- Gitblit v1.8.0