Merge branch 'master' of csk/wms into master

wms-center/src/main/java/com/lote/wms/config/HttpMsgConverter.java

@@ -72,8 +72,9 @@ public class HttpMsgConverter {
     public List<MediaType> mediaTypes() {
         //处理中文乱码
         List<MediaType> list = new LinkedList();
-        list.add(MediaType.TEXT_HTML);
         list.add(MediaType.APPLICATION_JSON);
+        list.add(MediaType.TEXT_HTML);
+        list.add(MediaType.APPLICATION_XML);
         return list;
     }
 

wms-client/src/main/java/com/lote/wms/controller/client/config/HttpMsgConverter.java

@@ -72,8 +72,9 @@ public class HttpMsgConverter {
     public List<MediaType> mediaTypes() {
         //处理中文乱码
         List<MediaType> list = new LinkedList();
-        list.add(MediaType.TEXT_HTML);
         list.add(MediaType.APPLICATION_JSON);
+        list.add(MediaType.TEXT_HTML);
+        list.add(MediaType.APPLICATION_XML);
         return list;
     }
 

wms-common/src/main/java/com/lote/wms/common/utils/JacksonUtil.java

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,10 +58,6 @@ public class JacksonUtil {
             objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
             //设置null值不参与序列化(字段不被显示)
             objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-            //使Jackson JSON支持Unicode编码非ASCII字符
-            SimpleModule module = new SimpleModule();
-            module.addSerializer(String.class, new JacksonStringUnicodeSerializer());
-            objectMapper.registerModule(module);
         }
         return objectMapper;
     }

wms-operate/src/main/java/com/lote/wms/controller/operate/config/HttpMsgConverter.java

@@ -72,8 +72,9 @@ public class HttpMsgConverter {
     public List<MediaType> mediaTypes() {
         //处理中文乱码
         List<MediaType> list = new LinkedList();
-        list.add(MediaType.TEXT_HTML);
         list.add(MediaType.APPLICATION_JSON);
+        list.add(MediaType.TEXT_HTML);
+        list.add(MediaType.APPLICATION_XML);
         return list;
     }