BJ_ZTEITS-Developers / parking-cloud-yudao

Commit b5f708114be076b1cba1fcfa2df78e21200abe8e

Authored by niudehua
1 parent ea882102

knife4j 版本 改为 2.x 解决 swagger 冲突

Inline Side-by-side
Showing 2 changed files with 9 additions and 7 deletions
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <!-- 统一依赖管理 --> 24 <!-- 统一依赖管理 -->
25 <spring.boot.version>2.4.2</spring.boot.version> 25 <spring.boot.version>2.4.2</spring.boot.version>
26 <!-- Web 相关 --> 26 <!-- Web 相关 -->
27 - <knife4j.version>3.0.2</knife4j.version> 27 + <knife4j.version>2.0.8</knife4j.version>
28 <!-- DB 相关 --> 28 <!-- DB 相关 -->
29 <mysql-connector-java.version>5.1.46</mysql-connector-java.version> 29 <mysql-connector-java.version>5.1.46</mysql-connector-java.version>
30 <druid.version>1.2.4</druid.version> 30 <druid.version>1.2.4</druid.version>
src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java
  View file @b5f7081
@@ -10,15 +10,17 @@ import org.springframework.context.annotation.Configuration; @@ -10,15 +10,17 @@ import org.springframework.context.annotation.Configuration;
10 import org.springframework.http.HttpHeaders; 10 import org.springframework.http.HttpHeaders;
11 import springfox.documentation.builders.ApiInfoBuilder; 11 import springfox.documentation.builders.ApiInfoBuilder;
12 import springfox.documentation.builders.PathSelectors; 12 import springfox.documentation.builders.PathSelectors;
13 -import springfox.documentation.service.*; 13 +import springfox.documentation.service.ApiInfo;
  14 +import springfox.documentation.service.ApiKey;
  15 +import springfox.documentation.service.AuthorizationScope;
  16 +import springfox.documentation.service.Contact;
  17 +import springfox.documentation.service.SecurityReference;
  18 +import springfox.documentation.service.SecurityScheme;
14 import springfox.documentation.spi.DocumentationType; 19 import springfox.documentation.spi.DocumentationType;
15 import springfox.documentation.spi.service.contexts.SecurityContext; 20 import springfox.documentation.spi.service.contexts.SecurityContext;
16 import springfox.documentation.spring.web.plugins.Docket; 21 import springfox.documentation.spring.web.plugins.Docket;
17 -import springfox.documentation.swagger2.annotations.EnableSwagger2;  
18 -import springfox.documentation.service.ApiKey; 22 +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
19 23
20 -import java.util.ArrayList;  
21 -import java.util.Arrays;  
22 import java.util.Collections; 24 import java.util.Collections;
23 import java.util.List; 25 import java.util.List;
24 26
@@ -30,7 +32,7 @@ import static springfox.documentation.builders.RequestHandlerSelectors.basePacka @@ -30,7 +32,7 @@ import static springfox.documentation.builders.RequestHandlerSelectors.basePacka
30 * @author 芋道源码 32 * @author 芋道源码
31 */ 33 */
32 @Configuration 34 @Configuration
33 -@EnableSwagger2 35 +@EnableSwagger2WebMvc
34 @EnableKnife4j 36 @EnableKnife4j
35 @ConditionalOnClass({Docket.class, ApiInfoBuilder.class}) 37 @ConditionalOnClass({Docket.class, ApiInfoBuilder.class})
36 @ConditionalOnProperty(prefix = "yudao.swagger", value = "enable", matchIfMissing = true) 38 @ConditionalOnProperty(prefix = "yudao.swagger", value = "enable", matchIfMissing = true)