diff --git a/common/constant/key.go b/common/constant/key.go index 07335bed599788b0240b28b096c7d7a395ee9c11..488da4867ea8436fdbcc3bce9e6a1b5aaf33c1b2 100644 --- a/common/constant/key.go +++ b/common/constant/key.go @@ -41,6 +41,7 @@ const ( LOCAL_ADDR = "local-addr" REMOTE_ADDR = "remote-addr" PATH_SEPARATOR = "/" + DUBBO_KEY = "dubbo" ) const ( diff --git a/config/reference_config.go b/config/reference_config.go index 7ce0013194f5c1a1d09e014a858433833aa07f0e..6fe8b02f5c87d5842cf1f51fb1063e153f341f36 100644 --- a/config/reference_config.go +++ b/config/reference_config.go @@ -185,6 +185,10 @@ func (c *ReferenceConfig) getUrlMap() url.Values { urlMap.Set(constant.VERSION_KEY, c.Version) urlMap.Set(constant.GENERIC_KEY, strconv.FormatBool(c.Generic)) urlMap.Set(constant.ROLE_KEY, strconv.Itoa(common.CONSUMER)) + urlMap.Set(constant.CATEGORY_KEY, (common.RoleType(common.CONSUMER)).String()) + urlMap.Set(constant.DUBBO_KEY, "dubbo-consumer-golang-"+constant.Version) + urlMap.Set(constant.SIDE_KEY, (common.RoleType(common.CONSUMER)).Role()) + if len(c.RequestTimeout) != 0 { urlMap.Set(constant.TIMEOUT_KEY, c.RequestTimeout) } diff --git a/config/service_config.go b/config/service_config.go index 7d97fa4d1e95bd79e051f77deaeafa1afcc58b0f..3624804dbcd9121d7e0e945319c11e541185838e 100644 --- a/config/service_config.go +++ b/config/service_config.go @@ -193,6 +193,10 @@ func (c *ServiceConfig) getUrlMap() url.Values { urlMap.Set(constant.GROUP_KEY, c.Group) urlMap.Set(constant.VERSION_KEY, c.Version) urlMap.Set(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)) + urlMap.Set(constant.CATEGORY_KEY, (common.RoleType(common.PROVIDER)).String()) + urlMap.Set(constant.DUBBO_KEY, "dubbo-provider-golang-"+constant.Version) + urlMap.Set(constant.SIDE_KEY, (common.RoleType(common.PROVIDER)).Role()) + // application info urlMap.Set(constant.APPLICATION_KEY, providerConfig.ApplicationConfig.Name) urlMap.Set(constant.ORGANIZATION_KEY, providerConfig.ApplicationConfig.Organization) diff --git a/registry/base_registry.go b/registry/base_registry.go index 3b64e93e2f6b5b58a70650f589dec3ca092376c1..18ec608ca64594dc7c2199ed75daa9e5a1b7e887 100644 --- a/registry/base_registry.go +++ b/registry/base_registry.go @@ -249,12 +249,6 @@ func (r *BaseRegistry) providerRegistry(c common.URL, params url.Values) (string // Dubbo java consumer to start looking for the provider url,because the category does not match, // the provider will not find, causing the consumer can not start, so we use consumers. - // DubboRole = [...]string{"consumer", "", "", "provider"} - // params.Add("category", (RoleType(PROVIDER)).Role()) - params.Add("category", (common.RoleType(common.PROVIDER)).String()) - params.Add("dubbo", "dubbo-provider-golang-"+constant.Version) - - params.Add("side", (common.RoleType(common.PROVIDER)).Role()) if len(c.Methods) == 0 { params.Add("methods", strings.Join(c.Methods, ",")) @@ -308,9 +302,6 @@ func (r *BaseRegistry) consumerRegistry(c common.URL, params url.Values) (string } params.Add("protocol", c.Protocol) - params.Add("category", (common.RoleType(common.CONSUMER)).String()) - params.Add("dubbo", "dubbogo-consumer-"+constant.Version) - rawURL = fmt.Sprintf("consumer://%s%s?%s", localIP, c.Path, params.Encode()) dubboPath = fmt.Sprintf("/dubbo/%s/%s", r.service(c), (common.RoleType(common.CONSUMER)).String()) diff --git a/registry/etcdv3/registry_test.go b/registry/etcdv3/registry_test.go index 6e26a8f3fcbbf50592520a44b253e5abbaedb061..51644be85a69458d9abfa514970b91e522ecc2d2 100644 --- a/registry/etcdv3/registry_test.go +++ b/registry/etcdv3/registry_test.go @@ -63,7 +63,7 @@ func (suite *RegistryTestSuite) TestRegister() { if err != nil { t.Fatal(err) } - assert.Regexp(t, ".*dubbo%3A%2F%2F127.0.0.1%3A20000%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26category%3Dproviders%26cluster%3Dmock%26dubbo%3Ddubbo-provider-golang-1.3.0%26.*provider", children) + assert.Regexp(t, ".*dubbo%3A%2F%2F127.0.0.1%3A20000%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26cluster%3Dmock", children) assert.NoError(t, err) } diff --git a/registry/zookeeper/registry_test.go b/registry/zookeeper/registry_test.go index 0d7623ca12a9b4e49f84ec988c796f2e913d537f..688deccfbec67771c4071f6307802a16e4e0fc8b 100644 --- a/registry/zookeeper/registry_test.go +++ b/registry/zookeeper/registry_test.go @@ -41,7 +41,7 @@ func Test_Register(t *testing.T) { defer ts.Stop() err := reg.Register(url) children, _ := reg.client.GetChildren("/dubbo/com.ikurento.user.UserProvider/providers") - assert.Regexp(t, ".*dubbo%3A%2F%2F127.0.0.1%3A20000%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26category%3Dproviders%26cluster%3Dmock%26dubbo%3Ddubbo-provider-golang-1.3.0%26.*.serviceid%3Dsoa.mock%26.*provider", children) + assert.Regexp(t, ".*dubbo%3A%2F%2F127.0.0.1%3A20000%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26cluster%3Dmock%26.*.serviceid%3Dsoa.mock", children) assert.NoError(t, err) }