From 364a7163880b22b7ef9068a71bf6d2598d87b185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=99=93=E4=B8=9C?= <763795151@qq.com> Date: Sun, 3 Dec 2023 22:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=87=8C=E5=8F=91=E9=80=81=E7=BB=9F=E8=AE=A1=E7=9A=84?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xuxd/kafka/console/config/AuthConfig.java | 5 +++++ .../com/xuxd/kafka/console/controller/MessageController.java | 1 + src/main/java/com/xuxd/kafka/console/dao/init/DataInit.java | 3 +++ src/main/resources/application.yml | 2 ++ src/main/resources/db/data-h2.sql | 5 +++-- ui/src/views/message/Message.vue | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/xuxd/kafka/console/config/AuthConfig.java b/src/main/java/com/xuxd/kafka/console/config/AuthConfig.java index e727cb1..78c5c31 100644 --- a/src/main/java/com/xuxd/kafka/console/config/AuthConfig.java +++ b/src/main/java/com/xuxd/kafka/console/config/AuthConfig.java @@ -46,4 +46,9 @@ public class AuthConfig { * @since 1.0.9 */ private boolean enableClusterAuthority; + + /** + * 重新加载权限信息，版本升级替换jar包的时候，新版本里增加了新的权限菜单，这个设置为true. + */ + private boolean reloadPermission; } diff --git a/src/main/java/com/xuxd/kafka/console/controller/MessageController.java b/src/main/java/com/xuxd/kafka/console/controller/MessageController.java index b220e2a..e644c17 100644 --- a/src/main/java/com/xuxd/kafka/console/controller/MessageController.java +++ b/src/main/java/com/xuxd/kafka/console/controller/MessageController.java @@ -75,6 +75,7 @@ public class MessageController { return messageService.delete(messages); } + @Permission("message:send-statistics") @PostMapping("/send/statistics") public Object sendStatistics(@RequestBody QuerySendStatisticsDTO dto) { if (StringUtils.isEmpty(dto.getTopic())) { diff --git a/src/main/java/com/xuxd/kafka/console/dao/init/DataInit.java b/src/main/java/com/xuxd/kafka/console/dao/init/DataInit.java index 71a9e0a..f87e006 100644 --- a/src/main/java/com/xuxd/kafka/console/dao/init/DataInit.java +++ b/src/main/java/com/xuxd/kafka/console/dao/init/DataInit.java @@ -71,6 +71,9 @@ public class DataInit implements SmartInitializingSingleton { initData(connection, SqlParse.ROLE_TABLE); } + if (authConfig.isReloadPermission()) { + permissionMapper.delete(null); + } Integer permCount = permissionMapper.selectCount(null); if (permCount == null || permCount == 0) { initData(connection, SqlParse.PERM_TABLE); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e794502..cc3a245 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -57,6 +57,8 @@ auth: hide-cluster-property: true # 是否启用集群的数据权限，如果启用，可以配置哪些角色看到哪些集群. 不启用，即使配置了也不生效，每个角色的用户都可以看到所有集群信息. enable-cluster-authority: false + # 重新加载权限信息，版本升级替换jar包的时候，新版本里增加了新的权限菜单，这个设置为true.然后在角色列表里分配新增加的菜单权限. + reload-permission: true log: # 是否打印操作日志（增加、删除、编辑） print-controller-log: true \ No newline at end of file diff --git a/src/main/resources/db/data-h2.sql b/src/main/resources/db/data-h2.sql index 45f8ef9..5df7a90 100644 --- a/src/main/resources/db/data-h2.sql +++ b/src/main/resources/db/data-h2.sql @@ -42,6 +42,7 @@ insert into t_sys_permission(id, name,type,parent_id,permission) values(64,'在 insert into t_sys_permission(id, name,type,parent_id,permission) values(65,'在线删除',1,61,'message:del'); insert into t_sys_permission(id, name,type,parent_id,permission) values(66,'消息详情',1,61,'message:detail'); insert into t_sys_permission(id, name,type,parent_id,permission) values(67,'重新发送',1,61,'message:resend'); +insert into t_sys_permission(id, name,type,parent_id,permission) values(68,'发送统计',1,61,'message:send-statistics'); insert into t_sys_permission(id, name,type,parent_id,permission) values(80,'限流',0,null,'quota'); insert into t_sys_permission(id, name,type,parent_id,permission) values(81,'用户',1,80,'quota:user'); @@ -101,8 +102,8 @@ insert into t_sys_permission(id, name,type,parent_id,permission) values(171,'取 -- t_sys_permission end-- -- t_sys_role start-- -insert into t_sys_role(id, role_name, description, permission_ids) VALUES (1,'超级管理员','超级管理员','12,13,14,22,23,24,25,26,27,28,29,30,34,35,31,32,33,42,43,44,45,46,47,48,49,50,62,63,64,65,66,67,81,82,83,84,85,86,87,88,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,141,142,143,144,145,146,147,148,149,150,151,152,153,161,162,163,164,165,166,167,168,169,171,170'); -insert into t_sys_role(id, role_name, description, permission_ids) VALUES (2,'普通管理员','普通管理员，不能更改用户信息','12,13,14,22,23,24,25,26,27,28,29,30,34,35,31,32,33,42,43,44,45,46,47,48,49,50,62,63,64,65,66,67,81,82,83,84,85,86,87,88,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,141,146,149,150,161,162,163,164,165,166,167,168,169,171,170'); +insert into t_sys_role(id, role_name, description, permission_ids) VALUES (1,'超级管理员','超级管理员','12,13,14,22,23,24,25,26,27,28,29,30,34,35,31,32,33,42,43,44,45,46,47,48,49,50,62,63,64,65,66,67,68,81,82,83,84,85,86,87,88,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,141,142,143,144,145,146,147,148,149,150,151,152,153,161,162,163,164,165,166,167,168,169,171,170'); +insert into t_sys_role(id, role_name, description, permission_ids) VALUES (2,'普通管理员','普通管理员，不能更改用户信息','12,13,14,22,23,24,25,26,27,28,29,30,34,35,31,32,33,42,43,44,45,46,47,48,49,50,62,63,64,65,66,67,68,81,82,83,84,85,86,87,88,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,141,146,149,150,161,162,163,164,165,166,167,168,169,171,170'); -- insert into t_sys_role(id, role_name, description, permission_ids) VALUES (2,'访客','访客','12,13,22,26,29,32,44,45,50,62,63,81,83,85,141,146,149,150,161,163'); -- t_sys_role end-- diff --git a/ui/src/views/message/Message.vue b/ui/src/views/message/Message.vue index 54ac4b5..5be623f 100644 --- a/ui/src/views/message/Message.vue +++ b/ui/src/views/message/Message.vue @@ -24,7 +24,7 @@ - +