1. 迁移角色相关逻辑

2. admin-web 接入角色新接口

admin-web/src/models/admin/roleList.js

@@ -2,9 +2,9 @@ import { message } from 'antd';
 import { arrayToStringParams } from '../../utils/request.qs';
 import { buildTreeNode, findAllNodes, findCheckedKeys } from '../../utils/tree.utils';
 import {
-  queryRoleResourceTree,
-  roleAssignResource,
-} from '../../services/admin';
+  authorizationRoleResourceTree,
+  authorizationRoleAssignResource,
+} from '../../services/system';
 import {
   rolePage,
   roleAdd,
@@ -83,9 +83,9 @@ export default {
         payload: true,
       });
 
-      const response = yield call(queryRoleResourceTree, payload);
+      const response = yield call(authorizationRoleResourceTree, payload);
       const roleResourceTree = response.data;
-      const roleTreeData = buildTreeNode(roleResourceTree, 'displayName', 'id');
+      const roleTreeData = buildTreeNode(roleResourceTree, 'name', 'id');
       const checkedKeys = findCheckedKeys(roleResourceTree);
 
       yield put({
@@ -102,13 +102,13 @@ export default {
       });
     },
     *roleAssignResource({ payload }, { call }) {
-      const { id, resourceIds, roleTreeData } = payload;
+      const { roleId, resourceIds, roleTreeData } = payload;
       const assignNodes = findAllNodes(resourceIds, roleTreeData);
       const params = {
-        id,
+        roleId,
         resourceIds: arrayToStringParams(assignNodes),
       };
-      const response = yield call(roleAssignResource, params);
+      const response = yield call(authorizationRoleAssignResource, params);
       if (response.code === 0) {
         message.info('操作成功!');
       }

admin-web/src/pages/Admin/RoleList.js

@@ -168,7 +168,7 @@ class RoleList extends PureComponent {
     dispatch({
       type: 'roleList/queryRoleAssign',
       payload: {
-        id: record.id,
+        roleId: record.id,
       },
     });
     this.setState({
@@ -200,7 +200,7 @@ class RoleList extends PureComponent {
     dispatch({
       type: 'roleList/roleAssignResource',
       payload: {
-        id: roleAssignRecord.id,
+        roleId: roleAssignRecord.id,
         resourceIds: data.checkedKeys,
         roleTreeData: data.roleTreeData,
       },

admin-web/src/services/admin.js

@@ -82,28 +82,14 @@ export async function deptTreeAll() {
   });
 }
 
-// resource
-
-
 
 // role
 
 
 
-export async function queryRoleResourceTree(params) {
-  return request(`/admin-api/admins/role/resource_tree?${stringify(params)}`, {
-    method: 'GET',
-  });
-}
 
-export async function roleAssignResource(params) {
-  return request(`/admin-api/admins/role/assign_resource?${stringify(params)}`, {
-    method: 'POST',
-    body: {
-      ...params,
-    },
-  });
-}
+
+
 
 // dictionary
 

admin-web/src/services/system.js

@@ -24,6 +24,19 @@ export async function authorizationResourcePermissions(params) {
   });
 }
 
+export async function authorizationRoleResourceTree(params) {
+  return request(`/system-api/admins/authorization/role_resource_tree?${stringify(params)}`, {
+    method: 'GET',
+  });
+}
+
+export async function authorizationRoleAssignResource(params) {
+  return request(`/system-api/admins/authorization/assign_role_resource?${stringify(params)}`, {
+    method: 'POST',
+    body: {},
+  });
+}
+
 // ========== Resource 模块 ==========
 
 export async function resourceTree(params) {