From 27cbdcd8b55101968cbad10a1d64804042e2e50d Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Mon, 20 Nov 2017 16:10:42 +0800
Subject: [PATCH] merge

---
 .../com/xwbing/configuration/DispatcherServletConfig.java     | 4 ++--
 .../src/main/java/com/xwbing/configuration/SwaggerConfig.java | 2 --
 pom.xml                                                       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

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 ac6a31b..ac4f542 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
+++ b/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);
     }
diff --git a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java
index 9b7e359..cff929f 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java
+++ b/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 {
diff --git a/pom.xml b/pom.xml
index 27bbd59..6da4362 100644
--- a/pom.xml
+++ b/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>