From 00e40ce8b1de4da44d427a80f46d69fb90a9c075 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 18 七月 2022 09:02:10 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java
index d8946cc..34ff3cd 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java
@@ -7,9 +7,11 @@
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.RoleAddRPCReqDTO;
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.RoleModRPCReqDTO;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.RoleRPCRespDTO;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -38,24 +40,24 @@
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO<String> addRole(Principal principal, RoleAddRPCReqDTO roleAddRPCReqDTO){
- String userId = principal.getName();
- return accountRoleService.addRole(Long.valueOf(userId),roleAddRPCReqDTO);
+ public ResultVO<String> addRole(Authentication authentication, RoleAddRPCReqDTO roleAddRPCReqDTO){
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountRoleService.addRole(currentUser.getUid(),roleAddRPCReqDTO);
}
@RequestMapping(value = "/mod",method = RequestMethod.POST)
- public ResultVO<String> modRole(Principal principal, RoleModRPCReqDTO roleModRPCReqDTO){
- String userId = principal.getName();
- return accountRoleService.modRole(Long.valueOf(userId),roleModRPCReqDTO);
+ public ResultVO<String> modRole(Authentication authentication, RoleModRPCReqDTO roleModRPCReqDTO){
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountRoleService.modRole(currentUser.getUid(),roleModRPCReqDTO);
}
@RequestMapping(value = "/del",method = RequestMethod.POST)
- public ResultVO<String> modRole(Principal principal, JSONObject json){
- String userId = principal.getName();
+ public ResultVO<String> modRole(Authentication authentication, JSONObject json){
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
Long depId = json.getLong("depId");
- return accountRoleService.delRole(Long.valueOf(userId),depId);
+ return accountRoleService.delRole(currentUser.getUid(),depId);
}
}
--
Gitblit v1.9.2