release v2.2.23 修复bug 与改进.

basjoo · Feb 25, 2021 · 87be500 · 87be500
1 parent 802efc3
commit 87be500
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 165 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=g:top.dcenter%20AND%20a:ums-spring-boot-starter">
-		<img alt='maven' src="https://img.shields.io/badge/UMS-2.2.22-green.svg" />
+		<img alt='maven' src="https://img.shields.io/badge/UMS-2.2.23-green.svg" />
 	</a>
 	<a target="_blank" href="http://www.opensource.org/licenses/mit-license.php">
 		<img alt='license' src="https://img.shields.io/badge/license-MIT-yellow.svg" />
@@ -28,7 +28,6 @@
     <img alt="Redis" src="https://img.shields.io/badge/Redis-5.0.3-green.svg"/>
     <img alt="SpringBoot" src="https://img.shields.io/badge/SpringBoot-2.3.4-green.svg"/>
     <img alt="SpringSecurity" src="https://img.shields.io/badge/SpringSecurity-5.4.1-green.svg"/>
-    <img alt="SpringSession" src="https://img.shields.io/badge/SpringSession-2.3.1-green.svg"/>
     <img alt="JustAuth" src="https://img.shields.io/badge/JustAuth-1.15.9-green.svg"/>
 
 </p>

diff --git a/Readme.osc.md b/Readme.osc.md
@@ -6,7 +6,7 @@
 
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=g:top.dcenter%20AND%20a:ums-spring-boot-starter">
-		<img alt='maven' src="https://img.shields.io/badge/UMS-2.2.22-green.svg" />
+		<img alt='maven' src="https://img.shields.io/badge/UMS-2.2.23-green.svg" />
 	</a>
 	<a target="_blank" href="http://www.opensource.org/licenses/mit-license.php">
 		<img alt='license' src="https://img.shields.io/badge/license-MIT-yellow.svg" />
@@ -27,7 +27,6 @@
     <img alt="Redis" src="https://img.shields.io/badge/Redis-5.0.3-green.svg"/>
     <img alt="SpringBoot" src="https://img.shields.io/badge/SpringBoot-2.3.4-green.svg"/>
     <img alt="SpringSecurity" src="https://img.shields.io/badge/SpringSecurity-5.4.1-green.svg"/>
-    <img alt="SpringSession" src="https://img.shields.io/badge/SpringSession-2.3.1-green.svg"/>
     <img alt="JustAuth" src="https://img.shields.io/badge/JustAuth-1.15.9-green.svg"/>
 
 </p>

diff --git a/UpdatedLog.md b/UpdatedLog.md
@@ -1,3 +1,11 @@
+## 2.2.23
+### Fixes and Improvements:
+1. oauth/修复: 当本地登录用户为临时登录用户时绑定异常, 当本地登录用户的 Authentication 为 JwtAuthenticationToken 时绑定异常.
+2. jwt/添加: AuthenticationToUserDetailsConverter.java 接口并实现此接口.
+3. oauth/改进: 添加 expireIn2Timestamp 重载方法.
+4. oauth/新增: BindingException.java, 重命名 UnBindingException.java.
+5. commons/优化: 接口添加 NonNull 注释标识.
+
 ## 2.2.22
 ### Fixes and Improvements:
 1. jwt/兼容性: 增加对 springBoot 高版本的 JwtAuthenticationConverter 兼容性.

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.22</version>
+        <version>2.2.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ums-commons</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.22</version>
+        <version>2.2.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jwt/pom.xml b/jwt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.22</version>
+        <version>2.2.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mdc/pom.xml b/mdc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.22</version>
+        <version>2.2.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/oauth/pom.xml b/oauth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.22</version>
+        <version>2.2.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>top.dcenter</groupId>
     <artifactId>ums</artifactId>
-    <version>2.2.22</version>
+    <version>2.2.23</version>
 
     <packaging>pom</packaging>
     <name>ums</name>
@@ -75,9 +75,6 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <java.version>1.8</java.version>
 
-        <spring-session.version>2.3.1.RELEASE</spring-session.version>
-        <spring-session-data-mongodb.version>2.3.0.RELEASE</spring-session-data-mongodb.version>
-        <spring-session-bom.version>Dragonfruit-SR1</spring-session-bom.version>
         <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
         <spring-security.version>5.4.1</spring-security.version>
 
@@ -97,167 +94,26 @@
     <dependencyManagement>
         <dependencies>
 
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.redisson</groupId>
-                <artifactId>redisson</artifactId>
-                <version>${redisson.version}</version>
-            </dependency>
-            <!-- spring-security-bom 不起作用
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-bom</artifactId>
                 <version>${spring-security.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            -->
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-acl</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-aspects</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-cas</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-config</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-core</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-crypto</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-data</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-ldap</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-messaging</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-oauth2-client</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-oauth2-core</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-oauth2-jose</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-oauth2-resource-server</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-openid</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-remoting</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-rsocket</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-saml2-service-provider</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-taglibs</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-test</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-web</artifactId>
-                <version>${spring-security.version}</version>
-            </dependency>
 
-            <!-- spring-session-bom 不起作用
             <dependency>
-                <groupId>org.springframework.session</groupId>
-                <artifactId>spring-session-bom</artifactId>
-                <version>${spring-session-bom.version}</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            -->
-            <dependency>
-                <groupId>org.springframework.session</groupId>
-                <artifactId>spring-session-jdbc</artifactId>
-                <version>${spring-session.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.session</groupId>
-                <artifactId>spring-session-data-geode</artifactId>
-                <version>${spring-session.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.session</groupId>
-                <artifactId>spring-session-hazelcast</artifactId>
-                <version>${spring-session.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.session</groupId>
-                <artifactId>spring-session-data-mongodb</artifactId>
-                <version>${spring-session-data-mongodb.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.session</groupId>
-                <artifactId>spring-session-core</artifactId>
-                <version>${spring-session.version}</version>
-            </dependency>
+
             <dependency>
-                <groupId>org.springframework.session</groupId>
-                <artifactId>spring-session-data-redis</artifactId>
-                <version>${spring-session.version}</version>
+                <groupId>org.redisson</groupId>
+                <artifactId>redisson</artifactId>
+                <version>${redisson.version}</version>
             </dependency>
 
             <dependency>

diff --git a/rbac/pom.xml b/rbac/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.22</version>
+        <version>2.2.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ums-dependencies/pom.xml b/ums-dependencies/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>top.dcenter</groupId>
     <artifactId>ums-dependencies</artifactId>
-    <version>2.2.22</version>
+    <version>2.2.23</version>
     <name>ums-dependencies</name>
     <packaging>pom</packaging>
     <description>UMS Dependencies</description>

diff --git a/ums-spring-boot-starter/pom.xml b/ums-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.22</version>
+        <version>2.2.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/vc/pom.xml b/vc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.22</version>
+        <version>2.2.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>