From 1d87d61cb31912ae9f5856cbfe1d763b27156afe Mon Sep 17 00:00:00 2001
From: er <913652501@qq.com>
Date: Fri, 03 Apr 2020 09:41:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 pom.xml |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7051a0a..337b868 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>
@@ -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,6 +156,7 @@
             <version>${javax.activatio.version}</version>
         </dependency>
         <!-- jaxb模块引用 - end -->
+
     </dependencies>
 
     <dependencyManagement>
@@ -226,6 +229,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 +271,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 +367,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