This is an automated email from the ASF dual-hosted git repository.
liujun 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 17687de update 2.7.0 related docs
17687de is described below
commit 17687de91d85af9d7d3ef8aab8c8dc4680df8280
Author: ken.lj <[email protected]>
AuthorDate: Fri Feb 15 12:32:50 2019 +0800
update 2.7.0 related docs
---
blog/en-us/dubbo-new-async.md | 6 +++---
blog/zh-cn/dubbo-new-async.md | 6 +++---
docs/zh-cn/user/SUMMARY.md | 24 +++++++++++++---------
docs/zh-cn/user/configuration/config-center.md | 2 +-
docs/zh-cn/user/demos/simplify-registry-data.md | 2 +-
.../metadata/introduction.md} | 3 ++-
.../user/references/metadata/metadata-redis.md | 3 +++
.../user/references/metadata/metadata-zookeeper.md | 3 +++
.../user/references/xml/dubbo-config-center.md | 7 +++----
docs/zh-cn/user/references/xml/dubbo-registry.md | 2 ++
docs/zh-cn/user/versions/version-270.md | 2 +-
incubator-dubbo-website.iml | 9 ++++++++
site_config/docs.js | 21 +++++++++++++++++++
13 files changed, 66 insertions(+), 24 deletions(-)
diff --git a/blog/en-us/dubbo-new-async.md b/blog/en-us/dubbo-new-async.md
index 58d647f..79aa137 100644
--- a/blog/en-us/dubbo-new-async.md
+++ b/blog/en-us/dubbo-new-async.md
@@ -162,7 +162,7 @@ Next, let's illustrate how to implement a fully
asynchronous Dubbo service call
## example 1：CompletableFuture interface
-CompletableFuture interface can be used both for a synchronous call and for an
asynchronous call on Consumer or Provider side. This example implements
asynchronous calls between Consumer and Provider sides. Code link
[dubbo-samples-async-original-future](https://github.com/dubbo/dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-async-original-future).
+CompletableFuture interface can be used both for a synchronous call and for an
asynchronous call on Consumer or Provider side. This example implements
asynchronous calls between Consumer and Provider sides. Code link
[dubbo-samples-async-original-future](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-async-original-future).
1. Interface definition
@@ -265,7 +265,7 @@ CompletableFuture interface can be used both for a
synchronous call and for an a
## Example 2：Synchronous interface uses Annotation Processor
-This example demonstrates how to implement the Consumer-side asynchronous
service call using the Annotation Processor based on the original synchronous
interface. Code link
[dubbo-samples-async-generated-future](https://github.com/dubbo/dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-async-generated-future).
+This example demonstrates how to implement the Consumer-side asynchronous
service call using the Annotation Processor based on the original synchronous
interface. Code link
[dubbo-samples-async-generated-future](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-async-generated-future).
1. Interface definition
@@ -398,7 +398,7 @@ This example demonstrates how to implement the
Consumer-side asynchronous servic
## Example 3：Use AsyncContext
-This example demonstrates how to implement the Provider-side asynchronous
execution through AsyncContext based on the original synchronous interface.
Code link
[dubbo-samples-async-provider](https://github.com/dubbo/dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-async-provider).
+This example demonstrates how to implement the Provider-side asynchronous
execution through AsyncContext based on the original synchronous interface.
Code link
[dubbo-samples-async-provider](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-async-provider).
1. Interface definition
diff --git a/blog/zh-cn/dubbo-new-async.md b/blog/zh-cn/dubbo-new-async.md
index a2d6997..b2782ce 100644
--- a/blog/zh-cn/dubbo-new-async.md
+++ b/blog/zh-cn/dubbo-new-async.md
@@ -160,7 +160,7 @@ Dubbo在2.7.0版本已经升级了对Java 8的支持，同时基于CompletableFu
## 示例1：CompletableFuture类型接口
-CompletableFuture类型的接口既可以用作同步调用，也可以实现Consumer或Provider的异步调用。本示例实现了Consumer和Provider端异步调用，代码参见[dubbo-samples-async-original-future](https://github.com/apache/incubator-dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-async/dubbo-samples-async-original-future)。
+CompletableFuture类型的接口既可以用作同步调用，也可以实现Consumer或Provider的异步调用。本示例实现了Consumer和Provider端异步调用，代码参见[dubbo-samples-async-original-future](https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-async/dubbo-samples-async-original-future)。
1. 定义接口
@@ -263,7 +263,7 @@ CompletableFuture类型的接口既可以用作同步调用，也可以实现Con
## 示例2：同步接口使用Annotation Processor
-这个示例演示了如何在只定义同步接口的基础上，使用Annotation
Processor实现Consumer端异步方服务调用，具体代码参见地址[dubbo-samples-async-generated-future](https://github.com/dubbo/dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-async-generated-future)
+这个示例演示了如何在只定义同步接口的基础上，使用Annotation
Processor实现Consumer端异步方服务调用，具体代码参见地址[dubbo-samples-async-generated-future](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-async-generated-future)
1. 定义接口
@@ -398,7 +398,7 @@ CompletableFuture类型的接口既可以用作同步调用，也可以实现Con
## 示例3：使用AsyncContext
-本示例演示了如何在同步接口的基础上，通过AsyncContext实现Provider端异步执行，示例代码参见[dubbo-samples-async-provider](https://github.com/dubbo/dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-async-provider)。
+本示例演示了如何在同步接口的基础上，通过AsyncContext实现Provider端异步执行，示例代码参见[dubbo-samples-async-provider](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-async-provider)。
1. 定义接口
diff --git a/docs/zh-cn/user/SUMMARY.md b/docs/zh-cn/user/SUMMARY.md
index 481409c..f5034e4 100644
--- a/docs/zh-cn/user/SUMMARY.md
+++ b/docs/zh-cn/user/SUMMARY.md
@@ -60,6 +60,7 @@
* [6.44 线程栈自动dump](./demos/dump.md)
* [6.45 Netty4](./demos/netty4.md)
* [6.46 Kryo和FST序列化](./demos/serialization.md)
+ * [6.47 简化注册中心URL](./demos/simplify-registry-data.md)
* [7 API 参考手册](./references/api.md)
* [8 schema 配置参考手册](./references/xml/introduction.md)
* [8.1 dubbo:service](./references/xml/dubbo-service.md)
@@ -90,16 +91,19 @@
* [10.2 Zookeeper 注册中心](./references/registry/zookeeper.md)
* [10.3 Redis 注册中心](./references/registry/redis.md)
* [10.4 Simple 注册中心](./references/registry/simple.md)
-* [11 telnet 命令参考手册](./references/telnet.md)
-* [12 在线运维命令-QOS](./references/qos.md)
-* [13 maven 插件参考手册](./references/maven.md)
-* [14 服务化最佳实践](./best-practice.md)
-* [15 推荐用法](./recommend.md)
-* [16 容量规划](./capacity-plan.md)
-* [17 性能测试报告](./perf-test.md)
-* [18 测试覆盖率报告](./coveragence.md)
-* [19 版本与升级](./versions/index.md)
- * [19.1 2.7.x升级步骤及注意事项](./version-270.md)
+* [11 元数据中心参考手册](./references/metadata/introduction.md)
+ * [11.1 Redis](./references/metadata/metadata-redis.md)
+ * [11.2 Zookeeper](./references/metadata/metadata-zookeeper.md)
+* [12 telnet 命令参考手册](./references/telnet.md)
+* [13 在线运维命令-QOS](./references/qos.md)
+* [14 maven 插件参考手册](./references/maven.md)
+* [15 服务化最佳实践](./best-practice.md)
+* [16 推荐用法](./recommend.md)
+* [17 容量规划](./capacity-plan.md)
+* [18 性能测试报告](./perf-test.md)
+* [19 测试覆盖率报告](./coveragence.md)
+* [20 版本与升级](./versions/index.md)
+ * [20.1 2.7.x升级步骤及注意事项](./version-270.md)
diff --git a/docs/zh-cn/user/configuration/config-center.md
b/docs/zh-cn/user/configuration/config-center.md
index a246a9c..8687d47 100644
--- a/docs/zh-cn/user/configuration/config-center.md
+++ b/docs/zh-cn/user/configuration/config-center.md
@@ -7,7 +7,7 @@
-启用动态配置（以Zookeeper为例）：
+启用动态配置（以Zookeeper为例，可查看[动态配置配置项详解](../references/xml/dubbo-config-center.md)）：
```xml
<dubbo:config-center address="zookeeper://127.0.0.1:2181"/>
diff --git a/docs/zh-cn/user/demos/simplify-registry-data.md
b/docs/zh-cn/user/demos/simplify-registry-data.md
index d7de91a..3b02068 100644
--- a/docs/zh-cn/user/demos/simplify-registry-data.md
+++ b/docs/zh-cn/user/demos/simplify-registry-data.md
@@ -77,7 +77,7 @@ consumer：
Constant Key表示来自于类org.apache.dubbo.common.Constants的字段。
-下面介绍几种常用的使用方式。所有的sample，都可以查看[sample-2.7](https://github.com/dubbo/dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT)
+下面介绍几种常用的使用方式。所有的sample，都可以查看[sample-2.7](https://github.com/dubbo/dubbo-samples/tree/master)
### 方式1. 配置dubbo.properties
diff --git a/docs/zh-cn/user/demos/metadata-report.md
b/docs/zh-cn/user/references/metadata/introduction.md
similarity index 99%
rename from docs/zh-cn/user/demos/metadata-report.md
rename to docs/zh-cn/user/references/metadata/introduction.md
index 77d3116..16f1e67 100644
--- a/docs/zh-cn/user/demos/metadata-report.md
+++ b/docs/zh-cn/user/references/metadata/introduction.md
@@ -56,7 +56,7 @@ dubbo.metadata-report.cycle-report=false ##非必须,default值true
<artifactId>dubbo-metadata-report-redis</artifactId>
</dependency>
```
->
**完整的sample，查看[sample-2.7](https://github.com/dubbo/dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT)**
+>
**完整的sample，查看[sample-2.7](https://github.com/dubbo/dubbo-samples/tree/master)**
## 方式一：配置中心配置
@@ -366,3 +366,4 @@
redis=org.apache.dubbo.metadata.store.redis.RedisMetadataReportFactory
只要将上面的修改和project打包成jar包，然后配置元数据中心的url：redis://10.20.153.10:6379。
至此，一个自定义的元数据存储就可以运行了。
+ookeeper.md)
\ No newline at end of file
diff --git a/docs/zh-cn/user/references/metadata/metadata-redis.md
b/docs/zh-cn/user/references/metadata/metadata-redis.md
new file mode 100644
index 0000000..5c8228d
--- /dev/null
+++ b/docs/zh-cn/user/references/metadata/metadata-redis.md
@@ -0,0 +1,3 @@
+## 注册中心参考手册
+
+推荐使用 [Zookeeper 注册中心](./zookeeper.md)
\ No newline at end of file
diff --git a/docs/zh-cn/user/references/metadata/metadata-zookeeper.md
b/docs/zh-cn/user/references/metadata/metadata-zookeeper.md
new file mode 100644
index 0000000..5c8228d
--- /dev/null
+++ b/docs/zh-cn/user/references/metadata/metadata-zookeeper.md
@@ -0,0 +1,3 @@
+## 注册中心参考手册
+
+推荐使用 [Zookeeper 注册中心](./zookeeper.md)
\ No newline at end of file
diff --git a/docs/zh-cn/user/references/xml/dubbo-config-center.md
b/docs/zh-cn/user/references/xml/dubbo-config-center.md
index 1c0f0be..cc31996 100644
--- a/docs/zh-cn/user/references/xml/dubbo-config-center.md
+++ b/docs/zh-cn/user/references/xml/dubbo-config-center.md
@@ -50,15 +50,14 @@ table tr:hover {
| ---------------- | ---------------------- | ------------------- | -------- |
---------------- | ------------------------------------------------------------
| ------ |
| protocol | config.protocol | string | 可选 |
zookeeper | 使用哪个配置中心：apollo、zookeeper、nacos等。<br />以zookeeper为例<br />1.
指定protocol，则address可以简化为`127.0.0.1:2181`；<br />2.
不指定protocol，则address取值为`zookeeper://127.0.0.1:2181` | 2.7.0+ |
| address | config.address | string | 必填 |
| 配置中心地址。<br />取值参见protocol说明 | 2.7.0+ |
-| highestPriority | config.highestPriority | boolean | 可选 |
true | 来自配置中心的配置项具有最高优先级，即会覆盖本地配置项。 | 2.7.0+ |
+| highest-priority | config.highestPriority | boolean | 可选 |
true | 来自配置中心的配置项具有最高优先级，即会覆盖本地配置项。 | 2.7.0+ |
| namespace | config.namespace | string | 可选 |
dubbo | 通常用于多租户隔离，实际含义视具体配置中心而不同。<br />如：<br />zookeeper -
环境隔离，默认值`dubbo`；<br />apollo - 区分不同领域的配置集合，默认使用`dubbo`和`application` | 2.7.0+ |
| cluster | config.cluster | string | 可选 |
| 含义视所选定的配置中心而不同。<br />如Apollo中用来区分不同的配置集群 | 2.7.0+ |
| group | config.group | string | 可选 |
dubbo | 含义视所选定的配置中心而不同。<br />nacos - 隔离不同配置集<br />zookeeper -
隔离不同配置集 | 2.7.0+ |
| check | config.check | boolean | 可选 |
true | 当配置中心连接失败时，是否终止应用启动。 | 2.7.0+ |
-| configFile | config.configFile | string | 可选 |
dubbo.properties | 全局级配置文件所映射到的key<br />zookeeper -
默认路径/dubbo/config/dubbo/dubbo.properties<br />apollo - dubbo
namespace中的dubbo.properties键 | 2.7.0+ |
-| appConfigFile | config.appConfigFile | string | |
dubbo.properties | 应用级配置文件所映射的key | 2.7.0+ |
+| config-file | config.configFile | string | 可选 |
dubbo.properties | 全局级配置文件所映射到的key<br />zookeeper -
默认路径/dubbo/config/dubbo/dubbo.properties<br />apollo - dubbo
namespace中的dubbo.properties键 | 2.7.0+ |
| timeout | config.timeout | integer | |
3000ms | 获取配置的超时时间 | 2.7.0+
|
| username | | string | |
| 如果配置中心需要做校验，用户名<br />Apollo暂未启用 | 2.7.0+ |
| password | | string | |
| 如果配置中心需要做校验，密码<br />Apollo暂未启用 | 2.7.0+ |
| parameters | | Map<string, string> | |
| 扩展参数，用来支持不同配置中心的定制化配置参数 | 2.7.0+ |
-| includeSpringEnv | | boolean | 可选 |
false | 使用Spring框架时支持，为true时，会自动从Spring Environment中读取配置。<br
/>默认依次读取<br />key为dubbo.properties的配置<br />key为dubbo.properties的PropertySource
| 2.7.0+ |
\ No newline at end of file
+| include-spring-env | | boolean | 可选 |
false | 使用Spring框架时支持，为true时，会自动从Spring Environment中读取配置。<br
/>默认依次读取<br />key为dubbo.properties的配置<br />key为dubbo.properties的PropertySource
| 2.7.0+ |
\ No newline at end of file
diff --git a/docs/zh-cn/user/references/xml/dubbo-registry.md
b/docs/zh-cn/user/references/xml/dubbo-registry.md
index 8fdc1a7..7fba0e4 100644
--- a/docs/zh-cn/user/references/xml/dubbo-registry.md
+++ b/docs/zh-cn/user/references/xml/dubbo-registry.md
@@ -64,3 +64,5 @@ table tr:hover {
| subscribe | subscribe | boolean | 可选 | true | 服务治理 |
是否向此注册中心订阅服务，如果设为false，将只注册，不订阅 | 2.0.5以上版本 |
| dynamic | dynamic | boolean | 可选 | true | 服务治理 |
服务是否动态注册，如果设为false，注册后将显示为disable状态，需人工启用，并且服务提供者停止时，也不会自动取消注册，需人工禁用。 |
2.0.5以上版本 |
| group | group | string | 可选 | dubbo | 服务治理 |
服务注册分组，跨组的服务不会相互影响，也无法相互调用，适用于环境隔离。 | 2.0.5以上版本 |
+| simplified | simplified | boolean | 可选 | false | 服务治理 |
注册到注册中心的URL是否采用精简模式的（与低版本兼容） | 2.7.0以上版本 |
+| extra-keys | extraKeys | string | 可选 | | 服务治理 |
在simplified=true时，extraKeys允许你在默认参数外将额外的key放到URL中，格式："interface,key1,key2"。 |
2.0.5以上版本 |
diff --git a/docs/zh-cn/user/versions/version-270.md
b/docs/zh-cn/user/versions/version-270.md
index 2adbd88..dc00760 100644
--- a/docs/zh-cn/user/versions/version-270.md
+++ b/docs/zh-cn/user/versions/version-270.md
@@ -191,7 +191,7 @@ dubbo.protocol.port=20880
关于治理规则更多详细说明，请参考[路由规则](/docs/zh-cn/user/demos/routing-rule.md)和[覆盖规则](/docs/zh-cn/user/demos/config-rule.md)用户文档。
-也可继续了解[使用示例](https://github.com/apache/incubator-dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-governance)。
+也可继续了解[使用示例](https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-governance)。
diff --git a/incubator-dubbo-website.iml b/incubator-dubbo-website.iml
new file mode 100644
index 0000000..8021953
--- /dev/null
+++ b/incubator-dubbo-website.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/site_config/docs.js b/site_config/docs.js
index 349a366..ead9464 100644
--- a/site_config/docs.js
+++ b/site_config/docs.js
@@ -837,6 +837,10 @@ export default {
title: 'Kryo和FST序列化',
link:
'/zh-cn/docs/user/demos/serialization.html',
},
+ {
+ title: '简化注册中心URL',
+ link:
'/zh-cn/docs/user/demos/simplify-registry-data.html',
+ },
],
},
{
@@ -975,6 +979,23 @@ export default {
]
},
{
+ title: '元数据中心参考手册',
+ children: [
+ {
+ title: '介绍',
+ link:
'/zh-cn/docs/user/references/metadata/introduction.html',
+ },
+ {
+ title: 'Redis',
+ link:
'/zh-cn/docs/user/references/metadata/metadata-redis.html',
+ },
+ {
+ title: 'Zookeeper',
+ link:
'/zh-cn/docs/user/references/metadata/metadata-zookeeper.html',
+ },
+ ]
+ },
+ {
title: 'telnet命令参考手册',
link: '/zh-cn/docs/user/references/telnet.html'
},
