修改requestTrace工具类与配置参数名

Signed-off-by: luoshi <luoshi@qmth.com.cn>

starter-api/src/main/java/com/qmth/boot/api/config/ApiControllerAspect.java

@@ -1,6 +1,6 @@
 package com.qmth.boot.api.config;
 
-import com.qmth.boot.api.utils.RequestTrace;
+import com.qmth.boot.api.utils.HttpTraceUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -16,13 +16,13 @@ import javax.servlet.http.HttpServletRequest;
 @Aspect
 public class ApiControllerAspect {
 
-    private ApiProperties apiProperties;
+    private HttpTraceUtil httpTraceUtil;
 
     /**
      * 构造函数
      */
     public ApiControllerAspect(ApiProperties apiProperties) {
-        this.apiProperties = apiProperties;
+        this.httpTraceUtil = new HttpTraceUtil(apiProperties);
     }
 
     /**
@@ -52,7 +52,8 @@ public class ApiControllerAspect {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes())
                 .getRequest();
         MethodSignature method = (MethodSignature) joinPoint.getSignature();
-        RequestTrace trace = new RequestTrace(apiProperties.isTraceRequest(), request, method, joinPoint.getArgs());
-        return trace.response(joinPoint.proceed());
+        httpTraceUtil.request(request, method, joinPoint.getArgs());
+        Object result = joinPoint.proceed();
+        return httpTraceUtil.response(result);
     }
 }

starter-api/src/main/java/com/qmth/boot/api/config/ApiProperties.java

@@ -25,7 +25,7 @@ public class ApiProperties implements ApiConstant {
 
     private boolean globalAuth = false;
 
-    private boolean traceRequest = false;
+    private boolean httpTrace = false;
 
     public String getUriPrefix() {
         return uriPrefix;
@@ -67,11 +67,11 @@ public class ApiProperties implements ApiConstant {
         this.globalAuth = globalAuth;
     }
 
-    public boolean isTraceRequest() {
-        return traceRequest;
+    public boolean isHttpTrace() {
+        return httpTrace;
     }
 
-    public void setTraceRequest(boolean traceRequest) {
-        this.traceRequest = traceRequest;
+    public void setHttpTrace(boolean httpTrace) {
+        this.httpTrace = httpTrace;
     }
 }

starter-api/src/main/java/com/qmth/boot/api/utils/RequestTrace.java → starter-api/src/main/java/com/qmth/boot/api/utils/HttpTraceUtil.java

@@ -1,6 +1,7 @@
 package com.qmth.boot.api.utils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.qmth.boot.api.config.ApiProperties;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.core.security.model.AccessEntity;
 import org.apache.commons.lang3.ArrayUtils;
@@ -16,17 +17,20 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * 请求跟踪信息
+ * HTTP请求/返回数据跟踪日志
  */
-public class RequestTrace {
+public class HttpTraceUtil {
 
-    private static final Logger log = LoggerFactory.getLogger(RequestTrace.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpTraceUtil.class);
 
     private boolean enable;
 
-    public RequestTrace(boolean enable, HttpServletRequest request, MethodSignature method, Object[] args) {
-        this.enable = enable && !request.getServletPath().equals(ApiConstant.DEFAULT_ERROR_URI);
-        if (this.enable) {
+    public HttpTraceUtil(ApiProperties apiProperties) {
+        this.enable = apiProperties.isHttpTrace();
+    }
+
+    public void request(HttpServletRequest request, MethodSignature method, Object[] args) {
+        if (this.enable && !request.getServletPath().equals(ApiConstant.DEFAULT_ERROR_URI)) {
             try {
                 Map<String, Object> content = new LinkedHashMap<>();
                 content.put("uri", request.getServletPath());