You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by gi...@apache.org on 2019/07/15 09:19:09 UTC
[dubbo-website] branch asf-site updated: Website updated with
cf9f34c23340c5396a2f0821a381ee586553d0d5
This is an automated email from the ASF dual-hosted git repository.
git-site-role 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 f8c6342 Website updated with cf9f34c23340c5396a2f0821a381ee586553d0d5
f8c6342 is described below
commit f8c634224149f8d212e78ec626d48b984acfaa20
Author: jenkins <us...@infra.apache.org>
AuthorDate: Mon Jul 15 09:19:03 2019 +0000
Website updated with cf9f34c23340c5396a2f0821a381ee586553d0d5
---
COMMIT_ID | 2 +-
en-us/docs/dev/impls/protocol.html | 10 +++++-----
en-us/docs/dev/impls/protocol.json | 2 +-
zh-cn/docs/dev/impls/protocol.html | 10 +++++-----
zh-cn/docs/dev/impls/protocol.json | 2 +-
zh-cn/docs/user/demos/routing-rule.html | 2 +-
zh-cn/docs/user/demos/routing-rule.json | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/COMMIT_ID b/COMMIT_ID
index 09142e2..2b1256c 100644
--- a/COMMIT_ID
+++ b/COMMIT_ID
@@ -1 +1 @@
-c7cbfe57c2361f27d53a74f133232fedc3e594b7
+cf9f34c23340c5396a2f0821a381ee586553d0d5
diff --git a/en-us/docs/dev/impls/protocol.html b/en-us/docs/dev/impls/protocol.html
index 9ae90a4..8054464 100644
--- a/en-us/docs/dev/impls/protocol.html
+++ b/en-us/docs/dev/impls/protocol.html
@@ -71,11 +71,11 @@
</code></pre>
<h2>Existing Protocol</h2>
<ul>
-<li><code>org.apache.dubbo.rpc.injvm.InjvmProtocol</code></li>
-<li><code>org.apache.dubbo.rpc.dubbo.DubboProtocol</code></li>
-<li><code>org.apache.dubbo.rpc.rmi.RmiProtocol</code></li>
-<li><code>org.apache.dubbo.rpc.http.HttpProtocol</code></li>
-<li><code>org.apache.dubbo.rpc.http.hessian.HessianProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.injvm.InjvmProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.rmi.RmiProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.http.HttpProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.http.hessian.HessianProtocol</code></li>
</ul>
<h2>Extension Guide</h2>
<p>Directory layout:</p>
diff --git a/en-us/docs/dev/impls/protocol.json b/en-us/docs/dev/impls/protocol.json
index ddd1407..4c90d29 100644
--- a/en-us/docs/dev/impls/protocol.json
+++ b/en-us/docs/dev/impls/protocol.json
@@ -1,6 +1,6 @@
{
"filename": "protocol.md",
- "__html": "<h1>Protocol Extension</h1>\n<h2>Summary</h2>\n<p>Extension to RPC protocol, hide details of remote call.</p>\n<p>Contract:</p>\n<ul>\n<li>When user calls <code>invoke()</code> method of <code>Invoker</code> object which's returned from <code>refer()</code> call, the protocol needs to correspondingly execute <code>invoke()</code> method of <code>Invoker</code> object passed from remote <code>export()</code> method associated with the same URL.</li>\n<li>Moreover, it's protoc [...]
+ "__html": "<h1>Protocol Extension</h1>\n<h2>Summary</h2>\n<p>Extension to RPC protocol, hide details of remote call.</p>\n<p>Contract:</p>\n<ul>\n<li>When user calls <code>invoke()</code> method of <code>Invoker</code> object which's returned from <code>refer()</code> call, the protocol needs to correspondingly execute <code>invoke()</code> method of <code>Invoker</code> object passed from remote <code>export()</code> method associated with the same URL.</li>\n<li>Moreover, it's protoc [...]
"link": "/en-us/docs/dev/impls/protocol.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/impls/protocol.html b/zh-cn/docs/dev/impls/protocol.html
index 4550e53..5691796 100644
--- a/zh-cn/docs/dev/impls/protocol.html
+++ b/zh-cn/docs/dev/impls/protocol.html
@@ -71,11 +71,11 @@
</code></pre>
<h2>已知扩展</h2>
<ul>
-<li><code>org.apache.dubbo.rpc.injvm.InjvmProtocol</code></li>
-<li><code>org.apache.dubbo.rpc.dubbo.DubboProtocol</code></li>
-<li><code>org.apache.dubbo.rpc.rmi.RmiProtocol</code></li>
-<li><code>org.apache.dubbo.rpc.http.HttpProtocol</code></li>
-<li><code>org.apache.dubbo.rpc.http.hessian.HessianProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.injvm.InjvmProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.rmi.RmiProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.http.HttpProtocol</code></li>
+<li><code>org.apache.dubbo.rpc.protocol.http.hessian.HessianProtocol</code></li>
</ul>
<h2>扩展示例</h2>
<p>Maven项目结构：</p>
diff --git a/zh-cn/docs/dev/impls/protocol.json b/zh-cn/docs/dev/impls/protocol.json
index 4349d20..1164728 100644
--- a/zh-cn/docs/dev/impls/protocol.json
+++ b/zh-cn/docs/dev/impls/protocol.json
@@ -1,6 +1,6 @@
{
"filename": "protocol.md",
- "__html": "<h1>协议扩展</h1>\n<h2>扩展说明</h2>\n<p>RPC 协议扩展，封装远程调用细节。</p>\n<p>契约：</p>\n<ul>\n<li>当用户调用 <code>refer()</code> 所返回的 <code>Invoker</code> 对象的 <code>invoke()</code> 方法时，协议需相应执行同 URL 远端 <code>export()</code> 传入的 <code>Invoker</code> 对象的 <code>invoke()</code> 方法。</li>\n<li>其中，<code>refer()</code> 返回的 <code>Invoker</code> 由协议实现，协议通常需要在此 <code>Invoker</code> 中发送远程请求，<code>export()</code> 传入的 <code>Invoker</code> 由框架实现并传入，协议不需要关心。</li>\n</ul>\n<p>注意：</p>\n<ul>\n<li>协议不关心业务接口的透明代理，以 <cod [...]
+ "__html": "<h1>协议扩展</h1>\n<h2>扩展说明</h2>\n<p>RPC 协议扩展，封装远程调用细节。</p>\n<p>契约：</p>\n<ul>\n<li>当用户调用 <code>refer()</code> 所返回的 <code>Invoker</code> 对象的 <code>invoke()</code> 方法时，协议需相应执行同 URL 远端 <code>export()</code> 传入的 <code>Invoker</code> 对象的 <code>invoke()</code> 方法。</li>\n<li>其中，<code>refer()</code> 返回的 <code>Invoker</code> 由协议实现，协议通常需要在此 <code>Invoker</code> 中发送远程请求，<code>export()</code> 传入的 <code>Invoker</code> 由框架实现并传入，协议不需要关心。</li>\n</ul>\n<p>注意：</p>\n<ul>\n<li>协议不关心业务接口的透明代理，以 <cod [...]
"link": "/zh-cn/docs/dev/impls/protocol.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/user/demos/routing-rule.html b/zh-cn/docs/user/demos/routing-rule.html
index 2e55ba5..66a1628 100644
--- a/zh-cn/docs/user/demos/routing-rule.html
+++ b/zh-cn/docs/user/demos/routing-rule.html
@@ -221,7 +221,7 @@ application != bops => host = 172.22.3.94,172.22.3.95,172.22.3.96
<h4>降级约定</h4>
<ol>
<li>
-<p><code>request.tag=tag1</code> 时优先选择 标记了<code>tag=tag1</code> 的 provider。若集群中不存在与请求标记对应的服务，默认将降级请求 tag为空的provider；如果要该表这种默认行为，即找不到匹配tag1的provider返回异常，需设置<code>request.tag.force=true</code>。</p>
+<p><code>request.tag=tag1</code> 时优先选择 标记了<code>tag=tag1</code> 的 provider。若集群中不存在与请求标记对应的服务，默认将降级请求 tag为空的provider；如果要改变这种默认行为，即找不到匹配tag1的provider返回异常，需设置<code>request.tag.force=true</code>。</p>
</li>
<li>
<p><code>request.tag</code>未设置时，只会匹配tag为空的provider。即使集群中存在可用的服务，若 tag 不匹配也就无法调用，这与约定1不同，携带标签的请求可以降级访问到无标签的服务，但不携带标签/携带其他种类标签的请求永远无法访问到其他标签的服务。</p>
diff --git a/zh-cn/docs/user/demos/routing-rule.json b/zh-cn/docs/user/demos/routing-rule.json
index 0738cb1..67d0d59 100644
--- a/zh-cn/docs/user/demos/routing-rule.json
+++ b/zh-cn/docs/user/demos/routing-rule.json
@@ -1,6 +1,6 @@
{
"filename": "routing-rule.md",
- "__html": "<h1>路由规则</h1>\n<p>在此查看<a href=\"./routing-rule-deprecated.md\">老版本路由规则(2.6.x or before)</a></p>\n<p>路由规则在发起一次RPC调用前起到过滤目标服务器地址的作用，过滤后的地址列表，将作为消费端最终发起RPC调用的备选地址。</p>\n<ul>\n<li>条件路由。支持以服务或Consumer应用为粒度配置路由规则。</li>\n<li>标签路由。以Provider应用为粒度配置路由规则。</li>\n</ul>\n<p>后续我们计划在2.6.x版本的基础上继续增强脚本路由功能，老版本脚本路由规则配置方式请参见开篇链接。</p>\n<h2>条件路由</h2>\n<p>您可以随时在服务治理控制台<a href=\"https://github.com/apache/dubbo-admin\">Dubbo-Admin</a>写入路由规则</p>\n<h3>简介</h3>\n<ul>\n<li>\n<p>应用粒度</p>\n<pre><code class [...]
+ "__html": "<h1>路由规则</h1>\n<p>在此查看<a href=\"./routing-rule-deprecated.md\">老版本路由规则(2.6.x or before)</a></p>\n<p>路由规则在发起一次RPC调用前起到过滤目标服务器地址的作用，过滤后的地址列表，将作为消费端最终发起RPC调用的备选地址。</p>\n<ul>\n<li>条件路由。支持以服务或Consumer应用为粒度配置路由规则。</li>\n<li>标签路由。以Provider应用为粒度配置路由规则。</li>\n</ul>\n<p>后续我们计划在2.6.x版本的基础上继续增强脚本路由功能，老版本脚本路由规则配置方式请参见开篇链接。</p>\n<h2>条件路由</h2>\n<p>您可以随时在服务治理控制台<a href=\"https://github.com/apache/dubbo-admin\">Dubbo-Admin</a>写入路由规则</p>\n<h3>简介</h3>\n<ul>\n<li>\n<p>应用粒度</p>\n<pre><code class [...]
"link": "/zh-cn/docs/user/demos/routing-rule.html",
"meta": {}
}
\ No newline at end of file