You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/11/04 11:15:43 UTC

[dubbo-website] branch master updated (277b32c -> f63f85b)

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git.


    from 277b32c  Fix URL to other documents (#507)
     new 0d6f1f7  update config center doc
     new 0c56864  update config center doc
     new f63f85b  Merge remote-tracking branch 'official/master'

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/zh-cn/user/configuration/config-center.md |  15 ++++-----------
 img/apollo-configcenter-dubbo.png              | Bin 0 -> 645257 bytes
 2 files changed, 4 insertions(+), 11 deletions(-)
 create mode 100644 img/apollo-configcenter-dubbo.png


[dubbo-website] 02/03: update config center doc

Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git

commit 0c56864478698df75c51866aef9b319cee53a3e2
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Nov 4 19:15:14 2019 +0800

    update config center doc
---
 docs/zh-cn/user/configuration/config-center.md |   2 +-
 img/apollo-configcenter-dubbo.png              | Bin 0 -> 645257 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/user/configuration/config-center.md b/docs/zh-cn/user/configuration/config-center.md
index 870a4c9..ab278a9 100644
--- a/docs/zh-cn/user/configuration/config-center.md
+++ b/docs/zh-cn/user/configuration/config-center.md
@@ -94,7 +94,7 @@ Apollo中的一个核心概念是命名空间 - namespace(和上面zookeeper
 
 默认情况下,Dubbo会从名叫`dubbo-properties`(由于 Apollo 不支持特殊后缀 `.properties` )的命名空间中读取全局配置(`<dubbo:config-center namespace="your namespace">`)
 
-![image-20190128095444169](/img/apollo-configcenter-dubbo.jpg)
+![image-20190128095444169](/img/apollo-configcenter-dubbo.png)
 
 
 > 这里相当于是把 `dubbo.properties` 配置文件的内容存储在了 Apollo 中,应用通过关联共享的 `dubbo-properties` namespace 继承公共配置,
diff --git a/img/apollo-configcenter-dubbo.png b/img/apollo-configcenter-dubbo.png
new file mode 100644
index 0000000..c6d48d5
Binary files /dev/null and b/img/apollo-configcenter-dubbo.png differ


[dubbo-website] 03/03: Merge remote-tracking branch 'official/master'

Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git

commit f63f85b3ddeb43afd3ff76b50f189189efc84a6e
Merge: 0c56864 277b32c
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Nov 4 19:15:29 2019 +0800

    Merge remote-tracking branch 'official/master'

 docs/zh-cn/user/configuration/properties.md  | 2 +-
 docs/zh-cn/user/demos/concurrency-control.md | 2 +-
 docs/zh-cn/user/recommend.md                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


[dubbo-website] 01/03: update config center doc

Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git

commit 0d6f1f727adc0bead11f5e95fd7f1497fcd3489d
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Nov 4 19:14:04 2019 +0800

    update config center doc
---
 docs/zh-cn/user/configuration/config-center.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/zh-cn/user/configuration/config-center.md b/docs/zh-cn/user/configuration/config-center.md
index db5c419..870a4c9 100644
--- a/docs/zh-cn/user/configuration/config-center.md
+++ b/docs/zh-cn/user/configuration/config-center.md
@@ -92,20 +92,13 @@ dubbo.application.qos.port=33333
 
 Apollo中的一个核心概念是命名空间 - namespace(和上面zookeeper的namespace概念不同),在这里全局和应用级别配置就是通过命名空间来区分的。
 
-默认情况下,Dubbo会从名叫`dubbo`的命名空间中读取全局配置(`<dubbo:config-center namespace="your namespace">`)
+默认情况下,Dubbo会从名叫`dubbo-properties`(由于 Apollo 不支持特殊后缀 `.properties` )的命名空间中读取全局配置(`<dubbo:config-center namespace="your namespace">`)
 
 ![image-20190128095444169](/img/apollo-configcenter-dubbo.jpg)
 
-而应用自有的配置,会从`application`命名空间读取
-
-![image-20190128095659517](/img/apollo-configcenter-application.jpg)
-
-
-
-> 注意:当前dubbo.properties是作为一个key存储在Apollo namespace中,为更好的适应Apollo的设计理念,在接下来的版本中可能会调整为
->
-> ![image-20190128100058755](/img/apollo-configcenter-enhance.jpg)
 
+> 这里相当于是把 `dubbo.properties` 配置文件的内容存储在了 Apollo 中,应用通过关联共享的 `dubbo-properties` namespace 继承公共配置,
+> 应用也可以按照 Apollo 的做法来覆盖个别配置项。
 
 
 #### 自己加载外部化配置