Commit c615bfc1 by huluobin

update

parent 8df61b61
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<qiniu-java-sdk.version>[7.2.0, 7.2.99]</qiniu-java-sdk.version> <qiniu-java-sdk.version>[7.2.0, 7.2.99]</qiniu-java-sdk.version>
<qcloudsms.version>1.0.6</qcloudsms.version> <qcloudsms.version>1.0.6</qcloudsms.version>
<!--doc--> <!--doc-->
<springfox-swagger-ui.version>2.9.2</springfox-swagger-ui.version> <springfox-swagger-ui.version>2.9.1</springfox-swagger-ui.version>
<springfox-swagger2.version>2.9.2</springfox-swagger2.version> <springfox-swagger2.version>2.9.2</springfox-swagger2.version>
<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version> <swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
<!--common--> <!--common-->
...@@ -240,15 +240,27 @@ ...@@ -240,15 +240,27 @@
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>${springfox-swagger2.version}</version> <version>${springfox-swagger2.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- 自动生成接口文档 --> <!-- https://mvnrepository.com/artifact/io.swagger/swagger-models -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.swagger</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>swagger-models</artifactId>
<version>${springfox-swagger-ui.version}</version> <version>1.5.21</version>
</dependency> </dependency>
<!-- &lt;!&ndash; 自动生成接口文档 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger-ui</artifactId>-->
<!-- <version>${springfox-swagger-ui.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
......
...@@ -25,9 +25,11 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport { ...@@ -25,9 +25,11 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
/*addPathPatterns 用于添加拦截规则*/ /*addPathPatterns 用于添加拦截规则*/
/* **表示拦截所有请求*/ /* **表示拦截所有请求*/
/*excludePathPatterns 用户排除拦截*/ /*excludePathPatterns 用户排除拦截*/
registry.addInterceptor(loginHandlerInterceptor) registry.addInterceptor(loginHandlerInterceptor)
.addPathPatterns("/**") .addPathPatterns("/**")
.excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**", "/error") .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**", "/error")
.excludePathPatterns("/doc.html")
//登陆 //登陆
.excludePathPatterns("/customer/message/pageIn") .excludePathPatterns("/customer/message/pageIn")
.excludePathPatterns("/customer/message/pageOut") .excludePathPatterns("/customer/message/pageOut")
...@@ -74,6 +76,7 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport { ...@@ -74,6 +76,7 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
registry.addInterceptor(authHandlerInterceptor) registry.addInterceptor(authHandlerInterceptor)
.addPathPatterns("/**") .addPathPatterns("/**")
.excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**", "/error") .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**", "/error")
.excludePathPatterns("/doc.html")
//登陆 //登陆
.excludePathPatterns("/customer/message/loginLog") .excludePathPatterns("/customer/message/loginLog")
.excludePathPatterns("/customer/message/pageIn") .excludePathPatterns("/customer/message/pageIn")
...@@ -137,6 +140,9 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport { ...@@ -137,6 +140,9 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
registry.addResourceHandler("/webjars/**") registry.addResourceHandler("/webjars/**")
.addResourceLocations("classpath:/META-INF/resources/webjars/"); .addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/doc.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
} }
// @Bean // @Bean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment