release v2.2.30 优化/兼容性/重构

basjoo · Mar 9, 2021 · 845b6c4 · 845b6c4
1 parent 69c6b20
commit 845b6c4
Show file tree

Hide file tree

Showing 22 changed files with 84 additions and 63 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.29-green.svg" />
+		<img alt='maven' src="https://img.shields.io/badge/UMS-2.2.30-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" />

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.29-green.svg" />
+		<img alt='maven' src="https://img.shields.io/badge/UMS-2.2.30-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" />

diff --git a/UpdatedLog.md b/UpdatedLog.md
@@ -1,3 +1,9 @@
+## 2.2.30
+### Fixes and Improvements:
+1. jwt/兼容性: 增加对 nimbus-jose-jwt:9.x.x/8.x.x 的兼容性.
+2. rbac/重构: getRolesByGroup 与 getRolesByGroupOfTenant 接口从 AbstractUriAuthorizeService 移动到 UriAuthorizeService. AbstractUriAuthorizeService 添加 updateAllGroupsOfAllTenant 接口.
+3. oauth/优化: 依赖, 删除对 spring-security-oauth2-client 的依赖.
+
 ## 2.2.29
 ### Fixes and Improvements:
 1. rbac/新增: 角色组(Group)的概念: 增加更新权限组接口, 更新权限组缓存接口, 更新权限组缓存切面, 更新权限组缓存监听器接口.

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.29</version>
+        <version>2.2.30</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.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/demo/basic-detail-example/pom.xml b/demo/basic-detail-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/demo/basic-example/pom.xml b/demo/basic-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>basic-example</artifactId>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/demo/demo/pom.xml b/demo/demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/demo/justAuth-security-oauth2-example/pom.xml b/demo/justAuth-security-oauth2-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <!-- 第三方授权登录默认会按照下面的优先级自行寻找一种 HTTP 工具依赖，java 11 HttpClient -> OkHttp3 -> apache HttpClient -> hutool-http

diff --git a/demo/jwt-example/pom.xml b/demo/jwt-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jwt-example</artifactId>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/demo/permission-example/pom.xml b/demo/permission-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>permission-example</artifactId>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <artifactId>ums</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ums-demo</artifactId>
-    <version>2.2.29</version>
     <packaging>pom</packaging>
 
     <name>ums-demo</name>
@@ -34,7 +33,6 @@
 
     <properties>
         <org.projectlombok.version>1.18.12</org.projectlombok.version>
-        <ums.version>[2.2.28,)</ums.version>
     </properties>
 
     <dependencies>

diff --git a/demo/quickStart/pom.xml b/demo/quickStart/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <dependency>

diff --git a/demo/session-detail-example/pom.xml b/demo/session-detail-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/demo/tenant-example/pom.xml b/demo/tenant-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <dependency>

diff --git a/demo/validate-code-example/pom.xml b/demo/validate-code-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ums-demo</artifactId>
         <groupId>top.dcenter</groupId>
-        <version>2.2.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>validate-code-example</artifactId>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>top.dcenter</groupId>
             <artifactId>ums-spring-boot-starter</artifactId>
-            <version>${ums.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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.29</version>
+        <version>2.2.30</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.29</version>
+    <version>2.2.30</version>
 
     <packaging>pom</packaging>
     <name>ums</name>
@@ -15,7 +15,7 @@
         access control function, support multi-tenancy, jwt, and sign etc...
     </description>
 
-<!--    <modules>
+    <modules>
         <module>commons</module>
         <module>mdc</module>
         <module>vc</module>
@@ -25,7 +25,7 @@
         <module>core</module>
         <module>ums-spring-boot-starter</module>
         <module>demo</module>
-    </modules>-->
+    </modules>
 
     <url>https://github.com/ZeroOrInfinity/UMS</url>
 
@@ -75,9 +75,6 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <java.version>1.8</java.version>
 
-        <nimbus-jose-jwt.version>8.19</nimbus-jose-jwt.version>
-        <ums-dependencies.version>2.2.29</ums-dependencies.version>
-
         <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
         <spring-security.version>5.4.1</spring-security.version>
 
@@ -99,10 +96,43 @@
 
             <dependency>
                 <groupId>top.dcenter</groupId>
-                <artifactId>ums-dependencies</artifactId>
-                <version>${ums-dependencies.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <artifactId>ums-commons</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>top.dcenter</groupId>
+                <artifactId>ums-vc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>top.dcenter</groupId>
+                <artifactId>ums-mdc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>top.dcenter</groupId>
+                <artifactId>ums-rbac</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>top.dcenter</groupId>
+                <artifactId>ums-jwt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>top.dcenter</groupId>
+                <artifactId>ums-oauth</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>top.dcenter</groupId>
+                <artifactId>ums-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>top.dcenter</groupId>
+                <artifactId>ums-spring-boot-starter</artifactId>
+                <version>${project.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.29</version>
+        <version>2.2.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>