diff --git a/config/base_config.go b/config/base_config.go index c0992006da6ea1bc96dfa1ccb547b82cb6bd2598..3602c17508f26480b115dd45f46685adf86c718e 100644 --- a/config/base_config.go +++ b/config/base_config.go @@ -69,8 +69,8 @@ func (c *BaseConfig) GetRemoteConfig(name string) (config *RemoteConfig, ok bool return } -func (c *BaseConfig) toURL(name string, protocol string) (common.URL, error) { - rc, ok := GetBaseConfig().GetRemoteConfig(name) +func (c *BaseConfig) toConfigCenterURL() (common.URL, error) { + rc, ok := GetBaseConfig().GetRemoteConfig(baseConfig.ConfigCenterConfig.RemoteRef) if !ok { return common.URL{}, perrors.New("Could not find out the remote ref config, name: " + name) @@ -80,7 +80,7 @@ func (c *BaseConfig) toURL(name string, protocol string) (common.URL, error) { common.WithUsername(rc.Username), common.WithPassword(rc.Password), common.WithLocation(rc.Address), - common.WithProtocol(protocol), + common.WithProtocol(baseConfig.ConfigCenterConfig.Protocol), ) } diff --git a/config/config_center_config.go b/config/config_center_config.go index e2943dcc5c880961b18da4726007a5cb723d6beb..514e2d9a0e3acec356228dc495ba7a137016931d 100644 --- a/config/config_center_config.go +++ b/config/config_center_config.go @@ -96,7 +96,7 @@ func (b *configCenter) toURL(baseConfig BaseConfig) (common.URL, error) { return common.NewURL(baseConfig.ConfigCenterConfig.Address, common.WithProtocol(baseConfig.ConfigCenterConfig.Protocol), common.WithParams(baseConfig.ConfigCenterConfig.GetUrlMap())) } - newURL, err := baseConfig.toURL(baseConfig.ConfigCenterConfig.RemoteRef, baseConfig.ConfigCenterConfig.Protocol) + newURL, err := baseConfig.toConfigCenterURL() if err == nil { newURL.SetParams(baseConfig.ConfigCenterConfig.GetUrlMap()) }