refactor：替换自增id为cuid

admin/src/api/auth/index.ts

@@ -9,6 +9,6 @@ export function login(data: LoginData) {
 }
 
 
-export function grantUserRoles(userId: number, data) {
+export function grantUserRoles(userId: string, data) {
   return request.post('/auth/userRole/' + userId,data);
 }

admin/src/api/menu/index.ts

@@ -16,6 +16,6 @@ export function updateMenu(data) {
   return request.patch('/menu/' + data.id, data);
 }
 
-export function deleteMenu(id: number) {
+export function deleteMenu(id: string) {
   return request.delete('/menu/' + id);
 }

admin/src/api/permission/index.ts

@@ -1,9 +1,9 @@
 import request from '@/utils/request';
 
-export function grantPermission(id: number, menuIds: number[]) {
+export function grantPermission(id: string, menuIds: string[]) {
   return request.patch('/permission/' + id, { menuIds });
 }
 
-export function getRoleMenuIds(id: number) {
+export function getRoleMenuIds(id: string) {
   return request.get('/permission/' + id + '/menu');
 }

admin/src/api/role/index.ts

@@ -16,6 +16,6 @@ export function updateRole(data) {
   return request.patch('/role/' + data.id, data);
 }
 
-export function deleteRole(id: number) {
+export function deleteRole(id: string) {
   return request.delete('/role/' + id);
 }

admin/src/api/user/index.ts

@@ -31,6 +31,6 @@ export function updateUser(data) {
 /**
  * 删除用户
  * */
-export function deleteUser(id: number) {
+export function deleteUser(id: string) {
   return request.delete('/user/' + id);
 }

admin/src/routes.ts

@@ -12,16 +12,20 @@ export type IRoute = AuthParams & {
   icon?: string
 };
 
-const generatorMenu = (data, parentId = 0) => {
+const generatorMenu = (data, parentId?:string) => {
   const menu = [];
   for (const item of data) {
     item.key = item.url;
-    if (item.parentId === parentId) {
-      const children = generatorMenu(data, item.id);
-      if (children.length) {
-        item.children = children;
-      }
+    if(!parentId){
       menu.push(item);
+    }else{
+      if (item.parentId === parentId) {
+        const children = generatorMenu(data, item.id);
+        if (children.length) {
+          item.children = children;
+        }
+        menu.push(item);
+      }
     }
   }
   return menu;

admin/src/store/modules/user.ts

@@ -46,13 +46,17 @@ export const createUserStore: StateCreator<IUserStore> = (set) => ({
   },
   logout: async () => {
     localStorage.removeItem('accessToken');
-    window.location.href = '/login';
+
     set({
       userInfo: {
         permissions: [],
         menus:[]
       }
     });
+
+    if (location.pathname !== '/login') {
+      window.location.href = '/login';
+    }
   }
 });