优化

common/src/main/java/com/pica/cloud/wechat/yunqueyilian/common/aop/PicaLogAspectForXml.java

@@ -54,7 +54,7 @@ public class PicaLogAspectForXml {
         ServletRequestAttributes sra = (ServletRequestAttributes) ra;
         HttpServletRequest request = sra.getRequest();
         this.request.set(request);
-        this.contentType.set(request.getHeader("Content-Type"));
+        this.contentType.set(StringUtil.isNotNull(request.getHeader("Content-Type")) ? request.getHeader("Content-Type") : "");
         String url = request.getRequestURL().toString();
         String method = request.getMethod();
         String uri = request.getRequestURI();
@@ -72,11 +72,11 @@ public class PicaLogAspectForXml {
         logger.info("request start, controller params==>, url: {}, method: {}, uri: {}, params: {}", new Object[]{url, method, uri, queryString});
         Object result = pjp.proceed();
         String res = "";
-        if (this.contentType.get().equals("text/xml")) {
-            if (StringUtil.isNotNull(result)){
+        if ("text/xml".equals(this.contentType.get())) {
+            if (StringUtil.isNotNull(result)) {
                 res = result.toString();
             }
-        } else if (this.contentType.get().equals("application/json")) {
+        } else {
             Gson gson = new Gson();
             res = gson.toJson(result);
         }
@@ -89,7 +89,7 @@ public class PicaLogAspectForXml {
     }
 
     protected Map<String, Object> getBeanFromJsonBody() throws Exception {
-        if (this.contentType.get().equals("text/xml")) {
+        if ("text/xml".equals(this.contentType.get())) {
             // 读取输入流
             SAXReader reader = new SAXReader();
             org.dom4j.Document document = reader.read(this.request.get().getInputStream());
@@ -101,12 +101,11 @@ public class PicaLogAspectForXml {
             for (Element e : elementList)
                 map.put(e.getName(), e.getText());
             return map;
-        } else if (this.contentType.get().equals("application/json")) {
+        } else {
             Gson gson = new Gson();
             return (Map) gson.fromJson(IOUtils.toString(new InputStreamReader(((HttpServletRequest) this.request.get()).getInputStream(), "utf-8")), (new TypeToken<Map<String, Object>>() {
             }).getType());
         }
-        return null;
     }
 
     protected boolean parseMultipart() throws Exception {