You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by GitBox <gi...@apache.org> on 2018/08/02 06:04:59 UTC
[GitHub] ralf0131 closed pull request #64: Modify the description of the config of the property of protocol so t… … …hat the document is consistent with the code
ralf0131 closed pull request #64: Modify the description of the config of the property of protocol so t… … …hat the document is consistent with the code
URL: https://github.com/apache/incubator-dubbo-website/pull/64
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/en-us/user/references/xml/dubbo-protocol.md b/docs/en-us/user/references/xml/dubbo-protocol.md
index 0a5cdc8..ba86533 100644
--- a/docs/en-us/user/references/xml/dubbo-protocol.md
+++ b/docs/en-us/user/references/xml/dubbo-protocol.md
@@ -50,7 +50,7 @@ Service provider protocol configuration. The corresponding class is `com.alibaba
| ------------- | --------------------------- | -------------- | ----------- | ---------------------------------------- | ------------------------- | ---------------------------------------- | ------------- |
| id | | string | False | dubbo | Configuration association | Bean Id of the protocol, can be referenced in <dubbo:service protocol=""> The default value is equal to the value of `name` attribute while `id` is not filled. If `name` value has already existed, it will add index to it's suffix. | Above 2.0.5 |
| name | <protocol> | string | <b>True</b> | dubbo | Performance optimize | Protocol name | Above 2.0.5 |
-| port | <port> | int | False | The default port of dubbo protocol is 20880, rmi protocol is 1099, http and hessian protocol are 80；It will allocate an unused port if `port` is not filled or equals `-1`. To ensure the ports scope is controllable, the port will increase based on the corresponding protocol default port after Dubbo 2.4.0+ | Service discovery | Service port | Above 2.0.5 |
+| port | <port> | int | False | The default port of dubbo protocol is 20880, rmi protocol is 1099, http and hessian protocol are 80；It will allocate the default port if `port` is not filled; It will allocate an unused port if `port` equals `-1`. To ensure the ports scope is controllable, the port will increase based on the corresponding protocol default port after Dubbo 2.4.0+ | Service discovery | Service port | Above 2.0.5 |
| host | <host> | string | False | Find local IP automatically | Service discovery | -The host name of services, to specify VIP and domain, or having multiple network cards. If null, it will find local IP automatically- It's recommended to let Dubbo find local IP automatically | Above 2.0.5 |
| threadpool | threadpool | string | False | fixed | Performance optimize | The type of Thread Pool, fixed/cached are available | Above 2.0.5 |
| threads | threads | int | False | 100 | Performance optimize | The size of the services' Thread Pool(Fixed) | Above 2.0.5 |
diff --git a/docs/zh-cn/user/references/xml/dubbo-protocol.md b/docs/zh-cn/user/references/xml/dubbo-protocol.md
index 943dfbf..3ce93ba 100644
--- a/docs/zh-cn/user/references/xml/dubbo-protocol.md
+++ b/docs/zh-cn/user/references/xml/dubbo-protocol.md
@@ -50,7 +50,7 @@ table tr:hover {
| --- | --- | ---- | --- | --- | --- | --- | --- |
| id | | string | 可选 | dubbo | 配置关联 | 协议BeanId，可以在<dubbo:service protocol="">中引用此ID，如果ID不填，缺省和name属性值一样，重复则在name后加序号。 | 2.0.5以上版本 |
| name | <protocol> | string | <b>必填</b> | dubbo | 性能调优 | 协议名称 | 2.0.5以上版本 |
-| port | <port> | int | 可选 | dubbo协议缺省端口为20880，rmi协议缺省端口为1099，http和hessian协议缺省端口为80；如果配置为<b>-1</b> 或者 <b>没有</b>配置port，则会分配一个没有被占用的端口。Dubbo 2.4.0+，分配的端口在协议缺省端口的基础上增长，确保端口段可控。 | 服务发现 | 服务端口 | 2.0.5以上版本 |
+| port | <port> | int | 可选 | dubbo协议缺省端口为20880，rmi协议缺省端口为1099，http和hessian协议缺省端口为80；如果<b>没有</b>配置port，则自动采用默认端口，如果配置为<b>-1</b>，则会分配一个没有被占用的端口。Dubbo 2.4.0+，分配的端口在协议缺省端口的基础上增长，确保端口段可控。 | 服务发现 | 服务端口 | 2.0.5以上版本 |
| host | <host> | string | 可选 | 自动查找本机IP | 服务发现 | -服务主机名，多网卡选择或指定VIP及域名时使用，为空则自动查找本机IP，-建议不要配置，让Dubbo自动获取本机IP | 2.0.5以上版本 |
| threadpool | threadpool | string | 可选 | fixed | 性能调优 | 线程池类型，可选：fixed/cached | 2.0.5以上版本 |
| threads | threads | int | 可选 | 100 | 性能调优 | 服务线程池大小(固定大小) | 2.0.5以上版本 |
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org