Merge branch 'release/1.5.4'

app/src/main/java/com/alvin/aspect/LogAspect.java

@@ -1,6 +1,5 @@
 package com.alvin.aspect;
 
-import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -11,6 +10,8 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * 日志切片
@@ -33,7 +34,7 @@ public class LogAspect {
          * 执行方法之前
          */
         long start = System.currentTimeMillis();
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         /*
          * 执行方法
          */
@@ -41,14 +42,13 @@ public class LogAspect {
         /*
          * 执行方法之后
          */
-        StringBuilder sb = new StringBuilder();
         String split = "; ";
-        sb.append("url=").append(request.getRequestURL()).append(split);
-        sb.append("method=").append(request.getMethod()).append(split);
-        sb.append("class_method=").append(joinPoint.getSignature().getDeclaringTypeName()).append(".").append(joinPoint.getSignature().getName()).append(split);
-        sb.append("args=").append(new Gson().toJson(joinPoint.getArgs())).append(split);
-        sb.append("consumer time(ms) = ").append(System.currentTimeMillis() - start);
-        log.info(sb.toString());
+        String sb = "url=" + request.getRequestURL() + split +
+                "method=" + request.getMethod() + split +
+                "class_method=" + joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName() + split +
+                "args=" + Arrays.toString(joinPoint.getArgs()) + split +
+                "consumer time(ms) = " + (System.currentTimeMillis() - start);
+        log.info(sb);
 
         return result;
     }

common/src/main/java/com/alvin/common/util/JsonUtil.java

@@ -18,7 +18,7 @@ import java.util.Map;
  * @date 2020/05/20
  */
 public class JsonUtil {
-    private static final Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();;
+    private static final Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
 
     public JsonUtil() {
     }
@@ -61,6 +61,7 @@ public class JsonUtil {
 
     /**
      * 转为数组
+     *
      * @param jsonString
      * @param tClass
      * @param <T>
@@ -72,13 +73,15 @@ public class JsonUtil {
 
     /**
      * 转为list
+     *
      * @param jsonString
      * @param tClass
      * @param <T>
      * @return
      */
     public static <T> List<T> getList(String jsonString, Class<T> tClass) {
-        return gson.fromJson(jsonString, new TypeToken<List<T>>() {}.getType());
+        return gson.fromJson(jsonString, new TypeToken<List<T>>() {
+        }.getType());
     }
 
     /**
@@ -88,6 +91,7 @@ public class JsonUtil {
      * @return
      */
     public static <T> Map<String, T> getMap(String gsonString) {
-        return gson.fromJson(gsonString, new TypeToken<Map<String, T>>() {}.getType());
+        return gson.fromJson(gsonString, new TypeToken<Map<String, T>>() {
+        }.getType());
     }
 }