Commit 2fa4831f by fengshuonan

更新一些版本

parent 8a70c796
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<shiro.version>1.4.0</shiro.version> <shiro.version>1.4.0</shiro.version>
<kaptcha.version>2.3.2</kaptcha.version> <kaptcha.version>2.3.2</kaptcha.version>
<ehcache.version>3.3.1</ehcache.version> <ehcache3.version>3.6.3</ehcache3.version>
<ehcache2.version>2.10.6</ehcache2.version>
<beetl.version>2.9.3</beetl.version> <beetl.version>2.9.3</beetl.version>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.9.2</swagger.version>
<ehcache.core.version>2.6.11</ehcache.core.version> <ehcache.core.version>2.6.11</ehcache.core.version>
...@@ -102,12 +103,21 @@ ...@@ -102,12 +103,21 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>ehcache-core</artifactId>
<groupId>net.sf.ehcache</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${ehcache2.version}</version>
</dependency>
<dependency>
<groupId>org.ehcache</groupId> <groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId> <artifactId>ehcache</artifactId>
<version>${ehcache.version}</version> <version>${ehcache3.version}</version>
</dependency> </dependency>
<!--验证码--> <!--验证码-->
......
...@@ -23,6 +23,7 @@ import springfox.documentation.builders.ApiInfoBuilder; ...@@ -23,6 +23,7 @@ import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
...@@ -44,7 +45,7 @@ public class SwaggerConfig { ...@@ -44,7 +45,7 @@ public class SwaggerConfig {
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.select() .select()
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) //这里采用包含注解的方式来确定要显示的接口 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) //这里采用包含注解的方式来确定要显示的接口
//.apis(RequestHandlerSelectors.basePackage("cn.stylefeng.guns.modular.system.controller")) //这里采用包扫描的方式来确定要显示的接口 //.apis(RequestHandlerSelectors.basePackage("cn.stylefeng.guns.modular.system.controller")) //这里采用包扫描的方式来确定要显示的接口
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build();
} }
...@@ -54,7 +55,7 @@ public class SwaggerConfig { ...@@ -54,7 +55,7 @@ public class SwaggerConfig {
.title("Guns Doc") .title("Guns Doc")
.description("Guns Api文档") .description("Guns Api文档")
.termsOfServiceUrl("https://gitee.com/stylefeng/guns") .termsOfServiceUrl("https://gitee.com/stylefeng/guns")
.contact("stylefeng") .contact(new Contact("stylefeng", "https://gitee.com/stylefeng/guns", ""))
.version("2.0") .version("2.0")
.build(); .build();
} }
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="ehcache.xsd" xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd"
updateCheck="false" monitoring="autodetect" updateCheck="false" monitoring="autodetect"
dynamicConfig="true" > dynamicConfig="true" >
......
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