TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-13 06:50:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ttlcache支持泛型

Browse Source
This commit is contained in:
刘祥超
2023-10-05 08:28:16 +08:00
parent 8561ff3e2d
commit d92f27c44b
10 changed files with 95 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/waf/utils/utils.go
View File

@@ -4,12 +4,11 @@ import (
"github.com/TeaOSLab/EdgeNode/internal/re"
"github.com/TeaOSLab/EdgeNode/internal/ttlcache"
"github.com/cespare/xxhash"
"github.com/iwind/TeaGo/types"
"strconv"
"time"
)
var cache = ttlcache.NewCache()
var cache = ttlcache.NewCache[int8]()
// MatchStringCache 正则表达式匹配字符串，并缓存结果
func MatchStringCache(regex *re.Regexp, s string) bool {
@@ -26,7 +25,7 @@ func MatchStringCache(regex *re.Regexp, s string) bool {
var key = regex.IdString() + "@" + strconv.FormatUint(hash, 10)
var item = cache.Read(key)
if item != nil {
return types.Int8(item.Value) == 1
return item.Value == 1
}
var b = regex.MatchString(s)
if b {
@@ -52,10 +51,10 @@ func MatchBytesCache(regex *re.Regexp, byteSlice []byte) bool {
var key = regex.IdString() + "@" + strconv.FormatUint(hash, 10)
var item = cache.Read(key)
if item != nil {
return types.Int8(item.Value) == 1
return item.Value == 1
}
if item != nil {
return types.Int8(item.Value) == 1
return item.Value == 1
}
var b = regex.Match(byteSlice)
if b {