From 0d977a61765b0c609ecc578e7c548aafa25da6ef Mon Sep 17 00:00:00 2001
From: maxf <1107047387@qq.com>
Date: Fri, 9 Nov 2018 16:57:11 +0800
Subject: [PATCH] =?UTF-8?q?1.1.4=20=E9=9B=86=E6=88=90springboot=20security?=
 =?UTF-8?q?=20=E5=A4=9A=E6=96=B9=E7=99=BB=E5=BD=95=20=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                       |  4 ++--
 UPDATE.md                       | 14 ++++++++++++++
 pom.xml                         |  4 ++--
 yexuejc-springboot-base/pom.xml |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 87f6ab0..770ce92 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ parent：版本封装<br/>
 base:功能封装
 
 #### 最新版本
-* 1.x yexuejc.springboot.version=1.1.3 <br>
-* yexuejc.base.version=1.2.0
+* 1.x yexuejc.springboot.version=1.1.4 <br>
+* yexuejc.base.version=1.2.1
 
 pom.xml
 ```
diff --git a/UPDATE.md b/UPDATE.md
index 941bc7b..a207ab2 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,6 +1,20 @@
 yexuejc-springboot 更新内容
 -------------------
 
+#### version ：1.1.4
+**time：2018-11-9 16:55:53** <br/>
+**branch：** master    <br/>
+**关联工程：**    <br/>
+```
+springboot-base:1.2.1
+spring-boot-starter-parent:1.5.16.RELEASE
+```
+**update：**     <br/>
+1. 集成springboot security 多方登录
+2. 文档拆分
+#
+
+
 #### version ：1.1.3
 **time：2018-10-27 16:40:36** <br/>
 **branch：** master    <br/>
diff --git a/pom.xml b/pom.xml
index 8bd946b..456578a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.yexuejc.springboot</groupId>
     <artifactId>yexuejc-springboot-parent</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -20,7 +20,7 @@
     </parent>
 
     <properties>
-        <yexuejc.base.version>1.2.0</yexuejc.base.version>
+        <yexuejc.base.version>1.2.1</yexuejc.base.version>
         <repos.yexuejc.url>https://nexus.yexuejc.club/repository/</repos.yexuejc.url>
 
         <repos.aliyun.url>http://maven.aliyun.com/nexus/content/groups/public</repos.aliyun.url>
diff --git a/yexuejc-springboot-base/pom.xml b/yexuejc-springboot-base/pom.xml
index 67e1525..80a3e95 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.1.3</version>
+        <version>1.1.4</version>
         <!-- 本地打包：使用相对关联路径 -->
         <!--<relativePath>../../yexuejc</relativePath>-->
     </parent>