This is an automated email from the ASF dual-hosted git repository. zhaoyunxing pushed a commit to branch compress in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 82a372532cd7388d160a39238965c4f4340c5113 Author: 氕氘氚 <[email protected]> AuthorDate: Tue Jul 13 13:20:57 2021 +0800 mod imports (#169) --- async/go-client/cmd/client.go | 1 + async/go-client/pkg/user.go | 1 + async/go-server/pkg/user.go | 1 + async/go-server/tests/integration/main_test.go | 1 + .../tests/integration/userprovider_test.go | 2 + attachment/go-client/cmd/client.go | 11 ++-- attachment/go-server/cmd/server.go | 8 +-- attachment/go-server/pkg/user.go | 6 +-- .../go-server/tests/integration/main_test.go | 13 ++--- .../tests/integration/userprovider_test.go | 2 + chain/backend/cmd/server.go | 8 +-- chain/backend/tests/integration/main_test.go | 12 ++--- chain/backend/tests/integration/services_test.go | 1 + chain/frontend/cmd/client.go | 8 +-- chain/middle/cmd/server.go | 8 +-- chain/middle/tests/integration/main_test.go | 12 ++--- chain/middle/tests/integration/services_test.go | 4 +- config-api/go-client/cmd/client.go | 1 + config-api/go-server/pkg/user.go | 1 + .../go-server/tests/integration/main_test.go | 2 - .../tests/integration/userprovider_test.go | 1 + configcenter/apollo/go-client/cmd/client.go | 1 + configcenter/apollo/go-server/cmd/server.go | 2 - configcenter/apollo/go-server/pkg/user.go | 1 + configcenter/nacos/go-client/cmd/client.go | 1 + configcenter/nacos/go-server/pkg/user.go | 1 + configcenter/zookeeper/go-client/cmd/client.go | 1 + configcenter/zookeeper/go-server/pkg/user.go | 1 + context/go-client/cmd/client.go | 1 + context/go-server/pkg/user.go | 1 + .../tests/integration/userprovider_test.go | 2 + direct/go-client/cmd/client.go | 1 + direct/go-server/pkg/user.go | 1 + .../tests/integration/userprovider_test.go | 3 +- docker/go-client/cmd/client.go | 1 + docker/go-server/pkg/user.go | 1 + filter/custom/go-client/cmd/client.go | 1 + filter/custom/go-server/pkg/custom_filter.go | 1 + filter/custom/go-server/pkg/user.go | 1 + .../tests/integration/userprovider_test.go | 1 + filter/sentinel/go-client/cmd/client.go | 2 + filter/sentinel/go-server/cmd/server.go | 1 + filter/sentinel/go-server/pkg/user.go | 1 + .../tests/integration/userprovider_test.go | 1 + filter/tpslimit/go-server/pkg/limit_strategy.go | 1 + filter/tpslimit/go-server/pkg/user.go | 1 + game/go-server-game/cmd/server.go | 42 ++++++++-------- game/go-server-game/pkg/consumer.go | 6 ++- game/go-server-game/pkg/provider.go | 16 +++--- .../tests/integration/gameprovider_test.go | 10 ++-- game/go-server-game/tests/integration/main_test.go | 40 +++++++-------- game/go-server-gate/cmd/server.go | 58 +++++++++++----------- game/go-server-gate/pkg/consumer.go | 9 ++-- game/go-server-gate/pkg/provider.go | 11 ++-- .../tests/integration/gateprovider_test.go | 10 ++-- game/go-server-gate/tests/integration/main_test.go | 40 +++++++-------- game/pkg/consumer/game/basketball.go | 7 ++- game/pkg/consumer/gate/basketball.go | 7 ++- game/pkg/pojo/info.go | 2 +- general/dubbo/go-client/cmd/client.go | 13 ++--- general/dubbo/go-server/cmd/server.go | 18 +++---- general/dubbo/go-server/pkg/user_provider.go | 9 ++-- .../dubbo/go-server/tests/integration/main_test.go | 21 ++++---- .../tests/integration/userprovider_test.go | 9 +++- general/grpc/go-client/cmd/client.go | 1 + general/grpc/go-server/cmd/server.go | 2 +- general/grpc/go-server/pkg/greeter.go | 3 ++ .../go-server/tests/integration/greeter_test.go | 2 +- .../grpc/go-server/tests/integration/main_test.go | 11 ++-- general/grpc/protobuf/helloworld.pb.go | 11 ++-- general/grpc/stream/go-client/app/client.go | 1 + general/grpc/stream/go-client/app/helloworld.pb.go | 11 ++-- general/grpc/stream/go-server/app/helloworld.pb.go | 12 +++-- general/grpc/unary/go-client/app/client.go | 1 + general/grpc/unary/go-client/app/helloworld.pb.go | 11 ++-- general/grpc/unary/go-server/app/greeter.go | 1 - general/grpc/unary/go-server/app/helloworld.pb.go | 11 ++-- general/jsonrpc/go-client/app/client.go | 14 ++---- general/jsonrpc/go-server/app/server.go | 8 ++- general/jsonrpc/go-server/app/user_provider.go | 5 +- general/jsonrpc/go-server/app/user_provider1.go | 5 +- general/jsonrpc/go-server/app/user_provider2.go | 5 +- general/rest/go-client/cmd/client.go | 12 ++--- general/rest/go-server/cmd/server.go | 12 ++--- general/rest/go-server/pkg/user_provider.go | 7 ++- general/rest/go-server/pkg/user_provider1.go | 7 ++- general/rest/go-server/pkg/user_provider2.go | 7 ++- .../tests/integration/userprovider_test.go | 4 +- generic/go-client/cmd/client.go | 11 ++-- generic/go-server/cmd/server.go | 3 +- generic/go-server/pkg/user.go | 6 +-- generic/go-server/tests/integration/main_test.go | 12 ++--- .../tests/integration/userprovider_test.go | 4 +- group/go-client/cmd/client.go | 11 ++-- group/go-server-group-a/pkg/user.go | 1 + .../tests/integration/main_test.go | 3 +- .../tests/integration/userprovider_test.go | 1 + group/go-server-group-b/pkg/user.go | 1 + .../tests/integration/main_test.go | 3 +- helloworld/go-client/cmd/client.go | 1 + metric/go-client/cmd/client.go | 1 + metric/go-server/cmd/server.go | 4 +- metric/go-server/pkg/user.go | 9 ++-- metric/go-server/tests/integration/main_test.go | 17 +++---- .../tests/integration/userprovider_test.go | 1 + multi-registry/go-client/cmd/client.go | 2 +- multi-registry/go-server/cmd/server.go | 1 - multi-registry/go-server/pkg/user.go | 6 +-- .../go-server/tests/integration/main_test.go | 14 +++--- .../tests/integration/userprovider_test.go | 1 + multi-zone/go-client/cmd/client.go | 2 +- .../go-client/tests/integration/main_test.go | 14 +++--- .../tests/integration/userprovider_test.go | 9 +++- multi-zone/go-server-hz/pkg/user.go | 1 + .../tests/integration/userprovider_test.go | 1 + multi-zone/go-server-sh/pkg/user.go | 1 + .../go-server-sh/tests/integration/main_test.go | 2 - .../tests/integration/userprovider_test.go | 1 + openzipkin/go-client/cmd/client.go | 11 ++-- openzipkin/go-server-a/cmd/server.go | 4 +- openzipkin/go-server-a/pkg/user.go | 1 + .../go-server-a/tests/integration/main_test.go | 3 +- .../tests/integration/userprovider_test.go | 1 + openzipkin/go-server-b/cmd/server.go | 5 +- openzipkin/go-server-b/pkg/user.go | 1 + .../go-server-b/tests/integration/main_test.go | 3 +- registry/etcd/go-client/cmd/client.go | 11 ++-- registry/etcd/go-server/cmd/server.go | 6 ++- registry/etcd/go-server/pkg/user.go | 6 +-- .../etcd/go-server/tests/integration/main_test.go | 17 +++---- .../tests/integration/userprovider_test.go | 1 + registry/nacos/go-client/cmd/client.go | 11 ++-- registry/nacos/go-server/pkg/user.go | 6 +-- .../nacos/go-server/tests/integration/main_test.go | 17 +++---- .../tests/integration/userprovider_test.go | 1 + .../consul/go-client/cmd/client.go | 20 ++++---- .../consul/go-server/cmd/server.go | 25 ++++------ .../consul/go-server/pkg/pojo/user.go | 2 - .../go-server/tests/integration/main_test.go | 1 - .../tests/integration/userprovider_test.go | 1 + .../servicediscovery/etcd/go-client/cmd/client.go | 12 ++--- .../servicediscovery/etcd/go-server/cmd/server.go | 6 ++- .../servicediscovery/etcd/go-server/pkg/user.go | 6 +-- .../etcd/go-server/tests/integration/main_test.go | 15 +++--- .../tests/integration/userprovider_test.go | 1 + .../servicediscovery/file/go-client/cmd/client.go | 12 ++--- .../servicediscovery/file/go-server/cmd/server.go | 6 ++- .../servicediscovery/file/go-server/pkg/user.go | 6 +-- .../file/go-server/tests/integration/main_test.go | 15 +++--- .../tests/integration/userprovider_test.go | 1 + .../servicediscovery/nacos/go-client/cmd/client.go | 12 ++--- .../servicediscovery/nacos/go-server/cmd/server.go | 6 ++- .../servicediscovery/nacos/go-server/pkg/user.go | 6 +-- .../nacos/go-server/tests/integration/main_test.go | 15 +++--- .../tests/integration/userprovider_test.go | 1 + .../zookeeper/go-client/cmd/client.go | 12 ++--- .../zookeeper/go-server/cmd/server.go | 6 ++- .../zookeeper/go-server/pkg/user.go | 6 +-- .../go-server/tests/integration/main_test.go | 17 +++---- .../tests/integration/userprovider_test.go | 1 + router/condition/go-client/cmd/client.go | 3 +- .../go-server/tests/integration/main_test.go | 15 +++--- .../tests/integration/userprovider_test.go | 1 + router/tag/go-client/cmd/client.go | 1 + .../tag/go-server/tests/integration/main_test.go | 14 +++--- .../tests/integration/userprovider_test.go | 1 + seata/client/app/client.go | 17 +++---- seata/client/app/svc/svc.go | 1 + seata/order-svc/app/dao/dao.go | 5 +- seata/order-svc/app/order_svc.go | 1 + seata/order-svc/app/server.go | 19 ++++--- seata/product-svc/app/dao/dao.go | 1 + seata/product-svc/app/product_svc.go | 1 + seata/product-svc/app/server.go | 19 ++++--- shopping-order/go-client/cmd/client.go | 1 + shopping-order/go-client/pkg/svc.go | 1 + shopping-order/go-server-order/cmd/order_svc.go | 1 + shopping-order/go-server-order/cmd/server.go | 2 + shopping-order/go-server-order/pkg/dao/dao.go | 1 + .../go-server-product/cmd/product_svc.go | 1 + shopping-order/go-server-product/cmd/server.go | 2 + tls/go-client/cmd/client.go | 4 +- tls/go-server/cmd/server.go | 4 +- tls/go-server/pkg/user.go | 2 +- tls/go-server/tests/integration/main_test.go | 1 + tracing/dubbo/go-client/app/client.go | 23 ++++----- tracing/dubbo/go-server/app/server.go | 22 ++++---- tracing/dubbo/go-server/app/user.go | 9 ++-- tracing/grpc/go-client/app/client.go | 12 ++--- tracing/grpc/go-client/app/hello.go | 6 +-- tracing/grpc/go-client/app/helloworld.pb.go | 13 ++--- tracing/grpc/go-server/app/helloworld.pb.go | 12 ++--- tracing/grpc/go-server/app/server.go | 1 + tracing/jsonrpc/go-client/app/client.go | 23 ++++----- tracing/jsonrpc/go-server/app/server.go | 20 ++++---- tracing/jsonrpc/go-server/app/user_provider.go | 6 +-- tracing/jsonrpc/go-server/app/user_provider1.go | 5 +- tracing/jsonrpc/go-server/app/user_provider2.go | 7 ++- version/go-client/cmd/client.go | 1 + version/go-server-v1/pkg/user.go | 1 + .../tests/integration/userprovider_test.go | 1 - version/go-server-v2/pkg/user.go | 1 + .../tests/integration/userprovider_test.go | 1 - 203 files changed, 721 insertions(+), 648 deletions(-) diff --git a/async/go-client/cmd/client.go b/async/go-client/cmd/client.go index 62a80b2..1796bf9 100644 --- a/async/go-client/cmd/client.go +++ b/async/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/async/go-client/pkg/user.go b/async/go-client/pkg/user.go index 92239d6..a579dd2 100644 --- a/async/go-client/pkg/user.go +++ b/async/go-client/pkg/user.go @@ -26,6 +26,7 @@ import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/protocol" "github.com/apache/dubbo-go/remoting" + gxlog "github.com/dubbogo/gost/log" ) diff --git a/async/go-server/pkg/user.go b/async/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/async/go-server/pkg/user.go +++ b/async/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/async/go-server/tests/integration/main_test.go b/async/go-server/tests/integration/main_test.go index cb20b83..7a6f920 100644 --- a/async/go-server/tests/integration/main_test.go +++ b/async/go-server/tests/integration/main_test.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/metadata/service/inmemory" "github.com/apache/dubbo-go/protocol" "github.com/apache/dubbo-go/remoting" + gxlog "github.com/dubbogo/gost/log" ) diff --git a/async/go-server/tests/integration/userprovider_test.go b/async/go-server/tests/integration/userprovider_test.go index 947d2cb..d84857a 100644 --- a/async/go-server/tests/integration/userprovider_test.go +++ b/async/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" @@ -31,6 +32,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/stretchr/testify/assert" ) diff --git a/attachment/go-client/cmd/client.go b/attachment/go-client/cmd/client.go index 0654e5a..04ce85d 100644 --- a/attachment/go-client/cmd/client.go +++ b/attachment/go-client/cmd/client.go @@ -25,11 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/attachment/go-client/pkg" - "github.com/dubbogo/gost/log" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/constant" @@ -39,6 +34,12 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/attachment/go-client/pkg" ) var userProvider = new(pkg.UserProvider) diff --git a/attachment/go-server/cmd/server.go b/attachment/go-server/cmd/server.go index fa04640..378f189 100644 --- a/attachment/go-server/cmd/server.go +++ b/attachment/go-server/cmd/server.go @@ -27,10 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/attachment/go-server/pkg" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -42,6 +38,10 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) +import ( + "github.com/apache/dubbo-go-samples/attachment/go-server/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/attachment/go-server/pkg/user.go b/attachment/go-server/pkg/user.go index 3ef5aa7..de1f24b 100644 --- a/attachment/go-server/pkg/user.go +++ b/attachment/go-server/pkg/user.go @@ -24,12 +24,10 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/dubbogo/gost/log" -) - -import ( "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/attachment/go-server/tests/integration/main_test.go b/attachment/go-server/tests/integration/main_test.go index 10bc5ca..b4a5139 100644 --- a/attachment/go-server/tests/integration/main_test.go +++ b/attachment/go-server/tests/integration/main_test.go @@ -20,10 +20,14 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" + "context" + "os" + "testing" + "time" ) import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -35,13 +39,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/attachment/go-server/tests/integration/userprovider_test.go b/attachment/go-server/tests/integration/userprovider_test.go index 5cc9943..a6fc679 100644 --- a/attachment/go-server/tests/integration/userprovider_test.go +++ b/attachment/go-server/tests/integration/userprovider_test.go @@ -24,8 +24,10 @@ import ( "testing" "time" ) + import ( "github.com/apache/dubbo-go/common/constant" + "github.com/stretchr/testify/assert" ) diff --git a/chain/backend/cmd/server.go b/chain/backend/cmd/server.go index aa9d7df..42544bc 100644 --- a/chain/backend/cmd/server.go +++ b/chain/backend/cmd/server.go @@ -26,10 +26,6 @@ import ( ) import ( - _ "github.com/apache/dubbo-go-samples/chain/backend/pkg" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -42,6 +38,10 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) +import ( + _ "github.com/apache/dubbo-go-samples/chain/backend/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/chain/backend/tests/integration/main_test.go b/chain/backend/tests/integration/main_test.go index 55c2706..979ffb1 100644 --- a/chain/backend/tests/integration/main_test.go +++ b/chain/backend/tests/integration/main_test.go @@ -20,6 +20,12 @@ package integration import ( + "os" + "testing" + "time" +) + +import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -31,12 +37,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "os" - "testing" - "time" -) - var cat = new(CatService) var dog = new(DogService) var tiger = new(TigerService) diff --git a/chain/backend/tests/integration/services_test.go b/chain/backend/tests/integration/services_test.go index 888ba24..c3d7529 100644 --- a/chain/backend/tests/integration/services_test.go +++ b/chain/backend/tests/integration/services_test.go @@ -22,6 +22,7 @@ package integration import ( "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/chain/frontend/cmd/client.go b/chain/frontend/cmd/client.go index e13ab55..e201571 100644 --- a/chain/frontend/cmd/client.go +++ b/chain/frontend/cmd/client.go @@ -23,10 +23,6 @@ import ( ) import ( - "github.com/apache/dubbo-go-samples/chain/frontend/pkg" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -38,6 +34,10 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) +import ( + "github.com/apache/dubbo-go-samples/chain/frontend/pkg" +) + func main() { var chinese = new(pkg.ChineseService) var american = new(pkg.AmericanService) diff --git a/chain/middle/cmd/server.go b/chain/middle/cmd/server.go index 007c5a4..fe81ad2 100644 --- a/chain/middle/cmd/server.go +++ b/chain/middle/cmd/server.go @@ -26,10 +26,6 @@ import ( ) import ( - _ "github.com/apache/dubbo-go-samples/chain/middle/pkg" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -42,6 +38,10 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) +import ( + _ "github.com/apache/dubbo-go-samples/chain/middle/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/chain/middle/tests/integration/main_test.go b/chain/middle/tests/integration/main_test.go index a45bb1a..f938433 100644 --- a/chain/middle/tests/integration/main_test.go +++ b/chain/middle/tests/integration/main_test.go @@ -20,6 +20,12 @@ package integration import ( + "os" + "testing" + "time" +) + +import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -31,12 +37,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "os" - "testing" - "time" -) - var ( chinese = new(ChineseService) american = new(AmericanService) diff --git a/chain/middle/tests/integration/services_test.go b/chain/middle/tests/integration/services_test.go index d1c9f97..5b39ea6 100644 --- a/chain/middle/tests/integration/services_test.go +++ b/chain/middle/tests/integration/services_test.go @@ -20,11 +20,11 @@ package integration import ( - "github.com/stretchr/testify/assert" + "testing" ) import ( - "testing" + "github.com/stretchr/testify/assert" ) func TestChinese(t *testing.T) { diff --git a/config-api/go-client/cmd/client.go b/config-api/go-client/cmd/client.go index 1427407..833071d 100644 --- a/config-api/go-client/cmd/client.go +++ b/config-api/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/config-api/go-server/pkg/user.go b/config-api/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/config-api/go-server/pkg/user.go +++ b/config-api/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/config-api/go-server/tests/integration/main_test.go b/config-api/go-server/tests/integration/main_test.go index f79029c..b4a5139 100644 --- a/config-api/go-server/tests/integration/main_test.go +++ b/config-api/go-server/tests/integration/main_test.go @@ -39,8 +39,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) - - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/config-api/go-server/tests/integration/userprovider_test.go b/config-api/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/config-api/go-server/tests/integration/userprovider_test.go +++ b/config-api/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/configcenter/apollo/go-client/cmd/client.go b/configcenter/apollo/go-client/cmd/client.go index 77c760a..fa6b74f 100644 --- a/configcenter/apollo/go-client/cmd/client.go +++ b/configcenter/apollo/go-client/cmd/client.go @@ -34,6 +34,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/configcenter/apollo/go-server/cmd/server.go b/configcenter/apollo/go-server/cmd/server.go index 065abfa..919cc26 100644 --- a/configcenter/apollo/go-server/cmd/server.go +++ b/configcenter/apollo/go-server/cmd/server.go @@ -27,7 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -38,7 +37,6 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" - ) import ( diff --git a/configcenter/apollo/go-server/pkg/user.go b/configcenter/apollo/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/configcenter/apollo/go-server/pkg/user.go +++ b/configcenter/apollo/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/configcenter/nacos/go-client/cmd/client.go b/configcenter/nacos/go-client/cmd/client.go index bc2c501..ff0bf9b 100644 --- a/configcenter/nacos/go-client/cmd/client.go +++ b/configcenter/nacos/go-client/cmd/client.go @@ -34,6 +34,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/configcenter/nacos/go-server/pkg/user.go b/configcenter/nacos/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/configcenter/nacos/go-server/pkg/user.go +++ b/configcenter/nacos/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/configcenter/zookeeper/go-client/cmd/client.go b/configcenter/zookeeper/go-client/cmd/client.go index 45b619d..1008ff0 100644 --- a/configcenter/zookeeper/go-client/cmd/client.go +++ b/configcenter/zookeeper/go-client/cmd/client.go @@ -34,6 +34,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/configcenter/zookeeper/go-server/pkg/user.go b/configcenter/zookeeper/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/configcenter/zookeeper/go-server/pkg/user.go +++ b/configcenter/zookeeper/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/context/go-client/cmd/client.go b/context/go-client/cmd/client.go index 484c1da..9579d4f 100644 --- a/context/go-client/cmd/client.go +++ b/context/go-client/cmd/client.go @@ -34,6 +34,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/context/go-server/pkg/user.go b/context/go-server/pkg/user.go index b943959..81b5225 100644 --- a/context/go-server/pkg/user.go +++ b/context/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/context/go-server/tests/integration/userprovider_test.go b/context/go-server/tests/integration/userprovider_test.go index 2618866..21cacc1 100644 --- a/context/go-server/tests/integration/userprovider_test.go +++ b/context/go-server/tests/integration/userprovider_test.go @@ -23,8 +23,10 @@ import ( "context" "testing" ) + import ( "github.com/apache/dubbo-go/common/constant" + "github.com/stretchr/testify/assert" ) diff --git a/direct/go-client/cmd/client.go b/direct/go-client/cmd/client.go index 13f587d..4b943ac 100644 --- a/direct/go-client/cmd/client.go +++ b/direct/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/direct/go-server/pkg/user.go b/direct/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/direct/go-server/pkg/user.go +++ b/direct/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/direct/go-server/tests/integration/userprovider_test.go b/direct/go-server/tests/integration/userprovider_test.go index 9dc1252..7183e64 100644 --- a/direct/go-server/tests/integration/userprovider_test.go +++ b/direct/go-server/tests/integration/userprovider_test.go @@ -23,12 +23,11 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) -// in order to make sure direct-invoking is enabled, check if references -> UserProvider -> url is specified -// in conf/client.yaml func TestGetUser(t *testing.T) { user := &User{} err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user) diff --git a/docker/go-client/cmd/client.go b/docker/go-client/cmd/client.go index 6ca8d95..6bcac75 100644 --- a/docker/go-client/cmd/client.go +++ b/docker/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/docker/go-server/pkg/user.go b/docker/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/docker/go-server/pkg/user.go +++ b/docker/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/filter/custom/go-client/cmd/client.go b/filter/custom/go-client/cmd/client.go index b14fd53..15c301c 100644 --- a/filter/custom/go-client/cmd/client.go +++ b/filter/custom/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/filter/custom/go-server/pkg/custom_filter.go b/filter/custom/go-server/pkg/custom_filter.go index 651fde5..8de581b 100644 --- a/filter/custom/go-server/pkg/custom_filter.go +++ b/filter/custom/go-server/pkg/custom_filter.go @@ -27,6 +27,7 @@ import ( "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/filter" "github.com/apache/dubbo-go/protocol" + "github.com/dubbogo/gost/log" ) diff --git a/filter/custom/go-server/pkg/user.go b/filter/custom/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/filter/custom/go-server/pkg/user.go +++ b/filter/custom/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/filter/custom/go-server/tests/integration/userprovider_test.go b/filter/custom/go-server/tests/integration/userprovider_test.go index beefe1b..4618a83 100644 --- a/filter/custom/go-server/tests/integration/userprovider_test.go +++ b/filter/custom/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/filter/sentinel/go-client/cmd/client.go b/filter/sentinel/go-client/cmd/client.go index 2a506c9..b24f7be 100644 --- a/filter/sentinel/go-client/cmd/client.go +++ b/filter/sentinel/go-client/cmd/client.go @@ -26,6 +26,7 @@ import ( "github.com/alibaba/sentinel-golang/api" sentinelConf "github.com/alibaba/sentinel-golang/core/config" "github.com/alibaba/sentinel-golang/core/flow" + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" @@ -35,6 +36,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/filter/sentinel/go-server/cmd/server.go b/filter/sentinel/go-server/cmd/server.go index 20b32b9..bf297b2 100644 --- a/filter/sentinel/go-server/cmd/server.go +++ b/filter/sentinel/go-server/cmd/server.go @@ -29,6 +29,7 @@ import ( "github.com/alibaba/sentinel-golang/api" sentinelConf "github.com/alibaba/sentinel-golang/core/config" "github.com/alibaba/sentinel-golang/core/flow" + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" diff --git a/filter/sentinel/go-server/pkg/user.go b/filter/sentinel/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/filter/sentinel/go-server/pkg/user.go +++ b/filter/sentinel/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/filter/sentinel/go-server/tests/integration/userprovider_test.go b/filter/sentinel/go-server/tests/integration/userprovider_test.go index d6a5ecc..397f3ab 100644 --- a/filter/sentinel/go-server/tests/integration/userprovider_test.go +++ b/filter/sentinel/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/filter/tpslimit/go-server/pkg/limit_strategy.go b/filter/tpslimit/go-server/pkg/limit_strategy.go index 161e62d..f64a049 100644 --- a/filter/tpslimit/go-server/pkg/limit_strategy.go +++ b/filter/tpslimit/go-server/pkg/limit_strategy.go @@ -24,6 +24,7 @@ import ( import ( "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/filter" + "github.com/dubbogo/gost/log" ) diff --git a/filter/tpslimit/go-server/pkg/user.go b/filter/tpslimit/go-server/pkg/user.go index 7a3231a..b778495 100644 --- a/filter/tpslimit/go-server/pkg/user.go +++ b/filter/tpslimit/go-server/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/game/go-server-game/cmd/server.go b/game/go-server-game/cmd/server.go index dbb9f28..16e42d8 100644 --- a/game/go-server-game/cmd/server.go +++ b/game/go-server-game/cmd/server.go @@ -1,29 +1,29 @@ package main import ( - "os" - "os/signal" - "syscall" - "time" - - "github.com/apache/dubbo-go/common/logger" - "github.com/apache/dubbo-go/config" - hessian "github.com/apache/dubbo-go-hessian2" - - _ "github.com/apache/dubbo-go/protocol/dubbo" - _ "github.com/apache/dubbo-go/registry/protocol" - - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" - _ "github.com/apache/dubbo-go/filter/filter_impl" + "os" + "os/signal" + "syscall" + "time" +) - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - // _ "github.com/apache/dubbo-go/metadata/service/remote" - _ "github.com/apache/dubbo-go/metadata/service/inmemory" - _ "github.com/apache/dubbo-go/registry/zookeeper" +import ( + hessian "github.com/apache/dubbo-go-hessian2" + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" + "github.com/apache/dubbo-go/common/logger" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" + _ "github.com/apache/dubbo-go/metadata/service/inmemory" + _ "github.com/apache/dubbo-go/protocol/dubbo" + _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" +) - "github.com/apache/dubbo-go-samples/game/go-server-game/pkg" - "github.com/apache/dubbo-go-samples/game/pkg/pojo" +import ( + "github.com/apache/dubbo-go-samples/game/go-server-game/pkg" + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) func init() { diff --git a/game/go-server-game/pkg/consumer.go b/game/go-server-game/pkg/consumer.go index dc3c045..c879fae 100644 --- a/game/go-server-game/pkg/consumer.go +++ b/game/go-server-game/pkg/consumer.go @@ -1,5 +1,7 @@ package pkg -import "github.com/apache/dubbo-go-samples/game/pkg/consumer/gate" +import ( + "github.com/apache/dubbo-go-samples/game/pkg/consumer/gate" +) -var GateBasketball = new(gate.BasketballService) \ No newline at end of file +var GateBasketball = new(gate.BasketballService) diff --git a/game/go-server-game/pkg/provider.go b/game/go-server-game/pkg/provider.go index 7892000..7b7c246 100644 --- a/game/go-server-game/pkg/provider.go +++ b/game/go-server-game/pkg/provider.go @@ -1,13 +1,17 @@ package pkg import ( - "context" - "fmt" - "strconv" + "context" + "fmt" + "strconv" +) - "github.com/apache/dubbo-go/common/logger" +import ( + "github.com/apache/dubbo-go/common/logger" +) - "github.com/apache/dubbo-go-samples/game/pkg/pojo" +import ( + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) type BasketballService struct{} @@ -103,4 +107,4 @@ func (p *BasketballService) Rank (ctx context.Context, uid string) (*pojo.Result func (p *BasketballService) Reference() string { return "gameProvider.basketballService" -} \ No newline at end of file +} diff --git a/game/go-server-game/tests/integration/gameprovider_test.go b/game/go-server-game/tests/integration/gameprovider_test.go index 02dcf4a..6240102 100755 --- a/game/go-server-game/tests/integration/gameprovider_test.go +++ b/game/go-server-game/tests/integration/gameprovider_test.go @@ -1,10 +1,12 @@ package integration import ( - "context" - "testing" + "context" + "testing" +) - "github.com/stretchr/testify/assert" +import ( + "github.com/stretchr/testify/assert" ) func TestLogin(t *testing.T) { @@ -29,4 +31,4 @@ func TestRank(t *testing.T) { assert.Nil(t, err) assert.NotNil(t, res) assert.Equal(t, int32(0), res.Code) -} \ No newline at end of file +} diff --git a/game/go-server-game/tests/integration/main_test.go b/game/go-server-game/tests/integration/main_test.go index e04d87a..9459f1a 100644 --- a/game/go-server-game/tests/integration/main_test.go +++ b/game/go-server-game/tests/integration/main_test.go @@ -1,27 +1,27 @@ package integration import ( - "os" - "testing" - "time" - - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" - - _ "github.com/apache/dubbo-go/protocol/dubbo" - _ "github.com/apache/dubbo-go/registry/protocol" - - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" - _ "github.com/apache/dubbo-go/filter/filter_impl" + "os" + "testing" + "time" +) - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - // _ "github.com/apache/dubbo-go/metadata/service/remote" - _ "github.com/apache/dubbo-go/metadata/service/inmemory" - _ "github.com/apache/dubbo-go/registry/zookeeper" +import ( + hessian "github.com/apache/dubbo-go-hessian2" + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" + _ "github.com/apache/dubbo-go/metadata/service/inmemory" + _ "github.com/apache/dubbo-go/protocol/dubbo" + _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" +) - "github.com/apache/dubbo-go-samples/game/pkg/consumer/game" - "github.com/apache/dubbo-go-samples/game/pkg/pojo" +import ( + "github.com/apache/dubbo-go-samples/game/pkg/consumer/game" + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) var gameProvider = new(game.BasketballService) @@ -34,4 +34,4 @@ func TestMain(m *testing.M) { time.Sleep(3 * time.Second) os.Exit(m.Run()) -} \ No newline at end of file +} diff --git a/game/go-server-gate/cmd/server.go b/game/go-server-gate/cmd/server.go index b16297b..bde9993 100755 --- a/game/go-server-gate/cmd/server.go +++ b/game/go-server-gate/cmd/server.go @@ -1,34 +1,34 @@ package main import ( - "context" - "encoding/json" - "io/ioutil" - "net/http" - "os" - "os/signal" - "strconv" - "syscall" - "time" - - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/common/logger" - "github.com/apache/dubbo-go/config" - - _ "github.com/apache/dubbo-go/protocol/dubbo" - _ "github.com/apache/dubbo-go/registry/protocol" - - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" - _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - // _ "github.com/apache/dubbo-go/metadata/service/remote" - _ "github.com/apache/dubbo-go/metadata/service/inmemory" - _ "github.com/apache/dubbo-go/registry/zookeeper" - - "github.com/apache/dubbo-go-samples/game/go-server-gate/pkg" - "github.com/apache/dubbo-go-samples/game/pkg/pojo" + "context" + "encoding/json" + "io/ioutil" + "net/http" + "os" + "os/signal" + "strconv" + "syscall" + "time" +) + +import ( + hessian "github.com/apache/dubbo-go-hessian2" + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" + "github.com/apache/dubbo-go/common/logger" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" + _ "github.com/apache/dubbo-go/metadata/service/inmemory" + _ "github.com/apache/dubbo-go/protocol/dubbo" + _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" +) + +import ( + "github.com/apache/dubbo-go-samples/game/go-server-gate/pkg" + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) func init() { @@ -136,4 +136,4 @@ func responseWithOrigin(w http.ResponseWriter, r *http.Request, code int, json [ w.Header().Set("Content-Type", "application/json; charset=utf-8") w.WriteHeader(code) w.Write(json) -} \ No newline at end of file +} diff --git a/game/go-server-gate/pkg/consumer.go b/game/go-server-gate/pkg/consumer.go index 74bd910..fedca07 100644 --- a/game/go-server-gate/pkg/consumer.go +++ b/game/go-server-gate/pkg/consumer.go @@ -1,9 +1,12 @@ package pkg import ( - "context" - "github.com/apache/dubbo-go-samples/game/pkg/consumer/game" - "github.com/apache/dubbo-go-samples/game/pkg/pojo" + "context" +) + +import ( + "github.com/apache/dubbo-go-samples/game/pkg/consumer/game" + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) var GameBasketball = new(game.BasketballService) diff --git a/game/go-server-gate/pkg/provider.go b/game/go-server-gate/pkg/provider.go index e47ed65..89d99d7 100644 --- a/game/go-server-gate/pkg/provider.go +++ b/game/go-server-gate/pkg/provider.go @@ -1,10 +1,15 @@ package pkg import ( - "context" - "github.com/apache/dubbo-go/common/logger" + "context" +) - "github.com/apache/dubbo-go-samples/game/pkg/pojo" +import ( + "github.com/apache/dubbo-go/common/logger" +) + +import ( + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) type BasketballService struct{} diff --git a/game/go-server-gate/tests/integration/gateprovider_test.go b/game/go-server-gate/tests/integration/gateprovider_test.go index ebb7ea2..c8b0c96 100644 --- a/game/go-server-gate/tests/integration/gateprovider_test.go +++ b/game/go-server-gate/tests/integration/gateprovider_test.go @@ -1,10 +1,12 @@ package integration import ( - "context" - "testing" + "context" + "testing" +) - "github.com/stretchr/testify/assert" +import ( + "github.com/stretchr/testify/assert" ) func TestSend(t *testing.T) { @@ -15,4 +17,4 @@ func TestSend(t *testing.T) { assert.NotNil(t, res.Data) assert.Equal(t, "A001", res.Data["to"]) assert.Equal(t, "hello", res.Data["message"]) -} \ No newline at end of file +} diff --git a/game/go-server-gate/tests/integration/main_test.go b/game/go-server-gate/tests/integration/main_test.go index 41bf36b..88bf8d3 100644 --- a/game/go-server-gate/tests/integration/main_test.go +++ b/game/go-server-gate/tests/integration/main_test.go @@ -1,27 +1,27 @@ package integration import ( - "os" - "testing" - "time" - - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" - - _ "github.com/apache/dubbo-go/protocol/dubbo" - _ "github.com/apache/dubbo-go/registry/protocol" - - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" - _ "github.com/apache/dubbo-go/filter/filter_impl" + "os" + "testing" + "time" +) - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - // _ "github.com/apache/dubbo-go/metadata/service/remote" - _ "github.com/apache/dubbo-go/metadata/service/inmemory" - _ "github.com/apache/dubbo-go/registry/zookeeper" +import ( + hessian "github.com/apache/dubbo-go-hessian2" + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" + _ "github.com/apache/dubbo-go/metadata/service/inmemory" + _ "github.com/apache/dubbo-go/protocol/dubbo" + _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" +) - "github.com/apache/dubbo-go-samples/game/pkg/consumer/gate" - "github.com/apache/dubbo-go-samples/game/pkg/pojo" +import ( + "github.com/apache/dubbo-go-samples/game/pkg/consumer/gate" + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) var gateProvider = new(gate.BasketballService) @@ -34,4 +34,4 @@ func TestMain(m *testing.M) { time.Sleep(3 * time.Second) os.Exit(m.Run()) -} \ No newline at end of file +} diff --git a/game/pkg/consumer/game/basketball.go b/game/pkg/consumer/game/basketball.go index 20dc0b6..36a343e 100644 --- a/game/pkg/consumer/game/basketball.go +++ b/game/pkg/consumer/game/basketball.go @@ -1,8 +1,11 @@ package game import ( - "context" - "github.com/apache/dubbo-go-samples/game/pkg/pojo" + "context" +) + +import ( + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) type BasketballService struct { diff --git a/game/pkg/consumer/gate/basketball.go b/game/pkg/consumer/gate/basketball.go index 74833d3..9d656d7 100644 --- a/game/pkg/consumer/gate/basketball.go +++ b/game/pkg/consumer/gate/basketball.go @@ -1,8 +1,11 @@ package gate import ( - "context" - "github.com/apache/dubbo-go-samples/game/pkg/pojo" + "context" +) + +import ( + "github.com/apache/dubbo-go-samples/game/pkg/pojo" ) type BasketballService struct { diff --git a/game/pkg/pojo/info.go b/game/pkg/pojo/info.go index 59d47dc..6125b5a 100644 --- a/game/pkg/pojo/info.go +++ b/game/pkg/pojo/info.go @@ -7,4 +7,4 @@ type Info struct { func (m Info) JavaClassName() string { return "org.apache.dubbo.pojo.Info" -} \ No newline at end of file +} diff --git a/general/dubbo/go-client/cmd/client.go b/general/dubbo/go-client/cmd/client.go index 1b89fc6..9df1d28 100644 --- a/general/dubbo/go-client/cmd/client.go +++ b/general/dubbo/go-client/cmd/client.go @@ -24,19 +24,20 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/general/dubbo/go-client/pkg" - "github.com/apache/dubbo-go/config" - "github.com/dubbogo/gost/log" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/general/dubbo/go-client/pkg" ) var ( diff --git a/general/dubbo/go-server/cmd/server.go b/general/dubbo/go-server/cmd/server.go index 97e5477..af84144 100644 --- a/general/dubbo/go-server/cmd/server.go +++ b/general/dubbo/go-server/cmd/server.go @@ -27,26 +27,26 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/general/dubbo/go-server/pkg" - + _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" - _ "github.com/apache/dubbo-go/protocol/dubbo" - _ "github.com/apache/dubbo-go/registry/protocol" - - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/metadata/service/inmemory" + _ "github.com/apache/dubbo-go/protocol/dubbo" + _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" ) +import ( + "github.com/apache/dubbo-go-samples/general/dubbo/go-server/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/general/dubbo/go-server/pkg/user_provider.go b/general/dubbo/go-server/pkg/user_provider.go index 6ccb0f1..38cb8c9 100644 --- a/general/dubbo/go-server/pkg/user_provider.go +++ b/general/dubbo/go-server/pkg/user_provider.go @@ -25,13 +25,12 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/dubbogo/gost/log" - perrors "github.com/pkg/errors" -) - -import ( "github.com/apache/dubbo-go-hessian2/java_exception" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" + + perrors "github.com/pkg/errors" ) func init() { diff --git a/general/dubbo/go-server/tests/integration/main_test.go b/general/dubbo/go-server/tests/integration/main_test.go index eaad5f4..52f360a 100644 --- a/general/dubbo/go-server/tests/integration/main_test.go +++ b/general/dubbo/go-server/tests/integration/main_test.go @@ -20,12 +20,20 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" + "context" + "fmt" + "os" + "strconv" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/metadata/service/inmemory" _ "github.com/apache/dubbo-go/protocol/dubbo" @@ -33,15 +41,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "context" - "fmt" - "os" - "strconv" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/general/dubbo/go-server/tests/integration/userprovider_test.go b/general/dubbo/go-server/tests/integration/userprovider_test.go index 70e7617..988e1cd 100644 --- a/general/dubbo/go-server/tests/integration/userprovider_test.go +++ b/general/dubbo/go-server/tests/integration/userprovider_test.go @@ -21,14 +21,19 @@ package integration import ( "context" - "github.com/apache/dubbo-go-hessian2/java_exception" - "github.com/apache/dubbo-go-samples/general/dubbo/go-server/pkg" "testing" ) + import ( + "github.com/apache/dubbo-go-hessian2/java_exception" + "github.com/stretchr/testify/assert" ) +import ( + "github.com/apache/dubbo-go-samples/general/dubbo/go-server/pkg" +) + func TestGetUserA000(t *testing.T) { user := &User{} err := userProvider.GetUser(context.TODO(), []interface{}{"A000"}, user) diff --git a/general/grpc/go-client/cmd/client.go b/general/grpc/go-client/cmd/client.go index 919c92c..e216621 100644 --- a/general/grpc/go-client/cmd/client.go +++ b/general/grpc/go-client/cmd/client.go @@ -32,6 +32,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/grpc" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/general/grpc/go-server/cmd/server.go b/general/grpc/go-server/cmd/server.go index 984fcc5..feaf763 100644 --- a/general/grpc/go-server/cmd/server.go +++ b/general/grpc/go-server/cmd/server.go @@ -37,7 +37,7 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import( +import ( "github.com/apache/dubbo-go-samples/general/grpc/go-server/pkg" ) diff --git a/general/grpc/go-server/pkg/greeter.go b/general/grpc/go-server/pkg/greeter.go index 154d35d..f205f39 100644 --- a/general/grpc/go-server/pkg/greeter.go +++ b/general/grpc/go-server/pkg/greeter.go @@ -20,6 +20,9 @@ package pkg import ( "context" "fmt" +) + +import ( "github.com/apache/dubbo-go-samples/general/grpc/protobuf" ) diff --git a/general/grpc/go-server/tests/integration/greeter_test.go b/general/grpc/go-server/tests/integration/greeter_test.go index 45eccdd..f49e5a1 100644 --- a/general/grpc/go-server/tests/integration/greeter_test.go +++ b/general/grpc/go-server/tests/integration/greeter_test.go @@ -24,7 +24,7 @@ import ( "testing" ) -import( +import ( "github.com/stretchr/testify/assert" ) diff --git a/general/grpc/go-server/tests/integration/main_test.go b/general/grpc/go-server/tests/integration/main_test.go index 74a9c4a..cba31a9 100644 --- a/general/grpc/go-server/tests/integration/main_test.go +++ b/general/grpc/go-server/tests/integration/main_test.go @@ -20,6 +20,12 @@ package integration import ( + "os" + "testing" + "time" +) + +import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -32,11 +38,6 @@ import ( ) import ( - "os" - "testing" - "time" -) -import ( "github.com/apache/dubbo-go-samples/general/grpc/protobuf" ) diff --git a/general/grpc/protobuf/helloworld.pb.go b/general/grpc/protobuf/helloworld.pb.go index 8124c8f..1dbb351 100644 --- a/general/grpc/protobuf/helloworld.pb.go +++ b/general/grpc/protobuf/helloworld.pb.go @@ -6,10 +6,6 @@ package protobuf 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,9 +13,14 @@ import ( "github.com/apache/dubbo-go/protocol" dgrpc "github.com/apache/dubbo-go/protocol/grpc" "github.com/apache/dubbo-go/protocol/invocation" + + 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. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf diff --git a/general/grpc/stream/go-client/app/client.go b/general/grpc/stream/go-client/app/client.go index ede6be7..e0f5f36 100644 --- a/general/grpc/stream/go-client/app/client.go +++ b/general/grpc/stream/go-client/app/client.go @@ -37,6 +37,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/grpc" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + gxlog "github.com/dubbogo/gost/log" ) diff --git a/general/grpc/stream/go-client/app/helloworld.pb.go b/general/grpc/stream/go-client/app/helloworld.pb.go index 4bdfb1e..206bf71 100644 --- a/general/grpc/stream/go-client/app/helloworld.pb.go +++ b/general/grpc/stream/go-client/app/helloworld.pb.go @@ -6,10 +6,6 @@ package main 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,9 +13,14 @@ import ( "github.com/apache/dubbo-go/protocol" dgrpc "github.com/apache/dubbo-go/protocol/grpc" "github.com/apache/dubbo-go/protocol/invocation" + + 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. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf diff --git a/general/grpc/stream/go-server/app/helloworld.pb.go b/general/grpc/stream/go-server/app/helloworld.pb.go index 4bdfb1e..1850d20 100644 --- a/general/grpc/stream/go-server/app/helloworld.pb.go +++ b/general/grpc/stream/go-server/app/helloworld.pb.go @@ -6,10 +6,6 @@ package main 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,9 +13,15 @@ import ( "github.com/apache/dubbo-go/protocol" dgrpc "github.com/apache/dubbo-go/protocol/grpc" "github.com/apache/dubbo-go/protocol/invocation" + + proto "github.com/golang/protobuf/proto" + + grpc "google.golang.org/grpc" + 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. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf diff --git a/general/grpc/unary/go-client/app/client.go b/general/grpc/unary/go-client/app/client.go index 6dd2cc7..fc0d332 100644 --- a/general/grpc/unary/go-client/app/client.go +++ b/general/grpc/unary/go-client/app/client.go @@ -31,6 +31,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/grpc" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + gxlog "github.com/dubbogo/gost/log" ) diff --git a/general/grpc/unary/go-client/app/helloworld.pb.go b/general/grpc/unary/go-client/app/helloworld.pb.go index e0e9b31..101f288 100644 --- a/general/grpc/unary/go-client/app/helloworld.pb.go +++ b/general/grpc/unary/go-client/app/helloworld.pb.go @@ -6,10 +6,6 @@ package main 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,9 +13,14 @@ import ( "github.com/apache/dubbo-go/protocol" dgrpc "github.com/apache/dubbo-go/protocol/grpc" "github.com/apache/dubbo-go/protocol/invocation" + + 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. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf diff --git a/general/grpc/unary/go-server/app/greeter.go b/general/grpc/unary/go-server/app/greeter.go index e5471f3..17c3290 100644 --- a/general/grpc/unary/go-server/app/greeter.go +++ b/general/grpc/unary/go-server/app/greeter.go @@ -22,7 +22,6 @@ import ( "fmt" ) - type GreeterProvider struct { *GreeterProviderBase } diff --git a/general/grpc/unary/go-server/app/helloworld.pb.go b/general/grpc/unary/go-server/app/helloworld.pb.go index e0e9b31..101f288 100644 --- a/general/grpc/unary/go-server/app/helloworld.pb.go +++ b/general/grpc/unary/go-server/app/helloworld.pb.go @@ -6,10 +6,6 @@ package main 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,9 +13,14 @@ import ( "github.com/apache/dubbo-go/protocol" dgrpc "github.com/apache/dubbo-go/protocol/grpc" "github.com/apache/dubbo-go/protocol/invocation" + + 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. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf diff --git a/general/jsonrpc/go-client/app/client.go b/general/jsonrpc/go-client/app/client.go index aa857df..24066b5 100644 --- a/general/jsonrpc/go-client/app/client.go +++ b/general/jsonrpc/go-client/app/client.go @@ -27,21 +27,17 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/jsonrpc" _ "github.com/apache/dubbo-go/registry/protocol" - - _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" ) var ( diff --git a/general/jsonrpc/go-server/app/server.go b/general/jsonrpc/go-server/app/server.go index 3ad3d4e..1f0dfe9 100644 --- a/general/jsonrpc/go-server/app/server.go +++ b/general/jsonrpc/go-server/app/server.go @@ -26,16 +26,14 @@ import ( ) import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/jsonrpc" _ "github.com/apache/dubbo-go/registry/protocol" - - _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/registry/zookeeper" ) diff --git a/general/jsonrpc/go-server/app/user_provider.go b/general/jsonrpc/go-server/app/user_provider.go index 3700daa..8957c7a 100644 --- a/general/jsonrpc/go-server/app/user_provider.go +++ b/general/jsonrpc/go-server/app/user_provider.go @@ -7,11 +7,10 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" -) -import ( - "github.com/apache/dubbo-go/config" perrors "github.com/pkg/errors" ) diff --git a/general/jsonrpc/go-server/app/user_provider1.go b/general/jsonrpc/go-server/app/user_provider1.go index 4b7af5a..8007234 100644 --- a/general/jsonrpc/go-server/app/user_provider1.go +++ b/general/jsonrpc/go-server/app/user_provider1.go @@ -7,11 +7,10 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" -) -import ( - "github.com/apache/dubbo-go/config" perrors "github.com/pkg/errors" ) diff --git a/general/jsonrpc/go-server/app/user_provider2.go b/general/jsonrpc/go-server/app/user_provider2.go index 752eb8b..1726574 100644 --- a/general/jsonrpc/go-server/app/user_provider2.go +++ b/general/jsonrpc/go-server/app/user_provider2.go @@ -7,11 +7,10 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" -) -import ( - "github.com/apache/dubbo-go/config" perrors "github.com/pkg/errors" ) diff --git a/general/rest/go-client/cmd/client.go b/general/rest/go-client/cmd/client.go index c8ca0d9..cc891bd 100644 --- a/general/rest/go-client/cmd/client.go +++ b/general/rest/go-client/cmd/client.go @@ -24,24 +24,22 @@ import ( ) import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/rest" _ "github.com/apache/dubbo-go/registry/protocol" - "github.com/dubbogo/gost/log" - - _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" ) import ( "github.com/apache/dubbo-go-samples/general/rest/go-client/pkg" ) -// need to setup environment variable "CONF_CONSUMER_FILE_PATH" to "conf/client.yml" before run func main() { config.Load() time.Sleep(3 * time.Second) diff --git a/general/rest/go-server/cmd/server.go b/general/rest/go-server/cmd/server.go index 469fbb2..1fb66fe 100644 --- a/general/rest/go-server/cmd/server.go +++ b/general/rest/go-server/cmd/server.go @@ -26,21 +26,21 @@ import ( ) import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/metadata/service/inmemory" _ "github.com/apache/dubbo-go/protocol/rest" "github.com/apache/dubbo-go/protocol/rest/server/server_impl" _ "github.com/apache/dubbo-go/registry/protocol" - "github.com/dubbogo/gost/log" - "github.com/emicklei/go-restful/v3" + _ "github.com/apache/dubbo-go/registry/zookeeper" - _ "github.com/apache/dubbo-go/filter/filter_impl" + "github.com/dubbogo/gost/log" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/emicklei/go-restful/v3" ) import ( diff --git a/general/rest/go-server/pkg/user_provider.go b/general/rest/go-server/pkg/user_provider.go index 5fa4428..bf42866 100644 --- a/general/rest/go-server/pkg/user_provider.go +++ b/general/rest/go-server/pkg/user_provider.go @@ -6,12 +6,11 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" - perrors "github.com/pkg/errors" -) -import ( - "github.com/apache/dubbo-go/config" + perrors "github.com/pkg/errors" ) func init() { diff --git a/general/rest/go-server/pkg/user_provider1.go b/general/rest/go-server/pkg/user_provider1.go index e8ffb21..6fdc271 100644 --- a/general/rest/go-server/pkg/user_provider1.go +++ b/general/rest/go-server/pkg/user_provider1.go @@ -6,12 +6,11 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" - perrors "github.com/pkg/errors" -) -import ( - "github.com/apache/dubbo-go/config" + perrors "github.com/pkg/errors" ) func init() { diff --git a/general/rest/go-server/pkg/user_provider2.go b/general/rest/go-server/pkg/user_provider2.go index 1399d05..8287d31 100644 --- a/general/rest/go-server/pkg/user_provider2.go +++ b/general/rest/go-server/pkg/user_provider2.go @@ -6,12 +6,11 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" - perrors "github.com/pkg/errors" -) -import ( - "github.com/apache/dubbo-go/config" + perrors "github.com/pkg/errors" ) func init() { diff --git a/general/rest/go-server/tests/integration/userprovider_test.go b/general/rest/go-server/tests/integration/userprovider_test.go index 98af57a..1f11ae2 100644 --- a/general/rest/go-server/tests/integration/userprovider_test.go +++ b/general/rest/go-server/tests/integration/userprovider_test.go @@ -25,11 +25,11 @@ import ( ) import ( - . "github.com/apache/dubbo-go-samples/general/rest/go-server/pkg" + "github.com/stretchr/testify/assert" ) import ( - "github.com/stretchr/testify/assert" + . "github.com/apache/dubbo-go-samples/general/rest/go-server/pkg" ) func TestGetUser(t *testing.T) { diff --git a/generic/go-client/cmd/client.go b/generic/go-client/cmd/client.go index 269988e..0d9d4f3 100644 --- a/generic/go-client/cmd/client.go +++ b/generic/go-client/cmd/client.go @@ -27,11 +27,6 @@ import ( ) import ( - "github.com/apache/dubbo-go-samples/generic/go-client/pkg" - "github.com/dubbogo/gost/log" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -41,6 +36,12 @@ import ( "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/generic/go-client/pkg" ) var ( diff --git a/generic/go-server/cmd/server.go b/generic/go-server/cmd/server.go index 041116a..7e2784e 100644 --- a/generic/go-server/cmd/server.go +++ b/generic/go-server/cmd/server.go @@ -27,7 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -37,7 +36,9 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" +) +import ( "github.com/apache/dubbo-go-samples/generic/go-server/pkg" ) diff --git a/generic/go-server/pkg/user.go b/generic/go-server/pkg/user.go index a7eef28..dd62f6d 100644 --- a/generic/go-server/pkg/user.go +++ b/generic/go-server/pkg/user.go @@ -23,12 +23,10 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/generic/go-server/tests/integration/main_test.go b/generic/go-server/tests/integration/main_test.go index 41fe4f0..f24056e 100644 --- a/generic/go-server/tests/integration/main_test.go +++ b/generic/go-server/tests/integration/main_test.go @@ -20,6 +20,12 @@ package integration import ( + "os" + "testing" + "time" +) + +import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -31,12 +37,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "os" - "testing" - "time" -) - var appName = "UserConsumerTest" var referenceConfig = config.ReferenceConfig{ InterfaceName: "org.apache.dubbo.UserProvider", diff --git a/generic/go-server/tests/integration/userprovider_test.go b/generic/go-server/tests/integration/userprovider_test.go index c272129..975e40b 100644 --- a/generic/go-server/tests/integration/userprovider_test.go +++ b/generic/go-server/tests/integration/userprovider_test.go @@ -21,12 +21,14 @@ package integration import ( "context" - "github.com/stretchr/testify/assert" "testing" "time" ) + import ( "github.com/apache/dubbo-go/config" + + "github.com/stretchr/testify/assert" ) func TestGetUser(t *testing.T) { diff --git a/group/go-client/cmd/client.go b/group/go-client/cmd/client.go index 8d42052..391bbd4 100644 --- a/group/go-client/cmd/client.go +++ b/group/go-client/cmd/client.go @@ -25,11 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/group/go-client/pkg" - "github.com/dubbogo/gost/log" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -38,6 +33,12 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/group/go-client/pkg" ) var userProviderA = new(pkg.UserProviderGroupA) diff --git a/group/go-server-group-a/pkg/user.go b/group/go-server-group-a/pkg/user.go index 47e2ec1..f61464f 100644 --- a/group/go-server-group-a/pkg/user.go +++ b/group/go-server-group-a/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/group/go-server-group-a/tests/integration/main_test.go b/group/go-server-group-a/tests/integration/main_test.go index 4a75f7a..b4a5139 100644 --- a/group/go-server-group-a/tests/integration/main_test.go +++ b/group/go-server-group-a/tests/integration/main_test.go @@ -28,11 +28,10 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/metadata/service/inmemory" _ "github.com/apache/dubbo-go/protocol/dubbo" diff --git a/group/go-server-group-a/tests/integration/userprovider_test.go b/group/go-server-group-a/tests/integration/userprovider_test.go index 3c4661a..6552e24 100644 --- a/group/go-server-group-a/tests/integration/userprovider_test.go +++ b/group/go-server-group-a/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/group/go-server-group-b/pkg/user.go b/group/go-server-group-b/pkg/user.go index f8d375a..221a208 100644 --- a/group/go-server-group-b/pkg/user.go +++ b/group/go-server-group-b/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/group/go-server-group-b/tests/integration/main_test.go b/group/go-server-group-b/tests/integration/main_test.go index 4a75f7a..b4a5139 100644 --- a/group/go-server-group-b/tests/integration/main_test.go +++ b/group/go-server-group-b/tests/integration/main_test.go @@ -28,11 +28,10 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/metadata/service/inmemory" _ "github.com/apache/dubbo-go/protocol/dubbo" diff --git a/helloworld/go-client/cmd/client.go b/helloworld/go-client/cmd/client.go index c44abbd..b6ac640 100644 --- a/helloworld/go-client/cmd/client.go +++ b/helloworld/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + gxlog "github.com/dubbogo/gost/log" ) diff --git a/metric/go-client/cmd/client.go b/metric/go-client/cmd/client.go index e06bf2a..d22c212 100644 --- a/metric/go-client/cmd/client.go +++ b/metric/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/metric/go-server/cmd/server.go b/metric/go-server/cmd/server.go index 6ed88ed..369a8b8 100644 --- a/metric/go-server/cmd/server.go +++ b/metric/go-server/cmd/server.go @@ -29,8 +29,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/prometheus/client_golang/prometheus/promhttp" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -41,6 +39,8 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/prometheus/client_golang/prometheus/promhttp" ) import ( diff --git a/metric/go-server/pkg/user.go b/metric/go-server/pkg/user.go index fb78eeb..df78163 100644 --- a/metric/go-server/pkg/user.go +++ b/metric/go-server/pkg/user.go @@ -19,17 +19,16 @@ package pkg import ( "context" - "github.com/opentracing/opentracing-go" "time" ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" + + "github.com/opentracing/opentracing-go" ) func init() { diff --git a/metric/go-server/tests/integration/main_test.go b/metric/go-server/tests/integration/main_test.go index 45de1c7..b4a5139 100644 --- a/metric/go-server/tests/integration/main_test.go +++ b/metric/go-server/tests/integration/main_test.go @@ -20,12 +20,18 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" + "context" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/metadata/service/inmemory" _ "github.com/apache/dubbo-go/protocol/dubbo" @@ -33,13 +39,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/metric/go-server/tests/integration/userprovider_test.go b/metric/go-server/tests/integration/userprovider_test.go index 0ee7a59..776299a 100644 --- a/metric/go-server/tests/integration/userprovider_test.go +++ b/metric/go-server/tests/integration/userprovider_test.go @@ -25,6 +25,7 @@ import ( "net/http" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/multi-registry/go-client/cmd/client.go b/multi-registry/go-client/cmd/client.go index 9516cd5..22bce13 100644 --- a/multi-registry/go-client/cmd/client.go +++ b/multi-registry/go-client/cmd/client.go @@ -25,7 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -35,6 +34,7 @@ import ( _ "github.com/apache/dubbo-go/registry/nacos" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/multi-registry/go-server/cmd/server.go b/multi-registry/go-server/cmd/server.go index 0d538c9..388188b 100644 --- a/multi-registry/go-server/cmd/server.go +++ b/multi-registry/go-server/cmd/server.go @@ -27,7 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" diff --git a/multi-registry/go-server/pkg/user.go b/multi-registry/go-server/pkg/user.go index 9920a59..b778495 100644 --- a/multi-registry/go-server/pkg/user.go +++ b/multi-registry/go-server/pkg/user.go @@ -23,12 +23,10 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/multi-registry/go-server/tests/integration/main_test.go b/multi-registry/go-server/tests/integration/main_test.go index a6c66da..d910b0d 100644 --- a/multi-registry/go-server/tests/integration/main_test.go +++ b/multi-registry/go-server/tests/integration/main_test.go @@ -20,6 +20,13 @@ package integration import ( + "context" + "os" + "testing" + "time" +) + +import ( hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" @@ -32,13 +39,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/multi-registry/go-server/tests/integration/userprovider_test.go b/multi-registry/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/multi-registry/go-server/tests/integration/userprovider_test.go +++ b/multi-registry/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/multi-zone/go-client/cmd/client.go b/multi-zone/go-client/cmd/client.go index 6095f55..a72f62e 100644 --- a/multi-zone/go-client/cmd/client.go +++ b/multi-zone/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) @@ -40,7 +41,6 @@ import ( "github.com/apache/dubbo-go-samples/multi-zone/go-client/pkg" ) -// need to setup environment variable "CONF_CONSUMER_FILE_PATH" to "conf/client.yml" before run func main() { hessian.RegisterPOJO(&pkg.User{}) userProvider := new(pkg.UserProvider) diff --git a/multi-zone/go-client/tests/integration/main_test.go b/multi-zone/go-client/tests/integration/main_test.go index e0d834e..44b9717 100644 --- a/multi-zone/go-client/tests/integration/main_test.go +++ b/multi-zone/go-client/tests/integration/main_test.go @@ -20,13 +20,17 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" - "github.com/apache/dubbo-go-samples/multi-zone/go-client/pkg" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" @@ -34,9 +38,7 @@ import ( ) import ( - "os" - "testing" - "time" + "github.com/apache/dubbo-go-samples/multi-zone/go-client/pkg" ) var userProvider = new(pkg.UserProvider) diff --git a/multi-zone/go-client/tests/integration/userprovider_test.go b/multi-zone/go-client/tests/integration/userprovider_test.go index 098445c..2961b57 100644 --- a/multi-zone/go-client/tests/integration/userprovider_test.go +++ b/multi-zone/go-client/tests/integration/userprovider_test.go @@ -21,14 +21,19 @@ package integration import ( "context" - "github.com/apache/dubbo-go/common/constant" - "github.com/apache/dubbo-go-samples/multi-zone/go-client/pkg" "testing" ) + import ( + "github.com/apache/dubbo-go/common/constant" + "github.com/stretchr/testify/assert" ) +import ( + "github.com/apache/dubbo-go-samples/multi-zone/go-client/pkg" +) + func TestGetUser(t *testing.T) { ctx := context.WithValue(context.Background(), constant.REGISTRY_KEY+"."+constant.ZONE_FORCE_KEY, true) diff --git a/multi-zone/go-server-hz/pkg/user.go b/multi-zone/go-server-hz/pkg/user.go index b75b3fc..a637df7 100644 --- a/multi-zone/go-server-hz/pkg/user.go +++ b/multi-zone/go-server-hz/pkg/user.go @@ -24,6 +24,7 @@ import ( import ( "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) 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/pkg/user.go b/multi-zone/go-server-sh/pkg/user.go index b75b3fc..a637df7 100644 --- a/multi-zone/go-server-sh/pkg/user.go +++ b/multi-zone/go-server-sh/pkg/user.go @@ -24,6 +24,7 @@ import ( import ( "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) 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 f79029c..b4a5139 100644 --- a/multi-zone/go-server-sh/tests/integration/main_test.go +++ b/multi-zone/go-server-sh/tests/integration/main_test.go @@ -39,8 +39,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) - - var userProvider = new(UserProvider) func TestMain(m *testing.M) { 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/openzipkin/go-client/cmd/client.go b/openzipkin/go-client/cmd/client.go index 872ef8c..53e1c11 100644 --- a/openzipkin/go-client/cmd/client.go +++ b/openzipkin/go-client/cmd/client.go @@ -19,14 +19,14 @@ package main import ( "context" - "contrib.go.opencensus.io/exporter/prometheus" - "go.opencensus.io/stats/view" "math/rand" "os" "time" ) import ( + "contrib.go.opencensus.io/exporter/prometheus" + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" @@ -36,12 +36,17 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" - // tracing zipkin & prometheus + "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" + + "go.opencensus.io/stats/view" ) import ( diff --git a/openzipkin/go-server-a/cmd/server.go b/openzipkin/go-server-a/cmd/server.go index fc06874..c90b3d0 100644 --- a/openzipkin/go-server-a/cmd/server.go +++ b/openzipkin/go-server-a/cmd/server.go @@ -36,11 +36,13 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + gxlog "github.com/dubbogo/gost/log" - // tracing "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" ) diff --git a/openzipkin/go-server-a/pkg/user.go b/openzipkin/go-server-a/pkg/user.go index d0ca328..2251983 100644 --- a/openzipkin/go-server-a/pkg/user.go +++ b/openzipkin/go-server-a/pkg/user.go @@ -26,6 +26,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/openzipkin/go-server-a/tests/integration/main_test.go b/openzipkin/go-server-a/tests/integration/main_test.go index 4a75f7a..b4a5139 100644 --- a/openzipkin/go-server-a/tests/integration/main_test.go +++ b/openzipkin/go-server-a/tests/integration/main_test.go @@ -28,11 +28,10 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/metadata/service/inmemory" _ "github.com/apache/dubbo-go/protocol/dubbo" diff --git a/openzipkin/go-server-a/tests/integration/userprovider_test.go b/openzipkin/go-server-a/tests/integration/userprovider_test.go index 3c4661a..6552e24 100644 --- a/openzipkin/go-server-a/tests/integration/userprovider_test.go +++ b/openzipkin/go-server-a/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/openzipkin/go-server-b/cmd/server.go b/openzipkin/go-server-b/cmd/server.go index 17dfc6c..7c75247 100644 --- a/openzipkin/go-server-b/cmd/server.go +++ b/openzipkin/go-server-b/cmd/server.go @@ -36,10 +36,13 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + gxlog "github.com/dubbogo/gost/log" - // trace: zipkin + "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" ) diff --git a/openzipkin/go-server-b/pkg/user.go b/openzipkin/go-server-b/pkg/user.go index aee528a..f1f841d 100644 --- a/openzipkin/go-server-b/pkg/user.go +++ b/openzipkin/go-server-b/pkg/user.go @@ -26,6 +26,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/openzipkin/go-server-b/tests/integration/main_test.go b/openzipkin/go-server-b/tests/integration/main_test.go index 4a75f7a..b4a5139 100644 --- a/openzipkin/go-server-b/tests/integration/main_test.go +++ b/openzipkin/go-server-b/tests/integration/main_test.go @@ -28,11 +28,10 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/metadata/service/inmemory" _ "github.com/apache/dubbo-go/protocol/dubbo" diff --git a/registry/etcd/go-client/cmd/client.go b/registry/etcd/go-client/cmd/client.go index 1a16c1a..99ca471 100644 --- a/registry/etcd/go-client/cmd/client.go +++ b/registry/etcd/go-client/cmd/client.go @@ -25,11 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/registry/etcd/go-client/pkg" - "github.com/dubbogo/gost/log" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -38,6 +33,12 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/etcdv3" _ "github.com/apache/dubbo-go/registry/protocol" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/registry/etcd/go-client/pkg" ) var userProvider = new(pkg.UserProvider) diff --git a/registry/etcd/go-server/cmd/server.go b/registry/etcd/go-server/cmd/server.go index 1d06639..5fa2e8c 100644 --- a/registry/etcd/go-server/cmd/server.go +++ b/registry/etcd/go-server/cmd/server.go @@ -27,8 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/registry/etcd/go-server/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -40,6 +38,10 @@ import ( _ "github.com/apache/dubbo-go/registry/protocol" ) +import ( + "github.com/apache/dubbo-go-samples/registry/etcd/go-server/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/registry/etcd/go-server/pkg/user.go b/registry/etcd/go-server/pkg/user.go index 9920a59..b778495 100644 --- a/registry/etcd/go-server/pkg/user.go +++ b/registry/etcd/go-server/pkg/user.go @@ -23,12 +23,10 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/registry/etcd/go-server/tests/integration/main_test.go b/registry/etcd/go-server/tests/integration/main_test.go index 2611d11..b22e364 100644 --- a/registry/etcd/go-server/tests/integration/main_test.go +++ b/registry/etcd/go-server/tests/integration/main_test.go @@ -20,25 +20,24 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" + "context" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/etcdv3" _ "github.com/apache/dubbo-go/registry/protocol" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/registry/etcd/go-server/tests/integration/userprovider_test.go b/registry/etcd/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/registry/etcd/go-server/tests/integration/userprovider_test.go +++ b/registry/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/nacos/go-client/cmd/client.go b/registry/nacos/go-client/cmd/client.go index 72037c3..c9e0117 100644 --- a/registry/nacos/go-client/cmd/client.go +++ b/registry/nacos/go-client/cmd/client.go @@ -25,11 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/registry/nacos/go-client/pkg" - "github.com/dubbogo/gost/log" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -38,6 +33,12 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/nacos" _ "github.com/apache/dubbo-go/registry/protocol" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/registry/nacos/go-client/pkg" ) var userProvider = new(pkg.UserProvider) diff --git a/registry/nacos/go-server/pkg/user.go b/registry/nacos/go-server/pkg/user.go index 9920a59..b778495 100644 --- a/registry/nacos/go-server/pkg/user.go +++ b/registry/nacos/go-server/pkg/user.go @@ -23,12 +23,10 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/registry/nacos/go-server/tests/integration/main_test.go b/registry/nacos/go-server/tests/integration/main_test.go index a6a81e4..eb1bc0c 100644 --- a/registry/nacos/go-server/tests/integration/main_test.go +++ b/registry/nacos/go-server/tests/integration/main_test.go @@ -20,25 +20,24 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go/config" + "context" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/nacos" _ "github.com/apache/dubbo-go/registry/protocol" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/registry/nacos/go-server/tests/integration/userprovider_test.go b/registry/nacos/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/registry/nacos/go-server/tests/integration/userprovider_test.go +++ b/registry/nacos/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/registry/servicediscovery/consul/go-client/cmd/client.go b/registry/servicediscovery/consul/go-client/cmd/client.go index d9b46af..0be5b6c 100644 --- a/registry/servicediscovery/consul/go-client/cmd/client.go +++ b/registry/servicediscovery/consul/go-client/cmd/client.go @@ -27,30 +27,28 @@ import ( ) import ( - "github.com/apache/dubbo-go-samples/registry/servicediscovery/consul/go-client/pkg/pojo" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" - _ "github.com/apache/dubbo-go/protocol/dubbo" - _ "github.com/apache/dubbo-go/registry/protocol" - _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/metadata/mapping/dynamic" _ "github.com/apache/dubbo-go/metadata/report/consul" _ "github.com/apache/dubbo-go/metadata/service/remote" + _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/consul" + _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/servicediscovery" + gxlog "github.com/dubbogo/gost/log" ) +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/consul/go-client/pkg/pojo" +) + var ( survivalTimeout int = 10e9 ) diff --git a/registry/servicediscovery/consul/go-server/cmd/server.go b/registry/servicediscovery/consul/go-server/cmd/server.go index b3a571b..ffc5857 100644 --- a/registry/servicediscovery/consul/go-server/cmd/server.go +++ b/registry/servicediscovery/consul/go-server/cmd/server.go @@ -26,30 +26,27 @@ import ( ) import ( - "github.com/apache/dubbo-go-samples/registry/servicediscovery/consul/go-server/pkg/pojo" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" - "github.com/apache/dubbo-go/config" - _ "github.com/apache/dubbo-go/protocol/dubbo" - _ "github.com/apache/dubbo-go/protocol/jsonrpc" - _ "github.com/apache/dubbo-go/registry/protocol" - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/registry/consul" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/metadata/mapping/memory" _ "github.com/apache/dubbo-go/metadata/report/consul" _ "github.com/apache/dubbo-go/metadata/service/remote" + _ "github.com/apache/dubbo-go/protocol/dubbo" + _ "github.com/apache/dubbo-go/protocol/jsonrpc" + _ "github.com/apache/dubbo-go/registry/consul" + _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/servicediscovery" ) +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/consul/go-server/pkg/pojo" +) + var ( survivalTimeout = int(3e9) ) diff --git a/registry/servicediscovery/consul/go-server/pkg/pojo/user.go b/registry/servicediscovery/consul/go-server/pkg/pojo/user.go index e011f01..4e59463 100644 --- a/registry/servicediscovery/consul/go-server/pkg/pojo/user.go +++ b/registry/servicediscovery/consul/go-server/pkg/pojo/user.go @@ -24,9 +24,7 @@ import ( import ( "github.com/apache/dubbo-go/config" -) -import ( gxlog "github.com/dubbogo/gost/log" ) diff --git a/registry/servicediscovery/consul/go-server/tests/integration/main_test.go b/registry/servicediscovery/consul/go-server/tests/integration/main_test.go index 1c6a64b..88a7662 100644 --- a/registry/servicediscovery/consul/go-server/tests/integration/main_test.go +++ b/registry/servicediscovery/consul/go-server/tests/integration/main_test.go @@ -28,7 +28,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" diff --git a/registry/servicediscovery/consul/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/consul/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/registry/servicediscovery/consul/go-server/tests/integration/userprovider_test.go +++ b/registry/servicediscovery/consul/go-server/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 bb167d8..021c58f 100644 --- a/registry/servicediscovery/etcd/go-client/cmd/client.go +++ b/registry/servicediscovery/etcd/go-client/cmd/client.go @@ -25,12 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/dubbogo/gost/log" -) - -import ( - "github.com/apache/dubbo-go-samples/registry/servicediscovery/etcd/go-client/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -44,6 +38,12 @@ import ( _ "github.com/apache/dubbo-go/registry/etcdv3" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/servicediscovery" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/etcd/go-client/pkg" ) var userProvider = new(pkg.UserProvider) diff --git a/registry/servicediscovery/etcd/go-server/cmd/server.go b/registry/servicediscovery/etcd/go-server/cmd/server.go index 0c7ae04..07bee9f 100644 --- a/registry/servicediscovery/etcd/go-server/cmd/server.go +++ b/registry/servicediscovery/etcd/go-server/cmd/server.go @@ -27,8 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/registry/servicediscovery/etcd/go-server/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -45,6 +43,10 @@ import ( _ "github.com/apache/dubbo-go/registry/servicediscovery" ) +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/etcd/go-server/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/registry/servicediscovery/etcd/go-server/pkg/user.go b/registry/servicediscovery/etcd/go-server/pkg/user.go index 9920a59..b778495 100644 --- a/registry/servicediscovery/etcd/go-server/pkg/user.go +++ b/registry/servicediscovery/etcd/go-server/pkg/user.go @@ -23,12 +23,10 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "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 90d99a4..6f4c991 100644 --- a/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go +++ b/registry/servicediscovery/etcd/go-server/tests/integration/main_test.go @@ -20,8 +20,14 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" + "context" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -37,13 +43,6 @@ import ( _ "github.com/apache/dubbo-go/registry/servicediscovery" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { 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/servicediscovery/file/go-client/cmd/client.go b/registry/servicediscovery/file/go-client/cmd/client.go index b6f37a9..de86cd6 100644 --- a/registry/servicediscovery/file/go-client/cmd/client.go +++ b/registry/servicediscovery/file/go-client/cmd/client.go @@ -25,12 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/dubbogo/gost/log" -) - -import ( - "github.com/apache/dubbo-go-samples/registry/servicediscovery/file/go-client/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -43,6 +37,12 @@ import ( _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/servicediscovery" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/file/go-client/pkg" ) var userProvider = new(pkg.UserProvider) diff --git a/registry/servicediscovery/file/go-server/cmd/server.go b/registry/servicediscovery/file/go-server/cmd/server.go index 6c2b0b5..2e8eb8f 100644 --- a/registry/servicediscovery/file/go-server/cmd/server.go +++ b/registry/servicediscovery/file/go-server/cmd/server.go @@ -27,8 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/registry/servicediscovery/file/go-server/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -45,6 +43,10 @@ import ( _ "github.com/apache/dubbo-go/registry/servicediscovery" ) +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/file/go-server/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/registry/servicediscovery/file/go-server/pkg/user.go b/registry/servicediscovery/file/go-server/pkg/user.go index 9920a59..b778495 100644 --- a/registry/servicediscovery/file/go-server/pkg/user.go +++ b/registry/servicediscovery/file/go-server/pkg/user.go @@ -23,12 +23,10 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/registry/servicediscovery/file/go-server/tests/integration/main_test.go b/registry/servicediscovery/file/go-server/tests/integration/main_test.go index feb6fe2..506ffba 100644 --- a/registry/servicediscovery/file/go-server/tests/integration/main_test.go +++ b/registry/servicediscovery/file/go-server/tests/integration/main_test.go @@ -20,8 +20,14 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" + "context" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -36,13 +42,6 @@ import ( _ "github.com/apache/dubbo-go/registry/servicediscovery" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/registry/servicediscovery/file/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/file/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/registry/servicediscovery/file/go-server/tests/integration/userprovider_test.go +++ b/registry/servicediscovery/file/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/registry/servicediscovery/nacos/go-client/cmd/client.go b/registry/servicediscovery/nacos/go-client/cmd/client.go index 8440c16..a49aef9 100644 --- a/registry/servicediscovery/nacos/go-client/cmd/client.go +++ b/registry/servicediscovery/nacos/go-client/cmd/client.go @@ -25,12 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/dubbogo/gost/log" -) - -import ( - "github.com/apache/dubbo-go-samples/registry/servicediscovery/etcd/go-client/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -45,6 +39,12 @@ import ( _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/servicediscovery" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/etcd/go-client/pkg" ) var userProvider = new(pkg.UserProvider) diff --git a/registry/servicediscovery/nacos/go-server/cmd/server.go b/registry/servicediscovery/nacos/go-server/cmd/server.go index 4084ab5..2a1e71d 100644 --- a/registry/servicediscovery/nacos/go-server/cmd/server.go +++ b/registry/servicediscovery/nacos/go-server/cmd/server.go @@ -27,8 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/registry/servicediscovery/nacos/go-server/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -46,6 +44,10 @@ import ( _ "github.com/apache/dubbo-go/registry/servicediscovery" ) +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/nacos/go-server/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/registry/servicediscovery/nacos/go-server/pkg/user.go b/registry/servicediscovery/nacos/go-server/pkg/user.go index 9920a59..b778495 100644 --- a/registry/servicediscovery/nacos/go-server/pkg/user.go +++ b/registry/servicediscovery/nacos/go-server/pkg/user.go @@ -23,12 +23,10 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/registry/servicediscovery/nacos/go-server/tests/integration/main_test.go b/registry/servicediscovery/nacos/go-server/tests/integration/main_test.go index cdc8b96..89acd08 100644 --- a/registry/servicediscovery/nacos/go-server/tests/integration/main_test.go +++ b/registry/servicediscovery/nacos/go-server/tests/integration/main_test.go @@ -20,8 +20,14 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" + "context" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -38,13 +44,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/registry/servicediscovery/nacos/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/nacos/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/registry/servicediscovery/nacos/go-server/tests/integration/userprovider_test.go +++ b/registry/servicediscovery/nacos/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/registry/servicediscovery/zookeeper/go-client/cmd/client.go b/registry/servicediscovery/zookeeper/go-client/cmd/client.go index 9f82758..8088f8f 100644 --- a/registry/servicediscovery/zookeeper/go-client/cmd/client.go +++ b/registry/servicediscovery/zookeeper/go-client/cmd/client.go @@ -25,12 +25,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/dubbogo/gost/log" -) - -import ( - "github.com/apache/dubbo-go-samples/registry/servicediscovery/zookeeper/go-client/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" @@ -43,6 +37,12 @@ import ( _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/servicediscovery" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" +) + +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/zookeeper/go-client/pkg" ) var userProvider = new(pkg.UserProvider) diff --git a/registry/servicediscovery/zookeeper/go-server/cmd/server.go b/registry/servicediscovery/zookeeper/go-server/cmd/server.go index 80fe85c..0124682 100644 --- a/registry/servicediscovery/zookeeper/go-server/cmd/server.go +++ b/registry/servicediscovery/zookeeper/go-server/cmd/server.go @@ -27,8 +27,6 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "github.com/apache/dubbo-go-samples/registry/servicediscovery/zookeeper/go-server/pkg" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -45,6 +43,10 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) +import ( + "github.com/apache/dubbo-go-samples/registry/servicediscovery/zookeeper/go-server/pkg" +) + var ( survivalTimeout = int(3e9) ) diff --git a/registry/servicediscovery/zookeeper/go-server/pkg/user.go b/registry/servicediscovery/zookeeper/go-server/pkg/user.go index 9920a59..b778495 100644 --- a/registry/servicediscovery/zookeeper/go-server/pkg/user.go +++ b/registry/servicediscovery/zookeeper/go-server/pkg/user.go @@ -23,12 +23,10 @@ import ( ) import ( - "github.com/dubbogo/gost/log" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" ) func init() { diff --git a/registry/servicediscovery/zookeeper/go-server/tests/integration/main_test.go b/registry/servicediscovery/zookeeper/go-server/tests/integration/main_test.go index fa94ebc..0486cc7 100644 --- a/registry/servicediscovery/zookeeper/go-server/tests/integration/main_test.go +++ b/registry/servicediscovery/zookeeper/go-server/tests/integration/main_test.go @@ -20,17 +20,21 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" + "context" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" _ "github.com/apache/dubbo-go/filter/filter_impl" - //_ "github.com/apache/dubbo-go/metadata/mapping/dynamic" _ "github.com/apache/dubbo-go/metadata/mapping/memory" _ "github.com/apache/dubbo-go/metadata/report/zookeeper" - //_ "github.com/apache/dubbo-go/metadata/service/remote" _ "github.com/apache/dubbo-go/metadata/service/inmemory" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" @@ -38,13 +42,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/registry/servicediscovery/zookeeper/go-server/tests/integration/userprovider_test.go b/registry/servicediscovery/zookeeper/go-server/tests/integration/userprovider_test.go index dc29d9a..7183e64 100644 --- a/registry/servicediscovery/zookeeper/go-server/tests/integration/userprovider_test.go +++ b/registry/servicediscovery/zookeeper/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/router/condition/go-client/cmd/client.go b/router/condition/go-client/cmd/client.go index 4f9e495..f6d1773 100644 --- a/router/condition/go-client/cmd/client.go +++ b/router/condition/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) @@ -40,8 +41,6 @@ import ( "github.com/apache/dubbo-go-samples/router/condition/go-client/pkg" ) -// need to setup environment variable "CONF_CONSUMER_FILE_PATH" to "conf/client.yml" before run -// need to setup environment variable "CONF_ROUTER_FILE_PATH" to "conf/router_config.yml" before run func main() { userProvider := new(pkg.UserProvider) config.SetConsumerService(userProvider) diff --git a/router/condition/go-server/tests/integration/main_test.go b/router/condition/go-server/tests/integration/main_test.go index 758cc00..9279543 100644 --- a/router/condition/go-server/tests/integration/main_test.go +++ b/router/condition/go-server/tests/integration/main_test.go @@ -20,8 +20,14 @@ package integration import ( - hessian "github.com/apache/dubbo-go-hessian2" + "context" + "os" + "testing" + "time" +) +import ( + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" _ "github.com/apache/dubbo-go/cluster/router/condition" @@ -33,13 +39,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/router/condition/go-server/tests/integration/userprovider_test.go b/router/condition/go-server/tests/integration/userprovider_test.go index 05c607f..f4c030c 100644 --- a/router/condition/go-server/tests/integration/userprovider_test.go +++ b/router/condition/go-server/tests/integration/userprovider_test.go @@ -23,6 +23,7 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/router/tag/go-client/cmd/client.go b/router/tag/go-client/cmd/client.go index 1586ec9..bee40d1 100644 --- a/router/tag/go-client/cmd/client.go +++ b/router/tag/go-client/cmd/client.go @@ -41,6 +41,7 @@ import ( _ "github.com/apache/dubbo-go/registry/directory" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + gxlog "github.com/dubbogo/gost/log" ) diff --git a/router/tag/go-server/tests/integration/main_test.go b/router/tag/go-server/tests/integration/main_test.go index 8d37927..1ec5da9 100644 --- a/router/tag/go-server/tests/integration/main_test.go +++ b/router/tag/go-server/tests/integration/main_test.go @@ -20,6 +20,13 @@ package integration import ( + "context" + "os" + "testing" + "time" +) + +import ( hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" @@ -32,13 +39,6 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" ) -import ( - "context" - "os" - "testing" - "time" -) - var userProvider = new(UserProvider) func TestMain(m *testing.M) { diff --git a/router/tag/go-server/tests/integration/userprovider_test.go b/router/tag/go-server/tests/integration/userprovider_test.go index 863c533..e4dbb83 100644 --- a/router/tag/go-server/tests/integration/userprovider_test.go +++ b/router/tag/go-server/tests/integration/userprovider_test.go @@ -26,6 +26,7 @@ import ( import ( "github.com/apache/dubbo-go/common/constant" + "github.com/stretchr/testify/assert" ) diff --git a/seata/client/app/client.go b/seata/client/app/client.go index 451fdbf..2a7809e 100644 --- a/seata/client/app/client.go +++ b/seata/client/app/client.go @@ -27,24 +27,23 @@ import ( ) import ( - "github.com/apache/dubbo-go-samples/seata/client/app/svc" -) - -import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/transaction-wg/seata-golang/pkg/client" config2 "github.com/transaction-wg/seata-golang/pkg/client/config" "github.com/transaction-wg/seata-golang/pkg/client/tm" +) - _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/registry/zookeeper" +import ( + "github.com/apache/dubbo-go-samples/seata/client/app/svc" ) const ( diff --git a/seata/client/app/svc/svc.go b/seata/client/app/svc/svc.go index 5a53342..8d219d1 100644 --- a/seata/client/app/svc/svc.go +++ b/seata/client/app/svc/svc.go @@ -25,6 +25,7 @@ import ( import ( "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/config" + context2 "github.com/transaction-wg/seata-golang/pkg/client/context" "github.com/transaction-wg/seata-golang/pkg/client/tm" ) diff --git a/seata/order-svc/app/dao/dao.go b/seata/order-svc/app/dao/dao.go index a216fae..ece4584 100644 --- a/seata/order-svc/app/dao/dao.go +++ b/seata/order-svc/app/dao/dao.go @@ -18,15 +18,14 @@ package dao import ( - hessian "github.com/apache/dubbo-go-hessian2" "time" ) import ( + hessian "github.com/apache/dubbo-go-hessian2" + "github.com/bwmarrin/snowflake" -) -import ( "github.com/transaction-wg/seata-golang/pkg/client/at/exec" "github.com/transaction-wg/seata-golang/pkg/client/context" ) diff --git a/seata/order-svc/app/order_svc.go b/seata/order-svc/app/order_svc.go index 1cbc4bc..100136d 100644 --- a/seata/order-svc/app/order_svc.go +++ b/seata/order-svc/app/order_svc.go @@ -23,6 +23,7 @@ import ( import ( "github.com/apache/dubbo-go/common/constant" + context2 "github.com/transaction-wg/seata-golang/pkg/client/context" ) diff --git a/seata/order-svc/app/server.go b/seata/order-svc/app/server.go index c45c1a1..95b71b0 100644 --- a/seata/order-svc/app/server.go +++ b/seata/order-svc/app/server.go @@ -27,24 +27,23 @@ import ( ) import ( - dao2 "github.com/apache/dubbo-go-samples/seata/order-svc/app/dao" -) - -import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/transaction-wg/seata-golang/pkg/client" "github.com/transaction-wg/seata-golang/pkg/client/at/exec" config2 "github.com/transaction-wg/seata-golang/pkg/client/config" +) - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" - _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/registry/zookeeper" +import ( + dao2 "github.com/apache/dubbo-go-samples/seata/order-svc/app/dao" ) const ( diff --git a/seata/product-svc/app/dao/dao.go b/seata/product-svc/app/dao/dao.go index 5e5fe4f..a9f5e89 100644 --- a/seata/product-svc/app/dao/dao.go +++ b/seata/product-svc/app/dao/dao.go @@ -19,6 +19,7 @@ package dao import ( hessian "github.com/apache/dubbo-go-hessian2" + "github.com/transaction-wg/seata-golang/pkg/client/at/exec" "github.com/transaction-wg/seata-golang/pkg/client/context" ) diff --git a/seata/product-svc/app/product_svc.go b/seata/product-svc/app/product_svc.go index 9d97211..d32c518 100644 --- a/seata/product-svc/app/product_svc.go +++ b/seata/product-svc/app/product_svc.go @@ -23,6 +23,7 @@ import ( import ( "github.com/apache/dubbo-go/common/constant" + context2 "github.com/transaction-wg/seata-golang/pkg/client/context" ) diff --git a/seata/product-svc/app/server.go b/seata/product-svc/app/server.go index f39b1ac..68db9be 100644 --- a/seata/product-svc/app/server.go +++ b/seata/product-svc/app/server.go @@ -27,24 +27,23 @@ import ( ) import ( - dao2 "github.com/apache/dubbo-go-samples/seata/product-svc/app/dao" -) - -import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/transaction-wg/seata-golang/pkg/client" "github.com/transaction-wg/seata-golang/pkg/client/at/exec" config2 "github.com/transaction-wg/seata-golang/pkg/client/config" +) - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" - _ "github.com/apache/dubbo-go/filter/filter_impl" - - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/registry/zookeeper" +import ( + dao2 "github.com/apache/dubbo-go-samples/seata/product-svc/app/dao" ) const ( diff --git a/shopping-order/go-client/cmd/client.go b/shopping-order/go-client/cmd/client.go index 7486877..f5e10e0 100644 --- a/shopping-order/go-client/cmd/client.go +++ b/shopping-order/go-client/cmd/client.go @@ -36,6 +36,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/transaction-wg/seata-golang/pkg/client" seataConfig "github.com/transaction-wg/seata-golang/pkg/client/config" "github.com/transaction-wg/seata-golang/pkg/client/tm" diff --git a/shopping-order/go-client/pkg/svc.go b/shopping-order/go-client/pkg/svc.go index 2f8d9ae..1dcba91 100644 --- a/shopping-order/go-client/pkg/svc.go +++ b/shopping-order/go-client/pkg/svc.go @@ -25,6 +25,7 @@ import ( import ( "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/config" + seataContext "github.com/transaction-wg/seata-golang/pkg/client/context" "github.com/transaction-wg/seata-golang/pkg/client/tm" ) diff --git a/shopping-order/go-server-order/cmd/order_svc.go b/shopping-order/go-server-order/cmd/order_svc.go index 2eb6659..0521b08 100644 --- a/shopping-order/go-server-order/cmd/order_svc.go +++ b/shopping-order/go-server-order/cmd/order_svc.go @@ -23,6 +23,7 @@ import ( import ( "github.com/apache/dubbo-go/common/constant" + "github.com/opentrx/mysql" ) diff --git a/shopping-order/go-server-order/cmd/server.go b/shopping-order/go-server-order/cmd/server.go index 0feb02b..d45eb76 100644 --- a/shopping-order/go-server-order/cmd/server.go +++ b/shopping-order/go-server-order/cmd/server.go @@ -37,7 +37,9 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/nacos" _ "github.com/apache/dubbo-go/registry/protocol" + "github.com/opentrx/mysql" + "github.com/transaction-wg/seata-golang/pkg/client" seataConfig "github.com/transaction-wg/seata-golang/pkg/client/config" ) diff --git a/shopping-order/go-server-order/pkg/dao/dao.go b/shopping-order/go-server-order/pkg/dao/dao.go index 99c9865..79f1272 100644 --- a/shopping-order/go-server-order/pkg/dao/dao.go +++ b/shopping-order/go-server-order/pkg/dao/dao.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" + "github.com/bwmarrin/snowflake" ) diff --git a/shopping-order/go-server-product/cmd/product_svc.go b/shopping-order/go-server-product/cmd/product_svc.go index 1b5e21e..03c659e 100644 --- a/shopping-order/go-server-product/cmd/product_svc.go +++ b/shopping-order/go-server-product/cmd/product_svc.go @@ -23,6 +23,7 @@ import ( import ( "github.com/apache/dubbo-go/common/constant" + "github.com/opentrx/mysql" ) diff --git a/shopping-order/go-server-product/cmd/server.go b/shopping-order/go-server-product/cmd/server.go index fa39efb..8b0607f 100644 --- a/shopping-order/go-server-product/cmd/server.go +++ b/shopping-order/go-server-product/cmd/server.go @@ -37,7 +37,9 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/nacos" _ "github.com/apache/dubbo-go/registry/protocol" + "github.com/opentrx/mysql" + "github.com/transaction-wg/seata-golang/pkg/client" seataConfig "github.com/transaction-wg/seata-golang/pkg/client/config" ) diff --git a/tls/go-client/cmd/client.go b/tls/go-client/cmd/client.go index 9e97f6c..9ed5f7c 100755 --- a/tls/go-client/cmd/client.go +++ b/tls/go-client/cmd/client.go @@ -29,6 +29,7 @@ import ( import ( getty "github.com/apache/dubbo-getty" + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" @@ -39,6 +40,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + gxlog "github.com/dubbogo/gost/log" ) @@ -103,4 +105,4 @@ func initSignal() { return } } -} \ No newline at end of file +} diff --git a/tls/go-server/cmd/server.go b/tls/go-server/cmd/server.go index 9f59211..7325b19 100755 --- a/tls/go-server/cmd/server.go +++ b/tls/go-server/cmd/server.go @@ -28,6 +28,7 @@ import ( import ( getty "github.com/apache/dubbo-getty" + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" @@ -44,7 +45,6 @@ import ( "github.com/apache/dubbo-go-samples/tls/go-server/pkg" ) -// survival time var ( survivalTimeout = int(3e9) ) @@ -96,4 +96,4 @@ func initSignal() { return } } -} \ No newline at end of file +} diff --git a/tls/go-server/pkg/user.go b/tls/go-server/pkg/user.go index e295a11..936eabb 100755 --- a/tls/go-server/pkg/user.go +++ b/tls/go-server/pkg/user.go @@ -49,4 +49,4 @@ func (u *UserProvider) Reference() string { func (u User) JavaClassName() string { return "org.apache.dubbo.User" -} \ No newline at end of file +} diff --git a/tls/go-server/tests/integration/main_test.go b/tls/go-server/tests/integration/main_test.go index 5abb8f7..89d1c93 100644 --- a/tls/go-server/tests/integration/main_test.go +++ b/tls/go-server/tests/integration/main_test.go @@ -29,6 +29,7 @@ import ( import ( getty "github.com/apache/dubbo-getty" + hessian "github.com/apache/dubbo-go-hessian2" _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" diff --git a/tracing/dubbo/go-client/app/client.go b/tracing/dubbo/go-client/app/client.go index 1e739f6..e6c9edf 100644 --- a/tracing/dubbo/go-client/app/client.go +++ b/tracing/dubbo/go-client/app/client.go @@ -28,25 +28,24 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "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" -) - -import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" - _ "github.com/apache/dubbo-go/filter/filter_impl" + "github.com/dubbogo/gost/log" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/registry/zookeeper" + "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" ) var ( diff --git a/tracing/dubbo/go-server/app/server.go b/tracing/dubbo/go-server/app/server.go index eada598..9b5444d 100644 --- a/tracing/dubbo/go-server/app/server.go +++ b/tracing/dubbo/go-server/app/server.go @@ -27,24 +27,22 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" - "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" -) - -import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" - _ "github.com/apache/dubbo-go/filter/filter_impl" + "github.com/opentracing/opentracing-go" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/registry/zookeeper" + zipkinot "github.com/openzipkin-contrib/zipkin-go-opentracing" + + "github.com/openzipkin/zipkin-go" + zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" ) var ( diff --git a/tracing/dubbo/go-server/app/user.go b/tracing/dubbo/go-server/app/user.go index a96d42e..3745caa 100644 --- a/tracing/dubbo/go-server/app/user.go +++ b/tracing/dubbo/go-server/app/user.go @@ -23,13 +23,12 @@ import ( ) import ( - "github.com/dubbogo/gost/log" - "github.com/opentracing/opentracing-go" -) - -import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + + "github.com/dubbogo/gost/log" + + "github.com/opentracing/opentracing-go" ) func init() { diff --git a/tracing/grpc/go-client/app/client.go b/tracing/grpc/go-client/app/client.go index e433d53..a928c3a 100644 --- a/tracing/grpc/go-client/app/client.go +++ b/tracing/grpc/go-client/app/client.go @@ -27,12 +27,6 @@ import ( ) import ( - "github.com/dubbogo/gost/log" - opentracing "github.com/opentracing/opentracing-go" - jaegercfg "github.com/uber/jaeger-client-go/config" -) - -import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" @@ -43,6 +37,12 @@ import ( _ "github.com/apache/dubbo-go/protocol/grpc" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + + "github.com/dubbogo/gost/log" + + opentracing "github.com/opentracing/opentracing-go" + + jaegercfg "github.com/uber/jaeger-client-go/config" ) var ( diff --git a/tracing/grpc/go-client/app/hello.go b/tracing/grpc/go-client/app/hello.go index f3e6a8f..b4c859a 100644 --- a/tracing/grpc/go-client/app/hello.go +++ b/tracing/grpc/go-client/app/hello.go @@ -22,11 +22,9 @@ import ( ) import ( - "google.golang.org/grpc" -) - -import ( "github.com/apache/dubbo-go/config" + + "google.golang.org/grpc" ) var grpcGreeterImpl = new(GrpcGreeterImpl) diff --git a/tracing/grpc/go-client/app/helloworld.pb.go b/tracing/grpc/go-client/app/helloworld.pb.go index 75e18b9..1b54125 100644 --- a/tracing/grpc/go-client/app/helloworld.pb.go +++ b/tracing/grpc/go-client/app/helloworld.pb.go @@ -7,20 +7,21 @@ import ( "context" "fmt" "math" - - "github.com/golang/protobuf/proto" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) import ( "github.com/apache/dubbo-go/protocol" dgrpc "github.com/apache/dubbo-go/protocol/grpc" "github.com/apache/dubbo-go/protocol/invocation" + + "github.com/golang/protobuf/proto" + + "google.golang.org/grpc" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) -// Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf diff --git a/tracing/grpc/go-server/app/helloworld.pb.go b/tracing/grpc/go-server/app/helloworld.pb.go index 75e18b9..3b5a1dd 100644 --- a/tracing/grpc/go-server/app/helloworld.pb.go +++ b/tracing/grpc/go-server/app/helloworld.pb.go @@ -7,20 +7,20 @@ import ( "context" "fmt" "math" - - "github.com/golang/protobuf/proto" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) import ( "github.com/apache/dubbo-go/protocol" dgrpc "github.com/apache/dubbo-go/protocol/grpc" "github.com/apache/dubbo-go/protocol/invocation" + + "github.com/golang/protobuf/proto" + + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) -// Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf diff --git a/tracing/grpc/go-server/app/server.go b/tracing/grpc/go-server/app/server.go index 5abdce4..f922f79 100644 --- a/tracing/grpc/go-server/app/server.go +++ b/tracing/grpc/go-server/app/server.go @@ -37,6 +37,7 @@ import ( _ "github.com/apache/dubbo-go/registry/zookeeper" opentracing "github.com/opentracing/opentracing-go" + jaegercfg "github.com/uber/jaeger-client-go/config" ) diff --git a/tracing/jsonrpc/go-client/app/client.go b/tracing/jsonrpc/go-client/app/client.go index 4974ec5..3052740 100644 --- a/tracing/jsonrpc/go-client/app/client.go +++ b/tracing/jsonrpc/go-client/app/client.go @@ -27,25 +27,24 @@ import ( ) import ( - "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" -) - -import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/jsonrpc" _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" - _ "github.com/apache/dubbo-go/filter/filter_impl" + "github.com/dubbogo/gost/log" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/registry/zookeeper" + "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" ) var ( diff --git a/tracing/jsonrpc/go-server/app/server.go b/tracing/jsonrpc/go-server/app/server.go index 90f6042..caae38f 100644 --- a/tracing/jsonrpc/go-server/app/server.go +++ b/tracing/jsonrpc/go-server/app/server.go @@ -26,24 +26,22 @@ import ( ) import ( - "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" -) - -import ( + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/filter/filter_impl" _ "github.com/apache/dubbo-go/protocol/jsonrpc" _ "github.com/apache/dubbo-go/registry/protocol" + _ "github.com/apache/dubbo-go/registry/zookeeper" - _ "github.com/apache/dubbo-go/filter/filter_impl" + "github.com/opentracing/opentracing-go" - _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" - _ "github.com/apache/dubbo-go/registry/zookeeper" + zipkinot "github.com/openzipkin-contrib/zipkin-go-opentracing" + + "github.com/openzipkin/zipkin-go" + zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" ) var ( diff --git a/tracing/jsonrpc/go-server/app/user_provider.go b/tracing/jsonrpc/go-server/app/user_provider.go index cb6a60e..211473e 100644 --- a/tracing/jsonrpc/go-server/app/user_provider.go +++ b/tracing/jsonrpc/go-server/app/user_provider.go @@ -8,12 +8,12 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" + "github.com/opentracing/opentracing-go" -) -import ( - "github.com/apache/dubbo-go/config" perrors "github.com/pkg/errors" ) diff --git a/tracing/jsonrpc/go-server/app/user_provider1.go b/tracing/jsonrpc/go-server/app/user_provider1.go index 4b7af5a..8007234 100644 --- a/tracing/jsonrpc/go-server/app/user_provider1.go +++ b/tracing/jsonrpc/go-server/app/user_provider1.go @@ -7,11 +7,10 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" -) -import ( - "github.com/apache/dubbo-go/config" perrors "github.com/pkg/errors" ) diff --git a/tracing/jsonrpc/go-server/app/user_provider2.go b/tracing/jsonrpc/go-server/app/user_provider2.go index a5f9766..1726574 100644 --- a/tracing/jsonrpc/go-server/app/user_provider2.go +++ b/tracing/jsonrpc/go-server/app/user_provider2.go @@ -7,12 +7,11 @@ import ( ) import ( + "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" - perrors "github.com/pkg/errors" -) -import ( - "github.com/apache/dubbo-go/config" + perrors "github.com/pkg/errors" ) func init() { diff --git a/version/go-client/cmd/client.go b/version/go-client/cmd/client.go index a01094f..fb697de 100644 --- a/version/go-client/cmd/client.go +++ b/version/go-client/cmd/client.go @@ -33,6 +33,7 @@ import ( _ "github.com/apache/dubbo-go/protocol/dubbo" _ "github.com/apache/dubbo-go/registry/protocol" _ "github.com/apache/dubbo-go/registry/zookeeper" + "github.com/dubbogo/gost/log" ) diff --git a/version/go-server-v1/pkg/user.go b/version/go-server-v1/pkg/user.go index 26f1017..cd1ad81 100644 --- a/version/go-server-v1/pkg/user.go +++ b/version/go-server-v1/pkg/user.go @@ -24,6 +24,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" + "github.com/dubbogo/gost/log" ) diff --git a/version/go-server-v1/tests/integration/userprovider_test.go b/version/go-server-v1/tests/integration/userprovider_test.go index 6f9dadd..b38dcdb 100644 --- a/version/go-server-v1/tests/integration/userprovider_test.go +++ b/version/go-server-v1/tests/integration/userprovider_test.go @@ -28,7 +28,6 @@ import ( "github.com/stretchr/testify/assert" ) -// in conf/client.yaml func TestGetUser(t *testing.T) { user := &User{} err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user) diff --git a/version/go-server-v2/pkg/user.go b/version/go-server-v2/pkg/user.go index f2d6ff6..8560a48 100644 --- a/version/go-server-v2/pkg/user.go +++ b/version/go-server-v2/pkg/user.go @@ -25,6 +25,7 @@ import ( import ( hessian "github.com/apache/dubbo-go-hessian2" "github.com/apache/dubbo-go/config" + "github.com/dubbogo/gost/log" ) diff --git a/version/go-server-v2/tests/integration/userprovider_test.go b/version/go-server-v2/tests/integration/userprovider_test.go index a5d8154..fb83b01 100644 --- a/version/go-server-v2/tests/integration/userprovider_test.go +++ b/version/go-server-v2/tests/integration/userprovider_test.go @@ -28,7 +28,6 @@ import ( "github.com/stretchr/testify/assert" ) -// in conf/client.yaml func TestGetUser(t *testing.T) { user := &User{} err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
