From 4ffbcc75927f1a6335f57cc52214f6e0b0fedf9e Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 10:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/pom.xml | 5 +++--
ruoyi-admin/pom.xml | 16 ++--------------
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java | 1 -
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index 09e0f91..524efa1 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -76,10 +76,11 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
+ <!--knife4j渚濊禆-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-annotations</artifactId>
- <version>2.0.9</version>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>3.0.3</version>
</dependency>
<!--寮犲缓鎻愪緵寮曞渚濊禆-->
<dependency>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index d5d3012..1294940 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -26,25 +26,13 @@
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
</dependency>
+ <!--knife4j渚濊禆-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>3.0.3</version>
</dependency>
- <!-- swagger3-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- </dependency>
-
- <!-- 闃叉杩涘叆swagger椤甸潰鎶ョ被鍨嬭浆鎹㈤敊璇紝鎺掗櫎3.0.0涓殑寮曠敤锛屾墜鍔ㄥ鍔�1.6.2鐗堟湰 -->
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- <version>1.6.2</version>
- </dependency>
-
<!-- Postgresql椹卞姩鍖� -->
- <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 63269c8..100f25b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -23,7 +23,6 @@
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
/**
* Swagger2鐨勬帴鍙ｉ厤缃�
--
Gitblit v1.9.3