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 2021/10/02 02:52:42 UTC

[dubbo-go-pixiu] branch develop updated (7e8add1 -> 32a7ddf)

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

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


    from 7e8add1  fix:POST request body is missing (#260)
     new c88074e  update: init sc_design
     new 7c32695  update: add desc
     new 27b46c4  update: link sc
     new 0ffbf97  update: add demo
     new a1ba333  add: sc demo
     new 897f0e2  update: add scx
     new 0863e6f  'get nacos client'
     new 254f3ae  add eureka
     new f2caafa  update:
     new 3056f8c  Merge branch 'feature/springcloud' into config-local
     new cd15d1f  Merge pull request #2 from yamicro/config-local
     new 302609d  Merge pull request #1 from apache/develop
     new a7757a2  Merge branch 'apache:develop' into develop
     new 1143e9a  Merge branch 'apache:develop' into develop
     new c383a7c  Merge branch 'apache:develop' into develop
     new e4f40d5  Merge branch 'apache:develop' into develop
     new f96e22e  Merge branch 'apache:develop' into develop
     new f3f33c4  Merge branch 'apache:develop' into develop
     new 73b00f4  Merge branch 'PhilYue:develop' into config-local
     new 9d3aff6  'the rest code of get nacos client'
     new e14a052  Merge pull request #4 from yamicro/config-local
     new 6a3e0c0  update: merge pr
     new a68deb5  update: clusters config
     new 72a9298  update: clean
     new 4cceede  update: start proceing
     new 0a091e1  Merge branch 'feature/springcloud' of https://github.com/PhilYue/dubbo-go-pixiu into PhilYue-feature/springcloud
     new faaf2d2  Merge branch 'PhilYue-feature/springcloud' into feat-springcloud
     new d288543  update
     new 629e7b0  cloud firstFetch and backgroupSync
     new a93f142  first version without watch
     new e427a23  remove change
     new 1ee86d3  merge
     new 5360855  Merge branch 'ztelur-feat-springcloud' into feature/springcloud
     new 4e3bcff  update: rm eureka
     new 3cd0642  update: readme
     new 131c43f  merge and clean
     new 9d31150  refactor
     new eb52dbf  update: quick
     new ef7b4c8  feat: add service discover by consul
     new 44e07f0  refactor: add licensed
     new 5b4fc3e  fix: licensed
     new ce74092  Merge branch 'develop' into feature/springcloud
     new d0a1541  watch
     new f252a9b  watch
     new 20a33bc  Merge branch 'feat-springcloud' into feature/springcloud
     new 190425d  Merge pull request #2 from PhilYue/feature/springcloud
     new df2d7e3  add watch mechanism
     new ee2878f  update
     new e87eb7a  Merge pull request #6 from ztelur/feat-springcloud
     new e7400a0  refactor: add license
     new ef34c0d  test: test springcloud and clean
     new 2de4107  Merge branch 'develop' into feature/springcloud
     new e070e02  fix: add fixme in model/router.go MatchRouter
     new 03bf2e7  refactor: clean and add log
     new 6304476  clean up
     new 19c18d8  fix: fmt
     new 5ecc6df  clean
     new 5b8b5d0  clean
     new 1e83b72  fix: git-action
     new 440f45f  update: fmt of github action
     new f9867f2  fix: go.sum
     new f970195  fix: cleanup:
     new 6546bd3  Merge pull request #4 from PhilYue/feature/springcloud
     new 2342b08  import regroup
     new 4ce7102  Merge pull request #7 from ztelur/feat-springcloud
     new 0d3e3d5  Update cloud.go
     new c6580b5  merge
     new 27f2a7f  Merge branch 'develop' into feature/springcloud
     new 32a7ddf  Merge pull request #255 from PhilYue/feature/springcloud

The 1093 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:
 .github/workflows/github-actions.yml               |   4 +-
 .gitignore                                         |  29 +-
 README.md                                          |   4 +-
 go.mod                                             |   1 +
 go.sum                                             |  12 +
 pkg/adapter/springcloud/cloud.go                   | 304 ++++++++++++++++++---
 .../springcloud/common/common.go}                  |   6 +-
 pkg/adapter/springcloud/servicediscovery/README.md |  29 ++
 .../springcloud/servicediscovery/nacos/nacos.go    | 251 +++++++++++++++++
 .../servicediscovery/servicediscovery.go           |  88 ++++++
 pkg/common/constant/key.go                         |  31 ++-
 pkg/common/extension/adapter/adapter.go            |   4 +-
 pkg/common/extension/adapter/adapter_test.go       |   4 +-
 pkg/common/router/router.go                        |   8 +
 pkg/common/router/router_test.go                   |   6 -
 pkg/common/yaml/yaml.go                            |   2 +
 pkg/context/http/context.go                        |   4 +
 .../{host/host.go => http/proxyrewrite/rewrite.go} |  51 +++-
 pkg/model/cluster.go                               |  33 ++-
 pkg/model/lb.go                                    |   6 -
 pkg/model/{adapter.go => remote.go}                |  12 +-
 pkg/model/router.go                                |   4 +-
 pkg/pluginregistry/registry.go                     |   1 +
 pkg/registry/zookeeper.go                          |   6 +-
 pkg/remote/nacos/client.go                         |  81 ++++++
 pkg/server/adapter_manager.go                      |  15 +-
 pkg/server/adapter_manager_test.go                 |   4 +-
 pkg/server/cluster_manager.go                      | 152 +++++++++--
 pkg/server/cluster_manager_test.go                 |  12 +-
 pkg/server/pixiu_start.go                          |   1 -
 samples/springcloud/docker/docker-compose.yml      |  61 +++++
 .../{http/simple => springcloud}/pixiu/conf.yaml   |  44 +--
 samples/springcloud/readme.md                      |  13 +
 samples/springcloud/server/auth-service/pom.xml    |  91 ++++++
 .../spring/cloud/NacosProviderApplication.java     |  46 ++++
 .../src/main/resources/application.properties      |   8 +-
 .../springcloud/server/auth-service/start.sh       |   6 +-
 samples/springcloud/server/user-service/pom.xml    |  91 ++++++
 .../spring/cloud/NacosProviderApplication.java     |  46 ++++
 .../src/main/resources/application.properties      |   8 +-
 .../springcloud/server/user-service/start.sh       |   6 +-
 41 files changed, 1374 insertions(+), 211 deletions(-)
 copy pkg/{config/version.go => adapter/springcloud/common/common.go} (94%)
 create mode 100644 pkg/adapter/springcloud/servicediscovery/README.md
 create mode 100644 pkg/adapter/springcloud/servicediscovery/nacos/nacos.go
 create mode 100644 pkg/adapter/springcloud/servicediscovery/servicediscovery.go
 copy pkg/filter/{host/host.go => http/proxyrewrite/rewrite.go} (66%)
 copy pkg/model/{adapter.go => remote.go} (65%)
 create mode 100644 pkg/remote/nacos/client.go
 create mode 100644 samples/springcloud/docker/docker-compose.yml
 copy samples/{http/simple => springcloud}/pixiu/conf.yaml (70%)
 create mode 100644 samples/springcloud/readme.md
 create mode 100755 samples/springcloud/server/auth-service/pom.xml
 create mode 100755 samples/springcloud/server/auth-service/src/main/java/com/dubbogo/pixiu/spring/cloud/NacosProviderApplication.java
 copy pkg/common/yaml/testdata/config.yml => samples/springcloud/server/auth-service/src/main/resources/application.properties (87%)
 mode change 100644 => 100755
 copy pkg/common/yaml/testdata/config.yml => samples/springcloud/server/auth-service/start.sh (90%)
 create mode 100755 samples/springcloud/server/user-service/pom.xml
 create mode 100755 samples/springcloud/server/user-service/src/main/java/com/dubbogo/pixiu/spring/cloud/NacosProviderApplication.java
 copy pkg/common/yaml/testdata/config.yml => samples/springcloud/server/user-service/src/main/resources/application.properties (87%)
 mode change 100644 => 100755
 copy pkg/common/yaml/testdata/config.yml => samples/springcloud/server/user-service/start.sh (90%)