From 39cfbde080c34033ff1da1fdffce0912ed086a6c Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Wed, 27 Dec 2017 17:47:32 +0800
Subject: [PATCH] merge

---
 .../java/com/xwbing/configuration/DispatcherServletConfig.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
index 6f35837..43db824 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
@@ -92,10 +92,10 @@ public class DispatcherServletConfig extends WebMvcConfigurerAdapter {
     public HttpMessageConverter getFastJsonHttpMessageConverter() {
         FastJsonHttpMessageConverter httpMessageConverter = new FastJsonHttpMessageConverter();
         List<MediaType> mediaTypes = new ArrayList<>();
-        mediaTypes.add(MediaType.TEXT_HTML);//避免IE出现下载JSON文件的情况
         mediaTypes.add(MediaType.APPLICATION_JSON);
         mediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
         mediaTypes.add(MediaType.APPLICATION_OCTET_STREAM);
+        mediaTypes.add(MediaType.TEXT_HTML);//避免IE出现下载JSON文件的情况
         httpMessageConverter.setSupportedMediaTypes(mediaTypes);
         return httpMessageConverter;
     }