diff --git a/.gitignore b/.gitignore index c5078494..405f68f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ target .idea +logs diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-dev.properties b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-dev.properties index 74ba7641..e6acef83 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-dev.properties +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-dev.properties @@ -1,4 +1,4 @@ #nacos.server-addr=114.132.64.230:8123 nacos.server-addr=192.168.0.194:8848 - +logging.config=classpath:logback-sit.xml \ No newline at end of file diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-prod.properties b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-prod.properties index 8d1263a1..bf784475 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-prod.properties +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-prod.properties @@ -11,3 +11,4 @@ spring.redis.lettuce.pool.max-active=8 spring.redis.lettuce.pool.max-idle=8 spring.redis.lettuce.pool.min-idle=0 +logging.config=classpath:logback-prod.xml \ No newline at end of file diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties index dfb600fe..9137d34c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties @@ -13,4 +13,4 @@ spring.redis.lettuce.pool.max-active=8 spring.redis.lettuce.pool.max-idle=8 spring.redis.lettuce.pool.min-idle=0 -logging.level.root=DEBUG +logging.config=classpath:logback-sit.xml \ No newline at end of file diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/logback-prod.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/logback-prod.xml new file mode 100644 index 00000000..152fd408 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/logback-prod.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %msg%n + + + + + + + debug + + ${logDir}/nflg-bom-new.log + + + ${logDir}/%d{yyyy-MM-dd}.%i.log + + 15 + + true + + ${splitSize} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{50} %msg%n + + + + + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 00000000..9127e28e --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/logback-sit.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %msg%n + + + + + + + debug + + ${logDir}/nflg-bom-new.log + + + ${logDir}/%d{yyyy-MM-dd}.%i.log + + 15 + + true + + ${splitSize} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{50} %msg%n + + + + + + + + + + + + \ No newline at end of file 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 874e8f7e..d49e0fb5 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,11 +1,15 @@ package com.nflg.product.base.core.config.fillter; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import lombok.extern.slf4j.Slf4j; +import org.slf4j.MDC; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.nio.charset.StandardCharsets; /** * 请求拦截器 @@ -16,13 +20,28 @@ import javax.servlet.http.HttpServletResponse; @Slf4j public class HttpInterceptor implements HandlerInterceptor { + private static final String CHARSET = StandardCharsets.UTF_8.name(); + @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - response.setCharacterEncoding("UTF-8"); + 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()); + return true; + } - return true; - } - - - // } + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) { + //String body = response.getContentType().contains("json") ? response.getOutputStream().toString() : "内容无法显示(" + response.getContentType() + ")"; + log.info("HttpRecord Response,url:" + request.getRequestURL() + ",status:" + response.getStatus()); + } }