diff --git a/src/main/java/com/sczx/order/aspect/WebLogAspect.java b/src/main/java/com/sczx/order/aspect/WebLogAspect.java index d098fbf..f3ca7a8 100644 --- a/src/main/java/com/sczx/order/aspect/WebLogAspect.java +++ b/src/main/java/com/sczx/order/aspect/WebLogAspect.java @@ -3,6 +3,7 @@ package com.sczx.order.aspect; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.*; import org.slf4j.MDC; @@ -12,9 +13,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; +import java.util.*; /** * @Author Huang Kai @@ -64,8 +63,15 @@ public class WebLogAspect { filteredArgs.add(arg); } } + Map paramMap = new HashMap<>(); + paramMap.put("args", filteredArgs); + if (request != null) { - log.info("URL:{} , {}", request.getRequestURL().toString(), JSON.toJSONString(filteredArgs)); + String token = request.getHeader("Authorization"); + if(StringUtils.isNotBlank(token)){ + paramMap.put("Authorization", token); + } + log.info("URL:{} , {}", request.getRequestURL().toString(), JSON.toJSONString(paramMap)); } } catch (Exception e){ log.error("打印WebLogAspect_Request失败,args无法被序列化", e); diff --git a/src/main/java/com/sczx/order/utils/JwtUtil.java b/src/main/java/com/sczx/order/utils/JwtUtil.java index c106d7b..30e0ca9 100644 --- a/src/main/java/com/sczx/order/utils/JwtUtil.java +++ b/src/main/java/com/sczx/order/utils/JwtUtil.java @@ -1,5 +1,6 @@ package com.sczx.order.utils; +import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; import com.sczx.order.dto.SimpleUserInfoDTO; import io.jsonwebtoken.JwtException; @@ -109,10 +110,12 @@ public class JwtUtil { */ public SimpleUserInfoDTO getUserInfoFromToken() { String authHeader = getAuthorizationHeader(); + log.info("token:{}",authHeader); if (authHeader != null && authHeader.startsWith("Bearer ")) { String token = authHeader.substring(7); + String userInfoJson = getClaim(token, "userInfo", String.class); // 进行token验证等操作 - return getClaim(token, "userInfo", SimpleUserInfoDTO.class); + return JSONObject.parseObject(userInfoJson, SimpleUserInfoDTO.class); }else { throw new RuntimeException("token不存在"); }