refactor: 逻辑规则显示效果

This commit is contained in:
Skyxim
2022-05-30 13:58:37 +08:00
parent 1f95c74f1e
commit 11ddac2b5f
3 changed files with 5 additions and 6 deletions

View File

@@ -29,15 +29,14 @@ func NewAND(payload string, adapter string) (*AND, error) {
and.rules = rules
payloads := make([]string, 0, len(rules))
for _, rule := range rules {
payloads = append(payloads, fmt.Sprintf("(%s)", rule.Payload()))
payloads = append(payloads, fmt.Sprintf("(%s,%s)", rule.RuleType().String(), rule.Payload()))
if rule.ShouldResolveIP() {
and.needIP = true
break
}
}
and.payload = strings.Join(payloads, " && ")
and.payload = fmt.Sprintf("(%s)", strings.Join(payloads, " && "))
return and, nil
}