Merge remote-tracking branch 'origin/2.x' into 2.x

# Conflicts:
#	README.md
#	UPDATE.md
#	doc/MENU.md
#	pom.xml
#	yexuejc-springboot-base/pom.xml

README.md

@@ -12,7 +12,7 @@ parent：版本封装<br/>
 base:功能封装
 
 #### 最新版本
->yexuejc.springboot.version=2.0.2 <br>
+>yexuejc.springboot.version=2.0.5 <br>
 >yexuejc.base.version=1.2.0
 
 pom.xml

UPDATE.md

@@ -1,6 +1,21 @@
 yexuejc-springboot 更新内容
 -------------------
 
+#### version ：2.0.5
+**time：2018-12-1 12:27:10** <br/>
+**branch：** master    <br/>
+**关联工程：**    <br/>
+```
+springboot-base:1.2.4
+spring-boot-starter-parent:2.0.5.RELEASE
+```
+**update：**     <br/>
+1. security多方登录第一个稳定版<br/>
+支持账号登录、短信登录、第三方授权openid登录<br/>
+功能链接[security重构-多方登录](doc/SECURITY.md)
+
+
+#
 #### version ：2.0.3
 **time：2018-11-9 16:58:06** <br/>
 **branch：** master    <br/>

doc/MENU.md

@@ -9,7 +9,7 @@
 
 ### 内部集成
 #
-* [2.0.3新增 集成security登录](SECURITY.md)
+* [(2.0.3-2.0.5)新增 集成security多方登录](SECURITY.md)
-
+单独使用例子工程：[https://github.com/yexuejc/springboot-security-login-simple](https://github.com/yexuejc/springboot-security-login-simple)
 * [1.0.6新增 针对API请求安全解决方案](PARAMS_RSA_DECRYPT_ENCRYPT.md)<br/>
 * [1.0.6新增 加密功能](PARAMS_RSA_DECRYPT_ENCRYPT.md)

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.yexuejc.springboot</groupId>
     <artifactId>yexuejc-springboot-parent</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -20,7 +20,7 @@
     </parent>
 
     <properties>
-        <yexuejc.base.version>1.2.2</yexuejc.base.version>
+        <yexuejc.base.version>1.2.4</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>

yexuejc-springboot-base/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <!-- 本地打包：使用相对关联路径 -->
         <!--<relativePath>../../yexuejc</relativePath>-->
     </parent>
@@ -62,13 +62,6 @@
             <artifactId>aliyun-sdk-oss</artifactId>
             <optional>true</optional>
         </dependency>
-        <!-- 阿里云消息服务MNS相关SDK -->
-        <dependency>
-            <groupId>com.aliyun.mns</groupId>
-            <artifactId>aliyun-sdk-mns</artifactId>
-            <classifier>jar-with-dependencies</classifier>
-            <optional>true</optional>
-        </dependency>
         <!-- JJWT -->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -77,8 +70,8 @@
         </dependency>
         <!-- 使用Redis -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <artifactId>spring-data-redis</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -86,6 +79,20 @@
             <artifactId>jedis</artifactId>
             <optional>true</optional>
         </dependency>
+        <!-- 阿里云消息服务MNS相关SDK -->
+        <dependency>
+            <groupId>com.aliyun.mns</groupId>
+            <artifactId>aliyun-sdk-mns</artifactId>
+            <classifier>jar-with-dependencies</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <optional>true</optional>
+            <scope>test</scope>
+        </dependency>
+
         <!-- HikariCP数据库连接池（JDK1.8） -->
         <dependency>
             <groupId>com.zaxxer</groupId>
@@ -105,11 +112,6 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <optional>true</optional>
             <scope>test</scope>
         </dependency>