精简: 订阅极简输出: 去掉分流规则注入(Happ/Clash/Incy 远程规则源+remote_routing 拉取缓存+RemoteRoutingJob、Clash 远程规则合并簇、subJsonRules 注入); 保留多格式转换与默认极简模板

internal/web/service/setting.go

@@ -81,11 +81,7 @@ var defaultValueMap = map[string]string{
 	"subSupportUrl":              "",
 	"subProfileUrl":              "",
 	"subAnnounce":                "",
-	"subEnableRouting":           "false",
-	"subRoutingRules":            "",
 	"subHideSettings":            "false",
-	"subIncyEnableRouting":       "false",
-	"subIncyRoutingRules":        "",
 	"subListen":                  "",
 	"subPort":                    "2096",
 	"subPath":                    "/sub/",
@@ -100,10 +96,7 @@ var defaultValueMap = map[string]string{
 	"subClashEnable":             "false",
 	"subClashPath":               "/clash/",
 	"subClashURI":                "",
-	"subClashEnableRouting":      "false",
-	"subClashRules":              "",
 	"subJsonMux":                 "",
-	"subJsonRules":               "",
 	"subJsonFinalMask":           "",
 	"subJsonObservatory":         "",
 	"subThemeDir":                "",
@@ -623,26 +616,10 @@ func (s *SettingService) GetSubAnnounce() (string, error) {
 	return s.getString("subAnnounce")
 }
 
-func (s *SettingService) GetSubEnableRouting() (bool, error) {
-	return s.getBool("subEnableRouting")
-}
-
-func (s *SettingService) GetSubRoutingRules() (string, error) {
-	return s.getString("subRoutingRules")
-}
-
 func (s *SettingService) GetSubHideSettings() (bool, error) {
 	return s.getBool("subHideSettings")
 }
 
-func (s *SettingService) GetSubIncyEnableRouting() (bool, error) {
-	return s.getBool("subIncyEnableRouting")
-}
-
-func (s *SettingService) GetSubIncyRoutingRules() (string, error) {
-	return s.getString("subIncyRoutingRules")
-}
-
 func (s *SettingService) GetSubListen() (string, error) {
 	return s.getString("subListen")
 }
@@ -711,22 +688,10 @@ func (s *SettingService) GetSubClashURI() (string, error) {
 	return s.getString("subClashURI")
 }
 
-func (s *SettingService) GetSubClashEnableRouting() (bool, error) {
-	return s.getBool("subClashEnableRouting")
-}
-
-func (s *SettingService) GetSubClashRules() (string, error) {
-	return s.getString("subClashRules")
-}
-
 func (s *SettingService) GetSubJsonMux() (string, error) {
 	return s.getString("subJsonMux")
 }
 
-func (s *SettingService) GetSubJsonRules() (string, error) {
-	return s.getString("subJsonRules")
-}
-
 func (s *SettingService) GetSubJsonFinalMask() (string, error) {
 	return s.getString("subJsonFinalMask")
 }
@@ -913,26 +878,6 @@ func validateSettingsURLs(allSetting *entity.AllSetting) error {
 	// the scheme instead of forcing SanitizeHTTPURL's http(s)-only rule.
 	allSetting.SubSupportUrl = common.EnsureURLScheme(allSetting.SubSupportUrl)
 	allSetting.SubProfileUrl = common.EnsureURLScheme(allSetting.SubProfileUrl)
-	for name, value := range map[string]*string{
-		"Happ routing source":         &allSetting.SubRoutingRules,
-		"Clash/Mihomo routing source": &allSetting.SubClashRules,
-		"Incy routing source":         &allSetting.SubIncyRoutingRules,
-	} {
-		if err := validateRemoteRoutingURLSetting(name, value); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func validateRemoteRoutingURLSetting(name string, value *string) error {
-	canonical, remote, err := common.ParseRemoteRoutingURL(*value)
-	if err != nil {
-		return common.NewError(name, err.Error())
-	}
-	if remote {
-		*value = canonical
-	}
 	return nil
 }