You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by xi...@apache.org on 2019/08/26 03:41:53 UTC

[dubbo-go] branch develop updated (23b95a0 -> 9a7642b)

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

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


    from 23b95a0  Merge pull request #171 from pantianying/develop
     new d04c33e  consul init
     new 858f7c9  update
     new 26959d1  solve conflict
     new dc0e93b  update consul
     new a231f0e  add consul example
     new 5e0a4a1  Merge branch 'master' into consul
     new 7564165  go mod
     new 0adb3a9  go fmt
     new dcde19b  fix bug: add wg.done
     new 127f034  Merge branch 'master' into consul
     new 461cfc3  Merge branch 'develop' into consul
     new 8970b13  modify travis
     new 218cc74  new go.sum
     new c37e13a  modify go mod
     new 65ae799  new go.mod and go.sum
     new eeb1177  update gitignore
     new f82563f  merge develop branch
     new 87e9bab  modify based rw
     new 340b98b  fix bug
     new 85582d5  add for
     new cbb0534  improve consul examples
     new 64df877  merge develop
     new 97e0e51  add consul in travis
     new 01485b5  modify travis
     new c8e0403  modify travis
     new f671f55  modify travis
     new bc10a18  modify travis
     new 1ca3536  modfiy travis
     new 4b29e7c  modify travis
     new e4a39c9  add unit test for consul
     new 588dd96  resolve conflict
     new 1bb5457  fix typo
     new 82fb516  recolve conflict
     new a958f13  resolve conflict
     new f616b4a  fix initialize len and cap for make
     new 803c1b2  resolve conflict
     new 24e7d6f  Merge branch 'develop' into consul
     new 1edd0f5  Merge branch 'develop' into consul
     new bd25bbd  fix typo
     new 114b0c9  Merge branch 'develop' into consul
     new 38a4b0c  consul test
     new 2aa483a  consul test
     new 46cc00a  travis
     new 11032c5  import
     new 5c05d1c  fix typo
     new c52c611  Merge branch 'develop' into consul
     new dd8728e  test
     new 85c89b7  revert
     new e77abb3  go mod
     new d11fff0  typo
     new 8125771  modify version
     new f73ee62  examples
     new 21d7b15  add unregister test
     new 5dd2bd0  modify yaml
     new 9a7642b  Merge pull request #121 from dubbo-x/consul

The 771 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |   4 +-
 common/url.go                                      |   4 +
 config/config_loader.go                            |  11 +-
 examples/consul/README.md                          |  44 +++
 .../go-client/app => consul/go-client}/client.go   |  23 +-
 .../test => consul/go-client/config}/client.yml    |  35 +--
 .../test => consul/go-client/config}/log.yml       |   0
 .../consul/go-client/service.go                    |  20 +-
 .../test => consul/go-server/config}/log.yml       |   0
 .../release => consul/go-server/config}/server.yml |  26 +-
 .../go-server/app => consul/go-server}/server.go   |  19 +-
 .../consul/go-server/service.go                    |  20 +-
 examples/consul/java-client/.gitignore             |   7 +
 examples/consul/java-client/pom.xml                |  74 +++++
 .../src/main/java/dubbo/DubboService.java          |   5 +
 .../src/main/java/dubbo/client/Main.java           |  25 ++
 .../src/main/resources/log4j.properties            |   4 +
 examples/consul/java-server/.gitignore             |   7 +
 examples/consul/java-server/pom.xml                |  74 +++++
 .../src/main/java/dubbo/DubboService.java          |   5 +
 .../java/dubbo/server/Impl/DubboServiceImpl.java   |  11 +
 .../src/main/java/dubbo/server/Main.java           |  35 +++
 .../src/main/resources/log4j.properties            |   4 +
 go.mod                                             |   5 +-
 go.sum                                             | 334 +++++++++++++++++++++
 registry/consul/listener.go                        | 206 +++++++++++++
 .../consul/listener_test.go                        |  15 +-
 registry/consul/registry.go                        | 143 +++++++++
 registry/consul/registry_test.go                   |  57 ++++
 registry/consul/utils.go                           | 114 +++++++
 registry/consul/utils_test.go                      | 226 ++++++++++++++
 registry/directory/directory.go                    |   9 +-
 registry/nacos/registry.go                         |   2 +-
 registry/nacos/registry_test.go                    |   8 +-
 remoting/zookeeper/client.go                       |   6 +-
 remoting/zookeeper/facade_test.go                  |   2 +-
 remoting/zookeeper/listener.go                     |  32 +-
 37 files changed, 1484 insertions(+), 132 deletions(-)
 create mode 100644 examples/consul/README.md
 copy examples/{helloworld/dubbo/go-client/app => consul/go-client}/client.go (77%)
 copy examples/{generic/go-client/profiles/test => consul/go-client/config}/client.yml (74%)
 copy examples/{helloworld/dubbo/go-server/profiles/test => consul/go-client/config}/log.yml (100%)
 copy common/proxy/proxy_factory.go => examples/consul/go-client/service.go (73%)
 copy examples/{helloworld/dubbo/go-server/profiles/test => consul/go-server/config}/log.yml (100%)
 copy examples/{helloworld/dubbo/go-server/profiles/release => consul/go-server/config}/server.yml (67%)
 copy examples/{helloworld/dubbo/go-server/app => consul/go-server}/server.go (89%)
 copy common/proxy/proxy_factory.go => examples/consul/go-server/service.go (72%)
 create mode 100644 examples/consul/java-client/.gitignore
 create mode 100644 examples/consul/java-client/pom.xml
 create mode 100644 examples/consul/java-client/src/main/java/dubbo/DubboService.java
 create mode 100644 examples/consul/java-client/src/main/java/dubbo/client/Main.java
 create mode 100644 examples/consul/java-client/src/main/resources/log4j.properties
 create mode 100644 examples/consul/java-server/.gitignore
 create mode 100644 examples/consul/java-server/pom.xml
 create mode 100644 examples/consul/java-server/src/main/java/dubbo/DubboService.java
 create mode 100644 examples/consul/java-server/src/main/java/dubbo/server/Impl/DubboServiceImpl.java
 create mode 100644 examples/consul/java-server/src/main/java/dubbo/server/Main.java
 create mode 100644 examples/consul/java-server/src/main/resources/log4j.properties
 create mode 100644 registry/consul/listener.go
 copy common/utils/net_test.go => registry/consul/listener_test.go (73%)
 create mode 100644 registry/consul/registry.go
 create mode 100644 registry/consul/registry_test.go
 create mode 100644 registry/consul/utils.go
 create mode 100644 registry/consul/utils_test.go