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 c9e6703..74ac8c8 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
@@ -1,7 +1,6 @@
package com.xwbing.configuration;
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import com.xwbing.handler.LoginInterceptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
@@ -10,9 +9,7 @@ import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.web.filter.CharacterEncodingFilter;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.*;
import javax.servlet.Filter;
import java.util.ArrayList;
@@ -38,13 +35,26 @@ public class DispatcherServletConfig extends WebMvcConfigurerAdapter {
public void addInterceptors(InterceptorRegistry registry) {
logger.info("addInterceptors......");
//拦截器1:登录判断
- registry.addInterceptor(new LoginInterceptor()).addPathPatterns("/**");
+// registry.addInterceptor(new LoginInterceptor()).addPathPatterns("/**");
// registry.addInterceptor(new LoginInterceptor())
// .addPathPatterns("/**").excludePathPatterns("/user/login", "/servlet/captchaCode", "/doc.html", "/swagger-ui.html");
//拦截器2...
super.addInterceptors(registry);
}
+ // /**
+// * 配置静态访问资源
+// * @param registry
+// */
+// @Override
+// public void addResourceHandlers(ResourceHandlerRegistry registry) {
+// registry.addResourceHandler("swagger-ui.html")
+// .addResourceLocations("classpath:/META-INF/resources/");
+// registry.addResourceHandler("/webjars/**")
+// .addResourceLocations("classpath:/META-INF/resources/webjars/");
+// super.addResourceHandlers(registry);
+// }
+
/**
* 扩展消息转换器,增加fastjson
*
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 d16000e..072cb65 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java
@@ -6,6 +6,7 @@ import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -21,22 +22,22 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableSwagger2
public class SwaggerConfig {
@Bean
- public Docket createRestApi() {
+ public Docket buildDocket(){
return new Docket(DocumentationType.SWAGGER_2)
- .apiInfo(apiInfo())
+ .apiInfo(buildApiInf())
.select()
- .apis(RequestHandlerSelectors.basePackage("com.xwbing.controller"))
+ .apis(RequestHandlerSelectors.basePackage("com.xwbing.controller"))//controller路径
.paths(PathSelectors.any())
.build();
}
- private ApiInfo apiInfo() {
+ private ApiInfo buildApiInf(){
return new ApiInfoBuilder()
- .title("管理系统RESTful APIs")
- .description("管理系统api接口,包含登录、注册.......")
+ .title("Document RESTful APIs")
+ .description("API接口文档")
.termsOfServiceUrl("http://localhost:8080/swagger-ui.html")
- .contact("xiangwb")
- .version("1.0")
+ .contact(new Contact("xiangwb", "http://localhost:8080/swagger-ui.html", "xiangwbs@163.com"))
+ .version("1.0.0")
.build();
}
diff --git a/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java b/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java
index b470683..36856e6 100644
--- a/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java
@@ -24,7 +24,7 @@ import java.util.List;
* 创建时间: 2017/5/10 16:36
* 作者: xiangwb
*/
-@Api("系统配置")
+@Api(tags = "configApi", description = "系统配置")
@RestController
@RequestMapping("/config/")
public class SysConfigControl {
diff --git a/boot-web/src/main/resources/application.yml b/boot-web/src/main/resources/application.yml
index ed6aace..0472388 100644
--- a/boot-web/src/main/resources/application.yml
+++ b/boot-web/src/main/resources/application.yml
@@ -1,6 +1,6 @@
#server
server:
- port: 8088
+ port: 8080
session:
timeout: 60
context-path: /
diff --git a/pom.xml b/pom.xml
index d0f41cb..b75e9b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
1.16.16
true
- 2.2.2
+ 2.4.0