diff --git a/src/main/java/com/yn/bftl/thirdparty/aop/SessionAspect.java b/src/main/java/com/yn/bftl/thirdparty/aop/SessionAspect.java index aed0a24..5c42e8e 100644 --- a/src/main/java/com/yn/bftl/thirdparty/aop/SessionAspect.java +++ b/src/main/java/com/yn/bftl/thirdparty/aop/SessionAspect.java @@ -175,28 +175,39 @@ if (StringUtils.isEmpty(redisKey)) { return; } - // 通过key值获取redis缓存的操作人ID - String operatorId = stringRedisTemplate.opsForValue().get(redisKey); - if (StringUtils.isNotBlank(operatorId)) { - // 获取操作人 - Object operator = null; - if (StringUtils.isNotBlank(userToken)) { - operator = userRepository.findById(Long.valueOf(operatorId)).orElse(null); - } - if (StringUtils.isNotBlank(adminToken)) { - // 获取用户参数 - String userId = request.getHeader(USER_ID_HEADER_NAME); - if (StringUtils.isNotBlank(userId)) { - operator = userRepository.findById(Long.valueOf(userId)).orElse(null); + try { + // 通过key值获取redis缓存的操作人ID + String operatorId = stringRedisTemplate.opsForValue().get(redisKey); + if (StringUtils.isNotBlank(operatorId)) { + // 获取操作人 + Object operator = null; + if (StringUtils.isNotBlank(userToken)) { + log.info("sessionaspect->userToken不为空时->查询用户开始"); + operator = userRepository.findById(Long.valueOf(operatorId)).orElse(null); + log.info("sessionaspect->userToken不为空时->查询用户结束"); + } + if (StringUtils.isNotBlank(adminToken)) { + // 获取用户参数 + String userId = request.getHeader(USER_ID_HEADER_NAME); + if (StringUtils.isNotBlank(userId)) { + log.info("sessionaspect->userId不为空时->查询用户开始"); + operator = userRepository.findById(Long.valueOf(userId)).orElse(null); + log.info("sessionaspect->userId不为空时->查询用户结束"); + } + } + if (StringUtils.isNotBlank(customerToken)) { + log.info("sessionaspect->customerToken不为空时->查询用户开始"); + operator = customerRepository.findById(Long.valueOf(customerToken)).orElse(null); + log.info("sessionaspect->customerToken不为空时->查询用户结束"); + } + if (operator != null) { + request.setAttribute(OPERATOR_TOKEN, operator); + request.setAttribute(OPERATOR_TYPE, operatorType); } } - if (StringUtils.isNotBlank(customerToken)) { - operator = customerRepository.findById(Long.valueOf(customerToken)).orElse(null); - } - if (operator != null) { - request.setAttribute(OPERATOR_TOKEN, operator); - request.setAttribute(OPERATOR_TYPE, operatorType); - } + } catch (Exception e) { + log.error("======SessionAspect异常:" + e.getMessage()); + throw new RuntimeException(e); } } -} \ No newline at end of file +}