修改日志切面

src/main/java/cn/qg/qaplatform/aspect/HttpLogAspect.java

@@ -2,6 +2,7 @@ package cn.qg.qaplatform.aspect;
 
 import cn.qg.qaplatform.utils.JsonTransUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.commons.io.IOUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -18,8 +19,10 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -33,7 +36,7 @@ import java.util.Map;
 public class HttpLogAspect {
     private static final Logger logger = LoggerFactory.getLogger(HttpLogAspect.class);
 
-    @Pointcut("execution(public * cn.qg.qaplatform.zdata.controller..*.*(..))")
+    @Pointcut("execution(public * cn.qg.qaplatform.*.controller..*.*(..))")
     public void httpRequestLog() {}
 
     /**
@@ -46,11 +49,12 @@ public class HttpLogAspect {
     public void doBefore(JoinPoint joinPoint) throws JsonProcessingException {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
-        logger.info("url：{}", request.getRequestURL());
-        logger.info("method：{}", request.getMethod());
-        logger.info("ip：{}", request.getRemoteAddr());
-        logger.info("class_method={}", joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName());
-        logger.info("args：{}", joinPoint.getArgs());
+//        logger.info("url：{}", request.getRequestURL());
+//        logger.info("method：{}", request.getMethod());
+//        logger.info("ip：{}", request.getRemoteAddr());
+//        logger.info("class_method={}", joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName());
+//        logger.info("args：{}", joinPoint.getArgs());
+        logger.info("请求发起ip地址: {}, 请求url: {}, 请求参数：{}", request.getRemoteAddr(), request.getRequestURI(), getQuery(request));
     }
 
     /**
@@ -98,4 +102,38 @@ public class HttpLogAspect {
             return argList;
         }
     }
+
+    private String getQuery(HttpServletRequest request) {
+        if (isPostPutRequest(request)) {
+            return getParameters(request) + getRequestBody(request);
+        } else {
+            return getParameters(request);
+        }
+    }
+
+    private boolean isPostPutRequest(HttpServletRequest request) {
+        return "POST".equalsIgnoreCase(request.getMethod()) || "PUT".equalsIgnoreCase(request.getMethod());
+    }
+
+    private String getParameters(HttpServletRequest request) {
+        StringBuilder sb = new StringBuilder();
+        Map<String, String[]> params = request.getParameterMap();
+        for (String key : params.keySet()) {
+            sb.append('[')
+                    .append(key)
+                    .append('=')
+                    .append(request.getParameter(key))
+                    .append("] ");
+        }
+
+        return sb.toString();
+    }
+
+    private String getRequestBody(HttpServletRequest request) {
+        try {
+            return IOUtils.toString(request.getInputStream(), String.valueOf(Charset.defaultCharset()));
+        } catch (IOException e) {
+            return "";
+        }
+    }
 }
\ No newline at end of file