This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git

commit 727e346b30290df82167261eb44c63dba91b51c0
Merge: 40082d4 ca2a46f
Author: AlexStocks <[email protected]>
AuthorDate: Sun Jun 20 23:58:23 2021 +0800

    Merge branch '3.0' into develop

 .github/workflows/github-actions.yml               |   15 +-
 .gitignore                                         |    3 +
 CHANGE.md => CHANGELOG.md                          |    0
 contributing.md => CONTRIBUTING.md                 |    0
 README.md                                          |  236 +----
 README_CN.md                                       |  235 +----
 cluster/directory.go                               |    5 +
 cluster/loadbalance/consistent_hash.go             |   30 +-
 cluster/loadbalance/consistent_hash_test.go        |    2 +-
 common/constant/key.go                             |    5 +-
 common/constant/serializtion.go                    |    1 +
 common/extension/metadata_remote.go                |   12 +-
 common/logger/logger.go                            |    3 +-
 common/metadata_info.go                            |   12 +-
 common/url.go                                      |    5 +
 config/base_config.go                              |   16 +-
 config/base_config_test.go                         |    1 -
 config/config_api.go                               |   19 +-
 config/config_center_config.go                     |    2 -
 config/config_loader.go                            |   26 +-
 config/config_loader_options.go                    |   12 +-
 config/config_loader_test.go                       |   16 +-
 config/consumer_config.go                          |    6 +-
 config/graceful_shutdown.go                        |    6 +-
 config/graceful_shutdown_config.go                 |    1 -
 config/graceful_shutdown_test.go                   |    1 -
 config/metadata_report_config.go                   |    4 +-
 config/metadata_report_config_test.go              |    8 +-
 config/provider_config.go                          |    6 +-
 config/reference_config.go                         |   14 +-
 config/registry_config.go                          |    6 +-
 config/remote_config.go                            |   12 +-
 config/service_config.go                           |    9 +-
 config/service_config_test.go                      |    3 +-
 config/service_discovery_config.go                 |   10 +-
 config_center/nacos/client.go                      |  112 +--
 config_center/nacos/client_test.go                 |   49 +-
 config_center/nacos/facade.go                      |   54 +-
 config_center/nacos/impl.go                        |   31 +-
 config_center/nacos/impl_test.go                   |  112 +--
 config_center/nacos/listener.go                    |    2 +-
 config_center/zookeeper/impl.go                    |    2 +-
 filter/filter_impl/graceful_shutdown_filter.go     |    3 +
 go.mod                                             |   12 +-
 go.sum                                             |   56 +-
 integrate_test.sh                                  |   69 +-
 metadata/identifier/base_metadata_identifier.go    |    1 +
 .../identifier/subscribe_metadata_identifier.go    |    5 +
 metadata/report/consul/report_test.go              |    1 +
 metadata/report/delegate/delegate_report.go        |    4 +-
 metadata/report/etcd/report.go                     |   20 +-
 metadata/report/etcd/report_test.go                |   13 +
 metadata/report/nacos/report.go                    |   41 +-
 metadata/report/zookeeper/report_test.go           |   52 +-
 metadata/service/exporter/configurable/exporter.go |    3 +-
 .../{remote/remote_impl => remoting}/service.go    |   38 +-
 .../remote_impl => remoting}/service_test.go       |    4 +-
 .../{remote/remote.go => remoting_service.go}      |    5 +-
 protocol/dubbo/hessian2/hessian_response.go        |   37 +-
 protocol/dubbo3/dubbo3_invoker.go                  |   27 +-
 protocol/dubbo3/dubbo3_protocol.go                 |   52 +-
 .../protoc-gen-dubbo3/examples/helloworld.pb.go    |    4 +
 .../protoc-gen-dubbo3/plugin/dubbo3/dubbo3.go      |    6 +
 protocol/grpc/client.go                            |   17 +-
 protocol/grpc/grpc_protocol.go                     |    2 +-
 .../examples => internal}/Makefile                 |    2 +-
 protocol/grpc/internal/README.md                   |    8 +
 protocol/grpc/internal/doc.go                      |    1 -
 protocol/grpc/internal/helloworld.pb.go            |  165 +++-
 .../grpc/internal/helloworld.proto                 |   77 +-
 .../protoc-gen-dubbo/examples/helloworld.pb.go     |  312 ------
 .../protoc-gen-dubbo/examples/helloworld.proto     |   40 -
 .../grpc/protoc-gen-dubbo/plugin/dubbo/dubbo.go    |   23 +-
 protocol/grpc/server.go                            |   41 +-
 registry/directory/directory.go                    |   11 +-
 .../service_instances_changed_listener_impl.go     |    2 +-
 registry/nacos/listener.go                         |   17 +-
 registry/nacos/registry.go                         |   73 +-
 registry/nacos/registry_test.go                    |   11 +-
 registry/nacos/service_discovery.go                |   33 +-
 registry/nacos/service_discovery_test.go           |    5 +-
 registry/protocol/protocol.go                      |    8 +-
 .../servicediscovery/service_discovery_registry.go |    2 +-
 registry/zookeeper/registry.go                     |    8 +-
 registry/zookeeper/service_discovery.go            |    6 +-
 registry/zookeeper/service_discovery_test.go       |   25 +-
 remoting/getty/getty_client_test.go                |   10 +-
 remoting/nacos/builder.go                          |  104 +-
 remoting/nacos/builder_test.go                     |   46 +
 .../curator_discovery/service_discovery.go         |    9 +
 remoting/zookeeper/listener.go                     |   43 +-
 test/integrate/dubbo/go-client/go.mod              |    2 +-
 test/integrate/dubbo/go-client/go.sum              |   63 ++
 test/integrate/dubbo/go-server/go.mod              |    2 +-
 test/integrate/dubbo/go-server/go.sum              |   63 ++
 tools/cli/.gitignore                               |    5 -
 tools/cli/README.md                                |   14 -
 tools/cli/README_CN.md                             |   11 -
 tools/cli/build.sh                                 |    2 -
 tools/cli/client/client.go                         |  197 ----
 tools/cli/common/tool.go                           |   39 -
 tools/cli/example/README.md                        |  136 ---
 tools/cli/example/README_CN.md                     |  132 ---
 tools/cli/example/server/builddev.sh               |    2 -
 tools/cli/example/server/config/log.yml            |   28 -
 tools/cli/example/server/config/server.yml         |   58 --
 tools/cli/example/server/go.mod                    |   10 -
 tools/cli/example/server/go.sum                    | 1019 --------------------
 tools/cli/example/server/main.go                   |   78 --
 tools/cli/example/server/user.go                   |   82 --
 tools/cli/example/test.sh                          |    1 -
 tools/cli/example/user.json                        |   12 -
 tools/cli/example/userCall.json                    |   11 -
 tools/cli/go.mod                                   |   12 -
 tools/cli/go.sum                                   |  482 ---------
 tools/cli/json_register/json_register.go           |   66 --
 tools/cli/main.go                                  |   80 --
 tools/cli/protocol/dubbo/codec.go                  |  125 ---
 tools/cli/protocol/dubbo/dubbo_protocol.go         |  111 ---
 tools/cli/protocol/protocol.go                     |   37 -
 tools/cli/test.sh                                  |    1 -
 tools/cli/user.json                                |   12 -
 tools/cli/userCall.json                            |   11 -
 123 files changed, 1184 insertions(+), 4378 deletions(-)

Reply via email to