From 2c9260b8046dc0dcaa299a41a18d01bde476a3e0 Mon Sep 17 00:00:00 2001 From: chuanwei <463266963@qq.com> Date: Tue, 31 May 2022 01:16:47 +0000 Subject: [PATCH 1/7] =?UTF-8?q?update=20backend/dvadmin/utils/permission.p?= =?UTF-8?q?y.=20=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/utils/permission.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/backend/dvadmin/utils/permission.py b/backend/dvadmin/utils/permission.py index 35e5b4b..2be0691 100644 --- a/backend/dvadmin/utils/permission.py +++ b/backend/dvadmin/utils/permission.py @@ -65,14 +65,6 @@ class CustomPermission(BasePermission): def has_permission(self, request, view): if isinstance(request.user, AnonymousUser): return False - # 对ViewSet下的def方法进行权限判断 - # 当权限为空时,则可以访问 - is_head = getattr(view, 'head', None) - if is_head: - head_kwargs = getattr(view.head, 'kwargs', {}) - _permission_classes = head_kwargs.get('permission_classes', None) - if _permission_classes == []: - return True # 判断是否是超级管理员 if request.user.is_superuser: return True From b7114880ffc5be9ebb09ea459bb903ba2242de65 Mon Sep 17 00:00:00 2001 From: chuanwei <463266963@qq.com> Date: Tue, 31 May 2022 01:17:56 +0000 Subject: [PATCH 2/7] =?UTF-8?q?update=20backend/dvadmin/system/views/menu.?= =?UTF-8?q?py.=20detail=3DFalse=EF=BC=8C=E4=BF=9D=E7=95=99=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E7=9A=84url=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/dvadmin/system/views/menu.py b/backend/dvadmin/system/views/menu.py index b791b28..c7f7d2f 100644 --- a/backend/dvadmin/system/views/menu.py +++ b/backend/dvadmin/system/views/menu.py @@ -157,7 +157,7 @@ class MenuViewSet(CustomModelViewSet): filter_fields = ['parent', 'name', 'status', 'is_link', 'visible', 'cache', 'is_catalog'] extra_filter_backends = [] - @action(methods=['GET'], detail=True, permission_classes=[]) + @action(methods=['GET'], detail=False, permission_classes=[]) def web_router(self, request): """用于前端获取当前角色的路由""" user = request.user From 5454e1e823cba6d7f9443577cc183adc2c224f37 Mon Sep 17 00:00:00 2001 From: chuanwei <463266963@qq.com> Date: Tue, 31 May 2022 01:21:06 +0000 Subject: [PATCH 3/7] =?UTF-8?q?update=20backend/dvadmin/system/views/user.?= =?UTF-8?q?py.=20=E4=BF=AE=E6=94=B9URL=E6=A0=B7=E5=BC=8F=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=EF=BC=8C=E5=8F=A6=E5=A4=96=E6=AD=A4=E5=A4=84=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E5=AF=86=E7=A0=81=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E4=BD=BF=E7=94=A8id=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E8=B6=8A?= =?UTF-8?q?=E6=9D=83=EF=BC=9F=E4=BD=9C=E8=80=85=E7=A1=AE=E8=AE=A4=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py index 28e6462..ef9f40b 100644 --- a/backend/dvadmin/system/views/user.py +++ b/backend/dvadmin/system/views/user.py @@ -229,7 +229,7 @@ class UserViewSet(CustomModelViewSet): "role": "角色ID", } - @action(methods=["GET"], detail=True, permission_classes=[IsAuthenticated]) + @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated]) def user_info(self, request): """获取当前用户信息""" user = request.user @@ -242,7 +242,7 @@ class UserViewSet(CustomModelViewSet): } return DetailResponse(data=result, msg="获取成功") - @action(methods=["PUT"], detail=True, permission_classes=[IsAuthenticated]) + @action(methods=["PUT"], detail=False, permission_classes=[IsAuthenticated]) def update_user_info(self, request): """修改当前用户信息""" user = request.user From 6b352f9f01c07b6bf6558e9199d2157e2f150e99 Mon Sep 17 00:00:00 2001 From: chuanwei <463266963@qq.com> Date: Tue, 31 May 2022 01:25:14 +0000 Subject: [PATCH 4/7] =?UTF-8?q?update=20backend/dvadmin/system/urls.py.=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84url=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/urls.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/backend/dvadmin/system/urls.py b/backend/dvadmin/system/urls.py index 9d6c89f..06fcd9e 100644 --- a/backend/dvadmin/system/urls.py +++ b/backend/dvadmin/system/urls.py @@ -28,12 +28,6 @@ system_url.register(r'api_white_list', ApiWhiteListViewSet) system_url.register(r'system_config', SystemConfigViewSet) urlpatterns = [ - path('role/roleId_get_menu//', RoleViewSet.as_view({'get': 'roleId_get_menu'})), - path('menu/web_router/', MenuViewSet.as_view({'get': 'web_router'})), - path('user/user_info/', UserViewSet.as_view({'get': 'user_info', 'put': 'update_user_info'})), - path('user/change_password//', UserViewSet.as_view({'put': 'change_password'})), - path('user/reset_to_default_password//', UserViewSet.as_view({'put': 'reset_to_default_password'})), - path('user/reset_password//', UserViewSet.as_view({'put': 'reset_password'})), path('user/export/', UserViewSet.as_view({'post': 'export_data', })), path('user/import/', UserViewSet.as_view({'get': 'import_data', 'post': 'import_data'})), path('system_config/save_content/', SystemConfigViewSet.as_view({'put': 'save_content'})), From 9f4a21de22f66f1d72dee8e12bd74549e062baef Mon Sep 17 00:00:00 2001 From: chuanwei <463266963@qq.com> Date: Tue, 31 May 2022 01:26:41 +0000 Subject: [PATCH 5/7] =?UTF-8?q?update=20web/src/views/system/user/api.js.?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81url=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/views/system/user/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/views/system/user/api.js b/web/src/views/system/user/api.js index 8a705a3..d8f7d18 100644 --- a/web/src/views/system/user/api.js +++ b/web/src/views/system/user/api.js @@ -50,7 +50,7 @@ export function DelObj (id) { */ export function ResetPwd (obj) { return request({ - url: urlPrefix + 'reset_password/' + obj.id + '/', + url: urlPrefix + obj.id + '/reset_password/', method: 'put', data: obj }) From a439e2ee5fef285beb3d2450037e008799c3a491 Mon Sep 17 00:00:00 2001 From: chuanwei <463266963@qq.com> Date: Tue, 31 May 2022 01:29:41 +0000 Subject: [PATCH 6/7] =?UTF-8?q?update=20web/src/layout/header-aside/compon?= =?UTF-8?q?ents/header-user/userinfo.vue.=20=E4=BF=AE=E6=94=B9url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/header-aside/components/header-user/userinfo.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/layout/header-aside/components/header-user/userinfo.vue b/web/src/layout/header-aside/components/header-user/userinfo.vue index c327ffb..a761f9c 100644 --- a/web/src/layout/header-aside/components/header-user/userinfo.vue +++ b/web/src/layout/header-aside/components/header-user/userinfo.vue @@ -218,7 +218,7 @@ export default { _self.$refs.userInfoForm.validate((valid) => { if (valid) { request({ - url: '/api/system/user/user_info/', + url: '/api/system/user/update_user_info/', method: 'put', data: _self.userInfo }).then((res) => { @@ -266,7 +266,7 @@ export default { params.newPassword = _self.$md5(params.newPassword) params.newPassword2 = _self.$md5(params.newPassword2) request({ - url: '/api/system/user/change_password/' + userId + '/', + url: '/api/system/user/' + userId + '/change_password/', method: 'put', data: params }).then((res) => { From 61904e324849c541014f47c03aa19a6a82341e2a Mon Sep 17 00:00:00 2001 From: chuanwei <463266963@qq.com> Date: Tue, 31 May 2022 01:38:36 +0000 Subject: [PATCH 7/7] update web/src/views/system/rolePermission/api.js. --- web/src/views/system/rolePermission/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/views/system/rolePermission/api.js b/web/src/views/system/rolePermission/api.js index 23c9866..2b6eb6b 100644 --- a/web/src/views/system/rolePermission/api.js +++ b/web/src/views/system/rolePermission/api.js @@ -47,7 +47,7 @@ export function DelObj (id) { // 通过角色id,获取菜单数据 export function GetMenuData (obj) { return request({ - url: '/api/system/role/roleId_get_menu/' + obj.id + '/', + url: '/api/system/role/' + obj.id + '/roleId_get_menu/', method: 'get', params: {} }).then(res => {