From f4818d26d6a2f1ae758b828249cff57d4e3f1838 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 14 Mar 2021 22:46:39 +0800 Subject: [PATCH] 整理 permission、user 模块的 url --- ruoyi-ui/src/api/system/menu.js | 4 ++-- ruoyi-ui/src/api/system/notice.js | 4 ++-- ruoyi-ui/src/api/system/role.js | 6 +++--- ruoyi-ui/src/api/system/user.js | 12 ++++++------ ruoyi-ui/src/views/system/menu/index.vue | 90 +++++++++++++++++++----------------------------------------------------------------------- ruoyi-ui/src/views/system/role/index.vue | 117 +++++++++++++++++++++++---------------------------------------------------------------------------------------------- ruoyi-ui/src/views/system/user/index.vue | 168 +++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------- ruoyi-ui/src/views/system/user/profile/userInfo.vue | 14 +++++++------- sql/ruoyi-vue-pro.sql | 856 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------ src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java | 2 +- src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java | 86 +++++++++++++++++++++++++++++++++++++------------------------------------------------- src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java | 86 +++++++++++++++++++++++++++++++++++++++++++------------------------------------------- src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java | 20 ++++++++------------ src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java | 2 +- src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java | 2 +- src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java | 4 ++-- src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java | 48 ++++++++++++++++++++++++------------------------ src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java | 88 ++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------- src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java | 80 ++++++++++++++++++++++++++++++++++++++++---------------------------------------- src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java | 6 +++--- src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------- src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------- src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java | 2 +- 25 files changed, 1364 insertions(+), 874 deletions(-) diff --git a/ruoyi-ui/src/api/system/menu.js b/ruoyi-ui/src/api/system/menu.js index fb3fa6e..b378b01 100644 --- a/ruoyi-ui/src/api/system/menu.js +++ b/ruoyi-ui/src/api/system/menu.js @@ -38,7 +38,7 @@ export function addMenu(data) { export function updateMenu(data) { return request({ url: '/system/menu/update', - method: 'post', + method: 'put', data: data }) } @@ -47,6 +47,6 @@ export function updateMenu(data) { export function delMenu(id) { return request({ url: '/system/menu/delete?id=' + id, - method: 'post' + method: 'delete' }) } diff --git a/ruoyi-ui/src/api/system/notice.js b/ruoyi-ui/src/api/system/notice.js index 744bba7..b8c7cf7 100644 --- a/ruoyi-ui/src/api/system/notice.js +++ b/ruoyi-ui/src/api/system/notice.js @@ -30,7 +30,7 @@ export function addNotice(data) { export function updateNotice(data) { return request({ url: '/system/notice/update', - method: 'post', + method: 'put', data: data }) } @@ -39,6 +39,6 @@ export function updateNotice(data) { export function delNotice(noticeId) { return request({ url: '/system/notice/delete?id=' + noticeId, - method: 'post' + method: 'delete' }) } diff --git a/ruoyi-ui/src/api/system/role.js b/ruoyi-ui/src/api/system/role.js index 36edcc2..27bb050 100644 --- a/ruoyi-ui/src/api/system/role.js +++ b/ruoyi-ui/src/api/system/role.js @@ -38,7 +38,7 @@ export function addRole(data) { export function updateRole(data) { return request({ url: '/system/role/update', - method: 'post', + method: 'put', data: data }) } @@ -51,7 +51,7 @@ export function changeRoleStatus(id, status) { } return request({ url: '/system/role/update-status', - method: 'post', + method: 'put', data: data }) } @@ -60,7 +60,7 @@ export function changeRoleStatus(id, status) { export function delRole(roleId) { return request({ url: '/system/role/delete?id=' + roleId, - method: 'post' + method: 'delete' }) } diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js index 7676e2b..b1322ed 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/ruoyi-ui/src/api/system/user.js @@ -31,7 +31,7 @@ export function addUser(data) { export function updateUser(data) { return request({ url: '/system/user/update', - method: 'post', + method: 'put', data: data }) } @@ -62,7 +62,7 @@ export function resetUserPwd(id, password) { } return request({ url: '/system/user/update-password', - method: 'post', + method: 'put', data: data }) } @@ -75,7 +75,7 @@ export function changeUserStatus(id, status) { } return request({ url: '/system/user/update-status', - method: 'post', + method: 'put', data: data }) } @@ -83,7 +83,7 @@ export function changeUserStatus(id, status) { // 查询用户个人信息 export function getUserProfile() { return request({ - url: '/system/user/profile', + url: '/system/user/profile/get', method: 'get' }) } @@ -91,7 +91,7 @@ export function getUserProfile() { // 修改用户个人信息 export function updateUserProfile(data) { return request({ - url: '/system/user/profile', + url: '/system/user/profile/update', method: 'put', data: data }) @@ -114,7 +114,7 @@ export function updateUserPwd(oldPassword, newPassword) { export function uploadAvatar(data) { return request({ url: '/system/user/profile/avatar', - method: 'post', + method: 'put', data: data }) } diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index e2e759e..767878e 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -2,22 +2,11 @@
- + - + @@ -28,23 +17,14 @@ - 新增 + 新增 - + - + - + @@ -333,8 +237,18 @@