From 7a86ecb44bb86b5fe950abd8d6493940453da7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Thu, 17 Feb 2022 19:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96IPItem=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/db/models/ip_item_dao.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/db/models/ip_item_dao.go b/internal/db/models/ip_item_dao.go
index 72968e30..462f5fe0 100644
--- a/internal/db/models/ip_item_dao.go
+++ b/internal/db/models/ip_item_dao.go
@@ -429,7 +429,7 @@ func (this *IPItemDAO) UpdateItemsRead(tx *dbs.Tx) error {
 func (this *IPItemDAO) CleanExpiredIPItems(tx *dbs.Tx) error {
 	// 删除 N 天之前过期的数据
 	_, err := this.Query(tx).
-		Where("(expiredAt>0 AND expiredAt<=:timestamp)").
+		Where("expiredAt<=:timestamp").
 		State(IPItemStateDisabled).
 		Param("timestamp", time.Now().Unix()-7*86400). // N 天之前过期的
 		Limit(10000).                                  // 限制条数，防止数量过多导致超时
@@ -455,10 +455,10 @@ func (this *IPItemDAO) CleanExpiredIPItems(tx *dbs.Tx) error {
 		if err != nil {
 			return err
 		}
+		// 这里不重置过期时间用于清理
 		_, err = this.Query(tx).
 			Pk(expiredId).
 			Set("state", IPItemStateDisabled).
-			Set("expiredAt", 0).
 			Set("version", newVersion).
 			Update()