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
The following commit(s) were added to refs/heads/asf-site by this push:
new 4cc5927 enhance qos and telnet doc
4cc5927 is described below
commit 4cc5927365a543300a9bed6d76788da676b480ed
Author: beiwei30 <[email protected]>
AuthorDate: Mon Dec 10 13:28:41 2018 +0800
enhance qos and telnet doc
---
build/community.js | 2 +-
docs/en-us/user/references/qos.md | 84 ++++++++++++++++++++++++--
docs/en-us/user/references/telnet.md | 75 +----------------------
docs/zh-cn/user/references/qos.md | 83 ++++++++++++++++++++++++--
docs/zh-cn/user/references/telnet.md | 73 -----------------------
en-us/community/index.html | 2 +-
en-us/docs/user/configuration/properties.html | 2 +-
en-us/docs/user/configuration/properties.json | 2 +-
en-us/docs/user/references/qos.html | 85 +++++++++++++++++++++++++--
en-us/docs/user/references/qos.json | 2 +-
en-us/docs/user/references/telnet.html | 76 ------------------------
en-us/docs/user/references/telnet.json | 2 +-
zh-cn/community/index.html | 2 +-
zh-cn/docs/user/configuration/properties.html | 2 +-
zh-cn/docs/user/configuration/properties.json | 2 +-
zh-cn/docs/user/references/qos.html | 85 +++++++++++++++++++++++++--
zh-cn/docs/user/references/qos.json | 2 +-
zh-cn/docs/user/references/telnet.html | 76 ------------------------
zh-cn/docs/user/references/telnet.json | 2 +-
19 files changed, 333 insertions(+), 326 deletions(-)
diff --git a/build/community.js b/build/community.js
index cbdc8f6..4704938 100644
--- a/build/community.js
+++ b/build/community.js
@@ -3,4 +3,4 @@
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var
e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof
r;if("string"===o||"number"===o)e.push(r);else
if(Array.isArray(r)&&r.length){var a=n.apply(null,r);a&&e.push(a)}else
if("object"===o)for(var l in r)i.call(r,l)&&r[l]&&e.push(l)}}return e.join("
")}var i={}.hasOwnProperty;void
0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return
n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
+!function(){"use strict";function n(){for(var
e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof
r;if("string"===o||"number"===o)e.push(r);else
if(Array.isArray(r)&&r.length){var a=n.apply(null,r);a&&e.push(a)}else
if("object"===o)for(var l in r)i.call(r,l)&&r[l]&&e.push(l)}}return e.join("
")}var i={}.hasOwnProperty;void
0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return
n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
diff --git a/docs/en-us/user/references/qos.md
b/docs/en-us/user/references/qos.md
index 547de86..00686c2 100644
--- a/docs/en-us/user/references/qos.md
+++ b/docs/en-us/user/references/qos.md
@@ -1,7 +1,8 @@
# Telnet (new version) Command Usage
-dubbo 2.5.8 version refactor the telnet module, providing new telnet command
support.
-### Port
+In dubbo `2.5.8` a new QOS module is introduced, to provide new telnet command
support.
+
+## Port
the port of new version telnet is different from the port of dubbo protocol.
The default port is `22222`, which can be changed by modifying configuration
file `dubbo.properties`
```
@@ -14,7 +15,7 @@ or by modifying the JVM parameter
-Ddubbo.application.qos.port=33333
```
-### Safety
+## Safety
By default, dubbo can receive any command sent from the host, which can be
changed by modifying the configuration file `dubbo.properties`
@@ -30,7 +31,7 @@ or by configuring the JVM parameter
to reject command sent from the remote host, allowing only the local server to
run the command
-### Telnet and http protocol
+## Telnet and HTTP protocol
The telnet module supports both http and telnet protocol, in order to
facilitate the use of various situations
@@ -83,6 +84,8 @@ As Consumer side:
+---------------------+---+
```
+## Supported Commands
+
### ls List consumers and providers
```
@@ -149,3 +152,76 @@ dubbo>help online
+--------------+----------------------------------------------------------------------------------+
dubbo>
```
+
+## 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
+```
diff --git a/docs/en-us/user/references/telnet.md
b/docs/en-us/user/references/telnet.md
index 2e62700..3406839 100644
--- a/docs/en-us/user/references/telnet.md
+++ b/docs/en-us/user/references/telnet.md
@@ -88,77 +88,4 @@ 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
+[^1]: support since `2.0.6`
\ No newline at end of file
diff --git a/docs/zh-cn/user/references/qos.md
b/docs/zh-cn/user/references/qos.md
index 83557e2..8b1cfed 100644
--- a/docs/zh-cn/user/references/qos.md
+++ b/docs/zh-cn/user/references/qos.md
@@ -4,9 +4,9 @@
# 新版本 telnet 命令使用说明
-dubbo 2.5.8 新版本重构了 telnet 模块，提供了新的 telnet 命令支持。
+dubbo `2.5.8` 新版本增加了 QOS 模块，提供了新的 telnet 命令支持。
-### 端口
+## 端口
新版本的 telnet 端口 与 dubbo 协议的端口是不同的端口，默认为 `22222`，可通过配置文件`dubbo.properties` 修改:
```
@@ -19,7 +19,7 @@ dubbo.application.qos.port=33333
-Ddubbo.application.qos.port=33333
```
-### 安全
+## 安全
默认情况下，dubbo 接收任何主机发起的命令，可通过配置文件`dubbo.properties` 修改:
@@ -36,7 +36,7 @@ dubbo.application.qos.accept.foreign.ip=false
拒绝远端主机发出的命令，只允许服务本机执行
-### telnet 与 http 协议
+## telnet 与 http 协议
telnet 模块现在同时支持 http 协议和 telnet 协议，方便各种情况的使用
@@ -89,6 +89,8 @@ As Consumer side:
+---------------------+---+
```
+## 支持的命令
+
### ls 列出消费者和提供者
```
@@ -163,4 +165,77 @@ dubbo>help online
dubbo>
```
+## 相关参数说明
+
+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/docs/zh-cn/user/references/telnet.md
b/docs/zh-cn/user/references/telnet.md
index 729764e..1cc5e8a 100644
--- a/docs/zh-cn/user/references/telnet.md
+++ b/docs/zh-cn/user/references/telnet.md
@@ -91,76 +91,3 @@ status命令所检查的资源也可以扩展，参见：[扩展参考手册](..
[^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/community/index.html b/en-us/community/index.html
index cf79288..a4e0010 100644
--- a/en-us/community/index.html
+++ b/en-us/community/index.html
@@ -12,7 +12,7 @@
<link rel="stylesheet" href="/build/community.css" />
</head>
<body>
- <div id="root"><div class="community-page" data-reactroot=""><header
class="header-container header-container-normal"><div class="header-body"><a
href="/en-us/index.html"><img class="logo"
src="/img/dubbo_colorful.png"/></a><div class="search search-normal"><span
class="icon-search"></span></div><span class="language-switch
language-switch-normal">中</span><div class="header-menu"><img
class="header-menu-toggle" src="/img/menu_gray.png"/><ul><li class="menu-item
menu-item-normal"><a href [...]
+ <div id="root"><div class="community-page" data-reactroot=""><header
class="header-container header-container-normal"><div class="header-body"><a
href="/en-us/index.html"><img class="logo"
src="/img/dubbo_colorful.png"/></a><div class="search search-normal"><span
class="icon-search"></span></div><span class="language-switch
language-switch-normal">中</span><div class="header-menu"><img
class="header-menu-toggle" src="/img/menu_gray.png"/><ul><li class="menu-item
menu-item-normal"><a href [...]
<script
src="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js";></script>
<script
src="https://f.alicdn.com/react/15.4.1/react-dom.min.js";></script>
<script>
diff --git a/en-us/docs/user/configuration/properties.html
b/en-us/docs/user/configuration/properties.html
index 92910c3..6532591 100644
--- a/en-us/docs/user/configuration/properties.html
+++ b/en-us/docs/user/configuration/properties.html
@@ -23,7 +23,7 @@
</ul>
<p>If you have more than one tags in a XML configuration, you can use the
<code>id</code> value to distinguish. If you don't specify a id, ti will
applied to all tags.</p>
<ul>
-<li><code>dubbo.protocol.rmi.port=1234</code> equals to
<code><dubbo:protocol id="rmi" name="rmi"
port="1099" /></code></li>
+<li><code>dubbo.protocol.rmi.port=1099</code> equals to
<code><dubbo:protocol id="rmi" name="rmi"
port="1099" /></code></li>
<li><code>dubbo.registry.china.address=10.20.153.10:9090</code> equals to
<code><dubbo:registry id="china"
address="10.20.153.10:9090" /></code></li>
</ul>
<p>Here is a typical dubbo.properties demo configuration：</p>
diff --git a/en-us/docs/user/configuration/properties.json
b/en-us/docs/user/configuration/properties.json
index ee16faa..d4250a0 100644
--- a/en-us/docs/user/configuration/properties.json
+++ b/en-us/docs/user/configuration/properties.json
@@ -1,6 +1,6 @@
{
"filename": "properties.md",
- "__html": "<h1>Properties Configuration</h1>\n<p>If your application is
simple enough, say, you do not need multi-registries or multi-protocols, and
you want to share configuration among Spring containers. You can use
<code>dubbo.properties</code> as default configuration.</p>\n<p>Dubbo will load
dubbo.properties under the root of classpath automatically, you can also
specify the path for loading this file by using JVM parameter:
<code>-Ddubbo.properties.file=xxx.properties</code>.</p> [...]
+ "__html": "<h1>Properties Configuration</h1>\n<p>If your application is
simple enough, say, you do not need multi-registries or multi-protocols, and
you want to share configuration among Spring containers. You can use
<code>dubbo.properties</code> as default configuration.</p>\n<p>Dubbo will load
dubbo.properties under the root of classpath automatically, you can also
specify the path for loading this file by using JVM parameter:
<code>-Ddubbo.properties.file=xxx.properties</code>.</p> [...]
"link": "/en-us/docs/user/configuration/properties.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/user/references/qos.html
b/en-us/docs/user/references/qos.html
index 18a334c..cebcbd6 100644
--- a/en-us/docs/user/references/qos.html
+++ b/en-us/docs/user/references/qos.html
@@ -13,15 +13,15 @@
</head>
<body>
<div id="root"><div class="documentation-page"
data-reactroot=""><header class="header-container header-container-normal"><div
class="header-body"><a href="/en-us/index.html"><img class="logo"
src="/img/dubbo_colorful.png"/></a><div class="search search-normal"><span
class="icon-search"></span></div><span class="language-switch
language-switch-normal">中</span><div class="header-menu"><img
class="header-menu-toggle" src="/img/menu_gray.png"/><ul><li class="menu-item
menu-item-normal"><a [...]
-<p>dubbo 2.5.8 version refactor the telnet module, providing new telnet
command support.</p>
-<h3>Port</h3>
+<p>In dubbo <code>2.5.8</code> a new QOS module is introduced, to provide new
telnet command support.</p>
+<h2>Port</h2>
<p>the port of new version telnet is different from the port of dubbo
protocol. The default port is <code>22222</code>, which can be changed by
modifying configuration file <code>dubbo.properties</code></p>
<pre><code>dubbo.application.qos.port=33333
</code></pre>
<p>or by modifying the JVM parameter</p>
<pre><code>-Ddubbo.application.qos.port=33333
</code></pre>
-<h3>Safety</h3>
+<h2>Safety</h2>
<p>By default, dubbo can receive any command sent from the host, which can be
changed by modifying the configuration file <code>dubbo.properties</code></p>
<pre><code>dubbo.application.qos.accept.foreign.ip=false
</code></pre>
@@ -29,7 +29,7 @@
<pre><code>-Ddubbo.application.qos.accept.foreign.ip=false
</code></pre>
<p>to reject command sent from the remote host, allowing only the local server
to run the command</p>
-<h3>Telnet and http protocol</h3>
+<h2>Telnet and HTTP protocol</h2>
<p>The telnet module supports both http and telnet protocol, in order to
facilitate the use of various situations</p>
<p>For example,</p>
<pre><code>➜ ~ telnet localhost 22222
@@ -74,6 +74,7 @@ As Consumer side:
|Consumer Service Name|NUM|
+---------------------+---+
</code></pre>
+<h2>Supported Commands</h2>
<h3>ls List consumers and providers</h3>
<pre><code>dubbo>ls
As Provider side:
@@ -127,6 +128,82 @@ dubbo>help online
+--------------+----------------------------------------------------------------------------------+
dubbo>
</code></pre>
+<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>
</div></section><footer class="footer-container"><div class="footer-body"><img
src="/img/dubbo_gray.png"/><img class="apache" src="/img/apache_logo.png"/><div
class="cols-container"><div class="col col-12"><h3>Disclaimer</h3><p>Apache
Dubbo is an effort undergoing incubation at The Apache Software Foundation
(ASF), sponsored by the Incubator. Incubation is required of all newly accepted
projects until a further review indicates that the infrastructure,
communications, and decision making [...]
<script
src="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js";></script>
<script
src="https://f.alicdn.com/react/15.4.1/react-dom.min.js";></script>
diff --git a/en-us/docs/user/references/qos.json
b/en-us/docs/user/references/qos.json
index 73fb188..d099d3d 100644
--- a/en-us/docs/user/references/qos.json
+++ b/en-us/docs/user/references/qos.json
@@ -1,6 +1,6 @@
{
"filename": "qos.md",
- "__html": "<h1>Telnet (new version) Command Usage</h1>\n<p>dubbo 2.5.8
version refactor the telnet module, providing new telnet command
support.</p>\n<h3>Port</h3>\n<p>the port of new version telnet is different
from the port of dubbo protocol. The default port is <code>22222</code>, which
can be changed by modifying configuration file
<code>dubbo.properties</code></p>\n<pre><code>dubbo.application.qos.port=33333\n</code></pre>\n<p>or
by modifying the JVM parameter</p>\n<pre><code>-Ddu [...]
+ "__html": "<h1>Telnet (new version) Command Usage</h1>\n<p>In dubbo
<code>2.5.8</code> a new QOS module is introduced, to provide new telnet
command support.</p>\n<h2>Port</h2>\n<p>the port of new version telnet is
different from the port of dubbo protocol. The default port is
<code>22222</code>, which can be changed by modifying configuration file
<code>dubbo.properties</code></p>\n<pre><code>dubbo.application.qos.port=33333\n</code></pre>\n<p>or
by modifying the JVM parameter</p>\n<p [...]
"link": "/en-us/docs/user/references/qos.html",
"meta": {}
}
\ 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 281f22f..6d4d257 100644
--- a/en-us/docs/user/references/telnet.html
+++ b/en-us/docs/user/references/telnet.html
@@ -87,82 +87,6 @@
</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 dd64c7a..4f29e1b 100644
--- a/en-us/docs/user/references/telnet.json
+++ b/en-us/docs/user/references/telnet.json
@@ -1,6 +1,6 @@
{
"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 [...]
"link": "/en-us/docs/user/references/telnet.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/community/index.html b/zh-cn/community/index.html
index 843ec2b..2aa3ab7 100644
--- a/zh-cn/community/index.html
+++ b/zh-cn/community/index.html
@@ -12,7 +12,7 @@
<link rel="stylesheet" href="/build/community.css" />
</head>
<body>
- <div id="root"><div class="community-page" data-reactroot=""><header
class="header-container header-container-normal"><div class="header-body"><a
href="/zh-cn/index.html"><img class="logo"
src="/img/dubbo_colorful.png"/></a><div class="search search-normal"><span
class="icon-search"></span></div><span class="language-switch
language-switch-normal">En</span><div class="header-menu"><img
class="header-menu-toggle" src="/img/menu_gray.png"/><ul><li class="menu-item
menu-item-normal"><a hre [...]
+ <div id="root"><div class="community-page" data-reactroot=""><header
class="header-container header-container-normal"><div class="header-body"><a
href="/zh-cn/index.html"><img class="logo"
src="/img/dubbo_colorful.png"/></a><div class="search search-normal"><span
class="icon-search"></span></div><span class="language-switch
language-switch-normal">En</span><div class="header-menu"><img
class="header-menu-toggle" src="/img/menu_gray.png"/><ul><li class="menu-item
menu-item-normal"><a hre [...]
<script
src="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js";></script>
<script
src="https://f.alicdn.com/react/15.4.1/react-dom.min.js";></script>
<script>
diff --git a/zh-cn/docs/user/configuration/properties.html
b/zh-cn/docs/user/configuration/properties.html
index 4345790..71000aa 100644
--- a/zh-cn/docs/user/configuration/properties.html
+++ b/zh-cn/docs/user/configuration/properties.html
@@ -23,7 +23,7 @@
</ul>
<p>如果 XML 有多行同名标签配置，可用 id 号区分，如果没有 id 号将对所有同名标签生效</p>
<ul>
-<li>比如：<code>dubbo.protocol.rmi.port=1234</code>等价于<code><dubbo:protocol
id="rmi" name="rmi" port="1099" /></code> <sup
class="footnote-ref"><a href="#fn2" id="fnref2">[2]</a></sup></li>
+<li>比如：<code>dubbo.protocol.rmi.port=1099</code>等价于<code><dubbo:protocol
id="rmi" name="rmi" port="1099" /></code> <sup
class="footnote-ref"><a href="#fn2" id="fnref2">[2]</a></sup></li>
<li>比如：<code>dubbo.registry.china.address=10.20.153.10:9090</code>等价于<code><dubbo:registry
id="china" address="10.20.153.10:9090" /></code></li>
</ul>
<p>下面是 dubbo.properties 的一个典型配置：</p>
diff --git a/zh-cn/docs/user/configuration/properties.json
b/zh-cn/docs/user/configuration/properties.json
index f5f8729..0a7499c 100644
--- a/zh-cn/docs/user/configuration/properties.json
+++ b/zh-cn/docs/user/configuration/properties.json
@@ -1,6 +1,6 @@
{
"filename": "properties.md",
- "__html": "<h1>属性配置</h1>\n<p>如果公共配置很简单，没有多注册中心，多协议等情况，或者想多个 Spring
容器想共享配置，可以使用 dubbo.properties 作为缺省配置。</p>\n<p>Dubbo 将自动加载 classpath 根目录下的
dubbo.properties，可以通过JVM启动参数
<code>-Ddubbo.properties.file=xxx.properties</code> 改变缺省配置位置。<sup
class=\"footnote-ref\"><a href=\"#fn1\"
id=\"fnref1\">[1]</a></sup></p>\n<h2>映射规则</h2>\n<p>将 XML
配置的标签名，加属性名，用点分隔，多个属性拆成多行</p>\n<ul>\n<li>比如：<code>dubbo.application.name=foo</code>等价于<code><dubbo:application
name="foo" /></code></li>\n<li [...]
+ "__html": "<h1>属性配置</h1>\n<p>如果公共配置很简单，没有多注册中心，多协议等情况，或者想多个 Spring
容器想共享配置，可以使用 dubbo.properties 作为缺省配置。</p>\n<p>Dubbo 将自动加载 classpath 根目录下的
dubbo.properties，可以通过JVM启动参数
<code>-Ddubbo.properties.file=xxx.properties</code> 改变缺省配置位置。<sup
class=\"footnote-ref\"><a href=\"#fn1\"
id=\"fnref1\">[1]</a></sup></p>\n<h2>映射规则</h2>\n<p>将 XML
配置的标签名，加属性名，用点分隔，多个属性拆成多行</p>\n<ul>\n<li>比如：<code>dubbo.application.name=foo</code>等价于<code><dubbo:application
name="foo" /></code></li>\n<li [...]
"link": "/zh-cn/docs/user/configuration/properties.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/user/references/qos.html
b/zh-cn/docs/user/references/qos.html
index c11dcec..d3551d4 100644
--- a/zh-cn/docs/user/references/qos.html
+++ b/zh-cn/docs/user/references/qos.html
@@ -13,15 +13,15 @@
</head>
<body>
<div id="root"><div class="documentation-page"
data-reactroot=""><header class="header-container header-container-normal"><div
class="header-body"><a href="/zh-cn/index.html"><img class="logo"
src="/img/dubbo_colorful.png"/></a><div class="search search-normal"><span
class="icon-search"></span></div><span class="language-switch
language-switch-normal">En</span><div class="header-menu"><img
class="header-menu-toggle" src="/img/menu_gray.png"/><ul><li class="menu-item
menu-item-normal"><a [...]
-<p>dubbo 2.5.8 新版本重构了 telnet 模块，提供了新的 telnet 命令支持。</p>
-<h3>端口</h3>
+<p>dubbo <code>2.5.8</code> 新版本增加了 QOS 模块，提供了新的 telnet 命令支持。</p>
+<h2>端口</h2>
<p>新版本的 telnet 端口 与 dubbo 协议的端口是不同的端口，默认为
<code>22222</code>，可通过配置文件<code>dubbo.properties</code> 修改:</p>
<pre><code>dubbo.application.qos.port=33333
</code></pre>
<p>或者通过设置 JVM 参数:</p>
<pre><code>-Ddubbo.application.qos.port=33333
</code></pre>
-<h3>安全</h3>
+<h2>安全</h2>
<p>默认情况下，dubbo 接收任何主机发起的命令，可通过配置文件<code>dubbo.properties</code> 修改:</p>
<pre><code>dubbo.application.qos.accept.foreign.ip=false
</code></pre>
@@ -29,7 +29,7 @@
<pre><code>-Ddubbo.application.qos.accept.foreign.ip=false
</code></pre>
<p>拒绝远端主机发出的命令，只允许服务本机执行</p>
-<h3>telnet 与 http 协议</h3>
+<h2>telnet 与 http 协议</h2>
<p>telnet 模块现在同时支持 http 协议和 telnet 协议，方便各种情况的使用</p>
<p>示例如下：</p>
<pre><code>➜ ~ telnet localhost 22222
@@ -74,6 +74,7 @@ As Consumer side:
|Consumer Service Name|NUM|
+---------------------+---+
</code></pre>
+<h2>支持的命令</h2>
<h3>ls 列出消费者和提供者</h3>
<pre><code>dubbo>ls
As Provider side:
@@ -128,6 +129,82 @@ dubbo>help online
dubbo>
</code></pre>
+<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>
</div></section><footer class="footer-container"><div class="footer-body"><img
src="/img/dubbo_gray.png"/><img class="apache" src="/img/apache_logo.png"/><div
class="cols-container"><div class="col col-12"><h3>Disclaimer</h3><p>Apache
Dubbo is an effort undergoing incubation at The Apache Software Foundation
(ASF), sponsored by the Incubator. Incubation is required of all newly accepted
projects until a further review indicates that the infrastructure,
communications, and decision making [...]
<script
src="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js";></script>
<script
src="https://f.alicdn.com/react/15.4.1/react-dom.min.js";></script>
diff --git a/zh-cn/docs/user/references/qos.json
b/zh-cn/docs/user/references/qos.json
index 59b3ead..65a1ad7 100644
--- a/zh-cn/docs/user/references/qos.json
+++ b/zh-cn/docs/user/references/qos.json
@@ -1,6 +1,6 @@
{
"filename": "qos.md",
- "__html": "<h1>新版本 telnet 命令使用说明</h1>\n<p>dubbo 2.5.8 新版本重构了 telnet 模块，提供了新的
telnet 命令支持。</p>\n<h3>端口</h3>\n<p>新版本的 telnet 端口 与 dubbo 协议的端口是不同的端口，默认为
<code>22222</code>，可通过配置文件<code>dubbo.properties</code>
修改:</p>\n<pre><code>dubbo.application.qos.port=33333\n</code></pre>\n<p>或者通过设置
JVM
参数:</p>\n<pre><code>-Ddubbo.application.qos.port=33333\n</code></pre>\n<h3>安全</h3>\n<p>默认情况下，dubbo
接收任何主机发起的命令，可通过配置文件<code>dubbo.properties</code>
修改:</p>\n<pre><code>dubbo.application.qos.accept.fore [...]
+ "__html": "<h1>新版本 telnet 命令使用说明</h1>\n<p>dubbo <code>2.5.8</code> 新版本增加了
QOS 模块，提供了新的 telnet 命令支持。</p>\n<h2>端口</h2>\n<p>新版本的 telnet 端口 与 dubbo
协议的端口是不同的端口，默认为 <code>22222</code>，可通过配置文件<code>dubbo.properties</code>
修改:</p>\n<pre><code>dubbo.application.qos.port=33333\n</code></pre>\n<p>或者通过设置
JVM
参数:</p>\n<pre><code>-Ddubbo.application.qos.port=33333\n</code></pre>\n<h2>安全</h2>\n<p>默认情况下，dubbo
接收任何主机发起的命令，可通过配置文件<code>dubbo.properties</code>
修改:</p>\n<pre><code>dubbo.application.qos.a [...]
"link": "/zh-cn/docs/user/references/qos.html",
"meta": {}
}
\ 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 2ae4633..5ef84c5 100644
--- a/zh-cn/docs/user/references/telnet.html
+++ b/zh-cn/docs/user/references/telnet.html
@@ -85,82 +85,6 @@
</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 9221adb..e0a7710 100644
--- a/zh-cn/docs/user/references/telnet.json
+++ b/zh-cn/docs/user/references/telnet.json
@@ -1,6 +1,6 @@
{
"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 [...]
"link": "/zh-cn/docs/user/references/telnet.html",
"meta": {}
}
\ No newline at end of file
