From e06d00feffe9f6cdc8f1e8a3dd6eba320136a328 Mon Sep 17 00:00:00 2001
From: xy <10816187@qq.com>
Date: Tue, 11 Mar 2025 17:48:57 +0800
Subject: [PATCH] feat: RBAC

---
 admin/src/api/permission/index.ts                        | 4 ++--
 admin/src/pages/role/constants.tsx                       | 9 ++++++---
 admin/src/pages/role/index.tsx                           | 2 +-
 .../modules/system/permission/permission.controller.ts   | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/admin/src/api/permission/index.ts b/admin/src/api/permission/index.ts
index da82040..12a302c 100644
--- a/admin/src/api/permission/index.ts
+++ b/admin/src/api/permission/index.ts
@@ -1,9 +1,9 @@
 import request from '@/utils/request';
 
 export function grantPermission(id: string, menuIds: string[]) {
-  return request.put(`/permission/roles/${id}/menus`, { menuIds });
+  return request.put(`/permission/roles/${id}/resources`, { menuIds });
 }
 
 export function getRoleMenuIds(id: string) {
-  return request.get(`/permission/roles/${id}/menus`);
+  return request.get(`/permission/roles/${id}/resources`);
 }
diff --git a/admin/src/pages/role/constants.tsx b/admin/src/pages/role/constants.tsx
index 87ea51a..b0f5ace 100644
--- a/admin/src/pages/role/constants.tsx
+++ b/admin/src/pages/role/constants.tsx
@@ -15,7 +15,8 @@ const {Text} = Typography;
 export const enum TableOptions {
 	EDIT = 'edit',
 	DELETE = 'delete',
-	ASSIGN_PERMISSION = 'assign_permission',
+	ASSIGN_MENUS = 'assign_menus',
+	ASSIGN_RESOURCES = 'assign_resources',
 }
 
 export function getColumns(callback: (type: TableOptions, record: any) => Promise<void>): TableColumnProps[] {
@@ -61,8 +62,10 @@ export function getColumns(callback: (type: TableOptions, record: any) => Promis
 				<Space>
 					<Button size='small' onClick={() => callback(TableOptions.EDIT, record)} type="text"
 					        status="default">更新</Button>
-					<Button size='small' onClick={() => callback(TableOptions.ASSIGN_PERMISSION, record)} type="text"
-					        status="default">分配权限</Button>
+					<Button size='small' onClick={() => callback(TableOptions.ASSIGN_MENUS, record)} type="text"
+					        status="default">分配菜单</Button>
+					<Button size='small' onClick={() => callback(TableOptions.ASSIGN_RESOURCES, record)} type="text"
+					        status="default">分配数据</Button>
 					<Popconfirm
 						focusLock
 						title="删除数据"
diff --git a/admin/src/pages/role/index.tsx b/admin/src/pages/role/index.tsx
index 2e6380a..b604608 100644
--- a/admin/src/pages/role/index.tsx
+++ b/admin/src/pages/role/index.tsx
@@ -64,7 +64,7 @@ function UserManage() {
 			case TableOptions.DELETE:
 				await onDelete(record);
 				break
-			case TableOptions.ASSIGN_PERMISSION:
+			case TableOptions.ASSIGN_MENUS:
 				showAssignRolesModal(record);
 				break
 		}
diff --git a/server/src/modules/system/permission/permission.controller.ts b/server/src/modules/system/permission/permission.controller.ts
index b9132f4..38d7281 100644
--- a/server/src/modules/system/permission/permission.controller.ts
+++ b/server/src/modules/system/permission/permission.controller.ts
@@ -7,12 +7,12 @@ import { GrantMenuDto } from './dto/grant-menu.dto';
 export class PermissionController {
   constructor(private readonly permissionService: PermissionService) {}
 
-  @Get('/roles/:roleId/menus')
+  @Get('/roles/:roleId/resources')
   getRoleMenus(@Param('roleId') roleId: string) {
     return this.permissionService.getRoleMenus(roleId);
   }
 
-  @Put('/roles/:roleId/menus')
+  @Put('/roles/:roleId/resources')
   assignMenus(@Param('roleId') roleId: string, @Body() dto: GrantMenuDto) {
     return this.permissionService.assignMenus(roleId, dto);
   }