From 13d35de4bc744c6f1e413c407104ba9e5dd2a5e9 Mon Sep 17 00:00:00 2001 From: ForestL18 <45709305+ForestL18@users.noreply.github.com> Date: Tue, 11 Feb 2025 17:35:27 +0800 Subject: [PATCH] optimize log output of classical rule --- docs/config.yaml | 3 ++- rules/provider/classical_strategy.go | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/config.yaml b/docs/config.yaml index 2c2f3f43..02e82539 100644 --- a/docs/config.yaml +++ b/docs/config.yaml @@ -61,7 +61,7 @@ external-controller-tls: 0.0.0.0:9443 # RESTful API HTTPS 监听地址,需要 # RESTful API CORS标头配置 external-controller-cors: allow-origins: - - * + - "*" allow-private-network: true # RESTful API Unix socket 监听地址( windows版本大于17063也可以使用,即大于等于1803/RS4版本即可使用 ) @@ -78,6 +78,7 @@ external-controller-pipe: \\.\pipe\mihomo # 配置 WEB UI 目录,使用 http://{{external-controller}}/ui 访问 external-ui: /path/to/ui/folder/ external-ui-name: xd +# 目前支持下载zip,tgz格式的压缩包 external-ui-url: "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip" # 在RESTful API端口上开启DOH服务器 diff --git a/rules/provider/classical_strategy.go b/rules/provider/classical_strategy.go index 205a8e59..3b677a68 100644 --- a/rules/provider/classical_strategy.go +++ b/rules/provider/classical_strategy.go @@ -59,7 +59,11 @@ func (c *classicalStrategy) Insert(rule string) { r, err := c.parse(ruleType, rule, "", params) if err != nil { - log.Warnln("parse rule error:[%s]", err.Error()) + if ruleType == "" { + log.Warnln("parse classical rule error:[%s]", err.Error()+rule) + } else { + log.Warnln("parse classical rule error:[%s]", err.Error()) + } } else { if r.ShouldResolveIP() { c.shouldResolveIP = true @@ -83,7 +87,7 @@ func ruleParse(ruleRaw string) (string, string, []string) { return item[0], item[1], nil } else if len(item) > 2 { if item[0] == "NOT" || item[0] == "OR" || item[0] == "AND" || item[0] == "SUB-RULE" || item[0] == "DOMAIN-REGEX" || item[0] == "PROCESS-NAME-REGEX" || item[0] == "PROCESS-PATH-REGEX" { - return item[0], strings.Join(item[1:len(item)], ","), nil + return item[0], strings.Join(item[1:], ","), nil } else { return item[0], item[1], item[2:] }