From e680d7c95ea619571b191149f7cc62250d78fe38 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sun, 21 Apr 2024 10:48:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8IP=E5=90=8D=E5=8D=95=E4=B8=AD=E6=90=9C?= =?UTF-8?q?=E7=B4=A2IP=E6=97=B6=E5=90=8C=E6=97=B6=E4=B9=9F=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E2=80=9C=E6=89=80=E6=9C=89IP=E2=80=9D=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/ip_item_dao.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/db/models/ip_item_dao.go b/internal/db/models/ip_item_dao.go index c73cfdbe..648d4e46 100644 --- a/internal/db/models/ip_item_dao.go +++ b/internal/db/models/ip_item_dao.go @@ -614,10 +614,10 @@ func (this *IPItemDAO) CountAllEnabledIPItems(tx *dbs.Tx, sourceUserId int64, ke if len(keyword) > 0 { if net.ParseIP(keyword) != nil { // 是一个IP地址 if iputils.IsIPv4(keyword) { - query.Where("(ipFrom =:ipKeyword OR INET_ATON(:ipKeyword) BETWEEN INET_ATON(ipFrom) AND INET_ATON(ipTo))"). + query.Where("(type='all' OR ipFrom =:ipKeyword OR INET_ATON(:ipKeyword) BETWEEN INET_ATON(ipFrom) AND INET_ATON(ipTo))"). Param("ipKeyword", keyword) } else if iputils.IsIPv6(keyword) { - query.Where("(ipFrom =:ipKeyword OR HEX(INET6_ATON(:ipKeyword)) BETWEEN HEX(INET6_ATON(ipFrom)) AND HEX(INET6_ATON(ipTo)))"). + query.Where("(type='all' OR ipFrom =:ipKeyword OR HEX(INET6_ATON(:ipKeyword)) BETWEEN HEX(INET6_ATON(ipFrom)) AND HEX(INET6_ATON(ipTo)))"). Param("ipKeyword", keyword) } } else { @@ -666,10 +666,10 @@ func (this *IPItemDAO) ListAllEnabledIPItems(tx *dbs.Tx, sourceUserId int64, key if len(keyword) > 0 { if net.ParseIP(keyword) != nil { // 是一个IP地址 if iputils.IsIPv4(keyword) { - query.Where("(ipFrom =:ipKeyword OR INET_ATON(:ipKeyword) BETWEEN INET_ATON(ipFrom) AND INET_ATON(ipTo))"). + query.Where("(type='all' OR ipFrom =:ipKeyword OR INET_ATON(:ipKeyword) BETWEEN INET_ATON(ipFrom) AND INET_ATON(ipTo))"). Param("ipKeyword", keyword) } else if iputils.IsIPv6(keyword) { - query.Where("(ipFrom =:ipKeyword OR HEX(INET6_ATON(:ipKeyword)) BETWEEN HEX(INET6_ATON(ipFrom)) AND HEX(INET6_ATON(ipTo)))"). + query.Where("(type='all' OR ipFrom =:ipKeyword OR HEX(INET6_ATON(:ipKeyword)) BETWEEN HEX(INET6_ATON(ipFrom)) AND HEX(INET6_ATON(ipTo)))"). Param("ipKeyword", keyword) } } else {