This is an automated email from the ASF dual-hosted git repository.
nicholasjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/paimon-webui.git
The following commit(s) were added to refs/heads/main by this push:
new 36ff6a8 [Improvement] Align naming of menu interface with system
management conventions (#217)
36ff6a8 is described below
commit 36ff6a85795433d96f55fda43b965e9463eecfcc
Author: s7monk <[email protected]>
AuthorDate: Fri May 10 15:29:23 2024 +0800
[Improvement] Align naming of menu interface with system management
conventions (#217)
---
.../apache/paimon/web/server/controller/SysMenuController.java | 8 ++++----
scripts/sql/paimon-mysql.sql | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/controller/SysMenuController.java
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/controller/SysMenuController.java
index 7aaf581..615b51d 100644
---
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/controller/SysMenuController.java
+++
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/controller/SysMenuController.java
@@ -95,9 +95,9 @@ public class SysMenuController {
}
/** update menu. */
- @SaCheckPermission("system:menu:edit")
+ @SaCheckPermission("system:menu:update")
@PutMapping
- public R<Void> edit(@Validated @RequestBody SysMenu menu) {
+ public R<Void> update(@Validated @RequestBody SysMenu menu) {
if (!menuService.checkMenuNameUnique(menu)) {
return R.failed(Status.MENU_NAME_IS_EXIST, menu.getMenuName());
} else if (Constants.YES_FRAME == menu.getIsFrame()
@@ -108,9 +108,9 @@ public class SysMenuController {
}
/** delete menu. */
- @SaCheckPermission("system:menu:remove")
+ @SaCheckPermission("system:menu:delete")
@DeleteMapping("/{menuId}")
- public R<Void> remove(@PathVariable("menuId") Integer menuId) {
+ public R<Void> delete(@PathVariable("menuId") Integer menuId) {
if (menuService.hasChildByMenuId(menuId) ||
menuService.checkMenuExistRole(menuId)) {
return R.failed(Status.MENU_IN_USED);
}
diff --git a/scripts/sql/paimon-mysql.sql b/scripts/sql/paimon-mysql.sql
index 5778fae..91f234f 100644
--- a/scripts/sql/paimon-mysql.sql
+++ b/scripts/sql/paimon-mysql.sql
@@ -188,8 +188,8 @@ values (1, 'all', 0, 1, 'system', null, 1, 'M', 'system',
'admin', 'system root
(300, 'menu manager', 1, 1, 'menu', 'menu/index', 1, 'C',
'system:menu:list', 'menu', 'menu manager'),
(3000, 'menu query', 300, 1, '', '', 1, 'F', 'system:menu:query', '#',
''),
(3001, 'menu add', 300, 2, '', '', 1, 'F', 'system:menu:add', '#', ''),
- (3002, 'menu edit', 300, 3, '', '', 1, 'F', 'system:menu:edit', '#',
''),
- (3003, 'menu del', 300, 4, '', '', 1, 'F', 'system:menu:remove', '#',
'');
+ (3002, 'menu update', 300, 3, '', '', 1, 'F', 'system:menu:update',
'#', ''),
+ (3003, 'menu delete', 300, 4, '', '', 1, 'F', 'system:menu:delete',
'#', '');
insert into user_role (id, user_id, role_id)
values (1, 1, 1), (2, 2, 2);