diff --git a/internal/db/models/ip_item_dao.go b/internal/db/models/ip_item_dao.go index a7924eb8..72968e30 100644 --- a/internal/db/models/ip_item_dao.go +++ b/internal/db/models/ip_item_dao.go @@ -444,7 +444,7 @@ func (this *IPItemDAO) CleanExpiredIPItems(tx *dbs.Tx) error { Where("(expiredAt>0 AND expiredAt<=:timestamp)"). Param("timestamp", time.Now().Unix()). State(IPItemStateEnabled). - Limit(100). + Limit(500). FindOnes() if err != nil { return err diff --git a/internal/db/models/ip_item_dao_test.go b/internal/db/models/ip_item_dao_test.go index b1346f28..e1a92ca2 100644 --- a/internal/db/models/ip_item_dao_test.go +++ b/internal/db/models/ip_item_dao_test.go @@ -1,6 +1,7 @@ package models import ( + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" _ "github.com/go-sql-driver/mysql" "github.com/iwind/TeaGo/dbs" "github.com/iwind/TeaGo/rands" @@ -47,16 +48,17 @@ func TestIPItemDAO_CreateManyIPs(t *testing.T) { var tx *dbs.Tx var dao = NewIPItemDAO() - var n = 5 + var n = 10 for i := 0; i < n; i++ { - itemId, err := dao.CreateIPItem(tx, 1, "192."+types.String(rands.Int(0, 255))+"."+types.String(rands.Int(0, 255))+"."+types.String(rands.Int(0, 255)), "", time.Now().Unix()-86400, "test", IPItemTypeIPv4, "warning", 0, 0, 0, 0, 0, 0, 0) + itemId, err := dao.CreateIPItem(tx, firewallconfigs.GlobalListId, "192."+types.String(rands.Int(0, 255))+"."+types.String(rands.Int(0, 255))+"."+types.String(rands.Int(0, 255)), "", time.Now().Unix()+86400, "test", IPItemTypeIPv4, "warning", 0, 0, 0, 0, 0, 0, 0) if err != nil { t.Fatal(err) } - err = dao.Query(tx).Pk(itemId).Set("state", 0).UpdateQuickly() + _ = itemId + /**err = dao.Query(tx).Pk(itemId).Set("state", 0).UpdateQuickly() if err != nil { t.Fatal(err) - } + }**/ } t.Log("ok") } diff --git a/internal/db/models/sys_locker_dao.go b/internal/db/models/sys_locker_dao.go index 6d39313c..a50f4ff0 100644 --- a/internal/db/models/sys_locker_dao.go +++ b/internal/db/models/sys_locker_dao.go @@ -30,7 +30,7 @@ func init() { }) } -// 开锁 +// Lock 开锁 func (this *SysLockerDAO) Lock(tx *dbs.Tx, key string, timeout int64) (ok bool, err error) { maxErrors := 5 for { @@ -103,7 +103,7 @@ func (this *SysLockerDAO) Lock(tx *dbs.Tx, key string, timeout int64) (ok bool, } } -// 解锁 +// Unlock 解锁 func (this *SysLockerDAO) Unlock(tx *dbs.Tx, key string) error { _, err := this.Query(tx). Attr("key", key). @@ -112,7 +112,7 @@ func (this *SysLockerDAO) Unlock(tx *dbs.Tx, key string) error { return err } -// 增加版本号 +// Increase 增加版本号 func (this *SysLockerDAO) Increase(tx *dbs.Tx, key string, defaultValue int64) (int64, error) { if tx == nil { var result int64