From 65e448a1540efe51f74b79966c925ea58ea3be0a Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 10 五月 2021 14:37:19 +0800
Subject: [PATCH] 用户角色接口更新
---
src/main/java/com/whyc/controller/RoleController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RoleController.java b/src/main/java/com/whyc/controller/RoleController.java
index 46d8a29..3a4eb5b 100644
--- a/src/main/java/com/whyc/controller/RoleController.java
+++ b/src/main/java/com/whyc/controller/RoleController.java
@@ -1,10 +1,7 @@
package com.whyc.controller;
import com.whyc.pojo.*;
-import com.whyc.service.RoleMenuService;
-import com.whyc.service.RolePermissionService;
-import com.whyc.service.RoleService;
-import com.whyc.service.UserRoleService;
+import com.whyc.service.*;
import com.whyc.util.CommonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,6 +32,8 @@
@Autowired
private RoleMenuService roleMenuService;
+ @Autowired
+ private PermissionService permissionService;
/**=============鐢ㄦ埛涓庤鑹�================**/
@@ -61,6 +60,8 @@
public List<Role> getRoleAll(){
return roleService.getAll();
}
+
+
@PostMapping
@ApiOperation(value = "鏂板瑙掕壊")
@@ -90,6 +91,12 @@
/**===============瑙掕壊涓庢潈闄�================**/
+ @GetMapping("allPermissions")
+ @ApiOperation(value = "鑾峰彇鎵�鏈夋潈闄�")
+ public List<Permission> getAllPermissions(HttpServletRequest request){
+ return permissionService.getAll();
+ }
+
@PostMapping("bindingRoleWithPermission")
@ApiOperation(value = "缁戝畾瑙掕壊-鏉冮檺")
@CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
@@ -107,7 +114,8 @@
@GetMapping("permissions")
@ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛鐨勬潈闄�")
public List<Permission> getPermissions(HttpServletRequest request){
- User user = CommonUtil.getUser(request);
+ //User user = CommonUtil.getUser(request);
+ User user = (User) SecurityUtils.getSubject().getPrincipal();
return rolePermissionService.getPermissions(user.getId());
}
--
Gitblit v1.9.1