Przeglądaj źródła

:tada: 2.7.0.RELEASE 底层驱动全面升级

smallchill 5 lat temu
rodzic
commit
a5bf357718

+ 3 - 3
pom.xml

@@ -7,11 +7,11 @@
     <groupId>org.springblade</groupId>
     <artifactId>BladeX-Boot</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.1.RELEASE</version>
+    <version>2.7.0.RELEASE</version>
 
     <properties>
         <bladex.project.id>blade-api</bladex.project.id>
-        <bladex.project.version>2.6.1.RELEASE</bladex.project.version>
+        <bladex.project.version>2.7.0.RELEASE</bladex.project.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.1</maven.plugin.version>
@@ -20,7 +20,7 @@
 
         <flowable.version>6.4.2</flowable.version>
 
-        <spring.boot.version>2.1.17.RELEASE</spring.boot.version>
+        <spring.boot.version>2.2.11.RELEASE</spring.boot.version>
         <spring.platform.version>Cairo-SR8</spring.platform.version>
 
         <!-- 推荐使用Harbor -->

+ 13 - 3
src/main/java/org/springblade/common/config/SwaggerConfiguration.java

@@ -16,9 +16,11 @@
  */
 package org.springblade.common.config;
 
+import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.swagger.EnableSwagger;
 import org.springblade.core.swagger.SwaggerProperties;
 import org.springblade.core.swagger.SwaggerUtil;
 import org.springframework.context.annotation.Bean;
@@ -30,7 +32,6 @@ import springfox.documentation.service.Contact;
 import springfox.documentation.service.SecurityScheme;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -42,12 +43,20 @@ import java.util.List;
  * @author Chill
  */
 @Configuration
-@EnableSwagger2
+@EnableSwagger
 @AllArgsConstructor
 public class SwaggerConfiguration {
 
+	/**
+	 * 引入swagger配置类
+	 */
 	private final SwaggerProperties swaggerProperties;
 
+	/**
+	 * 引入Knife4j扩展类
+	 */
+	private final OpenApiExtensionResolver openApiExtensionResolver;
+
 	@Bean
 	public Docket authDocket() {
 		return docket("授权模块", Collections.singletonList(AppConstant.BASE_PACKAGES + ".modules.auth"));
@@ -71,7 +80,8 @@ public class SwaggerConfiguration {
 			.select()
 			.apis(SwaggerUtil.basePackages(basePackages))
 			.paths(PathSelectors.any())
-			.build().securitySchemes(Lists.<SecurityScheme>newArrayList(SwaggerUtil.clientInfo(), SwaggerUtil.bladeAuth(), SwaggerUtil.bladeTenant()));
+			.build().securitySchemes(Lists.<SecurityScheme>newArrayList(SwaggerUtil.clientInfo(), SwaggerUtil.bladeAuth(), SwaggerUtil.bladeTenant()))
+			.extensions(openApiExtensionResolver.buildExtensions(groupName));
 	}
 
 	private ApiInfo apiInfo() {

+ 21 - 1
src/main/resources/application.yml

@@ -70,11 +70,31 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+#knife4j配置
+knife4j:
+  #启用
+  enable: true
+  #基础认证
+  basic:
+    enable: true
+    username: bladex
+    password: bladex
+  #增强配置
+  setting:
+    enableSwaggerModels: true
+    enableDocumentManage: true
+    enableHost: false
+    enableHostText: http://localhost
+    enableRequestCache: true
+    enableFilterMultipartApis: false
+    enableFilterMultipartApiMethodType: POST
+    language: zh-CN
+
 #swagger公共信息
 swagger:
   title: BladeX 接口文档系统
   description: BladeX 接口文档系统
-  version: 2.6.1.RELEASE
+  version: 2.7.0.RELEASE
   license: Powered By BladeX
   license-url: https://bladex.vip
   terms-of-service-url: https://bladex.vip

+ 1 - 1
src/test/resources/application.yml

@@ -73,7 +73,7 @@ mybatis-plus:
 swagger:
   title: BladeX 接口文档系统
   description: BladeX 接口文档系统
-  version: 2.6.1.RELEASE
+  version: 2.7.0.RELEASE
   license: Powered By BladeX
   license-url: https://bladex.vip
   terms-of-service-url: https://bladex.vip