:white_check_mark: 日志优化

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aop/ControllerAspect.java

@@ -1,12 +1,23 @@
 package org.jeecg.modules.aop;
 
 import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.json.JsonReadFeature;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.modules.utils.AirportUtil;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.core.io.InputStreamSource;
 import org.springframework.messaging.handler.annotation.support.MethodArgumentNotValidException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestAttributes;
@@ -14,7 +25,10 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.security.auth.message.AuthException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 
 /**
@@ -46,6 +60,7 @@ public class ControllerAspect {
      */
     @Around(value = "controllerAspect()")
     public Object aroundAdvice(ProceedingJoinPoint pjp) throws Throwable {
+        ObjectMapper objectMapper = AirportUtil.getObjectMapper();
         RequestAttributes ra = RequestContextHolder.getRequestAttributes();
         ServletRequestAttributes sra = (ServletRequestAttributes) ra;
         //防止不是http请求的方法，例如：scheduled
@@ -54,31 +69,48 @@ public class ControllerAspect {
         }
         HttpServletRequest request = sra.getRequest();
 
-        //String authorization = request.getHeader("Authorization");
-        //log.info("AUTHORIZATION:{}", authorization);
-        //log.info("USER_NAME:{}", JwtUtil.getUsername(authorization));
+
+        String authorization = request.getHeader("Authorization");
+        log.info("AUTHORIZATION : {}", authorization);
+        if (!Strings.isNullOrEmpty(authorization)) {
+            log.info("USER_NAME : {}", JwtUtil.getUsername(authorization));
+        } else {
+            log.info("USER_NAME : 用户未登录，请求头中未携带Authorization");
+        }
         log.info("URL : " + request.getRequestURL().toString());
         log.info("HTTP_METHOD : " + request.getMethod());
         log.info("IP : " + request.getRemoteAddr());
         log.info("CLASS_METHOD : " + pjp.getSignature().getDeclaringTypeName() + "." + pjp.getSignature().getName());
-        //log.info("REQUEST ARGS : " + JSON.toJSONString(pjp.getArgs()));
+
 
         long startTime = System.currentTimeMillis();
         try {
+            Object[] args = pjp.getArgs();
+            if (args!=null) {
+                Object[] objects = new Object[args.length];
+                for (int i = 0; i < objects.length; i++) {
+                    if (args[i] instanceof ServletRequest || args[i] instanceof ServletResponse || args[i] instanceof InputStreamSource) {
+                        // 不打印request
+                        continue;
+                    }
+                    objects[i] = args[i];
+                }
+                log.info("请求参数 : " + objectMapper.writeValueAsString(objects) );
+            }
             Object response = pjp.proceed();
             // 3.出参打印
-            //log.info("RESPONSE:{}", response != null ? JSON.toJSONString(response) : "");
+            log.info("返回参数 : {}", response != null ? objectMapper.writeValueAsString(response) : "null");
             return response;
         } catch (Throwable e) {
             if (e instanceof MethodArgumentNotValidException) {
-                log.info("RESPONSE ERROR:{}", e.getMessage());
+                log.info("响应错误:{}", e.getMessage());
             } else {
-                log.error("RESPONSE ERROR:{}", Arrays.toString(e.getStackTrace()));
+                log.error("响应错误:{}", Arrays.toString(e.getStackTrace()));
             }
             throw e;
         } finally {
             long endTime = System.currentTimeMillis();
-            log.info("SPEND TIME : {}ms", (endTime - startTime));
+            log.info("耗时 : {}ms", (endTime - startTime));
         }
     }
 }