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

服务列表可以搜索端口号

Browse Source
This commit is contained in:
GoEdgeLab
2021-06-25 11:05:02 +08:00
parent 9a61ec4afc
commit 0b9ab2eaec
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/db/models/server_dao.go
View File

@@ -18,6 +18,7 @@ import (
"github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/maps"
"github.com/iwind/TeaGo/rands" "github.com/iwind/TeaGo/rands"
"github.com/iwind/TeaGo/types" "github.com/iwind/TeaGo/types"
"regexp"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@@ -640,8 +641,14 @@ func (this *ServerDAO) CountAllEnabledServersMatch(tx *dbs.Tx, groupId int64, ke
Param("groupId", numberutils.FormatInt64(groupId)) Param("groupId", numberutils.FormatInt64(groupId))
} }
if len(keyword) > 0 { if len(keyword) > 0 {
query.Where("(name LIKE :keyword OR serverNames LIKE :keyword)"). if regexp.MustCompile(`^\d+$`).MatchString(keyword) {
Param("keyword", "%"+keyword+"%") query.Where("(name LIKE :keyword OR serverNames LIKE :keyword OR JSON_CONTAINS(http, :portRange, '$.listen') OR JSON_CONTAINS(https, :portRange, '$.listen') OR JSON_CONTAINS(tcp, :portRange, '$.listen') OR JSON_CONTAINS(tls, :portRange, '$.listen'))").
Param("portRange", maps.Map{"portRange": keyword}.AsJSON()).
Param("keyword", "%"+keyword+"%")
} else {
query.Where("(name LIKE :keyword OR serverNames LIKE :keyword)").
Param("keyword", "%"+keyword+"%")
}
} }
if userId > 0 { if userId > 0 {
query.Attr("userId", userId) query.Attr("userId", userId)
@@ -674,8 +681,13 @@ func (this *ServerDAO) ListEnabledServersMatch(tx *dbs.Tx, offset int64, size in
Param("groupId", numberutils.FormatInt64(groupId)) Param("groupId", numberutils.FormatInt64(groupId))
} }
if len(keyword) > 0 { if len(keyword) > 0 {
query.Where("(name LIKE :keyword OR serverNames LIKE :keyword)"). if regexp.MustCompile(`^\d+$`).MatchString(keyword) {
Param("keyword", "%"+keyword+"%") query.Where("(name LIKE :keyword OR serverNames LIKE :keyword OR JSON_CONTAINS(http, :portRange, '$.listen') OR JSON_CONTAINS(https, :portRange, '$.listen') OR JSON_CONTAINS(tcp, :portRange, '$.listen') OR JSON_CONTAINS(tls, :portRange, '$.listen'))").
Param("portRange", string(maps.Map{"portRange": keyword}.AsJSON()))
} else {
query.Where("(name LIKE :keyword OR serverNames LIKE :keyword)").
Param("keyword", "%"+keyword+"%")
}
} }
if userId > 0 { if userId > 0 {
query.Attr("userId", userId) query.Attr("userId", userId)