You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2019/06/30 06:20:07 UTC

[dubbo-go] 01/01: Merge pull request #112 from fangyincheng/develop

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 0363d7834bd5e4ffd4e5f2006b266b0f67385763
Merge: 569562c 1aa5bcb
Author: Xin.Zh <dr...@foxmail.com>
AuthorDate: Sun Jun 30 14:20:02 2019 +0800

    Merge pull request #112 from fangyincheng/develop
    
    Develop

 cluster/loadbalance/least_active.go                |   2 +-
 common/config/environment.go                       | 104 ++++++++
 common/config/environment_test.go                  |  52 ++++
 common/constant/default.go                         |   3 +
 common/constant/key.go                             |   8 +
 .../config_center_factory.go}                      |  33 ++-
 common/url.go                                      |  19 +-
 common/url_test.go                                 |  27 +++
 config/application_config.go                       |  24 +-
 config/base_config.go                              | 262 +++++++++++++++++++++
 config/base_config_test.go                         | 258 ++++++++++++++++++++
 ...plication_config.go => config_center_config.go} |  23 +-
 config/config_loader.go                            | 208 +++-------------
 config/config_loader_test.go                       |  38 ++-
 config/consumer_config.go                          | 134 +++++++++++
 config/{application_config.go => method_config.go} |  27 ++-
 .../protocol_config.go                             |  46 ++--
 config/provider_config.go                          | 108 +++++++++
 config/reference_config.go                         |  40 ++--
 config/reference_config_test.go                    |  45 ++--
 config/registry_config.go                          |  52 ++--
 config/service_config.go                           |  33 ++-
 config/service_config_test.go                      |  49 ++--
 config/testdata/consumer_config.yml                |  12 +-
 ...g.yml => consumer_config_with_configcenter.yml} |  38 +--
 config/testdata/provider_config.yml                |  12 +-
 config_center/configuration_parser.go              |  24 ++
 config_center/configuration_parser_test.go         |  16 ++
 config_center/dynamic_configuration.go             |   6 +-
 .../dynamic_configuration_factory.go               |  15 +-
 config_center/mock_dynamic_config.go               |  95 ++++++++
 config_center/zookeeper/dynamic_configuration.go   | 134 -----------
 .../factory.go}                                    |  45 ++--
 config_center/zookeeper/impl.go                    | 206 ++++++++++++++++
 config_center/zookeeper/impl_test.go               | 168 +++++++++++++
 config_center/zookeeper/listener.go                |  73 ++++++
 .../contrib/fatjar/zookeeper-3.4.9-fatjar.jar      | Bin 0 -> 8673355 bytes
 examples/dubbo/go-client/app/client.go             |   5 +-
 examples/dubbo/go-client/profiles/dev/client.yml   |  38 ++-
 .../dubbo/go-client/profiles/release/client.yml    |  24 +-
 examples/dubbo/go-client/profiles/test/client.yml  |  24 +-
 examples/dubbo/go-server/app/server.go             |   5 +-
 examples/dubbo/go-server/profiles/dev/server.yml   |  39 ++-
 .../dubbo/go-server/profiles/release/server.yml    |  31 ++-
 examples/dubbo/go-server/profiles/test/server.yml  |  31 ++-
 .../app/client.go                                  |   6 +-
 .../dubbo/with-configcenter-go-client/app/user.go  | 117 +++++++++
 .../with-configcenter-go-client/app/version.go     |  13 +-
 .../assembly/bin/load.sh                           | 196 +++++++++++++++
 .../assembly/common/app.properties                 |  17 ++
 .../assembly/common/build.sh                       |  77 ++++++
 .../assembly/linux/dev.sh                          |  29 +++
 .../assembly/linux/release.sh                      |  28 +++
 .../assembly/linux/test.sh                         |  28 +++
 .../assembly/mac/dev.sh                            |  29 +++
 .../assembly/mac/release.sh                        |  27 +++
 .../assembly/mac/test.sh                           |  28 +++
 .../assembly/windows/dev.sh                        |  27 +++
 .../assembly/windows/release.sh                    |  27 +++
 .../assembly/windows/test.sh                       |  27 +++
 .../profiles/dev}/client.yml                       |  40 +---
 .../profiles/dev/log.yml                           |  28 +++
 .../profiles/release/client.yml                    |  40 +---
 .../profiles/release/log.yml                       |  28 +++
 .../profiles/test}/client.yml                      |  40 +---
 .../profiles/test/log.yml                          |  28 +++
 .../app/server.go                                  |  16 +-
 .../dubbo/with-configcenter-go-server/app/user.go  | 195 +++++++++++++++
 .../with-configcenter-go-server/app/version.go     |  13 +-
 .../assembly/bin/load.sh                           | 144 +++++++++++
 .../assembly/common/app.properties                 |  17 ++
 .../assembly/common/build.sh                       |  74 ++++++
 .../assembly/linux/dev.sh                          |  29 +++
 .../assembly/linux/release.sh                      |  29 +++
 .../assembly/linux/test.sh                         |  29 +++
 .../assembly/mac/dev.sh                            |  29 +++
 .../assembly/mac/release.sh                        |  29 +++
 .../assembly/mac/test.sh                           |  29 +++
 .../assembly/windows/dev.sh                        |  29 +++
 .../assembly/windows/release.sh                    |  29 +++
 .../assembly/windows/test.sh                       |  29 +++
 .../profiles/dev/log.yml                           |  28 +++
 .../profiles/dev/server.yml                        |  42 +---
 .../profiles/release/log.yml                       |  28 +++
 .../profiles/release}/server.yml                   |  42 +---
 .../profiles/test/log.yml                          |  28 +++
 .../profiles/test}/server.yml                      |  42 +---
 examples/jsonrpc/go-client/app/client.go           |   5 +-
 examples/jsonrpc/go-client/profiles/dev/client.yml |  14 +-
 .../jsonrpc/go-client/profiles/release/client.yml  |  51 ++--
 .../jsonrpc/go-client/profiles/test/client.yml     |  50 ++--
 examples/jsonrpc/go-server/app/server.go           |   5 +-
 examples/jsonrpc/go-server/profiles/dev/server.yml |  16 +-
 .../jsonrpc/go-server/profiles/release/server.yml  |  65 +++--
 .../jsonrpc/go-server/profiles/test/server.yml     |  50 ++--
 .../app/client.go                                  |   6 +-
 .../with-configcenter-go-client/app/user.go        |  67 ++++++
 .../with-configcenter-go-client/app/version.go     |  13 +-
 .../assembly/bin/load.sh                           | 196 +++++++++++++++
 .../assembly/common/app.properties                 |  17 ++
 .../assembly/common/build.sh                       |  77 ++++++
 .../assembly/linux/dev.sh                          |  29 +++
 .../assembly/linux/release.sh                      |  28 +++
 .../assembly/linux/test.sh                         |  28 +++
 .../assembly/mac/dev.sh                            |  29 +++
 .../assembly/mac/release.sh                        |  27 +++
 .../assembly/mac/test.sh                           |  28 +++
 .../assembly/windows/dev.sh                        |  27 +++
 .../assembly/windows/release.sh                    |  27 +++
 .../assembly/windows/test.sh                       |  27 +++
 .../profiles/dev/client.yml                        |  16 ++
 .../profiles/dev/log.yml                           |  28 +++
 .../profiles/release/client.yml                    |  16 ++
 .../profiles/release/log.yml                       |  28 +++
 .../profiles/test/client.yml                       |  16 ++
 .../profiles/test/log.yml                          |  28 +++
 .../app/server.go                                  |  15 +-
 .../with-configcenter-go-server/app/user.go        | 159 +++++++++++++
 .../with-configcenter-go-server/app/version.go     |  13 +-
 .../assembly/bin/load.sh                           | 144 +++++++++++
 .../assembly/common/app.properties                 |  17 ++
 .../assembly/common/build.sh                       |  74 ++++++
 .../assembly/linux/dev.sh                          |  29 +++
 .../assembly/linux/release.sh                      |  29 +++
 .../assembly/linux/test.sh                         |  29 +++
 .../assembly/mac/dev.sh                            |  29 +++
 .../assembly/mac/release.sh                        |  29 +++
 .../assembly/mac/test.sh                           |  29 +++
 .../assembly/windows/dev.sh                        |  29 +++
 .../assembly/windows/release.sh                    |  29 +++
 .../assembly/windows/test.sh                       |  29 +++
 .../profiles/dev/log.yml                           |  28 +++
 .../profiles/dev/server.yml                        |  22 ++
 .../profiles/release/log.yml                       |  28 +++
 .../profiles/release/server.yml                    |  25 ++
 .../profiles/test/log.yml                          |  28 +++
 .../profiles/test/server.yml                       |  25 ++
 go.mod                                             |   1 +
 go.sum                                             |   4 +
 protocol/dubbo/client.go                           |   5 +
 protocol/dubbo/client_test.go                      |   6 +-
 protocol/dubbo/codec.go                            |   6 +-
 protocol/dubbo/dubbo_invoker_test.go               |   2 +-
 protocol/dubbo/dubbo_protocol_test.go              |   2 +-
 protocol/dubbo/listener.go                         |   2 +-
 protocol/jsonrpc/server.go                         |   4 +-
 registry/directory/directory.go                    |   8 +-
 registry/directory/directory_test.go               |   8 +-
 registry/zookeeper/listener.go                     |  13 +-
 registry/zookeeper/listener_test.go                |  23 ++
 remoting/listener.go                               |   5 +-
 remoting/zookeeper/client.go                       |   8 +-
 remoting/zookeeper/client_test.go                  |  17 --
 remoting/zookeeper/{container.go => facade.go}     |   4 +-
 remoting/zookeeper/facade_test.go                  |  90 +++++++
 remoting/zookeeper/listener.go                     | 152 +++++++++---
 remoting/zookeeper/listener_test.go                | 117 +++++++++
 157 files changed, 5608 insertions(+), 1168 deletions(-)