From 8c44801b37719b8e9502c862428eed783ef53997 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sat, 11 Mar 2023 14:31:44 +0800 Subject: [PATCH] fix(ticks): the start time scale is incorrect --- .../LimitValidation/AbpFeaturesLimitValidationOptions.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationOptions.cs b/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationOptions.cs index c851fd954..c26547c6e 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationOptions.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationOptions.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using System; using System.Collections.Generic; -using System.Globalization; using Volo.Abp; namespace LINGYUN.Abp.Features.LimitValidation @@ -66,14 +65,14 @@ namespace LINGYUN.Abp.Features.LimitValidation } var utcOnceDayOfWeek = utcNow.AddDays(-dayOfWeek); - return (long)(utcOnceDayOfWeek.AddDays(time) - DateTime.UtcNow).TotalSeconds; + return (long)(utcOnceDayOfWeek.AddDays(time * 7) - DateTime.UtcNow).TotalSeconds; }); MapEffectPolicy(LimitPolicy.Month, (time) => { // 按月计算应取当月 var utcNow = DateTime.UtcNow; - var utcOnceDayOfMonth = new DateTime(utcNow.Year, utcNow.Month, 1, 1, 0, 0, 0); + var utcOnceDayOfMonth = new DateTime(utcNow.Year, utcNow.Month, 1, 0, 0, 0, 0); return (long)(utcOnceDayOfMonth.AddMonths(time) - utcNow).TotalSeconds; }); @@ -82,7 +81,7 @@ namespace LINGYUN.Abp.Features.LimitValidation { // 按年计算应取当年 var utcNow = DateTime.UtcNow; - var utcOnceDayOfYear = new DateTime(utcNow.Year, 1, 1, 1, 0, 0, 0); + var utcOnceDayOfYear = new DateTime(utcNow.Year, 1, 1, 0, 0, 0, 0); return (long)(utcOnceDayOfYear.AddYears(time) - utcNow).TotalSeconds; });