You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by il...@apache.org on 2018/10/30 09:06:19 UTC
[incubator-dubbo-website] branch asf-site updated (cdf1664 ->
72d0b10)
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git.
from cdf1664 add information (#169)
new bdc971f update docs
new b5d5a29 Merge branch 'asf-site' of https://github.com/apache/incubator-dubbo-website into asf-site
new 72d0b10 rebuild
The 3 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:
docs/en-us/user/references/telnet.md | 73 +++++++++++++++++++++++++++++
docs/zh-cn/user/references/telnet.md | 74 ++++++++++++++++++++++++++++++
en-us/docs/developers/developers_dev.html | 6 +--
en-us/docs/developers/developers_dev.json | 2 +-
en-us/docs/user/configuration/xml.html | 2 +-
en-us/docs/user/configuration/xml.json | 2 +-
en-us/docs/user/references/telnet.html | 76 +++++++++++++++++++++++++++++++
en-us/docs/user/references/telnet.json | 2 +-
zh-cn/docs/developers/developers_dev.html | 6 +--
zh-cn/docs/developers/developers_dev.json | 2 +-
zh-cn/docs/user/demos/group-merger.html | 8 ++--
zh-cn/docs/user/demos/group-merger.json | 2 +-
zh-cn/docs/user/references/telnet.html | 76 +++++++++++++++++++++++++++++++
zh-cn/docs/user/references/telnet.json | 2 +-
14 files changed, 316 insertions(+), 17 deletions(-)
[incubator-dubbo-website] 01/03: update docs
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
commit bdc971f5234aa9edee7ea4853e040fc8835a32b8
Author: beiwei30 <ia...@gmail.com>
AuthorDate: Tue Oct 30 17:04:56 2018 +0800
update docs
---
docs/en-us/user/references/telnet.md | 73 +++++++++++++++++++++++++++++++
docs/zh-cn/user/references/telnet.md | 74 ++++++++++++++++++++++++++++++++
en-us/docs/user/configuration/xml.html | 2 +-
en-us/docs/user/configuration/xml.json | 2 +-
en-us/docs/user/references/telnet.html | 76 +++++++++++++++++++++++++++++++++
en-us/docs/user/references/telnet.json | 2 +-
zh-cn/docs/user/demos/group-merger.html | 8 ++--
zh-cn/docs/user/demos/group-merger.json | 2 +-
zh-cn/docs/user/references/telnet.html | 76 +++++++++++++++++++++++++++++++++
zh-cn/docs/user/references/telnet.json | 2 +-
10 files changed, 308 insertions(+), 9 deletions(-)
diff --git a/docs/en-us/user/references/telnet.md b/docs/en-us/user/references/telnet.md
index c1af23d..2e62700 100644
--- a/docs/en-us/user/references/telnet.md
+++ b/docs/en-us/user/references/telnet.md
@@ -89,3 +89,76 @@ The built-in telnet commands are listed below. Furthermore, it is possible to ex
`exit`: exit current telnet session
[^1]: support since `2.0.6`
+
+## QoS' Parameters
+
+You can use parameters that QoS provides to config its startup. These parameters include:
+
+| Parameter | Explanation | Default |
+| ------------------ | ----------------- | ------ |
+| qosEnable | Activate QoS or not | true |
+| qosPort | The port QoS would bind to | 22222 |
+| qosAcceptForeignIp | Enable remote access or not | false |
+
+> Attention. From 2.6.4/2.7.0, `qosAcceptForeignIp` is set to `false` by default, because it's risky if this property is set to `true`. Think twice before you turn it on.
+
+You can configure these parameters in the following ways:
+
+* System property
+* `dubbo.properties`
+* XML
+* Spring-boot auto configuration
+
+They have priority in the following order: system property > `dubbo.properties` > XML > spring-boot.
+
+### System Property
+
+```
+-Ddubbo.application.qos.enable=true
+-Ddubbo.application.qos.port=33333
+-Ddubbo.application.qos.accept.foreign.ip=false
+```
+
+### `Dubbo.properties`
+
+Create a `dubbo.properties` file in this directory `src/main/resources` in your project, and copy the following codes into it:
+
+```
+dubbo.application.qos.enable=true
+dubbo.application.qos.port=33333
+dubbo.application.qos.accept.foreign.ip=false
+```
+
+### XML
+
+If you are going to config using XML, you can try this:
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
+ <dubbo:application name="demo-provider">
+ <dubbo:parameter key="qos.enable" value="true"/>
+ <dubbo:parameter key="qos.accept.foreign.ip" value="false"/>
+ <dubbo:parameter key="qos.port" value="33333"/>
+ </dubbo:application>
+ <dubbo:registry address="multicast://224.5.6.7:1234"/>
+ <dubbo:protocol name="dubbo" port="20880"/>
+ <dubbo:service interface="org.apache.dubbo.demo.provider.DemoService" ref="demoService"/>
+ <bean id="demoService" class="org.apache.dubbo.demo.provider.DemoServiceImpl"/>
+</beans>
+```
+
+### spring-boot auto configuration
+
+If you are developing a spring-boot application, you can configure in `application.properties` or `application.yml`:
+
+```
+dubbo.application.qosEnable=true
+dubbo.application.qosPort=33333
+dubbo.application.qosAcceptForeignIp=false
+```
\ No newline at end of file
diff --git a/docs/zh-cn/user/references/telnet.md b/docs/zh-cn/user/references/telnet.md
index eacfbbf..729764e 100644
--- a/docs/zh-cn/user/references/telnet.md
+++ b/docs/zh-cn/user/references/telnet.md
@@ -90,3 +90,77 @@ status命令所检查的资源也可以扩展，参见：[扩展参考手册](..
`exit`: 退出当前 telnet 命令行
[^1]: `2.0.6` 以上版本支持
+
+## 相关参数说明
+
+QoS提供了一些启动参数，来对启动进行配置，他们主要包括：
+
+| 参数 | 说明 | 默认值 |
+| ------------------ | ----------------- | ------ |
+| qosEnable | 是否启动QoS | true |
+| qosPort | 启动QoS绑定的端口 | 22222 |
+| qosAcceptForeignIp | 是否允许远程访问 | false |
+
+> 注意，从2.6.4/2.7.0开始，qosAcceptForeignIp默认配置改为false，如果qosAcceptForeignIp设置为true，有可能带来安全风险，请仔细评估后再打开。
+
+QoS参数可以通过如下方式进行配置
+
+* 系统属性
+* dubbo.properties
+* XML方式
+* Spring-boot自动装配方式
+
+其中，上述方式的优先顺序为系统属性 > dubbo.properties > XML/Spring-boot自动装配方式。
+
+### 使用系统属性方式进行配置
+
+```
+-Ddubbo.application.qos.enable=true
+-Ddubbo.application.qos.port=33333
+-Ddubbo.application.qos.accept.foreign.ip=false
+```
+
+### 使用dubbo.properties文件进行配置
+
+在项目的`src/main/resources`目录下添加dubbo.properties文件，内容如下:
+```
+dubbo.application.qos.enable=true
+dubbo.application.qos.port=33333
+dubbo.application.qos.accept.foreign.ip=false
+```
+
+### 使用XML方法进行配置
+
+如果要通过XML配置响应的QoS相关的参数，可以进行如下配置：
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
+ <dubbo:application name="demo-provider">
+ <dubbo:parameter key="qos.enable" value="true"/>
+ <dubbo:parameter key="qos.accept.foreign.ip" value="false"/>
+ <dubbo:parameter key="qos.port" value="33333"/>
+ </dubbo:application>
+ <dubbo:registry address="multicast://224.5.6.7:1234"/>
+ <dubbo:protocol name="dubbo" port="20880"/>
+ <dubbo:service interface="org.apache.dubbo.demo.provider.DemoService" ref="demoService"/>
+ <bean id="demoService" class="org.apache.dubbo.demo.provider.DemoServiceImpl"/>
+</beans>
+```
+
+### 使用spring-boot自动装配方式配置
+
+如果是spring-boot的应用，可以在`application.properties`或者`application.yml`上配置:
+
+```
+dubbo.application.qosEnable=true
+dubbo.application.qosPort=33333
+dubbo.application.qosAcceptForeignIp=false
+```
+
+
diff --git a/en-us/docs/user/configuration/xml.html b/en-us/docs/user/configuration/xml.html
index 539ee89..e5058c2 100644
--- a/en-us/docs/user/configuration/xml.html
+++ b/en-us/docs/user/configuration/xml.html
@@ -55,7 +55,7 @@
<tr>
<td><code><dubbo:service/></code></td>
<td>Service Export</td>
-<td>Used to export service, define service metadata, export service with mutiple protocols, register service to multiple registries</td>
+<td>Used to export service, define service metadata, export service with multiple protocols, register service to multiple registries</td>
</tr>
<tr>
<td><code><dubbo:reference/></code></td>
diff --git a/en-us/docs/user/configuration/xml.json b/en-us/docs/user/configuration/xml.json
index 76be118..0b4c59a 100644
--- a/en-us/docs/user/configuration/xml.json
+++ b/en-us/docs/user/configuration/xml.json
@@ -1,4 +1,4 @@
{
"filename": "xml.md",
- "__html": "<h1>XML Configuration</h1>\n<p>About the XML configuration items, see：<a href=\"../references/xml/introduction.md\">XML References</a>. If you prefer use API directly instead of using Spring, see <a href=\"./api.md\">API Configuration</a>. Want a example of how to use configuration, see <a href=\"../quick-start.md\">Quick Start</a>。</p>\n<h2>provider.xml demo</h2>\n<pre><code class=\"language-xml\"><span class=\"hljs-meta\"><?xml version=\"1.0\" encoding=\"UTF-8\"?></s [...]
+ "__html": "<h1>XML Configuration</h1>\n<p>About the XML configuration items, see：<a href=\"../references/xml/introduction.md\">XML References</a>. If you prefer use API directly instead of using Spring, see <a href=\"./api.md\">API Configuration</a>. Want a example of how to use configuration, see <a href=\"../quick-start.md\">Quick Start</a>。</p>\n<h2>provider.xml demo</h2>\n<pre><code class=\"language-xml\"><span class=\"hljs-meta\"><?xml version=\"1.0\" encoding=\"UTF-8\"?></s [...]
}
\ No newline at end of file
diff --git a/en-us/docs/user/references/telnet.html b/en-us/docs/user/references/telnet.html
index 6d4d257..281f22f 100644
--- a/en-us/docs/user/references/telnet.html
+++ b/en-us/docs/user/references/telnet.html
@@ -87,6 +87,82 @@
</ol>
<h3><code>exit</code></h3>
<p><code>exit</code>: exit current telnet session</p>
+<h2>QoS' Parameters</h2>
+<p>You can use parameters that QoS provides to config its startup. These parameters include:</p>
+<table>
+<thead>
+<tr>
+<th>Parameter</th>
+<th>Explanation</th>
+<th>Default</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>qosEnable</td>
+<td>Activate QoS or not</td>
+<td>true</td>
+</tr>
+<tr>
+<td>qosPort</td>
+<td>The port QoS would bind to</td>
+<td>22222</td>
+</tr>
+<tr>
+<td>qosAcceptForeignIp</td>
+<td>Enable remote access or not</td>
+<td>false</td>
+</tr>
+</tbody>
+</table>
+<blockquote>
+<p>Attention. From 2.6.4/2.7.0, <code>qosAcceptForeignIp</code> is set to <code>false</code> by default, because it's risky if this property is set to <code>true</code>. Think twice before you turn it on.</p>
+</blockquote>
+<p>You can configure these parameters in the following ways:</p>
+<ul>
+<li>System property</li>
+<li><code>dubbo.properties</code></li>
+<li>XML</li>
+<li>Spring-boot auto configuration</li>
+</ul>
+<p>They have priority in the following order: system property > <code>dubbo.properties</code> > XML > spring-boot.</p>
+<h3>System Property</h3>
+<pre><code>-Ddubbo.application.qos.enable=true
+-Ddubbo.application.qos.port=33333
+-Ddubbo.application.qos.accept.foreign.ip=false
+</code></pre>
+<h3><code>Dubbo.properties</code></h3>
+<p>Create a <code>dubbo.properties</code> file in this directory <code>src/main/resources</code> in your project, and copy the following codes into it:</p>
+<pre><code>dubbo.application.qos.enable=true
+dubbo.application.qos.port=33333
+dubbo.application.qos.accept.foreign.ip=false
+</code></pre>
+<h3>XML</h3>
+<p>If you are going to config using XML, you can try this:</p>
+<pre><code class="language-xml"><span class="hljs-meta"><?xml version="1.0" encoding="UTF-8"?></span>
+<span class="hljs-tag"><<span class="hljs-name">beans</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"http://www.springframework.org/schema/beans"</span>
+ <span class="hljs-attr">xmlns:xsi</span>=<span class="hljs-string">"http://www.w3.org/2001/XMLSchema-instance"</span>
+ <span class="hljs-attr">xmlns:dubbo</span>=<span class="hljs-string">"http://dubbo.apache.org/schema/dubbo"</span>
+ <span class="hljs-attr">xsi:schemaLocation</span>=<span class="hljs-string">"http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd"</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:application</span> <span class="hljs-attr">name</span>=<span class="hljs-string">"demo-provider"</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:parameter</span> <span class="hljs-attr">key</span>=<span class="hljs-string">"qos.enable"</span> <span class="hljs-attr">value</span>=<span class="hljs-string">"true"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:parameter</span> <span class="hljs-attr">key</span>=<span class="hljs-string">"qos.accept.foreign.ip"</span> <span class="hljs-attr">value</span>=<span class="hljs-string">"false"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:parameter</span> <span class="hljs-attr">key</span>=<span class="hljs-string">"qos.port"</span> <span class="hljs-attr">value</span>=<span class="hljs-string">"33333"</span>/></span>
+ <span class="hljs-tag"></<span class="hljs-name">dubbo:application</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:registry</span> <span class="hljs-attr">address</span>=<span class="hljs-string">"multicast://224.5.6.7:1234"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:protocol</span> <span class="hljs-attr">name</span>=<span class="hljs-string">"dubbo"</span> <span class="hljs-attr">port</span>=<span class="hljs-string">"20880"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:service</span> <span class="hljs-attr">interface</span>=<span class="hljs-string">"org.apache.dubbo.demo.provider.DemoService"</span> <span class="hljs-attr">ref</span>=<span class="hljs-string">"demoService"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">bean</span> <span class="hljs-attr">id</span>=<span class="hljs-string">"demoService"</span> <span class="hljs-attr">class</span>=<span class="hljs-string">"org.apache.dubbo.demo.provider.DemoServiceImpl"</span>/></span>
+<span class="hljs-tag"></<span class="hljs-name">beans</span>></span>
+</code></pre>
+<h3>spring-boot auto configuration</h3>
+<p>If you are developing a spring-boot application, you can configure in <code>application.properties</code> or <code>application.yml</code>:</p>
+<pre><code>dubbo.application.qosEnable=true
+dubbo.application.qosPort=33333
+dubbo.application.qosAcceptForeignIp=false
+</code></pre>
<hr class="footnotes-sep">
<section class="footnotes">
<ol class="footnotes-list">
diff --git a/en-us/docs/user/references/telnet.json b/en-us/docs/user/references/telnet.json
index dd493ea..51f0b94 100644
--- a/en-us/docs/user/references/telnet.json
+++ b/en-us/docs/user/references/telnet.json
@@ -1,4 +1,4 @@
{
"filename": "telnet.md",
- "__html": "<h1>Telnet Command Reference</h1>\n<p>Since <code>2.0.5</code> dubbo starts supporting to use telnet command to govern services.</p>\n<h2>How To Use</h2>\n<pre><code class=\"language-sh\">telnet localhost 20880\n</code></pre>\n<p>Or:</p>\n<pre><code class=\"language-sh\"><span class=\"hljs-built_in\">echo</span> status | nc -i 1 localhost 20880\n</code></pre>\n<p>It is possible to extend command <code>status</code> to check more resources, pls. refer to <a href=\"http://dubb [...]
+ "__html": "<h1>Telnet Command Reference</h1>\n<p>Since <code>2.0.5</code> dubbo starts supporting to use telnet command to govern services.</p>\n<h2>How To Use</h2>\n<pre><code class=\"language-sh\">telnet localhost 20880\n</code></pre>\n<p>Or:</p>\n<pre><code class=\"language-sh\"><span class=\"hljs-built_in\">echo</span> status | nc -i 1 localhost 20880\n</code></pre>\n<p>It is possible to extend command <code>status</code> to check more resources, pls. refer to <a href=\"http://dubb [...]
}
\ No newline at end of file
diff --git a/zh-cn/docs/user/demos/group-merger.html b/zh-cn/docs/user/demos/group-merger.html
index 1aebf5a..63db194 100644
--- a/zh-cn/docs/user/demos/group-merger.html
+++ b/zh-cn/docs/user/demos/group-merger.html
@@ -25,22 +25,22 @@
<p>指定方法合并结果，其它未指定的方法，将只调用一个 Group</p>
<pre><code class="language-xml"><span class="hljs-tag"><<span class="hljs-name">dubbo:reference</span> <span class="hljs-attr">interface</span>=<span class="hljs-string">"com.xxx.MenuService"</span> <span class="hljs-attr">group</span>=<span class="hljs-string">"*"</span>></span>
<span class="hljs-tag"><<span class="hljs-name">dubbo:method</span> <span class="hljs-attr">name</span>=<span class="hljs-string">"getMenuItems"</span> <span class="hljs-attr">merger</span>=<span class="hljs-string">"true"</span> /></span>
-<span class="hljs-tag"></<span class="hljs-name">dubbo:service</span>></span>
+<span class="hljs-tag"></<span class="hljs-name">dubbo:reference</span>></span>
</code></pre>
<p>某个方法不合并结果，其它都合并结果</p>
<pre><code class="language-xml"><span class="hljs-tag"><<span class="hljs-name">dubbo:reference</span> <span class="hljs-attr">interface</span>=<span class="hljs-string">"com.xxx.MenuService"</span> <span class="hljs-attr">group</span>=<span class="hljs-string">"*"</span> <span class="hljs-attr">merger</span>=<span class="hljs-string">"true"</span>></span>
<span class="hljs-tag"><<span class="hljs-name">dubbo:method</span> <span class="hljs-attr">name</span>=<span class="hljs-string">"getMenuItems"</span> <span class="hljs-attr">merger</span>=<span class="hljs-string">"false"</span> /></span>
-<span class="hljs-tag"></<span class="hljs-name">dubbo:service</span>></span>
+<span class="hljs-tag"></<span class="hljs-name">dubbo:reference</span>></span>
</code></pre>
<p>指定合并策略，缺省根据返回值类型自动匹配，如果同一类型有两个合并器时，需指定合并器的名称 <sup class="footnote-ref"><a href="#fn2" id="fnref2">[2]</a></sup></p>
<pre><code class="language-xml"><span class="hljs-tag"><<span class="hljs-name">dubbo:reference</span> <span class="hljs-attr">interface</span>=<span class="hljs-string">"com.xxx.MenuService"</span> <span class="hljs-attr">group</span>=<span class="hljs-string">"*"</span>></span>
<span class="hljs-tag"><<span class="hljs-name">dubbo:method</span> <span class="hljs-attr">name</span>=<span class="hljs-string">"getMenuItems"</span> <span class="hljs-attr">merger</span>=<span class="hljs-string">"mymerge"</span> /></span>
-<span class="hljs-tag"></<span class="hljs-name">dubbo:service</span>></span>
+<span class="hljs-tag"></<span class="hljs-name">dubbo:reference</span>></span>
</code></pre>
<p>指定合并方法，将调用返回结果的指定方法进行合并，合并方法的参数类型必须是返回结果类型本身</p>
<pre><code class="language-xml"><span class="hljs-tag"><<span class="hljs-name">dubbo:reference</span> <span class="hljs-attr">interface</span>=<span class="hljs-string">"com.xxx.MenuService"</span> <span class="hljs-attr">group</span>=<span class="hljs-string">"*"</span>></span>
<span class="hljs-tag"><<span class="hljs-name">dubbo:method</span> <span class="hljs-attr">name</span>=<span class="hljs-string">"getMenuItems"</span> <span class="hljs-attr">merger</span>=<span class="hljs-string">".addAll"</span> /></span>
-<span class="hljs-tag"></<span class="hljs-name">dubbo:service</span>></span>
+<span class="hljs-tag"></<span class="hljs-name">dubbo:reference</span>></span>
</code></pre>
<hr class="footnotes-sep">
<section class="footnotes">
diff --git a/zh-cn/docs/user/demos/group-merger.json b/zh-cn/docs/user/demos/group-merger.json
index ab88251..ed0e4fb 100644
--- a/zh-cn/docs/user/demos/group-merger.json
+++ b/zh-cn/docs/user/demos/group-merger.json
@@ -1,4 +1,4 @@
{
"filename": "group-merger.md",
- "__html": "<h1>分组聚合</h1>\n<p>按组合并返回结果 <sup class=\"footnote-ref\"><a href=\"#fn1\" id=\"fnref1\">[1]</a></sup>，比如菜单服务，接口一样，但有多种实现，用group区分，现在消费方需从每种group中调用一次返回结果，合并结果返回，这样就可以实现聚合菜单项。</p>\n<p>相关代码可以参考 <a href=\"https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-merge\">dubbo 项目中的示例</a></p>\n<h2>配置</h2>\n<p>搜索所有分组</p>\n<pre><code class=\"language-xml\"><span class=\"hljs-tag\"><<span class=\"hljs-name\">dubbo:reference</span> <span class=\"hljs-attr\">interface</span>=< [...]
+ "__html": "<h1>分组聚合</h1>\n<p>按组合并返回结果 <sup class=\"footnote-ref\"><a href=\"#fn1\" id=\"fnref1\">[1]</a></sup>，比如菜单服务，接口一样，但有多种实现，用group区分，现在消费方需从每种group中调用一次返回结果，合并结果返回，这样就可以实现聚合菜单项。</p>\n<p>相关代码可以参考 <a href=\"https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-merge\">dubbo 项目中的示例</a></p>\n<h2>配置</h2>\n<p>搜索所有分组</p>\n<pre><code class=\"language-xml\"><span class=\"hljs-tag\"><<span class=\"hljs-name\">dubbo:reference</span> <span class=\"hljs-attr\">interface</span>=< [...]
}
\ No newline at end of file
diff --git a/zh-cn/docs/user/references/telnet.html b/zh-cn/docs/user/references/telnet.html
index 5ef84c5..2ae4633 100644
--- a/zh-cn/docs/user/references/telnet.html
+++ b/zh-cn/docs/user/references/telnet.html
@@ -85,6 +85,82 @@
</ol>
<h3><code>exit</code></h3>
<p><code>exit</code>: 退出当前 telnet 命令行</p>
+<h2>相关参数说明</h2>
+<p>QoS提供了一些启动参数，来对启动进行配置，他们主要包括：</p>
+<table>
+<thead>
+<tr>
+<th>参数</th>
+<th>说明</th>
+<th>默认值</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>qosEnable</td>
+<td>是否启动QoS</td>
+<td>true</td>
+</tr>
+<tr>
+<td>qosPort</td>
+<td>启动QoS绑定的端口</td>
+<td>22222</td>
+</tr>
+<tr>
+<td>qosAcceptForeignIp</td>
+<td>是否允许远程访问</td>
+<td>false</td>
+</tr>
+</tbody>
+</table>
+<blockquote>
+<p>注意，从2.6.4/2.7.0开始，qosAcceptForeignIp默认配置改为false，如果qosAcceptForeignIp设置为true，有可能带来安全风险，请仔细评估后再打开。</p>
+</blockquote>
+<p>QoS参数可以通过如下方式进行配置</p>
+<ul>
+<li>系统属性</li>
+<li>dubbo.properties</li>
+<li>XML方式</li>
+<li>Spring-boot自动装配方式</li>
+</ul>
+<p>其中，上述方式的优先顺序为系统属性 > dubbo.properties > XML/Spring-boot自动装配方式。</p>
+<h3>使用系统属性方式进行配置</h3>
+<pre><code>-Ddubbo.application.qos.enable=true
+-Ddubbo.application.qos.port=33333
+-Ddubbo.application.qos.accept.foreign.ip=false
+</code></pre>
+<h3>使用dubbo.properties文件进行配置</h3>
+<p>在项目的<code>src/main/resources</code>目录下添加dubbo.properties文件，内容如下:</p>
+<pre><code>dubbo.application.qos.enable=true
+dubbo.application.qos.port=33333
+dubbo.application.qos.accept.foreign.ip=false
+</code></pre>
+<h3>使用XML方法进行配置</h3>
+<p>如果要通过XML配置响应的QoS相关的参数，可以进行如下配置：</p>
+<pre><code class="language-xml"><span class="hljs-meta"><?xml version="1.0" encoding="UTF-8"?></span>
+<span class="hljs-tag"><<span class="hljs-name">beans</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"http://www.springframework.org/schema/beans"</span>
+ <span class="hljs-attr">xmlns:xsi</span>=<span class="hljs-string">"http://www.w3.org/2001/XMLSchema-instance"</span>
+ <span class="hljs-attr">xmlns:dubbo</span>=<span class="hljs-string">"http://dubbo.apache.org/schema/dubbo"</span>
+ <span class="hljs-attr">xsi:schemaLocation</span>=<span class="hljs-string">"http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd"</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:application</span> <span class="hljs-attr">name</span>=<span class="hljs-string">"demo-provider"</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:parameter</span> <span class="hljs-attr">key</span>=<span class="hljs-string">"qos.enable"</span> <span class="hljs-attr">value</span>=<span class="hljs-string">"true"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:parameter</span> <span class="hljs-attr">key</span>=<span class="hljs-string">"qos.accept.foreign.ip"</span> <span class="hljs-attr">value</span>=<span class="hljs-string">"false"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:parameter</span> <span class="hljs-attr">key</span>=<span class="hljs-string">"qos.port"</span> <span class="hljs-attr">value</span>=<span class="hljs-string">"33333"</span>/></span>
+ <span class="hljs-tag"></<span class="hljs-name">dubbo:application</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:registry</span> <span class="hljs-attr">address</span>=<span class="hljs-string">"multicast://224.5.6.7:1234"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:protocol</span> <span class="hljs-attr">name</span>=<span class="hljs-string">"dubbo"</span> <span class="hljs-attr">port</span>=<span class="hljs-string">"20880"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">dubbo:service</span> <span class="hljs-attr">interface</span>=<span class="hljs-string">"org.apache.dubbo.demo.provider.DemoService"</span> <span class="hljs-attr">ref</span>=<span class="hljs-string">"demoService"</span>/></span>
+ <span class="hljs-tag"><<span class="hljs-name">bean</span> <span class="hljs-attr">id</span>=<span class="hljs-string">"demoService"</span> <span class="hljs-attr">class</span>=<span class="hljs-string">"org.apache.dubbo.demo.provider.DemoServiceImpl"</span>/></span>
+<span class="hljs-tag"></<span class="hljs-name">beans</span>></span>
+</code></pre>
+<h3>使用spring-boot自动装配方式配置</h3>
+<p>如果是spring-boot的应用，可以在<code>application.properties</code>或者<code>application.yml</code>上配置:</p>
+<pre><code>dubbo.application.qosEnable=true
+dubbo.application.qosPort=33333
+dubbo.application.qosAcceptForeignIp=false
+</code></pre>
<hr class="footnotes-sep">
<section class="footnotes">
<ol class="footnotes-list">
diff --git a/zh-cn/docs/user/references/telnet.json b/zh-cn/docs/user/references/telnet.json
index f9f6713..3efe259 100644
--- a/zh-cn/docs/user/references/telnet.json
+++ b/zh-cn/docs/user/references/telnet.json
@@ -1,4 +1,4 @@
{
"filename": "telnet.md",
- "__html": "<h1>Telnet 命令参考手册</h1>\n<p>从 <code>2.0.5</code> 版本开始，dubbo 开始支持通过 telnet 命令来进行服务治理。</p>\n<h2>使用</h2>\n<pre><code class=\"language-sh\">telnet localhost 20880\n</code></pre>\n<p>或者：</p>\n<pre><code class=\"language-sh\"><span class=\"hljs-built_in\">echo</span> status | nc -i 1 localhost 20880\n</code></pre>\n<p>status命令所检查的资源也可以扩展，参见：<a href=\"../../dev/impls/status-checker.md\">扩展参考手册</a>。</p>\n<h2>命令</h2>\n<p>以下展示了 dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：<a href [...]
+ "__html": "<h1>Telnet 命令参考手册</h1>\n<p>从 <code>2.0.5</code> 版本开始，dubbo 开始支持通过 telnet 命令来进行服务治理。</p>\n<h2>使用</h2>\n<pre><code class=\"language-sh\">telnet localhost 20880\n</code></pre>\n<p>或者：</p>\n<pre><code class=\"language-sh\"><span class=\"hljs-built_in\">echo</span> status | nc -i 1 localhost 20880\n</code></pre>\n<p>status命令所检查的资源也可以扩展，参见：<a href=\"../../dev/impls/status-checker.md\">扩展参考手册</a>。</p>\n<h2>命令</h2>\n<p>以下展示了 dubbo 内建的 telnet 命令的说明和用法，此外，telnet 命令还支持用户自行扩展，参见：<a href [...]
}
\ No newline at end of file
[incubator-dubbo-website] 02/03: Merge branch 'asf-site' of
https://github.com/apache/incubator-dubbo-website into asf-site
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
commit b5d5a293ad6f0c28b1f5ade2ceb9333a75d9944b
Merge: bdc971f cdf1664
Author: beiwei30 <ia...@gmail.com>
AuthorDate: Tue Oct 30 17:05:17 2018 +0800
Merge branch 'asf-site' of https://github.com/apache/incubator-dubbo-website into asf-site
docs/en-us/developers/developers_dev.md | 4 ++--
docs/zh-cn/developers/developers_dev.md | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
[incubator-dubbo-website] 03/03: rebuild
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
commit 72d0b102e810e75472998aa663580347924ea9cf
Author: beiwei30 <ia...@gmail.com>
AuthorDate: Tue Oct 30 17:05:59 2018 +0800
rebuild
---
en-us/docs/developers/developers_dev.html | 6 +++---
en-us/docs/developers/developers_dev.json | 2 +-
zh-cn/docs/developers/developers_dev.html | 6 +++---
zh-cn/docs/developers/developers_dev.json | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/en-us/docs/developers/developers_dev.html b/en-us/docs/developers/developers_dev.html
index 43008ab..cf4ff42 100644
--- a/en-us/docs/developers/developers_dev.html
+++ b/en-us/docs/developers/developers_dev.html
@@ -187,10 +187,10 @@
</thead>
<tbody>
<tr>
+<td>leyou240</td>
+<td><a href="https://github.com/leyou240">https://github.com/leyou240</a></td>
<td></td>
-<td></td>
-<td></td>
-<td></td>
+<td>+8</td>
</tr>
</tbody>
</table>
diff --git a/en-us/docs/developers/developers_dev.json b/en-us/docs/developers/developers_dev.json
index e5a9a7a..eb9f390 100644
--- a/en-us/docs/developers/developers_dev.json
+++ b/en-us/docs/developers/developers_dev.json
@@ -1,4 +1,4 @@
{
"filename": "developers_dev.md",
- "__html": "<h2>Developers</h2>\n<p>This page shows Dubbo developers. Please file PR to add or change items.</p>\n<h3>Committers</h3>\n<table>\n<thead>\n<tr>\n<th>Apache ID</th>\n<th>Name</th>\n<th>Organization</th>\n<th>Role</th>\n<th>TimeZone</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>jmclean</td>\n<td>Justin Mclean</td>\n<td>Apache</td>\n<td>Mentor</td>\n<td>+11</td>\n</tr>\n<tr>\n<td>markt</td>\n<td>Mark Thomas</td>\n<td>Apache</td>\n<td>Mentor</td>\n<td>+0</td>\n</tr>\n<tr>\n<td>wav [...]
+ "__html": "<h2>Developers</h2>\n<p>This page shows Dubbo developers. Please file PR to add or change items.</p>\n<h3>Committers</h3>\n<table>\n<thead>\n<tr>\n<th>Apache ID</th>\n<th>Name</th>\n<th>Organization</th>\n<th>Role</th>\n<th>TimeZone</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>jmclean</td>\n<td>Justin Mclean</td>\n<td>Apache</td>\n<td>Mentor</td>\n<td>+11</td>\n</tr>\n<tr>\n<td>markt</td>\n<td>Mark Thomas</td>\n<td>Apache</td>\n<td>Mentor</td>\n<td>+0</td>\n</tr>\n<tr>\n<td>wav [...]
}
\ No newline at end of file
diff --git a/zh-cn/docs/developers/developers_dev.html b/zh-cn/docs/developers/developers_dev.html
index 3830bd3..8f3f9bc 100644
--- a/zh-cn/docs/developers/developers_dev.html
+++ b/zh-cn/docs/developers/developers_dev.html
@@ -187,10 +187,10 @@
</thead>
<tbody>
<tr>
+<td>leyou240</td>
+<td><a href="https://github.com/leyou240">https://github.com/leyou240</a></td>
<td></td>
-<td></td>
-<td></td>
-<td></td>
+<td>+8</td>
</tr>
</tbody>
</table>
diff --git a/zh-cn/docs/developers/developers_dev.json b/zh-cn/docs/developers/developers_dev.json
index b2b463f..068ce0e 100644
--- a/zh-cn/docs/developers/developers_dev.json
+++ b/zh-cn/docs/developers/developers_dev.json
@@ -1,4 +1,4 @@
{
"filename": "developers_dev.md",
- "__html": "<h2>开发人员</h2>\n<p>本页面展示了Dubbo的开发团队。请通过提PR的方式把自己的信息添加到列表上。注：排名不分先后</p>\n<h3>Committers</h3>\n<table>\n<thead>\n<tr>\n<th>Apache ID</th>\n<th>Name</th>\n<th>Organization</th>\n<th>Role</th>\n<th>TimeZone</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>jmclean</td>\n<td>Justin Mclean</td>\n<td>Apache</td>\n<td>Mentor</td>\n<td>+11</td>\n</tr>\n<tr>\n<td>markt</td>\n<td>Mark Thomas</td>\n<td>Apache</td>\n<td>Mentor</td>\n<td>+0</td>\n</tr>\n<tr>\n<td>wave</td>\n<td>Dave Fisher</td>\n< [...]
+ "__html": "<h2>开发人员</h2>\n<p>本页面展示了Dubbo的开发团队。请通过提PR的方式把自己的信息添加到列表上。注：排名不分先后</p>\n<h3>Committers</h3>\n<table>\n<thead>\n<tr>\n<th>Apache ID</th>\n<th>Name</th>\n<th>Organization</th>\n<th>Role</th>\n<th>TimeZone</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>jmclean</td>\n<td>Justin Mclean</td>\n<td>Apache</td>\n<td>Mentor</td>\n<td>+11</td>\n</tr>\n<tr>\n<td>markt</td>\n<td>Mark Thomas</td>\n<td>Apache</td>\n<td>Mentor</td>\n<td>+0</td>\n</tr>\n<tr>\n<td>wave</td>\n<td>Dave Fisher</td>\n< [...]
}
\ No newline at end of file