From 6c1cadadbeff7e00897c53467bccdc47dd547e36 Mon Sep 17 00:00:00 2001 From: MicLng Date: Mon, 11 Oct 2021 12:43:11 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20#3222=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=B8=A5=E9=87=8DBUG,size=E4=BC=A0?= =?UTF-8?q?=E5=80=BC-1=E6=97=B6=E6=95=B4=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/data/mybatis/MybatisPlusConfiguration.java | 4 ++++ .../common/data/resolver/SqlFilterArgumentResolver.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index be4e80d01..f9d242d06 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.common.data.mybatis; +import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; @@ -88,6 +89,9 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer { dataScopeInnerInterceptor.setDataScopeHandle(dataScopeHandle()); interceptor.addInnerInterceptor(dataScopeInnerInterceptor); // 分页支持 + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + paginationInnerInterceptor.setDbType(DbType.MYSQL); + paginationInnerInterceptor.setMaxLimit(1000L); interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); return interceptor; } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java index 6eec6dc11..b9d50af81 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java @@ -17,9 +17,11 @@ package com.pig4cloud.pigx.common.data.resolver; +import cn.hutool.core.comparator.CompareUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pig4cloud.pigx.common.core.exception.CheckedException; import lombok.extern.slf4j.Slf4j; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.WebDataBinderFactory; @@ -79,6 +81,10 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver Page page = new Page(); if (StrUtil.isNotBlank(current)) { + // 如果current page 小于零 视为不合法数据 + if (CompareUtil.compare(Long.parseLong(current), 0L) < 0) { + throw new CheckedException("current page error"); + } page.setCurrent(Long.parseLong(current)); }