From e54ea2c275a93a577bf130da1f026cda49065ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Jul 2024 18:02:24 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20=E8=B0=83=E6=95=B4=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advice/LoggingRequestBodyAdvice.java | 12 ---------- .../core/config/fillter/HttpInterceptor.java | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/advice/LoggingRequestBodyAdvice.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/advice/LoggingRequestBodyAdvice.java index 62254e4a..ec59b929 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/advice/LoggingRequestBodyAdvice.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/advice/LoggingRequestBodyAdvice.java @@ -1,11 +1,7 @@ package com.nflg.product.bomnew.advice; import cn.hutool.core.util.StrUtil; -import com.nflg.product.bomnew.util.JsonUtil; import lombok.extern.slf4j.Slf4j; -import nflg.product.common.constant.STATE; -import nflg.product.common.util.JwtUtil; -import nflg.product.common.vo.ResultVO; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.core.MethodParameter; @@ -49,14 +45,6 @@ public class LoggingRequestBodyAdvice implements RequestBodyAdvice { bodyContent = reader.lines().collect(Collectors.joining()); log.info("请求参数: {}", bodyContent); } - log.info("请求头: {}", JsonUtil.toJson(httpInputMessage.getHeaders())); - String token = httpInputMessage.getHeaders().getFirst("Authorization"); - if (StrUtil.isNotBlank(token)) { - ResultVO result = JwtUtil.parse(token); - if (result.getState().equals(STATE.Success.getState())) { - log.info("请求用户: {}", JsonUtil.toJson(result.getData())); - } - } if (StrUtil.isBlank(bodyContent)) { return httpInputMessage; } else { diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/fillter/HttpInterceptor.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/fillter/HttpInterceptor.java index ae6b8c28..c0859663 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/fillter/HttpInterceptor.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/fillter/HttpInterceptor.java @@ -1,7 +1,12 @@ package com.nflg.product.base.core.config.fillter; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import lombok.extern.slf4j.Slf4j; +import nflg.product.common.constant.STATE; +import nflg.product.common.util.JwtUtil; +import nflg.product.common.vo.ResultVO; import org.slf4j.MDC; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @@ -9,6 +14,7 @@ import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.nio.charset.StandardCharsets; +import java.util.Enumeration; /** * 请求拦截器 @@ -29,6 +35,23 @@ public class HttpInterceptor implements HandlerInterceptor { String traceId = IdWorker.getIdStr(); MDC.put(TRACEID, traceId); log.info("HttpRecord Request,url: " + request.getRequestURL() + " ,method: " + request.getMethod()); + + StringBuilder sb = new StringBuilder("请求头: "); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + String headerName = headerNames.nextElement(); + sb.append(StrUtil.format("{}={},", headerName, request.getHeader(headerName))); + } + log.info(sb.substring(0, sb.length() - 1)); + + String token = request.getHeader("Authorization"); + if (StrUtil.isNotBlank(token)) { + ResultVO result = JwtUtil.parse(token); + if (result.getState().equals(STATE.Success.getState())) { + log.info("请求用户: {}", JSON.toJSONString(result.getData())); + } + } + AUTHORIZATION.set(request.getHeader("Authorization")); return true; }