This is an automated email from the ASF dual-hosted git repository. zhaoyunxing pushed a commit to branch config-enhance in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 1320da55ef88da7b6716203843b4ef38b256cd5b Author: Laurence <[email protected]> AuthorDate: Thu Aug 26 22:23:04 2021 +0800 update triple user api to standard, add hessian2 samples (#211) * fix * fix: init helloworld and registry zk * fix: change general to rpc * fix: add some samples * fix: update triple user api to standard, add hessian2 samples --- .run/triple/triplego-hessian-client.run.xml | 15 --- .run/triple/triplego-hessian-server.run.xml | 3 +- api/samples_api.pb.go | 13 +- config-api/configcenter/go-client/cmd/client.go | 4 +- config-api/configcenter/go-server/cmd/server.go | 2 +- config-api/rpc/triple/go-client/cmd/client.go | 4 +- configcenter/nacos/go-client/cmd/client.go | 4 +- context/dubbo/go-client/cmd/client.go | 5 +- context/dubbo/go-server/cmd/server.go | 5 +- context/triple/go-client/cmd/client.go | 3 +- context/triple/go-server/cmd/server.go | 1 + game/go-server-game/cmd/server.go | 16 +-- game/go-server-game/tests/integration/main_test.go | 1 + game/go-server-gate/cmd/server.go | 1 + generic/protobufjson/go-client/cmd/client.go | 9 +- generic/protobufjson/go-server/cmd/server.go | 8 +- generic/protobufjson/go-server/pkg/user.pb.go | 8 +- .../go-server/tests/integration/main_test.go | 12 +- .../tests/integration/userprovider_test.go | 5 +- go.mod | 15 ++- go.sum | 134 +++++++++++++++++++ helloworld/go-client/cmd/client.go | 4 +- helloworld/go-server/cmd/server.go | 1 + .../rpc/hessian2}/conf/client.yml | 0 .../rpc/hessian2}/conf/log.yml | 0 .../rpc/hessian2}/conf/server.yml | 0 .../rpc/hessian2}/docker/docker-compose.yml | 0 .../rpc/hessian2}/docker/docker-compose.yml~merged | 0 .../rpc/hessian2}/docker/docker-health-check.sh | 0 .../rpc/hessian2}/tests/integration/main_test.go | 0 .../tests/integration/userprovider_test.go | 0 .../go-server-hz/tests/integration/main_test.go | 1 + .../tests/integration/userprovider_test.go | 1 + .../go-server-sh/tests/integration/main_test.go | 1 + .../tests/integration/userprovider_test.go | 1 + .../servicediscovery/etcd/go-client/cmd/client.go | 2 + .../servicediscovery/etcd/go-server/cmd/server.go | 4 +- .../servicediscovery/etcd/go-server/pkg/user.go | 7 +- .../etcd/go-server/tests/integration/main_test.go | 15 ++- .../tests/integration/userprovider_test.go | 1 + registry/zookeeper/go-client/cmd/client.go | 4 +- rpc/dubbo/go-client/pkg/user.go | 10 +- rpc/dubbo3/hessian2/go-client/cmd/client.go | 142 ++++++++++++++++++--- .../hessian2/go-client/cmd/complex_service.go | 66 ++++++++++ .../hessian2/go-client/cmd/simple_service.go | 19 +++ rpc/dubbo3/hessian2/go-client/conf/client.yml | 32 ----- rpc/dubbo3/hessian2/go-client/conf/dubbogo.yml | 18 +++ rpc/dubbo3/hessian2/go-client/conf/log.yml | 27 ---- rpc/dubbo3/hessian2/go-client/pkg/hello.go | 40 ------ .../hessian2/go-server/cmd/complex_service.go | 104 +++++++++++++++ rpc/dubbo3/hessian2/go-server/cmd/server.go | 27 ++-- .../hessian2/go-server/cmd/simple_service.go | 29 +++++ rpc/dubbo3/hessian2/go-server/conf/dubbogo.yml | 22 ++++ rpc/dubbo3/hessian2/go-server/pkg/greeter.go | 57 --------- rpc/dubbo3/hessian2/java-client/pom.xml | 2 +- .../com/apache/dubbo/sample/basic/ApiConsumer.java | 54 +++++--- .../com/apache/dubbo/sample/basic/ComplexData.java | 21 +++ .../apache/dubbo/sample/basic/ComplexProvider.java | 11 ++ rpc/dubbo3/hessian2/java-server/pom.xml | 2 +- .../com/apache/dubbo/sample/basic/ApiProvider.java | 6 +- .../com/apache/dubbo/sample/basic/ComplexData.java | 37 ++++++ .../apache/dubbo/sample/basic/ComplexProvider.java | 10 ++ .../dubbo/sample/basic/ComplexProviderImpl.java | 35 +++++ .../pb/dubbogo-grpc/server/grpcgo-server/main.go | 1 - .../pb/dubbogo-java/protobuf/helloworld.pb.go | 1 - .../dubbo/go-server/tests/integration/main_test.go | 6 +- .../tests/integration/userprovider_test.go | 9 +- tracing/grpc/go-server/app/helloworld.pb.go | 4 +- 68 files changed, 795 insertions(+), 307 deletions(-) diff --git a/.run/triple/triplego-hessian-client.run.xml b/.run/triple/triplego-hessian-client.run.xml deleted file mode 100644 index 542d476..0000000 --- a/.run/triple/triplego-hessian-client.run.xml +++ /dev/null @@ -1,15 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="triplego-hessian-client" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="triple"> - <module name="dubbo-go-samples" /> - <working_directory value="$PROJECT_DIR$" /> - <envs> - <env name="APP_LOG_CONF_FILE" value="$PROJECT_DIR$/general/dubbo3/hessian2/go-client/conf/log.yml" /> - <env name="CONF_CONSUMER_FILE_PATH" value="$PROJECT_DIR$/general/dubbo3/hessian2/go-client/conf/client.yml" /> - </envs> - <kind value="PACKAGE" /> - <package value="github.com/apache/dubbo-go-samples/rpc/dubbo3/hessian2/go-client/cmd" /> - <directory value="$PROJECT_DIR$" /> - <filePath value="$PROJECT_DIR$/general/dubbo3/hessian2/go-client/cmd/client.go" /> - <method v="2" /> - </configuration> -</component> \ No newline at end of file diff --git a/.run/triple/triplego-hessian-server.run.xml b/.run/triple/triplego-hessian-server.run.xml index 5d0d252..2d43990 100644 --- a/.run/triple/triplego-hessian-server.run.xml +++ b/.run/triple/triplego-hessian-server.run.xml @@ -3,8 +3,7 @@ <module name="dubbo-go-samples" /> <working_directory value="$PROJECT_DIR$" /> <envs> - <env name="APP_LOG_CONF_FILE" value="$PROJECT_DIR$//general/dubbo3/hessian2/go-server/conf/log.yml" /> - <env name="CONF_PROVIDER_FILE_PATH" value="$PROJECT_DIR$/general/dubbo3/hessian2/go-server/conf/server.yml" /> + <env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/rpc/dubbo3/hessian2/go-server/conf/dubbogo.yml" /> </envs> <kind value="PACKAGE" /> <package value="github.com/apache/dubbo-go-samples/rpc/dubbo3/hessian2/go-server/cmd" /> diff --git a/api/samples_api.pb.go b/api/samples_api.pb.go index cf48c46..5451e2c 100644 --- a/api/samples_api.pb.go +++ b/api/samples_api.pb.go @@ -6,10 +6,6 @@ package api import ( context "context" fmt "fmt" - proto "github.com/golang/protobuf/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" math "math" ) @@ -17,8 +13,15 @@ import ( "dubbo.apache.org/dubbo-go/v3/protocol" dgrpc "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3" "dubbo.apache.org/dubbo-go/v3/protocol/invocation" + tripleConstant "github.com/dubbogo/triple/pkg/common/constant" dubbo3 "github.com/dubbogo/triple/pkg/triple" + + proto "github.com/golang/protobuf/proto" + + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" ) // Reference imports to suppress errors if they are not otherwise used. @@ -171,7 +174,7 @@ func (c *greeterDubbo3Client) SayHello(ctx context.Context, in *HelloRequest, op // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type GreeterClientImpl struct { // Sends a greeting - SayHello func(ctx context.Context, in *HelloRequest, out *User) error + SayHello func(ctx context.Context, in *HelloRequest) (*User, error) } func (c *GreeterClientImpl) Reference() string { diff --git a/config-api/configcenter/go-client/cmd/client.go b/config-api/configcenter/go-client/cmd/client.go index 823642a..827a88f 100644 --- a/config-api/configcenter/go-client/cmd/client.go +++ b/config-api/configcenter/go-client/cmd/client.go @@ -58,8 +58,8 @@ func main() { req := &api.HelloRequest{ Name: "laurence", } - reply := &api.User{} - if err := grpcGreeterImpl.SayHello(context.Background(), req, reply); err != nil { + reply, err := grpcGreeterImpl.SayHello(context.Background(), req) + if err != nil { logger.Error(err) } logger.Infof("client response result: %v\n", reply) diff --git a/config-api/configcenter/go-server/cmd/server.go b/config-api/configcenter/go-server/cmd/server.go index 0b511ac..4f3a374 100644 --- a/config-api/configcenter/go-server/cmd/server.go +++ b/config-api/configcenter/go-server/cmd/server.go @@ -19,11 +19,11 @@ package main import ( "context" - "dubbo.apache.org/dubbo-go/v3/config" ) import ( "dubbo.apache.org/dubbo-go/v3/common/logger" + "dubbo.apache.org/dubbo-go/v3/config" _ "dubbo.apache.org/dubbo-go/v3/imports" ) diff --git a/config-api/rpc/triple/go-client/cmd/client.go b/config-api/rpc/triple/go-client/cmd/client.go index c17c6ba..827bba1 100644 --- a/config-api/rpc/triple/go-client/cmd/client.go +++ b/config-api/rpc/triple/go-client/cmd/client.go @@ -65,8 +65,8 @@ func main() { req := &api.HelloRequest{ Name: "laurence", } - reply := &api.User{} - if err := tripleGreeterImpl.SayHello(context.Background(), req, reply); err != nil { + reply, err := tripleGreeterImpl.SayHello(context.Background(), req) + if err != nil { logger.Error(err) } logger.Infof("client response result: %v\n", reply) diff --git a/configcenter/nacos/go-client/cmd/client.go b/configcenter/nacos/go-client/cmd/client.go index 68fe2c0..2c0c7ad 100644 --- a/configcenter/nacos/go-client/cmd/client.go +++ b/configcenter/nacos/go-client/cmd/client.go @@ -47,8 +47,8 @@ func main() { req := &api.HelloRequest{ Name: "laurence", } - reply := &api.User{} - if err := grpcGreeterImpl.SayHello(context.Background(), req, reply); err != nil { + reply, err := grpcGreeterImpl.SayHello(context.Background(), req) + if err != nil { logger.Error(err) } logger.Infof("client response result: %v\n", reply) diff --git a/context/dubbo/go-client/cmd/client.go b/context/dubbo/go-client/cmd/client.go index b1a62d9..f6fd0a2 100644 --- a/context/dubbo/go-client/cmd/client.go +++ b/context/dubbo/go-client/cmd/client.go @@ -19,7 +19,6 @@ package main import ( "context" - pkg2 "github.com/apache/dubbo-go-samples/context/dubbo/go-client/pkg" "os" "time" ) @@ -40,6 +39,10 @@ import ( "github.com/dubbogo/gost/log" ) +import ( + pkg2 "github.com/apache/dubbo-go-samples/context/dubbo/go-client/pkg" +) + var userProvider = new(pkg2.UserProvider) func init() { diff --git a/context/dubbo/go-server/cmd/server.go b/context/dubbo/go-server/cmd/server.go index b72dec1..8586f22 100644 --- a/context/dubbo/go-server/cmd/server.go +++ b/context/dubbo/go-server/cmd/server.go @@ -19,7 +19,6 @@ package main import ( "fmt" - pkg2 "github.com/apache/dubbo-go-samples/context/dubbo/go-server/pkg" "os" "os/signal" "syscall" @@ -40,6 +39,10 @@ import ( hessian "github.com/apache/dubbo-go-hessian2" ) +import ( + pkg2 "github.com/apache/dubbo-go-samples/context/dubbo/go-server/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/context/triple/go-client/cmd/client.go b/context/triple/go-client/cmd/client.go index da318b6..f3f19d3 100644 --- a/context/triple/go-client/cmd/client.go +++ b/context/triple/go-client/cmd/client.go @@ -19,7 +19,6 @@ package main import ( "context" - tripleConstant "github.com/dubbogo/triple/pkg/common/constant" "time" ) @@ -27,6 +26,8 @@ import ( "dubbo.apache.org/dubbo-go/v3/common/logger" "dubbo.apache.org/dubbo-go/v3/config" _ "dubbo.apache.org/dubbo-go/v3/imports" + + tripleConstant "github.com/dubbogo/triple/pkg/common/constant" ) import ( diff --git a/context/triple/go-server/cmd/server.go b/context/triple/go-server/cmd/server.go index cf1fe46..fdd3916 100644 --- a/context/triple/go-server/cmd/server.go +++ b/context/triple/go-server/cmd/server.go @@ -25,6 +25,7 @@ import ( "dubbo.apache.org/dubbo-go/v3/common/logger" "dubbo.apache.org/dubbo-go/v3/config" _ "dubbo.apache.org/dubbo-go/v3/imports" + tripleConstant "github.com/dubbogo/triple/pkg/common/constant" ) diff --git a/game/go-server-game/cmd/server.go b/game/go-server-game/cmd/server.go index e0853a8..e45b268 100755 --- a/game/go-server-game/cmd/server.go +++ b/game/go-server-game/cmd/server.go @@ -5,26 +5,24 @@ import ( "os/signal" "syscall" "time" +) - hessian "github.com/apache/dubbo-go-hessian2" - +import ( _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" - _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" "dubbo.apache.org/dubbo-go/v3/common/logger" - _ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory" "dubbo.apache.org/dubbo-go/v3/config" - _ "dubbo.apache.org/dubbo-go/v3/filter/filter_impl" - _ "dubbo.apache.org/dubbo-go/v3/metadata/service/local" - _ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo" - _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" - _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + + hessian "github.com/apache/dubbo-go-hessian2" +) + +import ( "github.com/apache/dubbo-go-samples/game/go-server-game/pkg" "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) diff --git a/game/go-server-game/tests/integration/main_test.go b/game/go-server-game/tests/integration/main_test.go index 057d58f..dc7a38e 100755 --- a/game/go-server-game/tests/integration/main_test.go +++ b/game/go-server-game/tests/integration/main_test.go @@ -16,6 +16,7 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo" _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + hessian "github.com/apache/dubbo-go-hessian2" ) diff --git a/game/go-server-gate/cmd/server.go b/game/go-server-gate/cmd/server.go index 976445c..5fd64fc 100755 --- a/game/go-server-gate/cmd/server.go +++ b/game/go-server-gate/cmd/server.go @@ -23,6 +23,7 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo" _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + hessian "github.com/apache/dubbo-go-hessian2" ) diff --git a/generic/protobufjson/go-client/cmd/client.go b/generic/protobufjson/go-client/cmd/client.go index b2964cf..146cbb4 100644 --- a/generic/protobufjson/go-client/cmd/client.go +++ b/generic/protobufjson/go-client/cmd/client.go @@ -27,11 +27,6 @@ import ( ) import ( - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/dubbogo/gost/log" -) - -import ( _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" "dubbo.apache.org/dubbo-go/v3/common/logger" @@ -41,6 +36,10 @@ import ( "dubbo.apache.org/dubbo-go/v3/protocol/dubbo" _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + + hessian "github.com/apache/dubbo-go-hessian2" + + "github.com/dubbogo/gost/log" ) var ( diff --git a/generic/protobufjson/go-server/cmd/server.go b/generic/protobufjson/go-server/cmd/server.go index 87a9d5f..5d78ee0 100644 --- a/generic/protobufjson/go-server/cmd/server.go +++ b/generic/protobufjson/go-server/cmd/server.go @@ -26,10 +26,6 @@ import ( ) import ( - "github.com/apache/dubbo-go-samples/generic/protobufjson/go-server/pkg" -) - -import ( _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" "dubbo.apache.org/dubbo-go/v3/common/logger" @@ -41,6 +37,10 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" ) +import ( + "github.com/apache/dubbo-go-samples/generic/protobufjson/go-server/pkg" +) + func init() { config.SetProviderService(new(pkg.UserProvider)) } diff --git a/generic/protobufjson/go-server/pkg/user.pb.go b/generic/protobufjson/go-server/pkg/user.pb.go index 1c1ef8b..1166267 100644 --- a/generic/protobufjson/go-server/pkg/user.pb.go +++ b/generic/protobufjson/go-server/pkg/user.pb.go @@ -7,12 +7,16 @@ package pkg import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" ) +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + + protoimpl "google.golang.org/protobuf/runtime/protoimpl" +) + const ( // Verify that this generated code is sufficiently up-to-date. _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) diff --git a/generic/protobufjson/go-server/tests/integration/main_test.go b/generic/protobufjson/go-server/tests/integration/main_test.go index 0c776e7..44153bd 100644 --- a/generic/protobufjson/go-server/tests/integration/main_test.go +++ b/generic/protobufjson/go-server/tests/integration/main_test.go @@ -20,6 +20,12 @@ package integration import ( + "os" + "testing" + "time" +) + +import ( _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" _ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory" @@ -31,12 +37,6 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" ) -import ( - "os" - "testing" - "time" -) - var appName = "UserConsumerTest" var referenceConfig = config.ReferenceConfig{ InterfaceName: "org.apache.dubbo.UserProvider", diff --git a/generic/protobufjson/go-server/tests/integration/userprovider_test.go b/generic/protobufjson/go-server/tests/integration/userprovider_test.go index 43ef763..0ad6d74 100644 --- a/generic/protobufjson/go-server/tests/integration/userprovider_test.go +++ b/generic/protobufjson/go-server/tests/integration/userprovider_test.go @@ -21,12 +21,15 @@ package integration import ( "context" - "github.com/stretchr/testify/assert" "testing" ) + import ( "dubbo.apache.org/dubbo-go/v3/config" + hessian "github.com/apache/dubbo-go-hessian2" + + "github.com/stretchr/testify/assert" ) func TestGetUser(t *testing.T) { diff --git a/go.mod b/go.mod index 12ed8d4..550d8f4 100644 --- a/go.mod +++ b/go.mod @@ -1,28 +1,31 @@ module github.com/apache/dubbo-go-samples require ( - dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20210822082425-1bfface3303e + dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20210826094458-8ef173e7a77b github.com/alibaba/sentinel-golang v1.0.2 - github.com/apache/dubbo-getty v1.4.3 + github.com/apache/dubbo-getty v1.4.5 github.com/apache/dubbo-go-hessian2 v1.9.2 github.com/bwmarrin/snowflake v0.3.0 github.com/dubbogo/gost v1.11.16 github.com/dubbogo/net v0.0.3 - github.com/dubbogo/triple v1.0.6-0.20210822081945-0b88cc0d10df - github.com/emicklei/go-restful/v3 v3.4.0 + github.com/dubbogo/triple v1.0.6-0.20210826093718-8b877016f3bf + github.com/emicklei/go-restful/v3 v3.5.2 + github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/golang/protobuf v1.5.2 github.com/opentracing/opentracing-go v1.2.0 github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5 github.com/openzipkin/zipkin-go v0.2.2 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.9.0 + github.com/prometheus/client_golang v1.11.0 + github.com/satori/go.uuid v1.2.0 // indirect + github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.7.0 github.com/transaction-wg/seata-golang v0.2.0 github.com/uber/jaeger-client-go v2.22.1+incompatible github.com/uber/jaeger-lib v2.2.0+incompatible // indirect - golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect google.golang.org/grpc v1.38.0 google.golang.org/protobuf v1.27.1 + k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect ) replace github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.8.0 diff --git a/go.sum b/go.sum index 559bd3c..a608633 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= @@ -14,6 +15,9 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20210822082425-1bfface3303e h1:TnZXDmootOlIL+DZZkS7opNDwbFG2gT+Z9YeSLwKXy0= dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20210822082425-1bfface3303e/go.mod h1:quHg7AMGZichyo/h2msHsjregY4oL0lEJlljPbpwgs0= +dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20210826094458-8ef173e7a77b h1:swahNLXhkWgQtnkgafdaHPaEWcC51PvEalPY+ovZ6JQ= +dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20210826094458-8ef173e7a77b/go.mod h1:truc+fGVX3f/luIG6lAc8D49JXETiRtWDF5CVkG7ZMY= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= @@ -26,6 +30,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= +github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -53,6 +59,8 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDH github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/dubbo-getty v1.4.3 h1:PCKpryDasKOxwT5MBC6MIMO+0NLOaHF6Xco9YXQw7HI= github.com/apache/dubbo-getty v1.4.3/go.mod h1:ansXgKxxyhCOiQL29nO5ce1MDcEKmCyZuNR9oMs3hek= +github.com/apache/dubbo-getty v1.4.5 h1:MptKbjC0n2Mo/8eFPwirSInH2BfdNG4IZch43PdNvIM= +github.com/apache/dubbo-getty v1.4.5/go.mod h1:mcDyiu7M/TVrYDyL8TxDemQkOdvEqqHSQ4jOuYejY1w= github.com/apache/dubbo-go-hessian2 v1.9.1/go.mod h1:xQUjE7F8PX49nm80kChFvepA/AvqAZ0oh/UaB6+6pBE= github.com/apache/dubbo-go-hessian2 v1.9.2 h1:XuI8KvENSfKiAhiCBS4RNihmQDoPNmGWKT3gTui0p9A= github.com/apache/dubbo-go-hessian2 v1.9.2/go.mod h1:xQUjE7F8PX49nm80kChFvepA/AvqAZ0oh/UaB6+6pBE= @@ -62,11 +70,14 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= +github.com/armon/go-metrics v0.3.3/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -95,6 +106,16 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= +github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= +github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20200709052629-daa8e1ccc0bc/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= +github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= +github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -106,6 +127,8 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.1.0 h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -129,11 +152,16 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zA github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/dubbogo/go-zookeeper v1.0.3 h1:UkuY+rBsxdT7Bs63QAzp9z7XqQ53W1j8E5rwl83me8g= github.com/dubbogo/go-zookeeper v1.0.3/go.mod h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c= github.com/dubbogo/gost v1.9.0/go.mod h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8= github.com/dubbogo/gost v1.10.1/go.mod h1:+mQGS51XQEUWZP2JeGZTxJwipjRKtJO7Tr+FOg+72rI= +github.com/dubbogo/gost v1.11.12/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= github.com/dubbogo/gost v1.11.16 h1:fvOw8aKQ0BuUYuD+MaXAYFvT7tg2l7WAS5SL5gZJpFs= github.com/dubbogo/gost v1.11.16/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= github.com/dubbogo/jsonparser v1.0.1/go.mod h1:tYAtpctvSP/tWw4MeelsowSPgXQRVHHWbqL6ynps8jU= @@ -141,6 +169,8 @@ github.com/dubbogo/net v0.0.3 h1:2k53mh+1U8h1gFjJ8ykzyP4wNdAdgjc5moD+xVHI/AE= github.com/dubbogo/net v0.0.3/go.mod h1:B6/ka3g8VzcyrmdCH4VkHP1K0aHeI37FmclS+TCwIBU= github.com/dubbogo/triple v1.0.6-0.20210822081945-0b88cc0d10df h1:YSfvAnU0ebwLqWnD+5HTTsFhqA+aE4Si2c10zBsUW7c= github.com/dubbogo/triple v1.0.6-0.20210822081945-0b88cc0d10df/go.mod h1:tCl0mV54+V8Br9z71sFbS1IQUG41QKZUrW6FGaLheM0= +github.com/dubbogo/triple v1.0.6-0.20210826093718-8b877016f3bf h1:lj0hNwbjk7UpqyEYo6Kz4poTH4w5UfyqI4Gl6x3HEqo= +github.com/dubbogo/triple v1.0.6-0.20210826093718-8b877016f3bf/go.mod h1:tCl0mV54+V8Br9z71sFbS1IQUG41QKZUrW6FGaLheM0= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dvyukov/go-fuzz v0.0.0-20210429054444-fca39067bc72/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= @@ -154,6 +184,8 @@ github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.4.0 h1:IIDhql3oyWZj1ay2xBZGb4sTOWMad0HVW8rwhVxN/Yk= github.com/emicklei/go-restful/v3 v3.4.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.5.2 h1:RCNMSbcGIVafG4ZfgIXIEHTaV59ZRsi41IvZ7RC9+ls= +github.com/emicklei/go-restful/v3 v3.5.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.8.0/go.mod h1:GSSbY9P1neVhdY7G4wu+IK1rk/dqhiCC/4ExuWJZVuk= github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= @@ -165,9 +197,13 @@ github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= +github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.0/go.mod h1:BX0DCEr5pT4jm2CnQdVP1lFV521fcCNcyEeNp4DQQDk= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= @@ -186,8 +222,10 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= github.com/go-ldap/ldap/v3 v3.1.3/go.mod h1:3rbOH3jRS2u6jg2rJnKAMLE/xQyCKIveG2Sa/Cohzb8= +github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= @@ -211,11 +249,15 @@ github.com/go-resty/resty/v2 v2.3.0 h1:JOOeAvjSlapTT92p8xiS19Zxev1neGikoHsXJeOq8 github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM= github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ= +github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -265,6 +307,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= @@ -286,6 +329,7 @@ github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORR github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= @@ -298,6 +342,7 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= @@ -310,14 +355,20 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod h1:d1g9WGtAunDNpek8jUIEJnBlbgKS1N2Q61QkHiZyR1g= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-retryablehttp v0.6.2/go.mod h1:gEx6HMUGxYYhJScX7W1Il64m6cc2C1mDaW3NQ9sY1FY= +github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= @@ -331,6 +382,7 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -338,9 +390,13 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= +github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f/go.mod h1:euTFbi2YJgwcju3imEt919lhJKF68nN1cQPq3aA+kBE= github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= +github.com/hashicorp/vault/sdk v0.1.14-0.20200519221530-14615acda45f/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267 h1:e1ok06zGrWJW91rzRroyl5nRNqraaBe4d5hiKcVZuHM= github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= +github.com/hashicorp/vault/sdk v0.2.1 h1:S4O6Iv/dyKlE9AUTXGa7VOvZmsCvg36toPKgV4f2P4M= +github.com/hashicorp/vault/sdk v0.2.1/go.mod h1:WfUiO1vYzfBkz1TmoE4ZGU7HD0T0Cl/rZwaxjBkgN4U= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -353,8 +409,12 @@ github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGk github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag= github.com/jinzhu/copier v0.0.0-20190625015134-976e0346caa8 h1:mGIXW/lubQ4B+3bXTLxcTMTjUNDqoF6T/HUW9LbFx9s= github.com/jinzhu/copier v0.0.0-20190625015134-976e0346caa8/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s= +github.com/jinzhu/copier v0.3.2 h1:QdBOCbaouLDYaIPFfi1bKv5F5tPpeTwXe4sD0jqtz5w= +github.com/jinzhu/copier v0.3.2/go.mod h1:24xnZezI2Yqac9J61UC6/dG/k76ttpq0DdJI3QmUvro= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= +github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= @@ -367,6 +427,8 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -408,6 +470,7 @@ github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPK github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -434,6 +497,7 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= @@ -446,6 +510,8 @@ github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lN github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -454,6 +520,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nacos-group/nacos-sdk-go v1.0.8 h1:8pEm05Cdav9sQgJSv5kyvlgfz0SzFUUGI3pWX6SiSnM= github.com/nacos-group/nacos-sdk-go v1.0.8/go.mod h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA= +github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM= +github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= @@ -476,6 +544,13 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -502,6 +577,8 @@ github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.2.6+incompatible h1:6aCX4/YZ9v8q69hTyiR7dNLnTA3fgtKHVVW5BCd5Znw= github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= +github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8/go.mod h1:B1+S9LNcuMyLH/4HMTViQOJevkGiik3wW2AN9zb2fNQ= github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712/go.mod h1:PYMCGwN0JHjoqGr3HrZoD+b8Tgx8bKnArhSq8YVzUMc= github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= @@ -512,6 +589,7 @@ github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd/go.mod h1:4rbK1p9ILyIf github.com/pingcap/parser v0.0.0-20200424075042-8222d8b724a4/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= github.com/pingcap/tipb v0.0.0-20190428032612-535e1abaa330/go.mod h1:RtkHW8WbcNxj8lsbzjaILci01CtYnYbIkQhjyZWrWVI= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -525,9 +603,11 @@ github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -542,6 +622,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -550,6 +632,7 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= @@ -563,6 +646,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= @@ -572,7 +657,9 @@ github.com/shirou/gopsutil v3.20.11+incompatible h1:LJr4ZQK4mPpIV5gOa4jCOKOGb4ty github.com/shirou/gopsutil v3.20.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -588,11 +675,13 @@ github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -636,6 +725,7 @@ github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ= github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw= +github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= @@ -644,6 +734,7 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= github.com/zouyx/agollo/v3 v3.4.5 h1:7YCxzY9ZYaH9TuVUBvmI6Tk0mwMggikah+cfbYogcHQ= github.com/zouyx/agollo/v3 v3.4.5/go.mod h1:LJr3kDmm23QSW+F1Ol4TMHDa7HvJvscMdVxJ2IpUTVc= @@ -654,9 +745,15 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0-alpha.0 h1:+e5nrluATIy3GP53znpkHMFzPTHGYyzvJGFCbuI6ZLc= go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw= +go.etcd.io/etcd/api/v3 v3.5.0 h1:GsV3S+OfZEOCNXdtNkBSR7kgLobAa/SO6tCxRa0GAYw= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0 h1:2aQv6F436YnN7I4VbI8PPYrBhu+SmrTaADcf8Mi/6PU= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0-alpha.0/go.mod h1:kdV+xzCJ3luEBSIeQyB/OEKkWKd8Zkux4sbDeANrosU= go.etcd.io/etcd/client/v3 v3.5.0-alpha.0 h1:dr1EOILak2pu4Nf5XbRIOCNIBjcz6UmkQd7hHRXwxaM= go.etcd.io/etcd/client/v3 v3.5.0-alpha.0/go.mod h1:wKt7jgDgf/OfKiYmCq5WFGxOFAkVMLxiiXgLDFhECr8= +go.etcd.io/etcd/client/v3 v3.5.0 h1:62Eh0XOro+rDwkrypAGDfgmNh5Joq+z+W9HZdlXMzek= +go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 h1:3yLUEC0nFCxw/RArImOyRUI4OAFbg4PFpBbAhSNzKNY= go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0/go.mod h1:tV31atvwzcybuqejDoY3oaNRTtlD2l/Ot78Pc9w7DMY= go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0/go.mod h1:FAwse6Zlm5v4tEWZaTjmNhe17Int4Oxbu7+2r0DiD3w= @@ -677,6 +774,8 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+ go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= @@ -685,6 +784,9 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -697,6 +799,7 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -716,6 +819,7 @@ golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -724,6 +828,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -746,15 +851,19 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -767,6 +876,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -787,11 +898,13 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -805,6 +918,7 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -813,6 +927,13 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201223074533-0d417f636930 h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo= golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -821,10 +942,13 @@ golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5f golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -843,6 +967,7 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -861,6 +986,7 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200928182047-19e03678916f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201014170642-d1624618ad65/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -894,6 +1020,8 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210106152847-07624b53cd92 h1:jOTk2Z6KYaWoptUFqZ167cS8peoUPjFEXrsqfVkkCGc= google.golang.org/genproto v0.0.0-20210106152847-07624b53cd92/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -910,6 +1038,7 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= @@ -927,6 +1056,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -937,6 +1067,7 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -946,6 +1077,7 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -959,7 +1091,9 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/helloworld/go-client/cmd/client.go b/helloworld/go-client/cmd/client.go index 68fe2c0..2c0c7ad 100644 --- a/helloworld/go-client/cmd/client.go +++ b/helloworld/go-client/cmd/client.go @@ -47,8 +47,8 @@ func main() { req := &api.HelloRequest{ Name: "laurence", } - reply := &api.User{} - if err := grpcGreeterImpl.SayHello(context.Background(), req, reply); err != nil { + reply, err := grpcGreeterImpl.SayHello(context.Background(), req) + if err != nil { logger.Error(err) } logger.Infof("client response result: %v\n", reply) diff --git a/helloworld/go-server/cmd/server.go b/helloworld/go-server/cmd/server.go index 4f23c26..ef49a5a 100644 --- a/helloworld/go-server/cmd/server.go +++ b/helloworld/go-server/cmd/server.go @@ -40,6 +40,7 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in *api.HelloRequest) (* return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil } +// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-server/conf/dubbogo.yml func main() { config.SetProviderService(&GreeterProvider{}) config.Load() diff --git a/rpc/dubbo3/hessian2/go-server/conf/client.yml b/integrate_test/rpc/hessian2/conf/client.yml similarity index 100% rename from rpc/dubbo3/hessian2/go-server/conf/client.yml rename to integrate_test/rpc/hessian2/conf/client.yml diff --git a/rpc/dubbo3/hessian2/go-server/conf/log.yml b/integrate_test/rpc/hessian2/conf/log.yml similarity index 100% rename from rpc/dubbo3/hessian2/go-server/conf/log.yml rename to integrate_test/rpc/hessian2/conf/log.yml diff --git a/rpc/dubbo3/hessian2/go-server/conf/server.yml b/integrate_test/rpc/hessian2/conf/server.yml similarity index 100% rename from rpc/dubbo3/hessian2/go-server/conf/server.yml rename to integrate_test/rpc/hessian2/conf/server.yml diff --git a/rpc/dubbo3/hessian2/go-server/docker/docker-compose.yml b/integrate_test/rpc/hessian2/docker/docker-compose.yml similarity index 100% rename from rpc/dubbo3/hessian2/go-server/docker/docker-compose.yml rename to integrate_test/rpc/hessian2/docker/docker-compose.yml diff --git a/rpc/dubbo3/hessian2/go-server/docker/docker-compose.yml~merged b/integrate_test/rpc/hessian2/docker/docker-compose.yml~merged similarity index 100% rename from rpc/dubbo3/hessian2/go-server/docker/docker-compose.yml~merged rename to integrate_test/rpc/hessian2/docker/docker-compose.yml~merged diff --git a/rpc/dubbo3/hessian2/go-server/docker/docker-health-check.sh b/integrate_test/rpc/hessian2/docker/docker-health-check.sh similarity index 100% rename from rpc/dubbo3/hessian2/go-server/docker/docker-health-check.sh rename to integrate_test/rpc/hessian2/docker/docker-health-check.sh diff --git a/rpc/dubbo3/hessian2/go-server/tests/integration/main_test.go b/integrate_test/rpc/hessian2/tests/integration/main_test.go similarity index 100% rename from rpc/dubbo3/hessian2/go-server/tests/integration/main_test.go rename to integrate_test/rpc/hessian2/tests/integration/main_test.go diff --git a/rpc/dubbo3/hessian2/go-server/tests/integration/userprovider_test.go b/integrate_test/rpc/hessian2/tests/integration/userprovider_test.go similarity index 100% rename from rpc/dubbo3/hessian2/go-server/tests/integration/userprovider_test.go rename to integrate_test/rpc/hessian2/tests/integration/userprovider_test.go diff --git a/multi-zone/go-server-hz/tests/integration/main_test.go b/multi-zone/go-server-hz/tests/integration/main_test.go index 9a3edab..d028c55 100644 --- a/multi-zone/go-server-hz/tests/integration/main_test.go +++ b/multi-zone/go-server-hz/tests/integration/main_test.go @@ -36,6 +36,7 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo" _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + hessian "github.com/apache/dubbo-go-hessian2" ) diff --git a/multi-zone/go-server-hz/tests/integration/userprovider_test.go b/multi-zone/go-server-hz/tests/integration/userprovider_test.go index 89988b7..a506b8d 100644 --- a/multi-zone/go-server-hz/tests/integration/userprovider_test.go +++ b/multi-zone/go-server-hz/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/multi-zone/go-server-sh/tests/integration/main_test.go b/multi-zone/go-server-sh/tests/integration/main_test.go index 9a3edab..d028c55 100644 --- a/multi-zone/go-server-sh/tests/integration/main_test.go +++ b/multi-zone/go-server-sh/tests/integration/main_test.go @@ -36,6 +36,7 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo" _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + hessian "github.com/apache/dubbo-go-hessian2" ) diff --git a/multi-zone/go-server-sh/tests/integration/userprovider_test.go b/multi-zone/go-server-sh/tests/integration/userprovider_test.go index c8d3dd8..04ab061 100644 --- a/multi-zone/go-server-sh/tests/integration/userprovider_test.go +++ b/multi-zone/go-server-sh/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/registry/servicediscovery/etcd/go-client/cmd/client.go b/registry/servicediscovery/etcd/go-client/cmd/client.go index 41a0038..866126c 100644 --- a/registry/servicediscovery/etcd/go-client/cmd/client.go +++ b/registry/servicediscovery/etcd/go-client/cmd/client.go @@ -37,7 +37,9 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/registry/etcdv3" _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/servicediscovery" + hessian "github.com/apache/dubbo-go-hessian2" + "github.com/dubbogo/gost/log" ) diff --git a/registry/servicediscovery/etcd/go-server/cmd/server.go b/registry/servicediscovery/etcd/go-server/cmd/server.go index 1f3c38e..b32906c 100644 --- a/registry/servicediscovery/etcd/go-server/cmd/server.go +++ b/registry/servicediscovery/etcd/go-server/cmd/server.go @@ -26,8 +26,6 @@ import ( ) import ( - hessian "github.com/apache/dubbo-go-hessian2" - _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" "dubbo.apache.org/dubbo-go/v3/common/logger" @@ -42,6 +40,8 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/registry/etcdv3" _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/servicediscovery" + + hessian "github.com/apache/dubbo-go-hessian2" ) import ( diff --git a/registry/servicediscovery/etcd/go-server/pkg/user.go b/registry/servicediscovery/etcd/go-server/pkg/user.go index bda7344..75d0916 100644 --- a/registry/servicediscovery/etcd/go-server/pkg/user.go +++ b/registry/servicediscovery/etcd/go-server/pkg/user.go @@ -23,12 +23,11 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( "dubbo.apache.org/dubbo-go/v3/config" + hessian "github.com/apache/dubbo-go-hessian2" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go b/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go index ff9821e..b34dd03 100644 --- a/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go +++ b/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go @@ -20,6 +20,13 @@ package integration import ( + "context" + "os" + "testing" + "time" +) + +import ( _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" _ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory" @@ -33,14 +40,8 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/registry/etcdv3" _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/servicediscovery" - hessian "github.com/apache/dubbo-go-hessian2" -) -import ( - "context" - "os" - "testing" - "time" + hessian "github.com/apache/dubbo-go-hessian2" ) var userProvider = new(UserProvider) diff --git a/registry/servicediscovery/etcd/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/etcd/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/registry/servicediscovery/etcd/go-server/tests/integration/userprovider_test.go +++ b/registry/servicediscovery/etcd/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/registry/zookeeper/go-client/cmd/client.go b/registry/zookeeper/go-client/cmd/client.go index a7cb8cd..88b7c39 100644 --- a/registry/zookeeper/go-client/cmd/client.go +++ b/registry/zookeeper/go-client/cmd/client.go @@ -50,8 +50,8 @@ func main() { req := &api.HelloRequest{ Name: "laurence", } - reply := &api.User{} - if err := grpcGreeterImpl.SayHello(context.Background(), req, reply); err != nil { + reply, err := grpcGreeterImpl.SayHello(context.Background(), req) + if err != nil { logger.Error(err) } logger.Infof("client response result: %v\n", reply) diff --git a/rpc/dubbo/go-client/pkg/user.go b/rpc/dubbo/go-client/pkg/user.go index 59998af..14ef525 100644 --- a/rpc/dubbo/go-client/pkg/user.go +++ b/rpc/dubbo/go-client/pkg/user.go @@ -88,9 +88,13 @@ func (User) JavaClassName() string { } type UserProvider struct { - GetUsers func(req []interface{}) ([]interface{}, error) - GetErr func(ctx context.Context, req []interface{}, rsp *User) error - GetUser func(ctx context.Context, req []interface{}, rsp *User) error + GetUsers func(req []interface{}) ([]interface{}, error) + GetErr func(ctx context.Context, req []interface{}, rsp *User) error + + GetUserOld func(ctx context.Context, req []interface{}, rsp *User) error + + GetUserNew func(ctx context.Context, req1, req2 *User) (*User, error) + GetUser0 func(id string, name string) (User, error) GetUser1 func(ctx context.Context, req []interface{}, rsp *User) error GetUser2 func(ctx context.Context, req []interface{}, rsp *User) error `dubbo:"getUser"` diff --git a/rpc/dubbo3/hessian2/go-client/cmd/client.go b/rpc/dubbo3/hessian2/go-client/cmd/client.go index 8e664c3..5516d1b 100644 --- a/rpc/dubbo3/hessian2/go-client/cmd/client.go +++ b/rpc/dubbo3/hessian2/go-client/cmd/client.go @@ -19,46 +19,43 @@ package main import ( "context" + "encoding/json" "os" "time" ) import ( - _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" - _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" - _ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory" "dubbo.apache.org/dubbo-go/v3/config" - _ "dubbo.apache.org/dubbo-go/v3/filter/filter_impl" - _ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3" - _ "dubbo.apache.org/dubbo-go/v3/protocol/grpc" - _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" - _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + _ "dubbo.apache.org/dubbo-go/v3/imports" hessian "github.com/apache/dubbo-go-hessian2" "github.com/dubbogo/gost/log" ) -import ( - "github.com/apache/dubbo-go-samples/general/dubbo3/hessian2/go-client/pkg" -) - -var userProvider = new(pkg.UserProvider) +var userProvider = new(UserProvider) +var complexProvider = new(ComplexProvider) func init() { config.SetConsumerService(userProvider) - hessian.RegisterPOJO(&pkg.User{}) + config.SetConsumerService(complexProvider) + hessian.RegisterPOJO(&User{}) + hessian.RegisterPOJO(&ComplexData{}) } // need to setup environment variable "CONF_CONSUMER_FILE_PATH" to "conf/client.yml" before run func main() { - hessian.RegisterPOJO(&pkg.User{}) config.Load() time.Sleep(3 * time.Second) gxlog.CInfo("\n\n\nstart to test dubbo") - user := &pkg.User{} - err := userProvider.GetUser(context.TODO(), &pkg.User{Name: "laurence"}, user) + testNormalService() + + testComplexService() +} + +func testNormalService() { + user, err := userProvider.GetUser(context.TODO(), &User{Name: "laurence"}) if err != nil { gxlog.CError("error: %v\n", err) os.Exit(1) @@ -66,3 +63,114 @@ func main() { } gxlog.CInfo("response result: %v\n", user) } + +func testComplexService() { + // test with normal data + + //test without rsp and request + err := complexProvider.InvokeWithEmptyReq(context.TODO()) + if err != nil { + gxlog.CError("error: %v\n", err) + os.Exit(1) + return + } + + // test without response + err = complexProvider.InvokeWithSingleString(context.TODO(), "request string") + if err != nil { + gxlog.CError("error: %v\n", err) + os.Exit(1) + return + } + + err = complexProvider.InvokeWithStringList(context.TODO(), []string{"myfirststring", "mysecondstring"}) + if err != nil { + gxlog.CError("error: %v\n", err) + os.Exit(1) + return + } + + err = complexProvider.InvokeWithMultiString(context.TODO(), "first string", "secondString", "third str") + if err != nil { + gxlog.CError("error: %v\n", err) + os.Exit(1) + return + } + + // test without request + rsp, err := complexProvider.InvokeWithEmptyReqStringRsp(context.TODO()) + if err != nil { + gxlog.CError("error: %v\n", err) + os.Exit(1) + return + } + gxlog.CInfo("get InvokeWithEmptyReqStringRsp rsp = %+v", rsp) + + // complex data + stringIntMapData := make(map[string]int) + stringIntMapData["test1"] = 1 + stringIntMapData["test2"] = 2 + + stringStringMapData := make(map[string]string) + stringStringMapData["test1"] = "1" + stringStringMapData["test2"] = "2" + + stringUserMapData := make(map[string]User) + stringUserMapData["test1"] = User{Name: "1"} + stringUserMapData["test2"] = User{Name: "2"} + + stringUintMapData := make(map[string]uint32) + stringUintMapData["test1"] = 1 + stringUintMapData["test2"] = 2 + + stringUserPtrMapData := make(map[string]*User) + stringUserPtrMapData["test1"] = &User{Name: "1"} + stringUserPtrMapData["test2"] = &User{Name: "2"} + + intStringMapData := make(map[int]string) + intStringMapData[1] = "1" + intStringMapData[2] = "2" + + data, _ := json.Marshal(User{Name: "myJson", Age: 19, Id: "jsonID"}) + + cplexData := &ComplexData{ + BooleanData: true, + StringData: "testString", + //UIntData: 8, + UInt8Data: 8, + UInt16Data: 16, + UInt32Data: 32, + UInt64Data: 64, + Int8Data: 8, + Int16Data: 16, + Int32Data: 32, + Int64Data: 64, + IntData: 8, + //StringIntMapData: stringIntMapData, + StringStringMapData: stringStringMapData, + //StringUserDefinedMapData:stringUserMapData, + //StringUIntMapData: stringUintMapData, + StringUserDefinedPtrMapData: stringUserPtrMapData, + //IntStringMapData: intStringMapData, + UserDefinedData: User{Name: "myuser", Age: 18, Id: "testid"}, + UserDefinedDataPtr: &User{Name: "myuserPtr", Age: 18, Id: "testid"}, + ByteData: data, + ArrayListData: []string{"string1", "string2", "string3"}, + ArrayUserDefinedData: []User{{Name: "name1", Id: "id1", Age: 19}, {Name: "name1", Id: "id1", Age: 19}, {Name: "name1", Id: "id1", Age: 19}}, + ArrayUserDefinedPtrData: []*User{{Name: "name1", Id: "id1", Age: 19}, {Name: "name1", Id: "id1", Age: 19}, {Name: "name1", Id: "id1", Age: 19}}, + } + + cplxRsp, err := complexProvider.InvokeWithComplexReqComplexRspPtr(context.TODO(), cplexData) + if err != nil { + gxlog.CError("error: %v\n", err) + os.Exit(1) + return + } + gxlog.CInfo("get InvokeWithComplexReqComplexRspPtr rsp = %+v", cplxRsp) + + intRsp, err := complexProvider.InvokeWithMultiBasicData(context.TODO(), "reqstr", []byte{1, 2, 4}, 32, true) + if err != nil { + panic(err) + } + gxlog.CInfo("get InvokeWithMultiBasicData rsp = %d", intRsp) +} diff --git a/rpc/dubbo3/hessian2/go-client/cmd/complex_service.go b/rpc/dubbo3/hessian2/go-client/cmd/complex_service.go new file mode 100644 index 0000000..e5b6239 --- /dev/null +++ b/rpc/dubbo3/hessian2/go-client/cmd/complex_service.go @@ -0,0 +1,66 @@ +package main + +import ( + "context" +) + +import ( + "dubbo.apache.org/dubbo-go/v3/config" + + hessian "github.com/apache/dubbo-go-hessian2" +) + +func init() { + // ------for hessian2------ + hessian.RegisterPOJO(&User{}) + config.SetProviderService(new(UserProvider)) +} + +type ComplexData struct { + BooleanData bool + + StringData string + + //UIntData uint + UInt8Data uint8 + UInt16Data uint16 + UInt32Data uint32 + UInt64Data uint64 + + IntData int + Int8Data int8 + Int16Data int16 + Int32Data int32 + Int64Data int64 + + StringStringMapData map[string]string + //StringIntMapData map[string]int + //StringUIntMapData map[string]uint32 + //IntStringMapData map[int]string + //StringUserDefinedMapData map[string]User + StringUserDefinedPtrMapData map[string]*User + + UserDefinedData User + UserDefinedDataPtr *User + + ByteData []byte + + ArrayListData []string + ArrayUserDefinedData []User + ArrayUserDefinedPtrData []*User +} + +type ComplexProvider struct { + InvokeWithEmptyReq func(ctx context.Context) error + InvokeWithSingleString func(ctx context.Context, req string) error + InvokeWithMultiString func(ctx context.Context, req, req2, req3 string) error + InvokeWithStringList func(ctx context.Context, req []string) error + InvokeWithEmptyReqStringRsp func(ctx context.Context) (string, error) + InvokeWithComplexReqComplexRspPtr func(ctx context.Context, req *ComplexData) (*ComplexData, error) + InvokeWithMultiBasicData func(ctx context.Context, str string, data []byte, num int, boolValue bool) (int, error) + //InvokeWithStringMap func(ctx context.Context, req map[string]string) (map[string]string,error) +} + +func (u ComplexData) JavaClassName() string { + return "com.apache.dubbo.sample.basic.ComplexData" +} diff --git a/rpc/dubbo3/hessian2/go-client/cmd/simple_service.go b/rpc/dubbo3/hessian2/go-client/cmd/simple_service.go new file mode 100644 index 0000000..3a1c829 --- /dev/null +++ b/rpc/dubbo3/hessian2/go-client/cmd/simple_service.go @@ -0,0 +1,19 @@ +package main + +import ( + "context" +) + +type User struct { + Id string + Name string + Age int32 +} + +type UserProvider struct { + GetUser func(ctx context.Context, req *User) (*User, error) +} + +func (u *User) JavaClassName() string { + return "com.apache.dubbo.sample.basic.User" +} diff --git a/rpc/dubbo3/hessian2/go-client/conf/client.yml b/rpc/dubbo3/hessian2/go-client/conf/client.yml deleted file mode 100644 index c9761ef..0000000 --- a/rpc/dubbo3/hessian2/go-client/conf/client.yml +++ /dev/null @@ -1,32 +0,0 @@ -# dubbo client yaml configure file - -check: true -# client -request_timeout: "3s" -# connect timeout -connect_timeout: "3s" - -# application config -application: - organization: "dubbo.io" - name: "UserProvider" - module: "dubbo-go3.0 client" - version: "0.0.1" - environment: "dev" - -# registry config -registries: - "demoZk": - protocol: "zookeeper" - timeout: "3s" - address: "127.0.0.1:2181" - username: "" - password: "" - -# reference config -references: - "UserProvider": - registry: "demoZk" - protocol: "tri" - serialization: "hessian2" - interface: "org.apache.dubbo.UserProvider" \ No newline at end of file diff --git a/rpc/dubbo3/hessian2/go-client/conf/dubbogo.yml b/rpc/dubbo3/hessian2/go-client/conf/dubbogo.yml new file mode 100644 index 0000000..c1cfa67 --- /dev/null +++ b/rpc/dubbo3/hessian2/go-client/conf/dubbogo.yml @@ -0,0 +1,18 @@ +dubbo: + registries: + "demoZK": + protocol: "zookeeper" + timeout: "3s" + address: "127.0.0.1:2181" + consumer: + registry: + - demoZK + references: + "ComplexProvider": + protocol: "tri" + serialization: "hessian2" + interface: "com.apache.dubbo.sample.basic.ComplexProvider" # must be compatible with grpc or dubbo-java + "UserProvider": + protocol: "tri" + serialization: "hessian2" + interface: "com.apache.dubbo.sample.basic.IGreeter" # must be compatible with grpc or dubbo-java \ No newline at end of file diff --git a/rpc/dubbo3/hessian2/go-client/conf/log.yml b/rpc/dubbo3/hessian2/go-client/conf/log.yml deleted file mode 100644 index 8c3f700..0000000 --- a/rpc/dubbo3/hessian2/go-client/conf/log.yml +++ /dev/null @@ -1,27 +0,0 @@ -level: "info" -development: true -disableCaller: false -disableStacktrace: false -sampling: -encoding: "console" - -# encoder -encoderConfig: - messageKey: "message" - levelKey: "level" - timeKey: "time" - nameKey: "logger" - callerKey: "caller" - stacktraceKey: "stacktrace" - lineEnding: "" - levelEncoder: "capital" - timeEncoder: "iso8601" - durationEncoder: "seconds" - callerEncoder: "short" - nameEncoder: "" - -outputPaths: - - "stderr" -errorOutputPaths: - - "stderr" -initialFields: diff --git a/rpc/dubbo3/hessian2/go-client/pkg/hello.go b/rpc/dubbo3/hessian2/go-client/pkg/hello.go deleted file mode 100644 index 092fe0e..0000000 --- a/rpc/dubbo3/hessian2/go-client/pkg/hello.go +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package pkg - -import ( - "context" -) - -type User struct { - Id string - Name string - Age int32 -} - -type UserProvider struct { - GetUser func(ctx context.Context, req *User, rsp *User) error -} - -func (u *UserProvider) Reference() string { - return "UserProvider" -} - -func (User) JavaClassName() string { - return "org.apache.dubbo.User" -} diff --git a/rpc/dubbo3/hessian2/go-server/cmd/complex_service.go b/rpc/dubbo3/hessian2/go-server/cmd/complex_service.go new file mode 100644 index 0000000..56c503d --- /dev/null +++ b/rpc/dubbo3/hessian2/go-server/cmd/complex_service.go @@ -0,0 +1,104 @@ +package main + +import ( + "context" +) + +import ( + "dubbo.apache.org/dubbo-go/v3/common/logger" + "dubbo.apache.org/dubbo-go/v3/config" + + hessian "github.com/apache/dubbo-go-hessian2" +) + +func init() { + // ------for hessian2------ + hessian.RegisterPOJO(&User{}) + config.SetProviderService(new(UserProvider)) +} + +type ComplexData struct { + BooleanData bool + + StringData string + + //UIntData uint + UInt8Data uint8 + UInt16Data uint16 + UInt32Data uint32 + UInt64Data uint64 + + IntData int + Int8Data int8 + Int16Data int16 + Int32Data int32 + Int64Data int64 + + StringStringMapData map[string]string + //StringIntMapData map[string]int + //StringUIntMapData map[string]uint32 + //IntStringMapData map[int]string + //StringUserDefinedMapData map[string]User + StringUserDefinedPtrMapData map[string]*User + + UserDefinedData User + UserDefinedDataPtr *User + + ByteData []byte + + ArrayListData []string + ArrayUserDefinedData []User + ArrayUserDefinedPtrData []*User +} + +func (u *ComplexData) JavaClassName() string { + return "com.apache.dubbo.sample.basic.ComplexData" +} + +type ComplexProvider struct { +} + +func (u *ComplexProvider) InvokeWithMultiBasicData(ctx context.Context, str string, data []byte, num int, boolValue bool) (int, error) { + logger.Info("InvokeWithMultiBasicData", str, " ", data, " ", num, " ", boolValue) + return num, nil +} + +func (u *ComplexProvider) InvokeWithEmptyReq(ctx context.Context) error { + logger.Info("InvokeWithEmptyReq") + return nil +} + +func (u *ComplexProvider) InvokeWithSingleString(ctx context.Context, req string) error { + logger.Infof("InvokeWithSingleString, req = %s", req) + return nil +} + +func (u *ComplexProvider) InvokeWithMultiString(ctx context.Context, req, req2, req3 string) error { + logger.Info("InvokeWithMultiString, req = ", req, req2, req3) + return nil +} + +func (u *ComplexProvider) InvokeWithStringList(ctx context.Context, req []string) error { + logger.Infof("InvokeWithStringList, req = %s", req) + return nil +} + +//func (u *ComplexProvider) InvokeWithStringMap(ctx context.Context, req map[string]string) (map[string]string,error) { +// logger.Infof("InvokeWithStringList, req = %s", req) +// return req, nil +//} + +func (u *ComplexProvider) InvokeWithEmptyReqStringRsp(ctx context.Context) (string, error) { + logger.Infof("InvokeWithEmptyReqStringRsp") + return "success rsp", nil +} + +func (u *ComplexProvider) InvokeWithEmptyReqMultiStringRsp(ctx context.Context) (string, string, string, error) { + logger.Infof("InvokeWithEmptyReqMultiStringRsp") + return "success rsp1", "success rsp2", "success rsp3", nil +} + +func (u *ComplexProvider) InvokeWithComplexReqComplexRspPtr(ctx context.Context, req *ComplexData) (*ComplexData, error) { + logger.Infof("InvokeWithComplexReqComplexRsp req = %+v", req) + return req, nil +} diff --git a/rpc/dubbo3/hessian2/go-server/cmd/server.go b/rpc/dubbo3/hessian2/go-server/cmd/server.go index 311bb76..299d554 100644 --- a/rpc/dubbo3/hessian2/go-server/cmd/server.go +++ b/rpc/dubbo3/hessian2/go-server/cmd/server.go @@ -26,22 +26,11 @@ import ( ) import ( - _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" - _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" "dubbo.apache.org/dubbo-go/v3/common/logger" - _ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory" "dubbo.apache.org/dubbo-go/v3/config" - _ "dubbo.apache.org/dubbo-go/v3/filter/filter_impl" - _ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3" - _ "dubbo.apache.org/dubbo-go/v3/registry/nacos" - _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" - _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + _ "dubbo.apache.org/dubbo-go/v3/imports" - _ "github.com/dubbogo/triple/pkg/triple" -) - -import ( - "github.com/apache/dubbo-go-samples/general/dubbo3/hessian2/go-server/pkg" + hessian "github.com/apache/dubbo-go-hessian2" ) var ( @@ -49,12 +38,18 @@ var ( ) func init() { - config.SetProviderService(new(pkg.UserProvider)) + // ------for hessian2------ + hessian.RegisterPOJO(&User{}) + hessian.RegisterPOJO(&ComplexData{}) + config.SetProviderService(new(UserProvider)) + config.SetProviderService(new(ComplexProvider)) } -// need to setup environment variable "CONF_PROVIDER_FILE_PATH" to "conf/server.yml" before run +// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/rpc/dubbo3/hessian2/go-server/conf/dubbogo.yml func main() { - config.Load() + if err := config.Load(); err != nil { + panic(err) + } initSignal() } diff --git a/rpc/dubbo3/hessian2/go-server/cmd/simple_service.go b/rpc/dubbo3/hessian2/go-server/cmd/simple_service.go new file mode 100644 index 0000000..93dc772 --- /dev/null +++ b/rpc/dubbo3/hessian2/go-server/cmd/simple_service.go @@ -0,0 +1,29 @@ +package main + +import ( + "context" +) + +import ( + gxlog "github.com/dubbogo/gost/log" +) + +type User struct { + Id string + Name string + Age int32 +} + +func (u *User) JavaClassName() string { + return "com.apache.dubbo.sample.basic.User" +} + +type UserProvider struct { +} + +func (u *UserProvider) GetUser(ctx context.Context, usr *User) (*User, error) { + gxlog.CInfo("req:%#v", usr) + rsp := User{"12345", "" + usr.Name, 18} + gxlog.CInfo("rsp:%#v", rsp) + return &rsp, nil +} diff --git a/rpc/dubbo3/hessian2/go-server/conf/dubbogo.yml b/rpc/dubbo3/hessian2/go-server/conf/dubbogo.yml new file mode 100644 index 0000000..b7c6359 --- /dev/null +++ b/rpc/dubbo3/hessian2/go-server/conf/dubbogo.yml @@ -0,0 +1,22 @@ +dubbo: + registries: + "demoZK": + protocol: "zookeeper" + timeout: "3s" + address: "127.0.0.1:2181" + protocols: + "triple": + name: "tri" + port: 20000 + provider: + registry: + - demoZK + services: + "UserProvider": + protocol: "triple" + serialization: "hessian2" + interface: "com.apache.dubbo.sample.basic.IGreeter" # must be compatible with grpc or dubbo-java + "ComplexProvider": + protocol: "triple" + serialization: "hessian2" + interface: "com.apache.dubbo.sample.basic.ComplexProvider" # must be compatible with grpc or dubbo-java \ No newline at end of file diff --git a/rpc/dubbo3/hessian2/go-server/pkg/greeter.go b/rpc/dubbo3/hessian2/go-server/pkg/greeter.go deleted file mode 100644 index d890a95..0000000 --- a/rpc/dubbo3/hessian2/go-server/pkg/greeter.go +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package pkg - -import ( - "context" -) - -import ( - hessian "github.com/apache/dubbo-go-hessian2" - - "github.com/dubbogo/gost/log" -) - -func init() { - // ------for hessian2------ - hessian.RegisterPOJO(&User{}) -} - -type User struct { - Id string - Name string - Age int32 -} - -type UserProvider struct { -} - -func (u *UserProvider) GetUser(ctx context.Context, usr *User) (*User, error) { - gxlog.CInfo("req:%#v", usr) - rsp := User{"12345", "" + usr.Name, 18} - gxlog.CInfo("rsp:%#v", rsp) - return &rsp, nil -} - -func (u UserProvider) Reference() string { - return "UserProvider" -} - -func (u User) JavaClassName() string { - return "org.apache.dubbo.User" -} diff --git a/rpc/dubbo3/hessian2/java-client/pom.xml b/rpc/dubbo3/hessian2/java-client/pom.xml index 9812b42..aff1e73 100644 --- a/rpc/dubbo3/hessian2/java-client/pom.xml +++ b/rpc/dubbo3/hessian2/java-client/pom.xml @@ -27,7 +27,7 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <dubbo.version>3.0.0-SNAPSHOT</dubbo.version> + <dubbo.version>3.0.2</dubbo.version> <junit.version>4.12</junit.version> <spring-test.version>4.3.16.RELEASE</spring-test.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> diff --git a/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ApiConsumer.java b/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ApiConsumer.java index d80df27..2dc8cad 100644 --- a/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ApiConsumer.java +++ b/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ApiConsumer.java @@ -24,36 +24,56 @@ import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.sample.hello.Helloworld; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.concurrent.TimeUnit; public class ApiConsumer { public static void main(String[] args) throws InterruptedException, IOException { - ReferenceConfig<IGreeter> ref = new ReferenceConfig<>(); - ref.setInterface(IGreeter.class); - ref.setCheck(false); - ref.setInterface(IGreeter.class); + ReferenceConfig<ComplexProvider> ref = new ReferenceConfig<>(); + ref.setInterface(ComplexProvider.class); ref.setCheck(false); ref.setProtocol(CommonConstants.TRIPLE); ref.setLazy(true); ref.setTimeout(100000); ref.setApplication(new ApplicationConfig("demo-consumer")); + ref.setRegistry(new RegistryConfig("zookeeper://127.0.0.1:2181")); - final IGreeter iGreeter = ref.get(); + final ComplexProvider complexProvider = ref.get(); + +// complexProvider.invokeWithEmptyReq(); +// complexProvider.invokeWithSingleString("single string"); +// complexProvider.invokeWithMultiString("string1", "string2", "string3"); +// String [] strList = new String []{"first string"," second string"}; +// complexProvider.invokeWithStringList(strList ); +// String rsp = complexProvider.invokeWithEmptyReqStringRsp(); +// System.out.println("get rsp = "+ rsp); - System.out.println("dubbo ref started"); - int i = 0; - for( i = 0; i < 10; i++){ - try { - final User reply = iGreeter.getUser("laurence"); - TimeUnit.SECONDS.sleep(1); - System.out.println("Reply:" + reply.name + reply.age + reply.id); + ComplexData cpxData = new ComplexData(); + cpxData.booleanData = true; + cpxData.stringData = "test string"; + cpxData.byteData = new byte[] {1, 12, 4, 3, 3,3}; + cpxData.int16Data =16; + cpxData.intData = 32; + cpxData.int64Data = 64; + cpxData.arrayListData = new String[]{"array1", "array2"}; +// cpxData.arrayUserData = new User[]{new User(), new User(), new User()}; + cpxData.userDefinedData = new User(); + cpxData.userDefinedData.age = 18; + cpxData.userDefinedData.id = "iojfioj"; + cpxData.stringStringHashMap = new HashMap<>(); +// cpxData.stringStringHashMap.put("key1", "value"); +// cpxData.stringStringHashMap.put("key2", "value"); +// cpxData.stringUserDefinedPtrMapData = new HashMap<>(); +// cpxData.stringUserDefinedPtrMapData.put("key1", new User()); +// cpxData.stringUserDefinedPtrMapData.put("key2", new User()); - } catch (Throwable t) { - t.printStackTrace(); - } +// ComplexData response = complexProvider.invokeWithComplexReqComplexRspPtr(cpxData); +// System.out.println("get complex = "+ response); - } - System.in.read(); + int rsp = complexProvider.invokeWithMultiBasicData("str",new byte[]{1, 3, 4,6,7}, 32, true); + System.out.println("get multi basic rsp = "+ rsp); } } diff --git a/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ComplexData.java b/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ComplexData.java new file mode 100644 index 0000000..c3b51d1 --- /dev/null +++ b/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ComplexData.java @@ -0,0 +1,21 @@ +package com.apache.dubbo.sample.basic; + +import java.io.Serializable; +import java.util.HashMap; + +public class ComplexData implements Serializable { + boolean booleanData; + String stringData; + + short int16Data; + int intData; + long int64Data; + + User userDefinedData; + byte [] byteData; + HashMap<String, String> stringStringHashMap; +// HashMap<String, User> stringUserDefinedPtrMapData; + String[] arrayListData; +// User[] arrayUserData; + +} diff --git a/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ComplexProvider.java b/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ComplexProvider.java new file mode 100644 index 0000000..c486e89 --- /dev/null +++ b/rpc/dubbo3/hessian2/java-client/src/main/java/com/apache/dubbo/sample/basic/ComplexProvider.java @@ -0,0 +1,11 @@ +package com.apache.dubbo.sample.basic; + +public interface ComplexProvider { + void invokeWithEmptyReq(); + void invokeWithSingleString(String req); + void invokeWithStringList(String[] req); + void invokeWithMultiString(String str1, String str2, String str3); + String invokeWithEmptyReqStringRsp (); + ComplexData invokeWithComplexReqComplexRspPtr(ComplexData complexData); + int invokeWithMultiBasicData (String str, byte[]data, int num, boolean boolValue); +} diff --git a/rpc/dubbo3/hessian2/java-server/pom.xml b/rpc/dubbo3/hessian2/java-server/pom.xml index a6c41b5..82f616d 100644 --- a/rpc/dubbo3/hessian2/java-server/pom.xml +++ b/rpc/dubbo3/hessian2/java-server/pom.xml @@ -29,7 +29,7 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <dubbo.version>3.0.0-SNAPSHOT</dubbo.version> + <dubbo.version>3.0.0-ding-SNAPSHOT</dubbo.version> <junit.version>4.12</junit.version> <spring-test.version>4.3.16.RELEASE</spring-test.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> diff --git a/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ApiProvider.java b/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ApiProvider.java index 8a6f7f2..fcd180c 100644 --- a/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ApiProvider.java +++ b/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ApiProvider.java @@ -26,9 +26,9 @@ import java.util.concurrent.CountDownLatch; public class ApiProvider { public static void main(String[] args) throws InterruptedException { - ServiceConfig<IGreeter> service = new ServiceConfig<>(); - service.setInterface(IGreeter.class); - service.setRef(new IGreeter1Impl()); + ServiceConfig<ComplexProvider> service = new ServiceConfig<>(); + service.setInterface(ComplexProvider.class); + service.setRef(new ComplexProviderImpl()); service.setProtocol(new ProtocolConfig(CommonConstants.TRIPLE, 50053)); service.setApplication(new ApplicationConfig("demo-provider")); service.setRegistry(new RegistryConfig("zookeeper://127.0.0.1:2181")); diff --git a/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexData.java b/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexData.java new file mode 100644 index 0000000..52bf428 --- /dev/null +++ b/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexData.java @@ -0,0 +1,37 @@ +package com.apache.dubbo.sample.basic; + +import java.io.Serializable; +import java.util.HashMap; + +public class ComplexData implements Serializable { + boolean booleanData; + String stringData; + + short int16Data; + int intData; + long int64Data; + + User userDefinedData; + byte [] byteData; + HashMap<String, String> stringStringHashMap; + HashMap<String, User> stringUserDefinedPtrMapData; + String[] arrayListData; + User[] arrayUserData; + + public String GetString(){ + String result = ""; + result += booleanData; + result += stringData; + result += int16Data; + result += intData; + result += int64Data; + result += userDefinedData; + result += byteData; + result += stringStringHashMap; + result += stringUserDefinedPtrMapData; + result += arrayUserData; + result += arrayListData; + return result; + } + +} diff --git a/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexProvider.java b/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexProvider.java new file mode 100644 index 0000000..a1965dd --- /dev/null +++ b/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexProvider.java @@ -0,0 +1,10 @@ +package com.apache.dubbo.sample.basic; + +public interface ComplexProvider { + void invokeWithEmptyReq(); + void invokeWithSingleString(String req); + void invokeWithStringList(String[] req); + void invokeWithMultiString(String str1, String str2, String str3); + String invokeWithEmptyReqStringRsp (); + ComplexData invokeWithComplexReqComplexRspPtr(ComplexData complexData); +} diff --git a/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexProviderImpl.java b/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexProviderImpl.java new file mode 100644 index 0000000..79106cd --- /dev/null +++ b/rpc/dubbo3/hessian2/java-server/src/main/java/com/apache/dubbo/sample/basic/ComplexProviderImpl.java @@ -0,0 +1,35 @@ +package com.apache.dubbo.sample.basic; + +public class ComplexProviderImpl implements ComplexProvider { + @Override + public void invokeWithEmptyReq() { + System.out.println("invokeWithEmptyReq"); + } + + @Override + public void invokeWithSingleString(String req) { + System.out.println("invokeWithEmptyReq" + req); + } + + @Override + public void invokeWithStringList(String[] req) { + System.out.println("invokeWithEmptyReq" + req); + } + + @Override + public void invokeWithMultiString(String str1, String str2, String str3) { + System.out.println("invokeWithEmptyReq" + str1 + str2 + str3); + } + + @Override + public String invokeWithEmptyReqStringRsp() { + System.out.println("invokeWithEmptyReq"); + return "invoke success"; + } + + @Override + public ComplexData invokeWithComplexReqComplexRspPtr(ComplexData complexData) { + System.out.println("invokeWithComplexReqComplexRspPtr = "+ complexData.GetString()); + return complexData; + } +} diff --git a/rpc/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go b/rpc/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go index 87f308b..4041fb7 100644 --- a/rpc/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go +++ b/rpc/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go @@ -28,7 +28,6 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/reflection" - "google.golang.org/grpc/reflection" ) diff --git a/rpc/dubbo3/pb/dubbogo-java/protobuf/helloworld.pb.go b/rpc/dubbo3/pb/dubbogo-java/protobuf/helloworld.pb.go index 89625a4..dc13874 100644 --- a/rpc/dubbo3/pb/dubbogo-java/protobuf/helloworld.pb.go +++ b/rpc/dubbo3/pb/dubbogo-java/protobuf/helloworld.pb.go @@ -21,7 +21,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" ) diff --git a/tracing/dubbo/go-server/tests/integration/main_test.go b/tracing/dubbo/go-server/tests/integration/main_test.go index f29ce68..ee19ca1 100644 --- a/tracing/dubbo/go-server/tests/integration/main_test.go +++ b/tracing/dubbo/go-server/tests/integration/main_test.go @@ -27,10 +27,6 @@ import ( ) import ( - hessian "github.com/apache/dubbo-go-hessian2" -) - -import ( _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl" _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance" _ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory" @@ -44,6 +40,8 @@ import ( _ "dubbo.apache.org/dubbo-go/v3/registry/protocol" _ "dubbo.apache.org/dubbo-go/v3/registry/servicediscovery" _ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper" + + hessian "github.com/apache/dubbo-go-hessian2" ) var userProvider = new(UserProvider) diff --git a/tracing/dubbo/go-server/tests/integration/userprovider_test.go b/tracing/dubbo/go-server/tests/integration/userprovider_test.go index d795eb9..537111f 100644 --- a/tracing/dubbo/go-server/tests/integration/userprovider_test.go +++ b/tracing/dubbo/go-server/tests/integration/userprovider_test.go @@ -23,15 +23,20 @@ import ( "context" "testing" ) + import ( + "dubbo.apache.org/dubbo-go/v3/common/logger" + "github.com/dubbogo/gost/log" + "github.com/opentracing/opentracing-go" + zipkinot "github.com/openzipkin-contrib/zipkin-go-opentracing" + "github.com/openzipkin/zipkin-go" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" - "github.com/stretchr/testify/assert" - "dubbo.apache.org/dubbo-go/v3/common/logger" + "github.com/stretchr/testify/assert" ) func TestGetUser(t *testing.T) { diff --git a/tracing/grpc/go-server/app/helloworld.pb.go b/tracing/grpc/go-server/app/helloworld.pb.go index 43c9335..a6baf5c 100644 --- a/tracing/grpc/go-server/app/helloworld.pb.go +++ b/tracing/grpc/go-server/app/helloworld.pb.go @@ -18,10 +18,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - "google.golang.org/grpc/codes" - + "google.golang.org/grpc/status" "google.golang.org/grpc/status" )
