diff --git a/internal/db/models/ip_item_dao.go b/internal/db/models/ip_item_dao.go index 527a074c..aa058a74 100644 --- a/internal/db/models/ip_item_dao.go +++ b/internal/db/models/ip_item_dao.go @@ -123,14 +123,15 @@ func (this *IPItemDAO) FindEnabledIPItem(tx *dbs.Tx, id int64) (*IPItem, error) return result.(*IPItem), err } -// DisableOldIPItem 根据IP删除以前的旧记录 -func (this *IPItemDAO) DisableOldIPItem(tx *dbs.Tx, listId int64, ipFrom string, ipTo string) error { - return this.Query(tx). +// DeleteOldItem 根据IP删除以前的旧记录 +func (this *IPItemDAO) DeleteOldItem(tx *dbs.Tx, listId int64, ipFrom string, ipTo string) error { + _, err := this.Query(tx). + UseIndex("ipFrom"). Attr("listId", listId). Attr("ipFrom", ipFrom). Attr("ipTo", ipTo). - Set("state", IPItemStateDisabled). - UpdateQuickly() + Delete() + return err } // CreateIPItem 创建IP diff --git a/internal/rpc/services/service_ip_item.go b/internal/rpc/services/service_ip_item.go index 2170e37d..2b661f66 100644 --- a/internal/rpc/services/service_ip_item.go +++ b/internal/rpc/services/service_ip_item.go @@ -59,7 +59,7 @@ func (this *IPItemService) CreateIPItem(ctx context.Context, req *pb.CreateIPIte } // 删除以前的 - err = models.SharedIPItemDAO.DisableOldIPItem(tx, req.IpListId, req.IpFrom, req.IpTo) + err = models.SharedIPItemDAO.DeleteOldItem(tx, req.IpListId, req.IpFrom, req.IpTo) if err != nil { return nil, err }