解决依赖冲突

mitao

2025-01-21 76341cee012eb609ebd1b22bf68f7d8c635cec67

解决依赖冲突

 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>

 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() {

 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)
    {