From 74e526e7d73d5a1d47fab5a648bc843c04f33ce7 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Fri, 6 Nov 2020 15:22:51 +0800 Subject: [PATCH] Fix the wrong MaxMaxResultCount usage --- common.props | 2 +- .../EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs | 7 +++---- .../Plugins/Coupons/Coupons/Dtos/GetCouponListInput.cs | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/common.props b/common.props index c8b7eead..716bda7e 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 1.4.0 + 1.4.1 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs index 4a823cf3..49af06ad 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Orders.Orders.Dtos @@ -10,9 +11,7 @@ namespace EasyAbp.EShop.Orders.Orders.Dtos public Guid? CustomerUserId { get; set; } - public GetOrderListDto() - { - MaxMaxResultCount = 50; - } + [Range(1, 100)] + public override int MaxResultCount { get; set; } = DefaultMaxResultCount; } } \ No newline at end of file diff --git a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application.Contracts/EasyAbp/EShop/Plugins/Coupons/Coupons/Dtos/GetCouponListInput.cs b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application.Contracts/EasyAbp/EShop/Plugins/Coupons/Coupons/Dtos/GetCouponListInput.cs index 349bed02..acce54ba 100644 --- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application.Contracts/EasyAbp/EShop/Plugins/Coupons/Coupons/Dtos/GetCouponListInput.cs +++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application.Contracts/EasyAbp/EShop/Plugins/Coupons/Coupons/Dtos/GetCouponListInput.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Plugins.Coupons.Coupons.Dtos @@ -16,9 +17,7 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons.Dtos public bool IncludesExpired { get; set; } - public GetCouponListInput() - { - MaxMaxResultCount = CouponsConsts.MaxNotExpiredCouponQuantityPerUser; - } + [Range(1, CouponsConsts.MaxNotExpiredCouponQuantityPerUser)] + public override int MaxResultCount { get; set; } = DefaultMaxResultCount; } } \ No newline at end of file