This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 55b4644 Automated deployment: Sun Nov 17 10:23:45 UTC 2019
c83a1ef2e64ca574244f203be17a348ad08df04e
55b4644 is described below
commit 55b46440f66bb64b111c4e6f40653d8d1c522b35
Author: chickenlj <[email protected]>
AuthorDate: Sun Nov 17 10:23:45 2019 +0000
Automated deployment: Sun Nov 17 10:23:45 UTC 2019
c83a1ef2e64ca574244f203be17a348ad08df04e
---
build/ecology.js | 6 +++---
img/apollo-configcenter-dubbo.png | Bin 645257 -> 175064 bytes
img/apollo-configcenter-governance-dubbo.png | Bin 0 -> 193607 bytes
zh-cn/docs/user/configuration/config-center.html | 9 +++++++--
zh-cn/docs/user/configuration/config-center.json | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/build/ecology.js b/build/ecology.js
index 343dcd6..a813eb1 100644
--- a/build/ecology.js
+++ b/build/ecology.js
@@ -1,11 +1,11 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var
a=n[r]={i:r,l:!1,exports:{}};return
e[r].call(a.exports,a,a.exports,t),a.l=!0,a.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&&e.__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=320 [...]
+!function(e){function t(r){if(n[r])return n[r].exports;var
c=n[r]={i:r,l:!1,exports:{}};return
e[r].call(c.exports,c,c.exports,t),c.l=!0,c.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&&e.__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=320 [...]
Copyright (c) 2017 Jed Watson.
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 a=typeof
r;if("string"===a||"number"===a)e.push(r);else
if(Array.isArray(r)&&r.length){var o=n.apply(null,r);o&&e.push(o)}else
if("object"===a)for(var i in r)c.call(r,i)&&r[i]&&e.push(i)}}return e.join("
")}var c={}.hasOwnProperty;void
0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(a=function(){return
n}.apply(t,r))&&(e.exports=a))}()},function(e,t,n){"use strict";Objec [...]
+!function(){"use strict";function n(){for(var
e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var c=typeof
r;if("string"===c||"number"===c)e.push(r);else
if(Array.isArray(r)&&r.length){var o=n.apply(null,r);o&&e.push(o)}else
if("object"===c)for(var i in r)a.call(r,i)&&r[i]&&e.push(i)}}return e.join("
")}var a={}.hasOwnProperty;void
0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(c=function(){return
n}.apply(t,r))&&(e.exports=c))}()},function(e,t,n){"use strict";Objec [...]
object-assign
(c) Sindre Sorhus
@license MIT
*/
-var
a=Object.getOwnPropertySymbols,c=Object.prototype.hasOwnProperty,o=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var
e=new
String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var
t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return
t[e]}).join(""))return!1;var
r={};return"abcdefghijklmnopqrst".split("").forEach(function(e){r[e]=e}),"abcdefghijklmn
[...]
\ No newline at end of file
+var
c=Object.getOwnPropertySymbols,a=Object.prototype.hasOwnProperty,o=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var
e=new
String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var
t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return
t[e]}).join(""))return!1;var
r={};return"abcdefghijklmnopqrst".split("").forEach(function(e){r[e]=e}),"abcdefghijklmn
[...]
\ No newline at end of file
diff --git a/img/apollo-configcenter-dubbo.png
b/img/apollo-configcenter-dubbo.png
index c6d48d5..e6e5069 100644
Binary files a/img/apollo-configcenter-dubbo.png and
b/img/apollo-configcenter-dubbo.png differ
diff --git a/img/apollo-configcenter-governance-dubbo.png
b/img/apollo-configcenter-governance-dubbo.png
new file mode 100644
index 0000000..ce2b8fc
Binary files /dev/null and b/img/apollo-configcenter-governance-dubbo.png differ
diff --git a/zh-cn/docs/user/configuration/config-center.html
b/zh-cn/docs/user/configuration/config-center.html
index 01d1488..160b465 100644
--- a/zh-cn/docs/user/configuration/config-center.html
+++ b/zh-cn/docs/user/configuration/config-center.html
@@ -71,10 +71,15 @@ configCenter.setAddress(<span
class="hljs-string">"zookeeper://127.0.0.1:2181"</
<pre><code class="language-xml"><span class="hljs-tag"><<span
class="hljs-name">dubbo:config-center</span> <span
class="hljs-attr">protocol</span>=<span class="hljs-string">"apollo"</span>
<span class="hljs-attr">address</span>=<span
class="hljs-string">"127.0.0.1:2181"</span>/></span>
</code></pre>
<p>Apollo中的一个核心概念是命名空间 -
namespace(和上面zookeeper的namespace概念不同),在这里全局和应用级别配置就是通过命名空间来区分的。</p>
-<p>默认情况下,Dubbo会从名叫<code>dubbo-properties</code>(由于 Apollo 不支持特殊后缀
<code>.properties</code> )的命名空间中读取全局配置(<code><dubbo:config-center
namespace="your namespace"></code>)</p>
+<p>默认情况下,Dubbo会从名叫<code>dubbo</code>(由于 Apollo 不支持特殊后缀
<code>.properties</code> )的命名空间中读取全局配置(<code><dubbo:config-center
namespace="your namespace"></code>)</p>
<p><img src="/img/apollo-configcenter-dubbo.png"
alt="image-20190128095444169"></p>
+<p>由于 Apollo 也默认将会在 <code>dubbo</code> namespace 中存储服务治理规则(如路由规则),建议通过单独配置
<code>group</code> 将服务治理和配置文件托管分离开,以 XML 配置方式为例:</p>
+<pre><code class="language-xml"><span class="hljs-tag"><<span
class="hljs-name">dubbo</span> <span class="hljs-attr">namespace</span>=<span
class="hljs-string">"governance"</span> <span class="hljs-attr">group</span>
=<span class="hljs-string">"dubbo"</span>/></span>
+</code></pre>
+<p>这里,服务治理规则将存储在 governance namespace,而配置文件将存储在 dubbo namespace,如下图所示:
+<img src="/img/apollo-configcenter-governance-dubbo.png"
alt="image-20190128095444169"></p>
<blockquote>
-<p>这里相当于是把 <code>dubbo.properties</code> 配置文件的内容存储在了 Apollo 中,应用通过关联共享的
<code>dubbo-properties</code> namespace 继承公共配置,
+<p>关于文件配置托管,相当于是把 <code>dubbo.properties</code> 配置文件的内容存储在了 Apollo 中,应用通过关联共享的
<code>dubbo</code> namespace 继承公共配置,
应用也可以按照 Apollo 的做法来覆盖个别配置项。</p>
</blockquote>
<h4>自己加载外部化配置</h4>
diff --git a/zh-cn/docs/user/configuration/config-center.json
b/zh-cn/docs/user/configuration/config-center.json
index f6caa56..2e0a909 100644
--- a/zh-cn/docs/user/configuration/config-center.json
+++ b/zh-cn/docs/user/configuration/config-center.json
@@ -1,6 +1,6 @@
{
"filename": "config-center.md",
- "__html":
"<h1>动态配置中心</h1>\n<p>配置中心(v2.7.0)在Dubbo中承担两个职责:</p>\n<ol>\n<li>外部化配置。启动配置的集中式存储
(简单理解为dubbo.properties的外部化存储)。</li>\n<li>服务治理。服务治理规则的存储与通知。</li>\n</ol>\n<p>启用动态配置(以Zookeeper为例,可查看<a
href=\"../references/xml/dubbo-config-center.md\">动态配置配置项详解</a>):</p>\n<pre><code
class=\"language-xml\"><span class=\"hljs-tag\"><<span
class=\"hljs-name\">dubbo:config-center</span> <span
class=\"hljs-attr\">address</span>=<span
class=\"hljs-string\">\"zookeeper://127.0.0.1:2181\"</span>/> [...]
+ "__html":
"<h1>动态配置中心</h1>\n<p>配置中心(v2.7.0)在Dubbo中承担两个职责:</p>\n<ol>\n<li>外部化配置。启动配置的集中式存储
(简单理解为dubbo.properties的外部化存储)。</li>\n<li>服务治理。服务治理规则的存储与通知。</li>\n</ol>\n<p>启用动态配置(以Zookeeper为例,可查看<a
href=\"../references/xml/dubbo-config-center.md\">动态配置配置项详解</a>):</p>\n<pre><code
class=\"language-xml\"><span class=\"hljs-tag\"><<span
class=\"hljs-name\">dubbo:config-center</span> <span
class=\"hljs-attr\">address</span>=<span
class=\"hljs-string\">\"zookeeper://127.0.0.1:2181\"</span>/> [...]
"link": "/zh-cn/docs/user/configuration/config-center.html",
"meta": {}
}
\ No newline at end of file