You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by hy...@apache.org on 2019/06/21 02:06:25 UTC
[dubbo-website] branch master updated: Fix registry protocol
description (#407)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new d5b2314 Fix registry protocol description (#407)
d5b2314 is described below
commit d5b2314946d78ebc3fd84e053067ee2edb14ac66
Author: Xiaojie Li <xi...@outlook.com>
AuthorDate: Fri Jun 21 10:06:20 2019 +0800
Fix registry protocol description (#407)
* Close #353
* add sofa and consul registry
---
docs/en-us/user/references/xml/dubbo-registry.md | 2 +-
docs/zh-cn/user/references/xml/dubbo-registry.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/en-us/user/references/xml/dubbo-registry.md b/docs/en-us/user/references/xml/dubbo-registry.md
index 70c0463..3071802 100644
--- a/docs/en-us/user/references/xml/dubbo-registry.md
+++ b/docs/en-us/user/references/xml/dubbo-registry.md
@@ -6,7 +6,7 @@ The configuration of the registry center. The corresponding class is `org.apache
| --------- | --------------------------- | ------- | ----------- | ------------- | ------------------------- | ---------------------------------------- | ------------- |
| id | | string | False | | Configuration association | Bean Id of the registry center, can be referenced in <dubbo:service registry="">or <dubbo:reference registry=""> | Above 1.0.16 |
| address | <host:port> | string | <b>True</b> | | Service discovery | The address of the registry center. If the address has no port, default port 9999 will be adopted. Multiple addresses within the same cluster use `,` to seperate, such as `ip:port,ip:port`. Multiple registries within different cluster, please configure different `dubbo:registry` tag. | Above 1.0.16 |
-| protocol | <protocol> | string | False | dubbo | Service discovery | The protocol of the registry center. `dubbo`, `http`, `local` are available. | Above 2.0.0 |
+| protocol | <protocol> | string | False | dubbo | Service discovery | The protocol of the registry center. `dubbo`, `multicast`, `zookeeper`, `redis`, `consul(2.7.1)`, `sofa(2.7.2)`, `etcd(2.7.2)`, `nacos(2.7.2)` are available. | Above 2.0.0 |
| port | <port> | int | False | 9090 | Service discovery | The default port of the registry. When the `address` has no port, this default port will be adopted. | Above 2.0.0 |
| username | <username> | string | False | | Service governance | The usename of the registry. Do not set it if the registry doesn't need validation. | Above 2.0.0 |
| password | <password> | string | False | | Service governance | The password of the registry. Do not set it if the registry doesn't need validation. | Above 2.0.0 |
diff --git a/docs/zh-cn/user/references/xml/dubbo-registry.md b/docs/zh-cn/user/references/xml/dubbo-registry.md
index ea53975..ca380d6 100644
--- a/docs/zh-cn/user/references/xml/dubbo-registry.md
+++ b/docs/zh-cn/user/references/xml/dubbo-registry.md
@@ -6,7 +6,7 @@
| --- | --- | ---- | --- | --- | --- | --- | --- |
| id | | string | 可选 | | 配置关联 | 注册中心引用BeanId，可以在<dubbo:service registry="">或<dubbo:reference registry="">中引用此ID | 1.0.16以上版本 |
| address | <host:port> | string | <b>必填</b> | | 服务发现 | 注册中心服务器地址，如果地址没有端口缺省为9090，同一集群内的多个地址用逗号分隔，如：ip:port,ip:port，不同集群的注册中心，请配置多个<dubbo:registry>标签 | 1.0.16以上版本 |
-| protocol | <protocol> | string | 可选 | dubbo | 服务发现 | 注册中心地址协议，支持dubbo, http, local三种协议，分别表示：dubbo地址、http地址、本地注册中心 | 2.0.0以上版本 |
+| protocol | <protocol> | string | 可选 | dubbo | 服务发现 | 注册中心地址协议，支持`dubbo`, `multicast`, `zookeeper`, `redis`, `consul(2.7.1)`, `sofa(2.7.2)`, `etcd(2.7.2)`, `nacos(2.7.2)`等协议 | 2.0.0以上版本 |
| port | <port> | int | 可选 | 9090 | 服务发现 | 注册中心缺省端口，当address没有带端口时使用此端口做为缺省值 | 2.0.0以上版本 |
| username | <username> | string | 可选 | | 服务治理 | 登录注册中心用户名，如果注册中心不需要验证可不填 | 2.0.0以上版本 |
| password | <password> | string | 可选 | | 服务治理 | 登录注册中心密码，如果注册中心不需要验证可不填 | 2.0.0以上版本 |