From e0d9cce2fd3b1bd7c9b8f8acdc7f4d0e737610ee Mon Sep 17 00:00:00 2001 From: lengleng Date: Mon, 11 Mar 2019 15:18:13 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20oauth=20=E5=B0=81=E8=A3=85=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/util/SecurityUtils.java | 26 ------------------- .../cloud/openfeign/PigxFeignFallback.java | 2 +- .../act/controller/LeaveBillController.java | 2 +- .../pigx/act/controller/TaskController.java | 2 +- .../listener/LeaveProcessTaskListener.java | 10 +++---- .../act/service/impl/ActTaskServiceImpl.java | 2 +- 6 files changed, 9 insertions(+), 35 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java index bf6b55fa9..2a848c4f9 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java @@ -62,37 +62,11 @@ public class SecurityUtils { return null; } - /** - * 获取当前用名 - * - * @return String - */ - public String getUsername() { - Object principal = getAuthentication().getPrincipal(); - if (principal instanceof String) { - return principal.toString(); - } - return null; - } - - - public String getClientId() { - Authentication authentication = getAuthentication(); - if (authentication instanceof OAuth2Authentication) { - OAuth2Authentication auth2Authentication = (OAuth2Authentication) authentication; - return auth2Authentication.getOAuth2Request().getClientId(); - } - return null; - } - /** * 获取用户 */ public PigxUser getUser() { Authentication authentication = getAuthentication(); - if (authentication == null) { - return null; - } return getUser(authentication); } diff --git a/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java b/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java index 49ee7901a..fb849f19e 100644 --- a/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java +++ b/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java @@ -34,7 +34,7 @@ import java.util.Objects; /** * @author lengleng *

- * fallBack 代理处理 + * fallback 代理处理 */ @Slf4j @AllArgsConstructor diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java index 4b2e3813c..e808b3c00 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java @@ -74,7 +74,7 @@ public class LeaveBillController { */ @PostMapping public R save(@RequestBody LeaveBill leaveBill) { - leaveBill.setUsername(SecurityUtils.getUsername()); + leaveBill.setUsername(SecurityUtils.getUser().getUsername()); leaveBill.setState(TaskStatusEnum.UNSUBMIT.getStatus()); return new R<>(leaveBillService.save(leaveBill)); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java index 6fdb6694c..7aa8a26a5 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java @@ -44,7 +44,7 @@ public class TaskController { @GetMapping("/todo") public R todo(@RequestParam Map params) { - return new R<>(actTaskService.getTaskByName(params, SecurityUtils.getUsername())); + return new R<>(actTaskService.getTaskByName(params, SecurityUtils.getUser().getUsername())); } @GetMapping("/{id}") diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java index 012b27613..0384bdeb3 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java @@ -51,13 +51,13 @@ public class LeaveProcessTaskListener implements TaskListener { SimpMessagingTemplate simpMessagingTemplate = SpringContextHolder.getBean(SimpMessagingTemplate.class); RemoteUserService userService = SpringContextHolder.getBean(RemoteUserService.class); - R> result = userService.ancestorUsers(SecurityUtils.getUsername()); + R> result = userService.ancestorUsers(SecurityUtils.getUser().getUsername()); List remindUserList = new ArrayList<>(); if (CollUtil.isEmpty(result.getData())) { - log.info("用户 {} 不存在上级,任务单由当前用户审批", SecurityUtils.getUsername()); - delegateTask.addCandidateUser(SecurityUtils.getUsername()); - remindUserList.add(SecurityUtils.getUsername()); + log.info("用户 {} 不存在上级,任务单由当前用户审批", SecurityUtils.getUser().getUsername()); + delegateTask.addCandidateUser(SecurityUtils.getUser().getUsername()); + remindUserList.add(SecurityUtils.getUser().getUsername()); } else { List userList = result.getData().stream().map(SysUser::getUsername).collect(Collectors.toList()); log.info("当前任务 {}，由 {}处理", delegateTask.getId(), userList); @@ -66,7 +66,7 @@ public class LeaveProcessTaskListener implements TaskListener { } remindUserList.forEach(user -> { - String target = String.format("%s-%s", SecurityUtils.getUsername(), TenantContextHolder.getTenantId()); + String target = String.format("%s-%s", SecurityUtils.getUser().getUsername(), TenantContextHolder.getTenantId()); simpMessagingTemplate.convertAndSendToUser(target, "/remind", delegateTask.getName()); }); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java index 4ec7215f6..4a08cdb53 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java @@ -146,7 +146,7 @@ public class ActTaskServiceImpl implements ActTaskService { .singleResult(); String processInstanceId = task.getProcessInstanceId(); - Authentication.setAuthenticatedUserId(SecurityUtils.getUsername()); + Authentication.setAuthenticatedUserId(SecurityUtils.getUser().getUsername()); taskService.addComment(taskId, processInstanceId, message); Map variables = new HashMap<>(1);