From 354d1428604c5ad786b3101a6efd3bc886b51047 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Thu, 4 Jun 2026 21:55:23 +0200 Subject: [PATCH] fix --- frontend/src/models/setting.ts | 2 +- sub/sub.go | 3 +-- sub/subClashService.go | 13 +++---------- web/service/setting.go | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/frontend/src/models/setting.ts b/frontend/src/models/setting.ts index 4397d7cf..a8b40d44 100644 --- a/frontend/src/models/setting.ts +++ b/frontend/src/models/setting.ts @@ -55,7 +55,7 @@ export class AllSetting { subURI = ''; subJsonURI = ''; subClashURI = ''; - subClashEnableRouting = true; + subClashEnableRouting = false; subClashRules = ''; subJsonFragment = ''; subJsonNoises = ''; diff --git a/sub/sub.go b/sub/sub.go index 779109dd..9109947a 100644 --- a/sub/sub.go +++ b/sub/sub.go @@ -142,7 +142,7 @@ func (s *Server) initRouter() (*gin.Engine, error) { SubClashEnableRouting, err := s.settingService.GetSubClashEnableRouting() if err != nil { - SubClashEnableRouting = true + SubClashEnableRouting = false } SubClashRules, err := s.settingService.GetSubClashRules() @@ -150,7 +150,6 @@ func (s *Server) initRouter() (*gin.Engine, error) { SubClashRules = "" } - SubTitle, err := s.settingService.GetSubTitle() if err != nil { SubTitle = "" diff --git a/sub/subClashService.go b/sub/subClashService.go index 7628072c..c15639bf 100644 --- a/sub/subClashService.go +++ b/sub/subClashService.go @@ -557,7 +557,6 @@ func cloneMap(src map[string]any) map[string]any { return dst } - func mergeClashRulesYAML(base map[string]any, raw string) error { raw = strings.TrimSpace(raw) if raw == "" { @@ -573,20 +572,14 @@ func mergeClashRulesYAML(base map[string]any, raw string) error { switch typed := custom.(type) { case []any: mergeClashRules(base, typed) - case []string: - rules := make([]any, 0, len(typed)) - for _, rule := range typed { - rules = append(rules, rule) - } - mergeClashRules(base, rules) case map[string]any: if rules, ok := typed["rules"]; ok { if ruleList, ok := asAnySlice(rules); ok { mergeClashRules(base, ruleList) } } - case string: - mergeClashRules(base, linesToClashRules(typed)) + default: + mergeClashRules(base, linesToClashRules(raw)) } return nil @@ -655,4 +648,4 @@ func linesToClashRules(raw string) []any { rules = append(rules, line) } return rules -} \ No newline at end of file +} diff --git a/web/service/setting.go b/web/service/setting.go index b15dc30f..dced01e7 100644 --- a/web/service/setting.go +++ b/web/service/setting.go @@ -79,7 +79,7 @@ var defaultValueMap = map[string]string{ "subClashEnable": "false", "subClashPath": "/clash/", "subClashURI": "", - "subClashEnableRouting": "true", + "subClashEnableRouting": "false", "subClashRules": "", "subJsonFragment": "", "subJsonNoises": "",