From 76341cee012eb609ebd1b22bf68f7d8c635cec67 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 10:46:41 +0800
Subject: [PATCH] 解决依赖冲突
---
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java | 2 +-
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BasePage.java | 8 +++-----
ruoyi-common/ruoyi-common-core/pom.xml | 6 ------
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index 3df2ab6..6aa0b7d 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -141,12 +141,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
-
- <!-- SpringDoc webmvc -->
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BasePage.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BasePage.java
index 0108ddb..41c9be3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BasePage.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BasePage.java
@@ -1,22 +1,20 @@
package com.ruoyi.common.core.page;
-import io.swagger.v3.oas.annotations.media.Schema;
-
import java.io.Serializable;
-@Schema(name = "基础查询列表dto")
+//@Schema(name = "基础查询列表dto")
public class BasePage implements Serializable {
private static final long serialVersionUID = -6677391205868835849L;
/**
* 分页参数，当前页码
*/
- @Schema(name = "分页参数，当前页码")
+ //@Schema(name = "分页参数，当前页码")
private Integer pageCurr = 1;
/**
* 分页参数，每页数量
*/
- @Schema(name = "分页参数，每页数量，默认为10")
+ //@Schema(name = "分页参数，每页数量，默认为10")
private Integer pageSize = 10;
public Integer getPageCurr() {
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java
index eda1030..e6e564f 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java
@@ -52,7 +52,7 @@
@Autowired
private DiscoveryClient discoveryClient;
- private final static String[] EXCLUDE_ROUTES = new String[] { "ruoyi-gateway", /*"ruoyi-auth",*/ "ruoyi-file", "ruoyi-monitor" };
+ private final static String[] EXCLUDE_ROUTES = new String[] { "ruoyi-gateway", "ruoyi-auth", "ruoyi-file", "ruoyi-monitor" };
public SwaggerDocRegister(SwaggerUiConfigProperties swaggerUiConfigProperties, DiscoveryClient discoveryClient)
{
--
Gitblit v1.7.1