From 3bafc9db29ba2dca9e3f7bb8811a7c54b2bdec19 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 15 Aug 2020 12:13:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 pom.xml |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d07065..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>
@@ -92,6 +92,8 @@
         <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>
@@ -156,6 +158,16 @@
             <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>
 

--
Gitblit v1.8.0