From ee672da5766879632e3e8e638218e014a5d31d16 Mon Sep 17 00:00:00 2001 From: Joe Zou <yixian.zou@gmail.com> Date: Wed, 27 Nov 2019 16:17:21 +0800 Subject: [PATCH] add new config item for apollo --- common/constant/key.go | 1 + config/config_center_config.go | 1 + config_center/apollo/impl.go | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/constant/key.go b/common/constant/key.go index 0c0c91f39..a52f15875 100644 --- a/common/constant/key.go +++ b/common/constant/key.go @@ -101,6 +101,7 @@ const ( const ( CONFIG_NAMESPACE_KEY = "config.namespace" CONFIG_GROUP_KEY = "config.group" + CONFIG_APP_ID_KEY = "config.appId" CONFIG_CLUSTER_KEY = "config.cluster" CONFIG_CHECK_KEY = "config.check" CONFIG_TIMEOUT_KET = "config.timeout" diff --git a/config/config_center_config.go b/config/config_center_config.go index 9c100b349..b10d658ec 100644 --- a/config/config_center_config.go +++ b/config/config_center_config.go @@ -42,6 +42,7 @@ type ConfigCenterConfig struct { ConfigFile string `default:"dubbo.properties" yaml:"config_file" json:"config_file,omitempty"` Namespace string `default:"dubbo.properties" yaml:"namespace" json:"namespace,omitempty"` AppConfigFile string `default:"dubbo.properties" yaml:"app_config_file" json:"app_config_file,omitempty"` + AppId string `default:"dubbo" yaml:"app_id" json:"app_id,omitempty"` TimeoutStr string `yaml:"timeout" json:"timeout,omitempty"` timeout time.Duration } diff --git a/config_center/apollo/impl.go b/config_center/apollo/impl.go index 4eff318e5..ffe959e82 100644 --- a/config_center/apollo/impl.go +++ b/config_center/apollo/impl.go @@ -57,7 +57,7 @@ func newApolloConfiguration(url *common.URL) (*apolloConfiguration, error) { configAddr := c.getAddressWithProtocolPrefix(url) configCluster := url.GetParam(constant.CONFIG_CLUSTER_KEY, "") - appId := url.GetParam(constant.CONFIG_GROUP_KEY, DEFAULT_GROUP) + appId := url.GetParam(constant.CONFIG_APP_ID_KEY, "") namespaces := url.GetParam(constant.CONFIG_NAMESPACE_KEY, getProperties(DEFAULT_GROUP)) c.appConf = &agollo.AppConfig{ AppId: appId, -- GitLab