TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-04 16:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

IP名单搜索IP时同时搜索范围

Browse Source
This commit is contained in:
GoEdgeLab
2024-04-06 10:31:03 +08:00
parent 511f248473
commit 4e3b93a5fe
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/db/models/ip_item_dao.go
View File

@@ -514,13 +514,17 @@ func (this *IPItemDAO) CountAllEnabledIPItems(tx *dbs.Tx, sourceUserId int64, ke
} }
if len(keyword) > 0 { if len(keyword) > 0 {
if net.ParseIP(keyword) != nil { // 是一个IP地址 if net.ParseIP(keyword) != nil { // 是一个IP地址
query.Attr("ipFrom", keyword) // TODO 支持IPv6
query.Where("(ipFrom =:ipKeyword OR INET_ATON(:ipKeyword) BETWEEN INET_ATON(ipFrom) AND INET_ATON(ipTo))").
Param("ipKeyword", keyword)
} else { } else {
query.Like("ipFrom", dbutils.QuoteLike(keyword)) query.Like("ipFrom", dbutils.QuoteLike(keyword))
} }
} }
if len(ip) > 0 { if len(ip) > 0 {
query.Attr("ipFrom", ip) // TODO 支持IPv6
query.Where("(ipFrom =:ip OR INET_ATON(:ip) BETWEEN INET_ATON(ipFrom) AND INET_ATON(ipTo))").
Param("ip", ip)
} }
if listId > 0 { if listId > 0 {
query.Attr("listId", listId) query.Attr("listId", listId)
@@ -560,13 +564,17 @@ func (this *IPItemDAO) ListAllEnabledIPItems(tx *dbs.Tx, sourceUserId int64, key
} }
if len(keyword) > 0 { if len(keyword) > 0 {
if net.ParseIP(keyword) != nil { // 是一个IP地址 if net.ParseIP(keyword) != nil { // 是一个IP地址
query.Attr("ipFrom", keyword) // TODO 支持IPv6
query.Where("(ipFrom =:ipKeyword OR INET_ATON(:ipKeyword) BETWEEN INET_ATON(ipFrom) AND INET_ATON(ipTo))").
Param("ipKeyword", keyword)
} else { } else {
query.Like("ipFrom", dbutils.QuoteLike(keyword)) query.Like("ipFrom", dbutils.QuoteLike(keyword))
} }
} }
if len(ip) > 0 { if len(ip) > 0 {
query.Attr("ipFrom", ip) // TODO 支持IPv6
query.Where("(ipFrom =:ip OR INET_ATON(:ip) BETWEEN INET_ATON(ipFrom) AND INET_ATON(ipTo))").
Param("ip", ip)
} }
if listId > 0 { if listId > 0 {
query.Attr("listId", listId) query.Attr("listId", listId)