diff --git a/pom.xml b/pom.xml index 7f7edd27..4028a80b 100644 --- a/pom.xml +++ b/pom.xml @@ -37,8 +37,6 @@ 0.9.1 5.5.8 1.18.12 - 2.9.2 - 1.9.6 4.2.0 4.2.0 6.4.3 @@ -48,6 +46,7 @@ 4.4.6 4.17.6 3.1.57 + 2.0.8 @@ -124,21 +123,11 @@ ${lombok.versin} - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.springfox - springfox-swagger-ui - ${swagger.version} - + com.github.xiaoymin - swagger-bootstrap-ui - ${swagger.bootstrap.ui.version} + knife4j-spring-boot-starter + ${knife4j.version} diff --git a/snowy-base/snowy-system/pom.xml b/snowy-base/snowy-system/pom.xml index e68e6371..73a6c739 100644 --- a/snowy-base/snowy-system/pom.xml +++ b/snowy-base/snowy-system/pom.xml @@ -71,17 +71,9 @@ - - io.springfox - springfox-swagger2 - - - io.springfox - springfox-swagger-ui - com.github.xiaoymin - swagger-bootstrap-ui + knife4j-spring-boot-starter diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java index 883480ce..25c58638 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java @@ -25,9 +25,6 @@ Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意 package vip.xiaonuo.sys.config; import cn.hutool.core.collection.CollectionUtil; -import vip.xiaonuo.core.consts.CommonConstant; -import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI; -import io.swagger.annotations.ApiOperation; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; @@ -40,7 +37,8 @@ import springfox.documentation.service.Contact; import springfox.documentation.service.Parameter; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; +import vip.xiaonuo.core.consts.CommonConstant; import java.util.List; @@ -48,15 +46,18 @@ import java.util.List; * swagger配置 * * @author xuyuxiang - * @date 2020/3/11 15:05 - */ + * 加入分组功能(默认注释掉) + *

+ * https://doc.xiaominfo.com/knife4j/changelog/2017-12-18-swagger-bootstrap-ui-1.7-issue.html + *

+ * @author ldw4033#163.com + * @date 2021/4/9 10:42 + **/ @Configuration -@EnableSwagger2 -@EnableSwaggerBootstrapUI +@EnableSwagger2WebMvc public class SwaggerConfig { - @Bean - public Docket createRestApi() { + private List getParameters() { Parameter parameter = new ParameterBuilder() .name("Authorization") .description("token令牌") @@ -67,9 +68,15 @@ public class SwaggerConfig { List parameters = CollectionUtil.newArrayList(); parameters.add(parameter); + return parameters; + } + @Bean + public Docket defaultApi() { + List parameters = getParameters(); return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(apiInfo()) + .apiInfo(defaultApiInfo()) + .groupName("默认接口") .select() .apis(RequestHandlerSelectors.basePackage(CommonConstant.DEFAULT_PACKAGE_NAME)) .paths(PathSelectors.any()) @@ -77,7 +84,7 @@ public class SwaggerConfig { .globalOperationParameters(parameters); } - private ApiInfo apiInfo() { + private ApiInfo defaultApiInfo() { return new ApiInfoBuilder() .title("Snowy Doc") .description("Snowy Doc文档") @@ -87,4 +94,31 @@ public class SwaggerConfig { .build(); } + /** + * 想分组请放开注释 + */ + + // @Bean + // public Docket groupRestApi() { + // List parameters = getParameters(); + // return new Docket(DocumentationType.SWAGGER_2) + // .apiInfo(groupApiInfo()) + // .groupName("自定义") + // .select() + // //TODO 这里改为自己的包名 + // .apis(RequestHandlerSelectors.basePackage("com.example.XXX")) + // .paths(PathSelectors.any()) + // .build() + // .globalOperationParameters(parameters); + // } + // + // private ApiInfo groupApiInfo() { + // return new ApiInfoBuilder() + // .title("自定义") + // .description("自定义API") + // .termsOfServiceUrl("http://www.example.com/") + // .version("1.0") + // .build(); + // } + } diff --git a/snowy-main/src/main/resources/application-local.yml b/snowy-main/src/main/resources/application-local.yml index 1c13fda5..aa29aadd 100644 --- a/snowy-main/src/main/resources/application-local.yml +++ b/snowy-main/src/main/resources/application-local.yml @@ -2,7 +2,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/snowy-pub?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true + url: jdbc:mysql://localhost:3306/snowy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true username: root password: 123456 redis: