diff --git a/common/constant/env.go b/common/constant/env.go index a018da81f64549253ca332c250a044dfe14e685f..f0e4fabe02cb09f63173bc9fe0cbf83885bdefb6 100644 --- a/common/constant/env.go +++ b/common/constant/env.go @@ -21,6 +21,4 @@ const ( CONF_CONSUMER_FILE_PATH = "CONF_CONSUMER_FILE_PATH" CONF_PROVIDER_FILE_PATH = "CONF_PROVIDER_FILE_PATH" APP_LOG_CONF_FILE string = "APP_LOG_CONF_FILE" - DUBBO_VERSION_KEY = "dubbo" - DUBBO_VERSION = "2.0.2" ) diff --git a/filter/impl/echo_filter.go b/filter/impl/echo_filter.go index 5eb5a37fa500bd8c180d879240d1c1e367df31ce..18e42c8cb2b15acb27573c5e24f11a8b69e0d496 100644 --- a/filter/impl/echo_filter.go +++ b/filter/impl/echo_filter.go @@ -43,7 +43,8 @@ func (ef *EchoFilter) Invoke(invoker protocol.Invoker, invocation protocol.Invoc logger.Debugf("%v,%v", invocation.MethodName(), len(invocation.Arguments())) if invocation.MethodName() == constant.ECHO && len(invocation.Arguments()) == 1 { return &protocol.RPCResult{ - Rest: invocation.Arguments()[0], + Rest: invocation.Arguments()[0], + Attrs: invocation.Attachments(), } } diff --git a/go.mod b/go.mod index 7a1832a9ec4e9d31e138d84a2c4a401619b30afd..264559029655be4505faff2d714e8c6e05c87074 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ require ( github.com/Workiva/go-datastructures v1.0.50 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190802083043-4cd0c391755e // indirect - github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190902124655-28e15207c962 + github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190909140437-80cbb25cbb22 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23 // indirect github.com/coreos/bbolt v1.3.3 // indirect github.com/coreos/etcd v3.3.13+incompatible diff --git a/go.sum b/go.sum index 04366e672fe26daf67b55ad595c4ef2af3565c12..b04deb316931680ad3db2a68ca5b4f3c8dd3b92d 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190802083043-4cd0c391755e h1:MSuLXx/mveDbpDNhVrcWTMeV4lbYWKcyO4rH+jAxmX0= github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190802083043-4cd0c391755e/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ= github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190902124655-28e15207c962 h1:Nnlrk3rPLHkw0HO0zIf80a+bRaarKYyiDeouyMErMC4= -github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190902124655-28e15207c962/go.mod h1:LWnndnrFXZmJLAzoyNAPNHSIJ1KOHVkTSsHgC3YYWlo= +github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190909140437-80cbb25cbb22 h1:Ku+3LFRYVelgo/INS9893QOUeIiKNeNKzK3CzDcqt/4= +github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190909140437-80cbb25cbb22/go.mod h1:LWnndnrFXZmJLAzoyNAPNHSIJ1KOHVkTSsHgC3YYWlo= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= diff --git a/protocol/dubbo/dubbo_invoker.go b/protocol/dubbo/dubbo_invoker.go index edddc7ad59da50e4834842827d0c6234a805260a..4bfc1324cf9dcdb2412e7026214f6a3951a9c7c1 100644 --- a/protocol/dubbo/dubbo_invoker.go +++ b/protocol/dubbo/dubbo_invoker.go @@ -56,10 +56,6 @@ func (di *DubboInvoker) Invoke(invocation protocol.Invocation) protocol.Result { result protocol.RPCResult ) - if invocation.Attachments() != nil { - invocation.Attachments()[constant.DUBBO_VERSION_KEY] = constant.DUBBO_VERSION - } - inv := invocation.(*invocation_impl.RPCInvocation) url := di.GetUrl() // async