From abee95ff7de4b3514022b758044e77793f74896f Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Jun 2020 08:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7051a0a..7f29603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,8 @@
<spring-cloud-dependencies.version>Greenwich.SR5</spring-cloud-dependencies.version>
<spring-boot-dependencies.version>2.1.12.RELEASE</spring-boot-dependencies.version>
<spring-boot-maven-plugin.version>2.1.12.RELEASE</spring-boot-maven-plugin.version>
- <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
+<!-- <mysql-connector-java.version>5.1.38</mysql-connector-java.version>-->
+ <mysql-connector-java.version>8.0.13</mysql-connector-java.version>
<aliyun-sdk-oss>3.4.2</aliyun-sdk-oss>
<qiniu-java-sdk>7.2.18</qiniu-java-sdk>
<fastdfs-client.version>1.26.7</fastdfs-client.version>
@@ -58,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>
@@ -84,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>
@@ -154,11 +156,32 @@
<version>${javax.activatio.version}</version>
</dependency>
<!-- jaxb模块引用 - end -->
+
</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>
@@ -226,6 +249,21 @@
</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>
+ <groupId>com.kidgrow</groupId>
<artifactId>kidgrow-uaa-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -253,6 +291,11 @@
<dependency>
<groupId>com.kidgrow</groupId>
<artifactId>kidgrow-searchcenter-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.kidgrow</groupId>
+ <artifactId>kidgrow-rabbitmq-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -344,6 +387,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