merge

boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java

@@ -50,8 +50,8 @@ public class DispatcherServletConfig extends WebMvcConfigurerAdapter {
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         //swagger
-        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+//        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+//        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
         //
         super.addResourceHandlers(registry);
     }

boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java

@@ -2,7 +2,6 @@ package com.xwbing.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -18,7 +17,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  * 创建时间: 2017/5/10 16:36
  * 作者:  xiangwb
  */
-@EnableWebMvc
 @Configuration
 @EnableSwagger2
 public class SwaggerConfig {

pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.20</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>