From 6b0c9a5fad333a491ddac65126783481c638672f Mon Sep 17 00:00:00 2001 From: mhsanaei Date: Tue, 17 Sep 2024 09:33:44 +0200 Subject: update noise to noises + type --- sub/sub.go | 6 +++--- sub/subJsonService.go | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sub') diff --git a/sub/sub.go b/sub/sub.go index a8a20868..db582e8d 100644 --- a/sub/sub.go +++ b/sub/sub.go @@ -92,9 +92,9 @@ func (s *Server) initRouter() (*gin.Engine, error) { SubJsonFragment = "" } - SubJsonNoise, err := s.settingService.GetSubJsonNoise() + SubJsonNoises, err := s.settingService.GetSubJsonNoises() if err != nil { - SubJsonNoise = "" + SubJsonNoises = "" } SubJsonMux, err := s.settingService.GetSubJsonMux() @@ -111,7 +111,7 @@ func (s *Server) initRouter() (*gin.Engine, error) { s.sub = NewSUBController( g, LinksPath, JsonPath, Encrypt, ShowInfo, RemarkModel, SubUpdates, - SubJsonFragment, SubJsonNoise, SubJsonMux, SubJsonRules) + SubJsonFragment, SubJsonNoises, SubJsonMux, SubJsonRules) return engine, nil } diff --git a/sub/subJsonService.go b/sub/subJsonService.go index cbda594a..680a078d 100644 --- a/sub/subJsonService.go +++ b/sub/subJsonService.go @@ -21,14 +21,14 @@ type SubJsonService struct { configJson map[string]interface{} defaultOutbounds []json_util.RawMessage fragment string - noise string + noises string mux string inboundService service.InboundService SubService *SubService } -func NewSubJsonService(fragment string, noise string, mux string, rules string, subService *SubService) *SubJsonService { +func NewSubJsonService(fragment string, noises string, mux string, rules string, subService *SubService) *SubJsonService { var configJson map[string]interface{} var defaultOutbounds []json_util.RawMessage json.Unmarshal([]byte(defaultJson), &configJson) @@ -53,15 +53,15 @@ func NewSubJsonService(fragment string, noise string, mux string, rules string, defaultOutbounds = append(defaultOutbounds, json_util.RawMessage(fragment)) } - if noise != "" { - defaultOutbounds = append(defaultOutbounds, json_util.RawMessage(noise)) + if noises != "" { + defaultOutbounds = append(defaultOutbounds, json_util.RawMessage(noises)) } return &SubJsonService{ configJson: configJson, defaultOutbounds: defaultOutbounds, fragment: fragment, - noise: noise, + noises: noises, mux: mux, SubService: subService, } -- cgit v1.2.3