This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit 6043f7956646f347b2059c79ab5438f7af88653e Merge: 91117f9 3ad9a8d Author: AlexStocks <alexsto...@foxmail.com> AuthorDate: Tue Aug 13 21:23:10 2019 +0800 Merge: master .gitignore | 1 + NOTICE | 2 +- README.md | 17 +- README_CN.md | 17 +- cluster/cluster_impl/available_cluster.go | 40 ++++ cluster/cluster_impl/available_cluster_invoker.go | 61 ++++++ .../cluster_impl/available_cluster_invoker_test.go | 88 +++++++++ cluster/cluster_impl/base_cluster_invoker.go | 2 +- cluster/cluster_impl/broadcast_cluster.go | 40 ++++ cluster/cluster_impl/broadcast_cluster_invoker.go | 59 ++++++ .../cluster_impl/broadcast_cluster_invoker_test.go | 109 +++++++++++ cluster/cluster_impl/failback_cluster_invoker.go | 6 +- cluster/cluster_impl/failover_cluster_test.go | 3 +- cluster/cluster_impl/failsafe_cluster_invoker.go | 1 - cluster/loadbalance/least_active_test.go | 3 +- cluster/loadbalance/random_test.go | 6 +- common/constant/default.go | 2 + common/constant/key.go | 2 + common/logger/logger.go | 9 +- common/proxy/proxy.go | 4 +- common/proxy/proxy_test.go | 10 +- common/rpc_service.go | 15 +- common/rpc_service_test.go | 17 +- common/url.go | 5 + config/base_config.go | 40 ++-- config/base_config_test.go | 23 +-- config/config_loader.go | 36 ++-- config/config_loader_test.go | 19 +- config/consumer_config.go | 3 +- .../app/version.go => config/generic_service.go | 16 +- config/mock_rpcservice.go | 6 +- config/provider_config.go | 2 +- config/reference_config.go | 58 ++++-- config/reference_config_test.go | 7 +- config/registry_config.go | 27 ++- .../registry_config_test.go | 51 +++-- config/service.go | 4 +- config/service_config.go | 41 ++-- config/service_config_test.go | 2 +- config/testdata/consumer_config.yml | 15 +- .../testdata/consumer_config_with_configcenter.yml | 4 +- config/testdata/provider_config.yml | 10 +- config_center/zookeeper/impl.go | 2 +- .../with-configcenter-go-client/app/client.go | 4 +- .../dubbo/with-configcenter-go-client}/app/user.go | 10 +- .../with-configcenter-go-client}/app/version.go | 0 .../assembly/bin/load.sh | 0 .../assembly/common/app.properties | 0 .../assembly/common/build.sh | 0 .../assembly/linux/dev.sh | 0 .../assembly/linux/release.sh | 0 .../assembly/linux/test.sh | 0 .../assembly/mac/dev.sh | 0 .../assembly/mac/release.sh | 0 .../assembly/mac/test.sh | 0 .../assembly/windows/dev.sh | 0 .../assembly/windows/release.sh | 0 .../assembly/windows/test.sh | 0 .../profiles/dev/client.yml | 2 - .../profiles/dev/log.yml | 0 .../profiles/release/client.yml | 2 - .../profiles/release/log.yml | 0 .../profiles/test/client.yml | 2 - .../profiles/test/log.yml | 0 .../with-configcenter-go-server/app/server.go | 2 +- .../dubbo/with-configcenter-go-server/app/user.go | 14 +- .../with-configcenter-go-server}/app/version.go | 0 .../assembly/bin/load.sh | 0 .../assembly/common/app.properties | 0 .../assembly/common/build.sh | 0 .../assembly/linux/dev.sh | 0 .../assembly/linux/release.sh | 0 .../assembly/linux/test.sh | 0 .../assembly/mac/dev.sh | 0 .../assembly/mac/release.sh | 0 .../assembly/mac/test.sh | 0 .../assembly/windows/dev.sh | 0 .../assembly/windows/release.sh | 0 .../assembly/windows/test.sh | 0 .../profiles/dev/log.yml | 0 .../profiles/dev}/server.yml | 2 - .../profiles/release/log.yml | 0 .../profiles/release}/server.yml | 2 - .../profiles/test/log.yml | 0 .../profiles/test}/server.yml | 2 - .../with-configcenter-go-client/app/client.go | 2 +- .../with-configcenter-go-client}/app/user.go | 8 +- .../with-configcenter-go-client}/app/version.go | 0 .../assembly/bin/load.sh | 0 .../assembly/common/app.properties | 0 .../assembly/common/build.sh | 0 .../assembly/linux/dev.sh | 0 .../assembly/linux/release.sh | 0 .../assembly/linux/test.sh | 0 .../assembly/mac/dev.sh | 0 .../assembly/mac/release.sh | 0 .../assembly/mac/test.sh | 0 .../assembly/windows/dev.sh | 0 .../assembly/windows/release.sh | 0 .../assembly/windows/test.sh | 0 .../profiles/dev}/client.yml | 0 .../profiles/dev/log.yml | 0 .../profiles/release/client.yml | 0 .../profiles/release/log.yml | 0 .../profiles/test}/client.yml | 0 .../profiles/test/log.yml | 0 .../with-configcenter-go-server/app/server.go | 2 +- .../with-configcenter-go-server/app/user.go | 8 +- .../with-configcenter-go-server}/app/version.go | 0 .../assembly/bin/load.sh | 0 .../assembly/common/app.properties | 0 .../assembly/common/build.sh | 0 .../assembly/linux/dev.sh | 0 .../assembly/linux/release.sh | 0 .../assembly/linux/test.sh | 0 .../assembly/mac/dev.sh | 0 .../assembly/mac/release.sh | 0 .../assembly/mac/test.sh | 0 .../assembly/windows/dev.sh | 0 .../assembly/windows/release.sh | 0 .../assembly/windows/test.sh | 0 .../profiles/dev/log.yml | 0 .../profiles/dev/server.yml | 0 .../profiles/release/log.yml | 0 .../profiles/release}/server.yml | 0 .../profiles/test/log.yml | 0 .../profiles/test}/server.yml | 0 examples/dubbo/go-server/app/user.go | 214 --------------------- .../src/main/java/com/ikurento/user/Consumer.java | 101 ---------- .../{ => general}/dubbo/go-client/app/client.go | 194 ++++++++++++++++--- .../dubbo/go-client}/app/user.go | 44 ++++- .../dubbo/go-client}/app/version.go | 0 .../dubbo/go-client}/assembly/bin/load.sh | 0 .../go-client}/assembly/common/app.properties | 0 .../dubbo/go-client/assembly/common/build.sh | 0 .../dubbo/go-client}/assembly/linux/dev.sh | 0 .../dubbo/go-client}/assembly/linux/release.sh | 0 .../dubbo/go-client}/assembly/linux/test.sh | 0 .../dubbo/go-client}/assembly/mac/dev.sh | 0 .../dubbo/go-client}/assembly/mac/release.sh | 0 .../dubbo/go-client}/assembly/mac/test.sh | 0 .../dubbo/go-client}/assembly/windows/dev.sh | 0 .../dubbo/go-client}/assembly/windows/release.sh | 0 .../dubbo/go-client}/assembly/windows/test.sh | 0 .../dubbo/go-client/profiles/dev/client.yml | 26 ++- .../dubbo/go-client}/profiles/dev/log.yml | 0 .../dubbo/go-client/profiles/release}/client.yml | 38 ++-- .../dubbo/go-client}/profiles/release/log.yml | 0 .../dubbo/go-client/profiles/test/client.yml | 27 ++- .../dubbo/go-client}/profiles/test/log.yml | 0 examples/{ => general}/dubbo/go-server/app/app | Bin .../{ => general}/dubbo/go-server/app/server.go | 4 +- .../dubbo/go-server}/app/user.go | 68 +++---- .../general/dubbo/go-server/app/user_provider.go | 102 ++++++++++ .../general/dubbo/go-server/app/user_provider1.go | 88 +++++++++ .../general/dubbo/go-server/app/user_provider2.go | 97 ++++++++++ .../dubbo/go-server}/app/version.go | 0 .../dubbo/go-server}/assembly/bin/load.sh | 0 .../go-server}/assembly/common/app.properties | 0 .../dubbo/go-server}/assembly/common/build.sh | 0 .../dubbo/go-server}/assembly/linux/dev.sh | 0 .../dubbo/go-server}/assembly/linux/release.sh | 0 .../dubbo/go-server}/assembly/linux/test.sh | 0 .../dubbo/go-server}/assembly/mac/dev.sh | 0 .../dubbo/go-server}/assembly/mac/release.sh | 0 .../dubbo/go-server}/assembly/mac/test.sh | 0 .../dubbo/go-server}/assembly/windows/dev.sh | 0 .../dubbo/go-server}/assembly/windows/release.sh | 0 .../dubbo/go-server}/assembly/windows/test.sh | 0 .../dubbo/go-server}/profiles/dev/log.yml | 0 .../dubbo/go-server/profiles/dev/server.yml | 40 +++- .../dubbo/go-server}/profiles/release/log.yml | 0 .../dubbo/go-server/profiles/release}/server.yml | 31 ++- .../dubbo/go-server}/profiles/test/log.yml | 0 .../dubbo/go-server/profiles/test/server.yml | 39 +++- .../dubbo}/java-client/build.sh | 0 examples/{ => general}/dubbo/java-client/pom.xml | 0 .../java-client/src/main/assembly/assembly.xml | 0 .../src/main/assembly/conf/dubbo.properties | 0 .../src/main/assembly/conf}/log4j.properties | 0 .../src/main/java/com/ikurento/user/Consumer.java | 208 ++++++++++++++++++++ .../src/main/java/com/ikurento/user/Gender.java | 0 .../src/main/java/com/ikurento/user/User.java | 0 .../main/java/com/ikurento/user/UserProvider.java | 0 .../resources/META-INF/spring/dubbo.consumer.xml | 5 +- .../src/main/resources/META-INF/spring/service.xml | 2 + .../src/main/resources}/log4j.properties | 0 .../dubbo}/java-server/build.sh | 0 .../{jsonrpc => general/dubbo}/java-server/pom.xml | 0 .../dubbo}/java-server/script/debug.sh | 0 .../java-server/src/main/assembly/assembly.xml | 0 .../src/main/assembly/conf/dubbo.properties | 0 .../src/main/assembly/conf}/log4j.properties | 0 .../src/main/java/com/ikurento/user/Gender.java | 0 .../src/main/java/com/ikurento/user/Provider.java | 0 .../src/main/java/com/ikurento/user/Response.java | 0 .../src/main/java/com/ikurento/user/User.java | 0 .../main/java/com/ikurento/user/UserProvider.java | 0 .../com/ikurento/user/UserProviderAnotherImpl.java | 4 +- .../java/com/ikurento/user/UserProviderImpl.java | 4 +- .../resources/META-INF/spring/dubbo.provider.xml | 0 .../src/main/resources}/log4j.properties | 0 .../{ => general}/jsonrpc/go-client/app/client.go | 170 +++++++++++++--- .../jsonrpc/go-client}/app/user.go | 40 +++- .../jsonrpc/go-client}/app/version.go | 0 .../jsonrpc}/go-client/assembly/bin/load.sh | 0 .../go-client/assembly/common/app.properties | 0 .../jsonrpc/go-client/assembly/common/build.sh | 0 .../jsonrpc}/go-client/assembly/linux/dev.sh | 0 .../jsonrpc}/go-client/assembly/linux/release.sh | 0 .../jsonrpc}/go-client/assembly/linux/test.sh | 0 .../jsonrpc}/go-client/assembly/mac/dev.sh | 0 .../jsonrpc}/go-client/assembly/mac/release.sh | 0 .../jsonrpc}/go-client/assembly/mac/test.sh | 0 .../jsonrpc}/go-client/assembly/windows/dev.sh | 0 .../jsonrpc}/go-client/assembly/windows/release.sh | 0 .../jsonrpc}/go-client/assembly/windows/test.sh | 0 .../jsonrpc/go-client/profiles/dev}/client.yml | 54 +++--- .../jsonrpc/go-client}/profiles/dev/log.yml | 0 .../jsonrpc/go-client/profiles/release/client.yml | 45 ++--- .../jsonrpc/go-client}/profiles/release/log.yml | 0 .../jsonrpc}/go-client/profiles/test/client.yml | 52 +++-- .../jsonrpc/go-client}/profiles/test/log.yml | 0 .../{ => general}/jsonrpc/go-server/app/server.go | 4 +- examples/general/jsonrpc/go-server/app/user.go | 78 ++++++++ .../general/jsonrpc/go-server/app/user_provider.go | 98 ++++++++++ .../jsonrpc/go-server/app/user_provider1.go | 83 ++++++++ .../jsonrpc/go-server/app/user_provider2.go | 93 +++++++++ .../jsonrpc/go-server}/app/version.go | 0 .../jsonrpc}/go-server/assembly/bin/load.sh | 0 .../go-server/assembly/common/app.properties | 0 .../jsonrpc}/go-server/assembly/common/build.sh | 0 .../jsonrpc}/go-server/assembly/linux/dev.sh | 0 .../jsonrpc}/go-server/assembly/linux/release.sh | 0 .../jsonrpc}/go-server/assembly/linux/test.sh | 0 .../jsonrpc}/go-server/assembly/mac/dev.sh | 0 .../jsonrpc}/go-server/assembly/mac/release.sh | 0 .../jsonrpc}/go-server/assembly/mac/test.sh | 0 .../jsonrpc}/go-server/assembly/windows/dev.sh | 0 .../jsonrpc}/go-server/assembly/windows/release.sh | 0 .../jsonrpc}/go-server/assembly/windows/test.sh | 0 .../jsonrpc/go-server}/profiles/dev/log.yml | 0 .../jsonrpc}/go-server/profiles/dev/server.yml | 65 ++++--- .../jsonrpc/go-server}/profiles/release/log.yml | 0 .../jsonrpc/go-server/profiles/release/server.yml | 75 ++++++++ .../jsonrpc/go-server}/profiles/test/log.yml | 0 .../jsonrpc}/go-server/profiles/test/server.yml | 63 +++--- .../jsonrpc}/java-client/build.sh | 0 examples/{ => general}/jsonrpc/java-client/pom.xml | 0 .../java-client/src/main/assembly/assembly.xml | 0 .../src/main/assembly/conf/dubbo.properties | 0 .../src/main/assembly/conf}/log4j.properties | 0 .../src/main/java/com/ikurento/user/Consumer.java | 196 +++++++++++++++++++ .../src/main/java/com/ikurento/user/Gender.java | 0 .../src/main/java/com/ikurento/user/User.java | 0 .../main/java/com/ikurento/user/UserProvider.java | 0 .../resources/META-INF/spring/dubbo.consumer.xml | 4 + .../src/main/resources/META-INF/spring/service.xml | 2 + .../src/main/resources}/log4j.properties | 0 .../jsonrpc}/java-server/build.sh | 0 .../{dubbo => general/jsonrpc}/java-server/pom.xml | 0 .../jsonrpc}/java-server/script/debug.sh | 0 .../java-server/src/main/assembly/assembly.xml | 0 .../src/main/assembly/conf/dubbo.properties | 0 .../src/main/assembly/conf}/log4j.properties | 0 .../src/main/java/com/ikurento/user/Gender.java | 0 .../src/main/java/com/ikurento/user/Provider.java | 0 .../src/main/java/com/ikurento/user/Response.java | 0 .../src/main/java/com/ikurento/user/User.java | 0 .../main/java/com/ikurento/user/UserProvider.java | 0 .../com/ikurento/user/UserProviderAnotherImpl.java | 4 +- .../java/com/ikurento/user/UserProviderImpl.java | 4 +- .../resources/META-INF/spring/dubbo.provider.xml | 0 .../src/main/resources}/log4j.properties | 0 examples/generic/go-client/app/client.go | 100 ++++++++++ examples/generic/go-client/app/user.go | 57 ++++++ .../go-client}/assembly/bin/load.sh | 0 .../go-client}/assembly/common/app.properties | 0 .../go-client}/assembly/common/build.sh | 0 .../go-client}/assembly/linux/dev.sh | 0 .../go-client}/assembly/linux/release.sh | 0 .../go-client}/assembly/linux/test.sh | 0 .../go-client}/assembly/mac/dev.sh | 0 .../go-client}/assembly/mac/release.sh | 0 .../go-client}/assembly/mac/test.sh | 0 .../go-client}/assembly/windows/dev.sh | 0 .../go-client}/assembly/windows/release.sh | 0 .../go-client}/assembly/windows/test.sh | 0 .../go-client/profiles/dev}/client.yml | 17 +- .../go-client}/profiles/dev/log.yml | 0 .../go-client/profiles/release/client.yml | 15 +- .../go-client}/profiles/release/log.yml | 0 .../go-client/profiles/test/client.yml | 13 -- .../go-client}/profiles/test/log.yml | 0 examples/{jsonrpc => generic}/java-server/build.sh | 0 examples/{jsonrpc => generic}/java-server/pom.xml | 0 .../java-server/script/debug.sh | 0 .../java-server/src/main/assembly/assembly.xml | 0 .../src/main/assembly/conf/dubbo.properties | 0 .../src/main/assembly/conf}/log4j.properties | 0 .../src/main/java/com/ikurento/user/Gender.java | 0 .../src/main/java/com/ikurento/user/Provider.java | 0 .../src/main/java/com/ikurento/user/Response.java | 0 .../src/main/java/com/ikurento/user/User.java | 0 .../main/java/com/ikurento/user/UserProvider.java | 0 .../com/ikurento/user/UserProviderAnotherImpl.java | 0 .../java/com/ikurento/user/UserProviderImpl.java | 0 .../resources/META-INF/spring/dubbo.provider.xml | 0 .../src/main/resources/log4j.properties | 0 .../dubbo/go-client/app/client.go} | 43 +---- .../helloworld/dubbo/go-client/app/user.go | 37 +++- .../dubbo/go-client}/assembly/bin/load.sh | 0 .../go-client}/assembly/common/app.properties | 0 .../dubbo/go-client}/assembly/common/build.sh | 0 .../dubbo/go-client}/assembly/linux/dev.sh | 0 .../dubbo/go-client}/assembly/linux/release.sh | 0 .../dubbo/go-client}/assembly/linux/test.sh | 0 .../dubbo/go-client}/assembly/mac/dev.sh | 0 .../dubbo/go-client}/assembly/mac/release.sh | 0 .../dubbo/go-client}/assembly/mac/test.sh | 0 .../dubbo/go-client}/assembly/windows/dev.sh | 0 .../dubbo/go-client}/assembly/windows/release.sh | 0 .../dubbo/go-client}/assembly/windows/test.sh | 0 .../dubbo/go-client/profiles/dev/client.yml | 18 +- .../dubbo/go-client}/profiles/dev/log.yml | 0 .../dubbo/go-client/profiles/release/client.yml | 10 +- .../dubbo/go-client}/profiles/release/log.yml | 0 .../dubbo/go-client/profiles/test/client.yml | 13 +- .../dubbo/go-client}/profiles/test/log.yml | 0 .../dubbo}/go-server/app/server.go | 10 +- .../helloworld/dubbo/go-server/app/user.go | 39 +++- .../dubbo/go-server}/assembly/bin/load.sh | 0 .../go-server}/assembly/common/app.properties | 0 .../dubbo/go-server}/assembly/common/build.sh | 0 .../dubbo/go-server}/assembly/linux/dev.sh | 0 .../dubbo/go-server}/assembly/linux/release.sh | 0 .../dubbo/go-server}/assembly/linux/test.sh | 0 .../dubbo/go-server}/assembly/mac/dev.sh | 0 .../dubbo/go-server}/assembly/mac/release.sh | 0 .../dubbo/go-server}/assembly/mac/test.sh | 0 .../dubbo/go-server}/assembly/windows/dev.sh | 0 .../dubbo/go-server}/assembly/windows/release.sh | 0 .../dubbo/go-server}/assembly/windows/test.sh | 0 .../dubbo/go-server}/profiles/dev/log.yml | 0 .../dubbo/go-server/profiles/dev}/server.yml | 29 +-- .../dubbo/go-server}/profiles/release/log.yml | 0 .../dubbo/go-server/profiles/release/server.yml | 8 +- .../dubbo/go-server}/profiles/test/log.yml | 0 .../dubbo/go-server/profiles/test/server.yml | 20 +- .../dubbo}/java-server/build.sh | 0 .../dubbo}/java-server/pom.xml | 0 .../dubbo}/java-server/script/debug.sh | 0 .../java-server/src/main/assembly/assembly.xml | 0 .../src/main/assembly/conf/dubbo.properties | 0 .../src/main/assembly/conf}/log4j.properties | 0 .../src/main/java/com/ikurento/user/Provider.java | 0 .../src/main/java/com/ikurento/user/User.java | 13 +- .../main/java/com/ikurento/user/UserProvider.java} | 12 +- .../java/com/ikurento/user/UserProviderImpl.java | 15 ++ .../resources/META-INF/spring/dubbo.provider.xml | 5 - .../src/main/resources/log4j.properties | 0 .../jsonrpc/go-client/profiles/test/client.yml | 67 ------- examples/jsonrpc/go-server/app/user.go | 179 ----------------- examples/jsonrpc/go-server/profiles/dev/server.yml | 50 ----- .../jsonrpc/go-server/profiles/release/server.yml | 50 ----- .../jsonrpc/go-server/profiles/test/server.yml | 50 ----- .../src/main/java/com/ikurento/user/Consumer.java | 97 ---------- filter/impl/echo_filter_test.go | 4 +- filter/impl/generic_filter.go | 125 ++++++++++++ filter/impl/generic_filter_test.go | 89 +++++++++ go.mod | 4 +- go.sum | 9 +- protocol/dubbo/client.go | 132 +++++-------- protocol/dubbo/client_test.go | 48 ++--- protocol/dubbo/codec.go | 2 - protocol/dubbo/codec_test.go | 10 +- protocol/dubbo/config.go | 38 ++-- protocol/dubbo/dubbo_exporter.go | 4 +- protocol/dubbo/dubbo_invoker_test.go | 7 +- protocol/dubbo/dubbo_protocol.go | 6 +- protocol/dubbo/listener.go | 10 +- protocol/dubbo/pool.go | 27 +-- protocol/dubbo/readwriter.go | 9 +- protocol/dubbo/server.go | 18 +- protocol/invocation/rpcinvocation.go | 96 ++++----- protocol/jsonrpc/http_test.go | 12 +- protocol/jsonrpc/jsonrpc_exporter.go | 4 +- protocol/jsonrpc/jsonrpc_invoker_test.go | 8 +- protocol/jsonrpc/server.go | 9 +- registry/zookeeper/listener.go | 2 +- registry/zookeeper/registry.go | 16 +- registry/zookeeper/registry_test.go | 4 +- remoting/zookeeper/client.go | 5 +- remoting/zookeeper/facade.go | 4 +- remoting/zookeeper/listener.go | 6 +- remoting/zookeeper/listener_test.go | 13 +- 396 files changed, 3299 insertions(+), 1802 deletions(-)