diff --git a/README.md b/README.md index 49e64725..308c871f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

- maven + maven license diff --git a/Readme.osc.md b/Readme.osc.md index bb32547a..a7466d8e 100644 --- a/Readme.osc.md +++ b/Readme.osc.md @@ -6,7 +6,7 @@

- maven + maven license diff --git a/UpdatedLog.md b/UpdatedLog.md index d73e0476..b00ab220 100644 --- a/UpdatedLog.md +++ b/UpdatedLog.md @@ -1,3 +1,7 @@ +## 2.2.35 +### Fixes and Improvements: +1. rbac/新增: 添加 getMenuByRole 与 getMenuByRoleOfTenant 接口, 以适用与菜单 与 权限分开设计的权限模型; 添加 getRolesOfUser 与 getMenusOfUser 接口并实现 getRolesOfUser 接口. + ## 2.2.34 ### Fixes and Improvements: 1. rbac/重构: UpdateCacheOfRolesResourcesService 添加 initAllAuthorities() 接口, AbstractUriAuthorizeService 删除 updateAuthoritiesOfAllXXX() 接口, diff --git a/commons/pom.xml b/commons/pom.xml index 7a9f7d20..13ceae45 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0 ums-commons diff --git a/core/pom.xml b/core/pom.xml index 15a1ca2b..709dadcf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/demo/basic-detail-example/pom.xml b/demo/basic-detail-example/pom.xml index 70ab35d4..9d6cd3fe 100644 --- a/demo/basic-detail-example/pom.xml +++ b/demo/basic-detail-example/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/demo/basic-example/pom.xml b/demo/basic-example/pom.xml index e3e814a2..ceadf8a3 100644 --- a/demo/basic-example/pom.xml +++ b/demo/basic-example/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 basic-example diff --git a/demo/demo/pom.xml b/demo/demo/pom.xml index d42f2f4b..feb9368f 100644 --- a/demo/demo/pom.xml +++ b/demo/demo/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/demo/justAuth-security-oauth2-example/pom.xml b/demo/justAuth-security-oauth2-example/pom.xml index e525e3bc..94dbe965 100644 --- a/demo/justAuth-security-oauth2-example/pom.xml +++ b/demo/justAuth-security-oauth2-example/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/demo/jwt-example/pom.xml b/demo/jwt-example/pom.xml index d31b1b71..a49b69b9 100644 --- a/demo/jwt-example/pom.xml +++ b/demo/jwt-example/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 jwt-example diff --git a/demo/permission-example/Readme.md b/demo/permission-example/Readme.md index a17cb62c..8c907065 100644 --- a/demo/permission-example/Readme.md +++ b/demo/permission-example/Readme.md @@ -1,3 +1,84 @@ +# 权限表 +```sql +CREATE TABLE `sys_resources` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `available` bit(1) DEFAULT NULL, + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建记录时间', + `external` bit(1) DEFAULT NULL, + `icon` varchar(255) DEFAULT NULL, + `name` varchar(255) DEFAULT NULL, + `parent_id` bigint(20) DEFAULT NULL, + `permission` varchar(255) DEFAULT NULL, + `sort` int(11) DEFAULT NULL, + `type` varchar(255) DEFAULT NULL, + `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新记录时间', + `url` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_sys_resource_parent_id` (`parent_id`) +) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 + +CREATE TABLE `sys_role` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `available` bit(1) DEFAULT NULL, + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建记录时间', + `description` varchar(255) DEFAULT NULL, + `name` varchar(255) DEFAULT NULL, + `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新记录时间', + PRIMARY KEY (`id`) +) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 + +CREATE TABLE `sys_role_resources` ( + `resources_id` bigint(20) NOT NULL, + `role_id` bigint(20) NOT NULL, + `create_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + PRIMARY KEY (`resources_id`,`role_id`), + KEY `idx_role_id` (`role_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 + +CREATE TABLE `sys_user` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `authorities` varchar(255) DEFAULT NULL, + `avatar` varchar(255) DEFAULT NULL, + `birthday` datetime DEFAULT NULL, + `blog` varchar(255) DEFAULT NULL, + `company` varchar(255) DEFAULT NULL, + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建记录时间', + `email` varchar(255) DEFAULT NULL, + `experience` int(11) DEFAULT NULL, + `gender` int(11) DEFAULT NULL, + `last_login_ip` varchar(255) DEFAULT NULL, + `last_login_time` datetime DEFAULT NULL, + `location` varchar(255) DEFAULT NULL, + `login_count` int(11) DEFAULT NULL, + `mobile` varchar(255) DEFAULT NULL, + `nickname` varchar(255) DEFAULT NULL, + `notification` int(11) DEFAULT NULL, + `password` varchar(255) DEFAULT NULL, + `privacy` int(11) DEFAULT NULL, + `qq` varchar(255) DEFAULT NULL, + `reg_ip` varchar(255) DEFAULT NULL, + `remark` varchar(255) DEFAULT NULL, + `score` int(11) DEFAULT NULL, + `source` int(11) DEFAULT NULL, + `status` tinyint(4) DEFAULT '0' COMMENT '用户状态: 0 为 正常, 1 为删除', + `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新记录时间', + `user_type` int(11) DEFAULT NULL, + `username` varchar(255) DEFAULT NULL, + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 + +CREATE TABLE `sys_user_role` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建记录时间', + `role_id` bigint(20) DEFAULT NULL, + `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新记录时间', + `user_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 +``` + # 权限更新及权限缓存实时更新时序图 ![权限更新及权限缓存实时更新时序图](../../doc/RBAC%20权限更新及权限缓存实时更新流程.png) \ No newline at end of file diff --git a/demo/permission-example/pom.xml b/demo/permission-example/pom.xml index 833041e9..c56bf26c 100644 --- a/demo/permission-example/pom.xml +++ b/demo/permission-example/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 permission-example diff --git a/demo/pom.xml b/demo/pom.xml index 63578c67..dcc45f5a 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/demo/quickStart/pom.xml b/demo/quickStart/pom.xml index 9aa9c83e..0f543d62 100644 --- a/demo/quickStart/pom.xml +++ b/demo/quickStart/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/demo/session-detail-example/pom.xml b/demo/session-detail-example/pom.xml index c9f360e8..cf2c8acf 100644 --- a/demo/session-detail-example/pom.xml +++ b/demo/session-detail-example/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/demo/tenant-example/pom.xml b/demo/tenant-example/pom.xml index 002b544e..609d1466 100644 --- a/demo/tenant-example/pom.xml +++ b/demo/tenant-example/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/demo/validate-code-example/pom.xml b/demo/validate-code-example/pom.xml index ddadb4fc..521a928d 100644 --- a/demo/validate-code-example/pom.xml +++ b/demo/validate-code-example/pom.xml @@ -5,7 +5,7 @@ ums-demo top.dcenter - 2.2.34 + 2.2.35 4.0.0 validate-code-example diff --git a/jwt/pom.xml b/jwt/pom.xml index 14c3e2e1..e4c72bd7 100644 --- a/jwt/pom.xml +++ b/jwt/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/mdc/pom.xml b/mdc/pom.xml index fb1501af..e9b8fda8 100644 --- a/mdc/pom.xml +++ b/mdc/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/oauth/pom.xml b/oauth/pom.xml index 8b834fc3..e4bc7299 100644 --- a/oauth/pom.xml +++ b/oauth/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/pom.xml b/pom.xml index 8e221970..70aba217 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ top.dcenter ums - 2.2.34 + 2.2.35 pom ums diff --git a/rbac/pom.xml b/rbac/pom.xml index 9541283e..a76196c0 100644 --- a/rbac/pom.xml +++ b/rbac/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/ums-dependencies/pom.xml b/ums-dependencies/pom.xml index 0e144db4..b8ad66d3 100644 --- a/ums-dependencies/pom.xml +++ b/ums-dependencies/pom.xml @@ -6,7 +6,7 @@ top.dcenter ums-dependencies - 2.2.34 + 2.2.35 ums-dependencies pom UMS Dependencies diff --git a/ums-spring-boot-starter/pom.xml b/ums-spring-boot-starter/pom.xml index 3ea97a4f..d0877203 100644 --- a/ums-spring-boot-starter/pom.xml +++ b/ums-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0 diff --git a/vc/pom.xml b/vc/pom.xml index ff1420ea..8e304d5d 100644 --- a/vc/pom.xml +++ b/vc/pom.xml @@ -5,7 +5,7 @@ ums top.dcenter - 2.2.34 + 2.2.35 4.0.0