From e3d8d2137199efaa5454dd0c73fe3fa9b9fe61ab Mon Sep 17 00:00:00 2001
From: yexuejc <940526mf>
Date: Sat, 25 Aug 2018 14:31:44 +0800
Subject: [PATCH] 1.0.14

---
 README.md                       |  2 +-
 UPDATE.md                       | 12 +++++++++
 pom.xml                         | 45 +++++++++++++++++----------------
 yexuejc-springboot-base/pom.xml |  2 +-
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index d554a6f..1908000 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ parent：版本封装<br/>
 base:功能封装
 
 #### 最新版本
->yexuejc.springboot.version=1.0.13 <br>
+>yexuejc.springboot.version=1.0.14 <br>
 >yexuejc.base.version=1.1.7
 
 pom.xml
diff --git a/UPDATE.md b/UPDATE.md
index 8162dad..01d014a 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,6 +1,18 @@
 yexuejc-springboot 更新内容
 -------------------
 
+#### version ：1.0.14
+**time：2018-8-25 14:31:05** <br/>
+**branch：** master    <br/>
+**关联工程：**    <br/>
+```
+springboot-base:1.1.7
+spring-boot-starter-parent:1.5.15.RELEASE
+```
+**update：**     <br/>
+1. 升级依赖
+#
+
 #### version ：1.0.13
 **time：2018-8-17 11:41:18** <br/>
 **branch：** master    <br/>
diff --git a/pom.xml b/pom.xml
index 5f7289b..78958f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.yexuejc.springboot</groupId>
     <artifactId>yexuejc-springboot-parent</artifactId>
-    <version>1.0.13</version>
+    <version>1.0.14</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -15,7 +15,7 @@
         <!-- spring boot父级,包含了统一版本管理,统一插件管理等 -->
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.12.RELEASE</version>
+        <version>1.5.15.RELEASE</version>
         <!--  <relativePath/> lookup parent from repository -->
     </parent>
 
@@ -29,39 +29,40 @@
 
         <maven.compiler.verbose>true</maven.compiler.verbose>
         <java.version>1.8</java.version>
-        <validation-api.version>1.1.0.Final</validation-api.version>
-        <springfox-swagger2.version>2.2.2</springfox-swagger2.version>
-        <mybatis-spring-boot-starter.version>1.2.0</mybatis-spring-boot-starter.version>
-        <mybatis.version>3.4.2</mybatis.version>
+        <validation-api.version>2.0.1.Final</validation-api.version>
+        <springfox-swagger2.version>2.2.8</springfox-swagger2.version>
+        <mybatis-spring-boot-starter.version>1.3.2</mybatis-spring-boot-starter.version>
+        <mybatis.version>3.4.6</mybatis.version>
 
-        <jjwt.version>0.7.0</jjwt.version>
-        <fastjson.version>1.1.46</fastjson.version>
-        <commons-codec.version>1.10</commons-codec.version>
+        <jjwt.version>0.9.1</jjwt.version>
+        <fastjson.version>1.2.49</fastjson.version>
+        <commons-codec.version>1.11</commons-codec.version>
         <!-- 阿里云相关 -->
-        <aliyun-java-sdk-core.version>2.1.7</aliyun-java-sdk-core.version>
-        <aliyun-java-sdk-sts.version>2.1.6</aliyun-java-sdk-sts.version>
-        <aliyun-sdk-oss.version>2.8.1</aliyun-sdk-oss.version>
-        <aliyun-java-sdk-dysmsapi.version>1.0.0</aliyun-java-sdk-dysmsapi.version>
-        <aliyun-sdk-mns.version>1.1.8</aliyun-sdk-mns.version>
+        <aliyun-java-sdk-core.version>4.0.8</aliyun-java-sdk-core.version>
+        <aliyun-java-sdk-sts.version>3.0.0</aliyun-java-sdk-sts.version>
+        <aliyun-sdk-oss.version>3.1.0</aliyun-sdk-oss.version>
+        <aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
+        <aliyun-sdk-mns.version>1.1.8.6</aliyun-sdk-mns.version>
         <!-- 支付宝相关 -->
-        <alipay-sdk-java.version>20171023143759</alipay-sdk-java.version>
+        <alipay-sdk-java.version>3.3.49.ALL</alipay-sdk-java.version>
         <!-- 微信相关 -->
         <WXPay-SDK-Java.version>0.0.4</WXPay-SDK-Java.version>
-        <postgresql.version>9.4.1212</postgresql.version>
+        <postgresql.version>42.2.4</postgresql.version>
         <!--thymeleaf 相关-->
+
         <thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
-        <thymeleaf-layout-dialect.version>2.2.2</thymeleaf-layout-dialect.version>
+        <thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
         <thymeleaf-extras-springsecurity4.version>3.0.2.RELEASE</thymeleaf-extras-springsecurity4.version>
     </properties>
     <!-- 声明包版本 继承项目自引入 -->
     <dependencyManagement>
         <dependencies>
             <!--基础包-->
-            <dependency>
-                <groupId>com.github.yexuejc</groupId>
-                <artifactId>yexuejc-base</artifactId>
-                <version>${yexuejc.base.version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>com.github.yexuejc</groupId>-->
+                <!--<artifactId>yexuejc-base</artifactId>-->
+                <!--<version>${yexuejc.base.version}</version>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>com.yexuejc.base</groupId>
                 <artifactId>yexuejc-base</artifactId>
diff --git a/yexuejc-springboot-base/pom.xml b/yexuejc-springboot-base/pom.xml
index d47436a..e8d5e8c 100644
--- a/yexuejc-springboot-base/pom.xml
+++ b/yexuejc-springboot-base/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
         <!-- 本地打包：使用相对关联路径 -->
         <!--<relativePath>../../yexuejc</relativePath>-->
     </parent>