merge

2017-11-20 15:56:56 +08:00
parent 472ccea7ee
commit 00d6941eed
2 changed files with 2 additions and 3 deletions
@@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -20,7 +19,6 @@ import java.util.List;
 * 创建时间: 2017/5/10 16:36
 * 作者:  xiangwb
 */
-@EnableWebMvc
@Configuration
 public class DispatcherServletConfig extends WebMvcConfigurerAdapter {
    /***
@@ -2,6 +2,7 @@ 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;
@@ -17,7 +18,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 * 创建时间: 2017/5/10 16:36
 * 作者:  xiangwb
 */
-
+@EnableWebMvc
@Configuration
@EnableSwagger2
 public class SwaggerConfig {