diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/logback-sit.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/logback-sit.xml
index 1dad47bf..d7a2ea41 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/logback-sit.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/logback-sit.xml
@@ -35,8 +35,11 @@
-
+
+
+
+
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 3eb0497d..ae6b8c28 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
@@ -20,39 +20,33 @@ import java.nio.charset.StandardCharsets;
public class HttpInterceptor implements HandlerInterceptor {
private static final String CHARSET = StandardCharsets.UTF_8.name();
- private static final ThreadLocal currentAuthorization = new ThreadLocal<>();
+ private static final String TRACEID = "traceId";
+ private static final ThreadLocal AUTHORIZATION = new ThreadLocal<>();
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
response.setCharacterEncoding(CHARSET);
String traceId = IdWorker.getIdStr();
- MDC.put("traceId", traceId);
- // String body="内容无法显示(" + request.getContentType() + ")";
- // if (request.getMethod().equalsIgnoreCase("post") && request.getContentType().contains("json") && request.getContentLength()>0){
- // InputStream inputStream = request.getInputStream();
- // BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
- // char[] chars = new char[request.getContentLength()];
- // reader.read(chars, 0, chars.length);
- // body = String.valueOf(chars);
- // }
- log.info("HttpRecord Request,url:" + request.getRequestURL() + ",method:" + request.getMethod());
- currentAuthorization.set(request.getHeader("Authorization"));
+ MDC.put(TRACEID, traceId);
+ log.info("HttpRecord Request,url: " + request.getRequestURL() + " ,method: " + request.getMethod());
+ AUTHORIZATION.set(request.getHeader("Authorization"));
return true;
}
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
HandlerInterceptor.super.afterCompletion(request, response, handler, ex);
- log.info("HttpRecord Response,url:" + request.getRequestURL() + ",status:" + response.getStatus());
+ log.info("HttpRecord Response,url: " + request.getRequestURL() + " ,status: " + response.getStatus());
+ MDC.remove(TRACEID);
removeAuthorization();
}
private void removeAuthorization() {
log.trace("已清除当前线程的Authorization");
- currentAuthorization.remove();
+ AUTHORIZATION.remove();
}
public static String getAuthorization() {
- return currentAuthorization.get();
+ return AUTHORIZATION.get();
}
}