:white_check_mark: 日志完善

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

@@ -60,33 +60,32 @@ 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
-        if (ra == null || sra == null) {
-            return pjp.proceed();
-        }
-        HttpServletRequest request = sra.getRequest();
-
-
-        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());
-
-
         long startTime = System.currentTimeMillis();
         try {
+            RequestAttributes ra = RequestContextHolder.getRequestAttributes();
+            ServletRequestAttributes sra = (ServletRequestAttributes) ra;
+            //防止不是http请求的方法，例如：scheduled
+            if (ra == null || sra == null) {
+                log.info("非Http请求 : {}", pjp.getSignature().getDeclaringTypeName() + "." + pjp.getSignature().getName());
+                return pjp.proceed();
+            }
+            HttpServletRequest request = sra.getRequest();
+
+            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());
+
+            ObjectMapper objectMapper = AirportUtil.getObjectMapper();
             Object[] args = pjp.getArgs();
-            if (args!=null) {
+            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) {
@@ -95,8 +94,9 @@ public class ControllerAspect {
                     }
                     objects[i] = args[i];
                 }
-                log.info("请求参数 : " + objectMapper.writeValueAsString(objects) );
+                log.info("请求参数 : " + objectMapper.writeValueAsString(objects));
             }
+            startTime = System.currentTimeMillis();
             Object response = pjp.proceed();
             // 3.出参打印
             log.info("返回参数 : {}", response != null ? objectMapper.writeValueAsString(response) : "null");
@@ -107,7 +107,9 @@ public class ControllerAspect {
             } else {
                 log.error("响应错误:{}", Arrays.toString(e.getStackTrace()));
             }
-            throw e;
+            e.printStackTrace();
+            //throw e;
+            return pjp.proceed();
         } finally {
             long endTime = System.currentTimeMillis();
             log.info("耗时 : {}ms", (endTime - startTime));