Merge branch 'dev'

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

@@ -11,6 +11,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
 
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -281,7 +283,10 @@ public abstract class BaseRequestLogAspect {
         } else {
             StringBuilder builder = new StringBuilder("[");
             for (Object object : args) {
-                if (object != null) {
+                if (object != null
+                        && !(object instanceof ServletRequest)
+                        && !(object instanceof ServletResponse)
+                ) {
                     try {
                         // 尝试作为json解析
                         String objectString = JSON.toJSONString(object);