diff --git a/common/proxy/proxy_factory/default.go b/common/proxy/proxy_factory/default.go index 1b8ca222011292040c57c3e86df0438943a5b464..752f3ea38193ca46a5c9dbcb8ec4b05811d19159 100644 --- a/common/proxy/proxy_factory/default.go +++ b/common/proxy/proxy_factory/default.go @@ -89,6 +89,8 @@ func (pi *ProxyInvoker) Invoke(ctx context.Context, invocation protocol.Invocati result.SetAttachments(invocation.Attachments()) url := pi.GetUrl() + //get providerUrl. The origin url may be is registry URL. + url = *getProviderURL(&url) methodName := invocation.MethodName() proto := url.Protocol @@ -159,3 +161,10 @@ func (pi *ProxyInvoker) Invoke(ctx context.Context, invocation protocol.Invocati } return result } + +func getProviderURL(url *common.URL) *common.URL { + if url.SubURL == nil { + return url + } + return url.SubURL +} diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go index 5b2a5d66f67991cc6e7ead610b3259bb5962870d..e004d6dfe43d1affa6144d35f9d1fa2ee1cb16a4 100644 --- a/registry/protocol/protocol.go +++ b/registry/protocol/protocol.go @@ -32,7 +32,6 @@ import ( "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/common/logger" - "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" "github.com/apache/dubbo-go/config_center" _ "github.com/apache/dubbo-go/config_center/configurator" @@ -403,8 +402,6 @@ func newWrappedInvoker(invoker protocol.Invoker, url *common.URL) *wrappedInvoke // Invoke remote service base on URL of wrappedInvoker func (ivk *wrappedInvoker) Invoke(ctx context.Context, invocation protocol.Invocation) protocol.Result { - // get right url - ivk.invoker.(*proxy_factory.ProxyInvoker).BaseInvoker = *protocol.NewBaseInvoker(ivk.GetUrl()) return ivk.invoker.Invoke(ctx, invocation) }