From 9099a62636697bcf1fd849d00194c1a1e0968788 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Sat, 22 Aug 2020 16:58:31 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
pom.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c6858c..e4e0d40 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,12 +85,15 @@
<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>
<docker.image.prefix>kidgrow</docker.image.prefix>
<!--docker harbor地址-->
<docker.repostory>182.92.99.224:8081</docker.repostory>
+ <com.belerweb.pinyin4j.version>2.5.1</com.belerweb.pinyin4j.version>
+ <net.coobird.thumbnailator.version>0.4.11</net.coobird.thumbnailator.version>
</properties>
<dependencies>
@@ -155,11 +158,42 @@
<version>${javax.activatio.version}</version>
</dependency>
<!-- jaxb模块引用 - end -->
+ <dependency>
+ <groupId>com.belerweb</groupId>
+ <artifactId>pinyin4j</artifactId>
+ <version>${com.belerweb.pinyin4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.coobird</groupId>
+ <artifactId>thumbnailator</artifactId>
+ <version>${net.coobird.thumbnailator.version}</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 +257,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 +399,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