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

---
 README.md   | 9 +++++++--
 doc/MENU.md | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 770ce92..9a6ce2d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # yexuejc-springboot
 
 ### 说明
->本分支基于 springboot 1.x <br/>
->2.x 分支基于springboot 2.x
+>基于springboot版本分别维护1.x(对应springboot1.5.16.RELEASE) 2.x(对应springboot2.0.5.RELEASE) 分支 <br>
+>master将继续同步1.x分支（后期获取会同步于2.x）
 
 
 #### 项目介绍
@@ -14,6 +14,7 @@ base:功能封装
 
 #### 最新版本
 * 1.x yexuejc.springboot.version=1.1.4 <br>
+* 2.x yexuejc.springboot.version=2.0.3 <br>
 * yexuejc.base.version=1.2.1
 
 pom.xml
@@ -77,6 +78,10 @@ pom.xml
     <tr>
         <td>com.yexuejc.springboot.base.interceptor.*</td>
         <td>拦截器</td>
+    </tr> 
+      <tr>
+        <td>com.yexuejc.springboot.base.security.*</td>
+        <td>多方登录集成</td>
     </tr>
     <tr>
         <td>com.yexuejc.springboot.base.http.*</td>
diff --git a/doc/MENU.md b/doc/MENU.md
index bcc05d7..0d41bad 100644
--- a/doc/MENU.md
+++ b/doc/MENU.md
@@ -9,7 +9,7 @@
 
 ### 内部集成
 #
-* [2.0.3新增 集成security登录](SECURITY.md)
+* [(1.1.4/2.0.3)新增 集成security多方登录](SECURITY.md)
 
 * [1.0.6新增 针对API请求安全解决方案](PARAMS_RSA_DECRYPT_ENCRYPT.md)<br/>
 * [1.0.6新增 加密功能](PARAMS_RSA_DECRYPT_ENCRYPT.md)