From 01ca35f6a9086ea7d3c3db242303faa76c149f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 28 Mar 2022 09:36:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=87=AA=E8=A1=8C=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A=E6=8C=87=E6=A0=87=E6=95=B0=E6=8D=AE=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/serverconfigs/metric_item_config.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/serverconfigs/metric_item_config.go b/pkg/serverconfigs/metric_item_config.go index ba62cc9..c5025ea 100644 --- a/pkg/serverconfigs/metric_item_config.go +++ b/pkg/serverconfigs/metric_item_config.go @@ -142,31 +142,31 @@ func (this *MetricItemConfig) ServerExpiresDay() string { switch this.PeriodUnit { case MetricItemPeriodUnitMonth: if this.ExpiresPeriod > 0 { - return timeutil.Format("Ymd", time.Now().AddDate(0, -this.ExpiresPeriod, 0)) + return timeutil.Format("Ymd", time.Now().AddDate(0, -(this.Period*this.ExpiresPeriod), 0)) } else { return timeutil.Format("Ymd", time.Now().AddDate(0, -(this.Period*4), 0)) } case MetricItemPeriodUnitWeek: if this.ExpiresPeriod > 0 { - return timeutil.FormatTime("Ymd", time.Now().Unix()-86400*7*int64(this.ExpiresPeriod)) + return timeutil.FormatTime("Ymd", time.Now().Unix()-86400*7*int64(this.Period*this.ExpiresPeriod)) } else { return timeutil.FormatTime("Ymd", time.Now().Unix()-86400*7*int64(this.Period*5)) } case MetricItemPeriodUnitDay: if this.ExpiresPeriod > 0 { - return timeutil.FormatTime("Ymd", time.Now().Unix()-86400*int64(this.ExpiresPeriod)) + return timeutil.FormatTime("Ymd", time.Now().Unix()-86400*int64(this.Period*this.ExpiresPeriod)) } else { return timeutil.FormatTime("Ymd", time.Now().Unix()-86400*int64(this.Period*8)) } case MetricItemPeriodUnitHour: if this.ExpiresPeriod > 0 { - return timeutil.FormatTime("Ymd", time.Now().Unix()-3600*int64(this.ExpiresPeriod)-86400) + return timeutil.FormatTime("Ymd", time.Now().Unix()-3600*int64(this.Period*this.ExpiresPeriod)-86400) } else { return timeutil.FormatTime("Ymd", time.Now().Unix()-3600*int64(this.Period*25)-86400) } case MetricItemPeriodUnitMinute: if this.ExpiresPeriod > 0 { - return timeutil.FormatTime("Ymd", time.Now().Unix()-60*int64(this.ExpiresPeriod)-86400) + return timeutil.FormatTime("Ymd", time.Now().Unix()-60*int64(this.Period*this.ExpiresPeriod)-86400) } else { return timeutil.FormatTime("Ymd", time.Now().Unix()-60*int64(this.Period*60)-86400) }