You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/12/09 04:20:53 UTC
[servicecomb-website] 02/02: Published the website
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
commit 946aab9d7ae9a1d8a97be45de4d067c9f52e8953
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Mon Dec 9 12:20:16 2019 +0800
Published the website
---
.../developers/release-validation-guide/index.html | 12 +-
.../setup-develop-environment/index.html | 2 +-
content/cn/developers/submit-codes/index.html | 2 +-
content/cn/developers/submit-issues/index.html | 2 +-
.../cn/developers/subscribe-mail-list/index.html | 2 +-
content/cn/developers/use-gitter/index.html | 2 +-
content/cn/developers/use-jira/index.html | 2 +-
content/cn/docs/autoscale-on-company/index.html | 2 +-
content/cn/docs/company-on-kubernetes/index.html | 20 +-
.../cn/docs/config_center_integration/index.html | 14 +-
content/cn/docs/consul-servicemesh.html | 20 +-
content/cn/docs/crm-part-I/index.html | 212 +++++++--------
.../customized-tracing-with-servicecomb/index.html | 12 +-
.../index.html | 64 ++---
content/cn/docs/getting-started/index.html | 2 +-
.../how-to-do-microservice-accept-test/index.html | 34 +--
content/cn/docs/linuxcon-workshop-demo/index.html | 188 ++++++-------
content/cn/docs/loadtest-saga-with-kubernetes.html | 2 +-
.../index.html | 2 +-
.../mesher-distributed-tracing}/index.html | 2 +-
.../mesher-flow-control}/index.html | 6 +-
.../mesher-load-balance}/index.html | 2 +-
.../mesher-service-management}/index.html | 20 +-
.../index.html | 18 +-
content/cn/docs/open-design/index.html | 30 +-
.../index.html | 4 +-
.../quick-start-advance/flow-control/index.html | 2 +-
.../service-management/index.html | 2 +-
content/cn/docs/quick-start-bmi/index.html | 18 +-
.../cn/docs/quick-start-dataconsistency/index.html | 128 ++++-----
content/cn/docs/quick-start/index.html | 14 +-
content/cn/docs/release-note-1-0-0.html | 6 +-
content/cn/docs/saga_pack_design/index.html | 10 +-
content/cn/docs/saga_with_cucumber/index.html | 36 +--
.../index.html | 4 +-
.../cn/docs/servicecomb-pack-cluster/index.html | 60 ++--
content/cn/docs/servicecomb-pack-consul/index.html | 24 +-
content/cn/docs/servicecomb-pack-eureka/index.html | 2 +-
.../servicecomb-springcloud-zuul-demo/index.html | 20 +-
.../index.html | 2 +-
.../cn/docs/syncer/multi-servicecenters/index.html | 8 +-
content/cn/docs/toolkit/oas-validator/index.html | 6 +-
content/cn/docs/toolkit/quick-start/index.html | 2 +-
.../index.html | 4 +-
.../docs/users/application-boot-process/index.html | 2 +-
.../cn/docs/users/communicate-protocol/index.html | 12 +-
.../cn/docs/users/customized-tracing/index.html | 18 +-
.../cn/docs/users/develop-with-jax-rs/index.html | 16 +-
.../users/develop-with-rest-template/index.html | 26 +-
content/cn/docs/users/develop-with-rpc/index.html | 26 +-
.../develop-with-spring-boot-starter/index.html | 16 +-
.../docs/users/develop-with-springmvc/index.html | 18 +-
.../users/develop-with-transparent-rpc/index.html | 24 +-
.../cn/docs/users/distributed-tracing/index.html | 2 +-
content/cn/docs/users/dynamic-config/index.html | 16 +-
content/cn/docs/users/edge-in-1.0.0-m1/index.html | 12 +-
.../cn/docs/users/edging-service/nginx/index.html | 12 +-
.../cn/docs/users/edging-service/zuul/index.html | 8 +-
content/cn/docs/users/healthcheck/index.html | 18 +-
content/cn/docs/users/invoke-control/index.html | 2 +-
.../cn/docs/users/local-develop-test/index.html | 8 +-
.../index.html | 12 +-
content/cn/docs/users/metrics-in-0.5.0/index.html | 8 +-
.../cn/docs/users/metrics-in-1.0.0-m1/index.html | 52 ++--
.../index.html | 2 +-
.../index.html | 6 +-
content/cn/docs/users/run-mode/index.html | 6 +-
.../docs/users/service-configurations/index.html | 8 +-
content/cn/docs/users/service-contract/index.html | 2 +-
.../cn/docs/users/service-definition/index.html | 2 +-
content/cn/docs/users/service-heartbeat/index.html | 8 +-
.../users/service-interface-constraints/index.html | 18 +-
content/cn/docs/users/setup-environment/index.html | 46 ++--
.../cn/docs/users/use-service-contract/index.html | 2 +-
content/cn/docs/users/use-tls/index.html | 2 +-
content/cn/faqs/faqs-huawei-cloud/index.html | 2 +-
content/cn/faqs/index.html | 40 +--
content/cn/release/mesher-release-notes/index.html | 2 +-
.../developers/release-validation-guide/index.html | 12 +-
content/developers/submit-codes/index.html | 2 +-
content/developers/use-jira/index.html | 2 +-
content/docs/autoscale-on-company/index.html | 2 +-
content/docs/company-on-kubernetes/index.html | 20 +-
content/docs/howto-upgrade-topzipkin2/index.html | 60 ++--
content/docs/linuxcon-workshop-demo/index.html | 188 ++++++-------
.../index.html | 2 +-
.../mesher-distributed-tracing}/index.html | 2 +-
.../mesher-flow-control}/index.html | 6 +-
.../mesher-load-balance}/index.html | 2 +-
.../mesher-service-management}/index.html | 14 +-
.../index.html | 18 +-
.../quick-start-advance/flow-control/index.html | 2 +-
.../service-management/index.html | 2 +-
content/docs/quick-start-bmi/index.html | 18 +-
.../docs/quick-start-dataconsistency/index.html | 128 ++++-----
content/docs/quick-start/index.html | 12 +-
content/docs/release-note-1-0-0/index.html | 6 +-
.../index.html | 4 +-
content/docs/servicecomb-pack-cluster/index.html | 60 ++--
content/docs/servicecomb-pack-consul/index.html | 24 +-
content/docs/servicecomb-pack-eureka/index.html | 2 +-
.../index.html | 2 +-
.../docs/syncer/multi-servicecenters/index.html | 8 +-
content/docs/toolkit/oas-validator/index.html | 6 +-
content/docs/toolkit/quick-start/index.html | 2 +-
.../docs/users/application-boot-process/index.html | 2 +-
content/docs/users/communicate-protocol/index.html | 12 +-
content/docs/users/customized-tracing/index.html | 18 +-
content/docs/users/develop-with-jax-rs/index.html | 16 +-
.../users/develop-with-rest-template/index.html | 26 +-
content/docs/users/develop-with-rpc/index.html | 26 +-
.../develop-with-spring-boot-starter/index.html | 16 +-
.../docs/users/develop-with-springmvc/index.html | 18 +-
.../users/develop-with-transparent-rpc/index.html | 24 +-
content/docs/users/distributed-tracing/index.html | 2 +-
content/docs/users/dynamic-config/index.html | 16 +-
content/docs/users/edge-in-1.0.0-m1/index.html | 12 +-
content/docs/users/edging-service/nginx/index.html | 12 +-
content/docs/users/edging-service/zuul/index.html | 8 +-
content/docs/users/faq/index.html | 2 +-
content/docs/users/healthcheck/index.html | 18 +-
content/docs/users/invoke-control/index.html | 2 +-
content/docs/users/local-develop-test/index.html | 8 +-
.../index.html | 14 +-
content/docs/users/metrics-in-1.0.0-m1/index.html | 52 ++--
.../index.html | 2 +-
content/docs/users/run-mode/index.html | 6 +-
.../docs/users/service-configurations/index.html | 8 +-
content/docs/users/service-contract/index.html | 2 +-
content/docs/users/service-definition/index.html | 2 +-
content/docs/users/service-heartbeat/index.html | 8 +-
.../users/service-interface-constraints/index.html | 18 +-
content/docs/users/setup-environment/index.html | 46 ++--
content/docs/users/use-service-contract/index.html | 2 +-
content/docs/users/use-tls/index.html | 2 +-
content/faqs/index.html | 2 +-
content/feed.xml | 249 +++++++++--------
content/release/index.html | 32 +--
content/release/mesher-release-notes/index.html | 2 +-
content/sitemap.xml | 302 ++++++++++-----------
140 files changed, 1536 insertions(+), 1537 deletions(-)
diff --git a/content/cn/developers/release-validation-guide/index.html b/content/cn/developers/release-validation-guide/index.html
index 2102885..9434567 100644
--- a/content/cn/developers/release-validation-guide/index.html
+++ b/content/cn/developers/release-validation-guide/index.html
@@ -533,7 +533,7 @@
<p>验证Hash：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>sha512sum <span class="nt">-c</span> xxx-src.zip.sha512
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">sha512sum</span> <span class="nt">-c</span> xxx-src.zip.sha512
</code></pre></div></div>
<p>提示<code class="highlighter-rouge">OK</code>代表Hash正确。</p>
@@ -546,12 +546,12 @@
<p>使用<code class="highlighter-rouge">cd</code>命令切换到解压出来的源代码根目录下，执行：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean install <span class="nt">-Pdocker</span> <span class="nt">-Pit</span>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span> <span class="nt">-Pit</span>
</code></pre></div></div>
<blockquote>
<p>提示：如果如果验证环境操作系统是Windows：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean install <span class="nt">-Pdocker</span> <span class="nt">-Pit</span> <span class="nt">-Pdocker-machine</span>
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span> <span class="nt">-Pit</span> <span class="nt">-Pdocker-machine</span>
</code></pre></div> </div>
</blockquote>
@@ -560,7 +560,7 @@
<h3 id="验证staging-repository内的库正确">验证Staging Repository内的库正确</h3>
<p>首先删除本地Repo中ServiceComb的全部缓存：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>rm <span class="nt">-rf</span> /root/.m2/repository/org/apache/servicecomb/
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">rm</span> <span class="nt">-rf</span> /root/.m2/repository/org/apache/servicecomb/
</code></pre></div></div>
<blockquote>
@@ -605,12 +605,12 @@
<p>一切就绪后，使用<code class="highlighter-rouge">cd</code>命令切换到<strong>源代码demo目录(注意不是根目录)下</strong>，执行：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean install <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span>
</code></pre></div></div>
<blockquote>
<p>提示：如果如果验证环境操作系统是Windows：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean install <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span> <span class="nt">-Pdocker-machine</span>
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span> <span class="nt">-Pdocker-machine</span>
</code></pre></div> </div>
</blockquote>
diff --git a/content/cn/developers/setup-develop-environment/index.html b/content/cn/developers/setup-develop-environment/index.html
index a663b4b..d8df308 100644
--- a/content/cn/developers/setup-develop-environment/index.html
+++ b/content/cn/developers/setup-develop-environment/index.html
@@ -488,7 +488,7 @@
<li><strong>JDK 1.8</strong>，安装详情可参考<a href="https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html" target="_blank">JDK安装教程</a></li>
<li><strong>Maven 3.x</strong>，安装详情可参考<a href="https://maven.apache.org/install.html" target="_blank">Maven安装教程</a></li>
<li><strong>Docker</strong>，安装详情可参考<a href="https://docs.docker.com/engine/installation/" target="_blank">Docker 安装教程</a></li>
- <li><strong>Service Center</strong>, 安装详情可参考<a href="/cn/users/setup-environment/#运行service-center">Service Center安装教程</a></li>
+ <li><strong>Service Center</strong>, 安装详情可参考<a href="/cn/docs/service-center/install/">Service Center安装教程</a></li>
<li><strong>IntelliJ Idea IDE</strong>(可选，您可以使用其他心仪的IDE，如eclipse)，安装详情可参考<a href="https://www.jetbrains.com/help/idea/installing-and-launching.html" target="_blank">IntelliJ安装教程</a></li>
</ul>
diff --git a/content/cn/developers/submit-codes/index.html b/content/cn/developers/submit-codes/index.html
index e0debbf..f98d4a5 100644
--- a/content/cn/developers/submit-codes/index.html
+++ b/content/cn/developers/submit-codes/index.html
@@ -451,7 +451,7 @@
<meta itemprop="headline" content="代码提交指南">
<meta itemprop="description" content="介绍如何向 ServiceComb 项目提交代码">
- <meta itemprop="dateModified" content="September 10, 2017">
+ <meta itemprop="dateModified" content="September 08, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/developers/submit-issues/index.html b/content/cn/developers/submit-issues/index.html
index 73541e3..9d581d0 100644
--- a/content/cn/developers/submit-issues/index.html
+++ b/content/cn/developers/submit-issues/index.html
@@ -451,7 +451,7 @@
<meta itemprop="headline" content="发现问题">
<meta itemprop="description" content="介绍如何向 ServiceComb 项目提交issue">
- <meta itemprop="dateModified" content="March 14, 2019">
+ <meta itemprop="dateModified" content="March 13, 2019">
<div class="page__inner-wrap">
diff --git a/content/cn/developers/subscribe-mail-list/index.html b/content/cn/developers/subscribe-mail-list/index.html
index 69985a9..7d62501 100644
--- a/content/cn/developers/subscribe-mail-list/index.html
+++ b/content/cn/developers/subscribe-mail-list/index.html
@@ -451,7 +451,7 @@
<meta itemprop="headline" content="如何订阅Apache ServiceComb的邮件列表">
<meta itemprop="description" content="如何订阅Apache ServiceComb的邮件列表">
- <meta itemprop="dateModified" content="September 10, 2017">
+ <meta itemprop="dateModified" content="September 08, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/developers/use-gitter/index.html b/content/cn/developers/use-gitter/index.html
index faad460..cccc562 100644
--- a/content/cn/developers/use-gitter/index.html
+++ b/content/cn/developers/use-gitter/index.html
@@ -451,7 +451,7 @@
<meta itemprop="headline" content="Gitter 使用指南">
<meta itemprop="description" content="介绍如何使用Gitter参与到ServiceComb开源开发">
- <meta itemprop="dateModified" content="March 01, 2018">
+ <meta itemprop="dateModified" content="February 28, 2018">
<div class="page__inner-wrap">
diff --git a/content/cn/developers/use-jira/index.html b/content/cn/developers/use-jira/index.html
index 4dcf889..6bd492c 100644
--- a/content/cn/developers/use-jira/index.html
+++ b/content/cn/developers/use-jira/index.html
@@ -451,7 +451,7 @@
<meta itemprop="headline" content="JIRA使用指南">
<meta itemprop="description" content="介绍 ServiceComb 如何使用JIRA">
- <meta itemprop="dateModified" content="March 01, 2018">
+ <meta itemprop="dateModified" content="February 28, 2018">
<div class="page__inner-wrap">
diff --git a/content/cn/docs/autoscale-on-company/index.html b/content/cn/docs/autoscale-on-company/index.html
index ff9c3e7..d77840b 100644
--- a/content/cn/docs/autoscale-on-company/index.html
+++ b/content/cn/docs/autoscale-on-company/index.html
@@ -415,7 +415,7 @@
</code></pre></div></div>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">spec</span><span class="pi">:</span>
- <span class="na">replicas</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">replicas</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">template</span><span class="pi">:</span>
<span class="na">metadata</span><span class="pi">:</span>
<span class="na">labels</span><span class="pi">:</span>
diff --git a/content/cn/docs/company-on-kubernetes/index.html b/content/cn/docs/company-on-kubernetes/index.html
index ae89afb..6c78c19 100644
--- a/content/cn/docs/company-on-kubernetes/index.html
+++ b/content/cn/docs/company-on-kubernetes/index.html
@@ -453,9 +453,9 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<span class="s">spec</span><span class="pi">:</span>
<span class="na">ports</span><span class="pi">:</span>
<span class="err"> </span><span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">30100"</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">30100</span>
- <span class="na">targetPort</span><span class="pi">:</span> <span class="s">30100</span>
- <span class="s">selector</span><span class="pi">:</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">30100</span>
+ <span class="na">targetPort</span><span class="pi">:</span> <span class="m">30100</span>
+ <span class="na">selector</span><span class="pi">:</span>
<span class="s">io.kompose.service</span><span class="pi">:</span> <span class="s">company-bulletin-board</span>
<span class="na">status</span><span class="pi">:</span>
<span class="na">loadBalancer</span><span class="pi">:</span> <span class="pi">{}</span>
@@ -475,7 +475,7 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<span class="err"> </span><span class="s">io.kompose.service</span><span class="pi">:</span> <span class="s">company-worker</span>
<span class="s">name</span><span class="pi">:</span> <span class="s">company-worker</span>
<span class="na">spec</span><span class="pi">:</span>
- <span class="na">replicas</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">replicas</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">strategy</span><span class="pi">:</span> <span class="pi">{}</span>
<span class="na">template</span><span class="pi">:</span>
<span class="err"> </span><span class="na">metadata</span><span class="pi">:</span>
@@ -492,8 +492,8 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<span class="na">image</span><span class="pi">:</span> <span class="s">servicecomb/worker:0.0.1-SNAPSHOT</span>
<span class="na">name</span><span class="pi">:</span> <span class="s">company-worker</span>
<span class="na">ports</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">containerPort</span><span class="pi">:</span> <span class="s">7070</span>
- <span class="pi">-</span> <span class="na">containerPort</span><span class="pi">:</span> <span class="s">8080</span>
+ <span class="pi">-</span> <span class="na">containerPort</span><span class="pi">:</span> <span class="m">7070</span>
+ <span class="pi">-</span> <span class="na">containerPort</span><span class="pi">:</span> <span class="m">8080</span>
<span class="na">resources</span><span class="pi">:</span> <span class="pi">{}</span>
<span class="na">restartPolicy</span><span class="pi">:</span> <span class="s">Always</span>
<span class="na">status</span><span class="pi">:</span> <span class="pi">{}</span>
@@ -508,10 +508,10 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">spec</span><span class="pi">:</span>
<span class="na">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">8083"</span>
-<span class="err"> </span><span class="na">port</span><span class="pi">:</span> <span class="s">8083</span>
- <span class="err"> </span><span class="s">targetPort</span><span class="pi">:</span> <span class="s">8080</span>
- <span class="err"> </span><span class="s">nodePort</span><span class="pi">:</span> <span class="s">30301</span>
- <span class="err"> </span><span class="s">protocol</span><span class="pi">:</span> <span class="s">TCP</span>
+<span class="err"> </span><span class="na">port</span><span class="pi">:</span> <span class="m">8083</span>
+<span class="err"> </span><span class="na">targetPort</span><span class="pi">:</span> <span class="m">8080</span>
+<span class="err"> </span><span class="na">nodePort</span><span class="pi">:</span> <span class="m">30301</span>
+<span class="err"> </span><span class="na">protocol</span><span class="pi">:</span> <span class="s">TCP</span>
<span class="s">type</span><span class="pi">:</span> <span class="s">NodePort</span>
</code></pre></div></div>
diff --git a/content/cn/docs/config_center_integration/index.html b/content/cn/docs/config_center_integration/index.html
index 56463ed..c650b34 100644
--- a/content/cn/docs/config_center_integration/index.html
+++ b/content/cn/docs/config_center_integration/index.html
@@ -399,11 +399,11 @@
<p>项目代码中经常会用到各种配置项，比如下面的代码中是从系统环境变量中获取<code class="highlighter-rouge">prop</code> :</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">prop</span> <span class="o">=</span> <span class="n">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="n">myProperty</span><span class="o">);</span>
-<span class="kt">int</span> <span class="n">x</span> <span class="o">=</span> <span class="n">DEFAULT_VALUE</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">String</span> <span class="n">prop</span> <span class="o">=</span> <span class="nc">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="n">myProperty</span><span class="o">);</span>
+<span class="kt">int</span> <span class="n">x</span> <span class="o">=</span> <span class="no">DEFAULT_VALUE</span><span class="o">;</span>
<span class="k">try</span> <span class="o">{</span>
- <span class="n">x</span> <span class="o">=</span> <span class="n">Integer</span><span class="o">.</span><span class="na">parseInt</span><span class="o">(</span><span class="n">prop</span><span class="o">);</span>
-<span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">NumberFormatException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+ <span class="n">x</span> <span class="o">=</span> <span class="nc">Integer</span><span class="o">.</span><span class="na">parseInt</span><span class="o">(</span><span class="n">prop</span><span class="o">);</span>
+<span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">NumberFormatException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
<span class="c1">// handle format issues</span>
<span class="o">}</span>
<span class="n">myMethod</span><span class="o">(</span><span class="n">x</span><span class="o">);</span>
@@ -623,11 +623,11 @@
<p>init函数实现固定时间间隔或实时获取配置中心的配置项逻辑。<code class="highlighter-rouge">ApolloClient</code>中<code class="highlighter-rouge">refreshApolloConfig</code>函数启动了一个定时执行的线程刷新配置项：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kt">void</span> <span class="nf">refreshApolloConfig</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">EXECUTOR</span>
- <span class="o">.</span><span class="na">scheduleWithFixedDelay</span><span class="o">(</span><span class="k">new</span> <span class="n">ConfigRefresh</span><span class="o">(</span><span class="n">serviceUri</span><span class="o">),</span>
+ <span class="no">EXECUTOR</span>
+ <span class="o">.</span><span class="na">scheduleWithFixedDelay</span><span class="o">(</span><span class="k">new</span> <span class="nc">ConfigRefresh</span><span class="o">(</span><span class="n">serviceUri</span><span class="o">),</span>
<span class="n">firstRefreshInterval</span><span class="o">,</span>
<span class="n">refreshInterval</span><span class="o">,</span>
- <span class="n">TimeUnit</span><span class="o">.</span><span class="na">SECONDS</span><span class="o">);</span>
+ <span class="nc">TimeUnit</span><span class="o">.</span><span class="na">SECONDS</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/cn/docs/consul-servicemesh.html b/content/cn/docs/consul-servicemesh.html
index 70d28aa..dbb2b76 100644
--- a/content/cn/docs/consul-servicemesh.html
+++ b/content/cn/docs/consul-servicemesh.html
@@ -445,10 +445,10 @@ nodeB<span class="nv">$ </span>dev
<p>Consul 1.2新增了Connect功能，只需要在服务中增加一个<code class="highlighter-rouge">connect</code>配置，即可为该服务启动一个代理：</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"service"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"webfront"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"connect"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"proxy"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
+ </span><span class="nl">"service"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"webfront"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"connect"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"proxy"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
@@ -487,12 +487,12 @@ nodeB<span class="nv">$ </span>dev
<p>没错！其实，在Consul1.2中，Connect已经可以通过指定一个可执行文件的路径来启动第三方代理了。Consul会以daemon模式启动第三方代理，在后台运行：</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"service"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"webfront"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"connect"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"proxy"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"exec_mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"daemon"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"command"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"/usr/bin/my-proxy"</span><span class="p">,</span><span class="w"> </span><span class="s2">"--listen"</span><span class="p">,</span><span class="w"> </span><span class="s2">"8800"</span><span class="p">]</span><span class="w">
+ </span><span class="nl">"service"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"webfront"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"connect"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"proxy"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"exec_mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"daemon"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"command"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"/usr/bin/my-proxy"</span><span class="p">,</span><span class="w"> </span><span class="s2">"--listen"</span><span class="p">,</span><span class="w"> </span><span class="s2">"8800"</span><span class="p">]</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
diff --git a/content/cn/docs/crm-part-I/index.html b/content/cn/docs/crm-part-I/index.html
index 54b58ef..ffd1cd5 100644
--- a/content/cn/docs/crm-part-I/index.html
+++ b/content/cn/docs/crm-part-I/index.html
@@ -541,8 +541,8 @@
</ol>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"typ"</span><span class="p">:</span><span class="w"> </span><span class="s2">"JWT"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"alg"</span><span class="p">:</span><span class="w"> </span><span class="s2">"HS256"</span><span class="w">
+ </span><span class="nl">"typ"</span><span class="p">:</span><span class="w"> </span><span class="s2">"JWT"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"alg"</span><span class="p">:</span><span class="w"> </span><span class="s2">"HS256"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
@@ -551,9 +551,9 @@
</ol>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"sub"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1234567890"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"YangYong Zheng"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"iat"</span><span class="p">:</span><span class="w"> </span><span class="mi">1516239022</span><span class="w">
+ </span><span class="nl">"sub"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1234567890"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"YangYong Zheng"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"iat"</span><span class="p">:</span><span class="w"> </span><span class="mi">1516239022</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
@@ -604,30 +604,30 @@
<span class="nd">@Table</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"T_User"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">UserEntity</span> <span class="o">{</span>
<span class="nd">@Id</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="n">name</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="n">name</span><span class="o">;</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="n">password</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="n">password</span><span class="o">;</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setName</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setName</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">name</span> <span class="o">=</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">getPassword</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">getPassword</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">password</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setPassword</span><span class="o">(</span><span class="n">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setPassword</span><span class="o">(</span><span class="nc">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">password</span> <span class="o">=</span> <span class="n">password</span><span class="o">;</span>
<span class="o">}</span>
<span class="kd">public</span> <span class="nf">UserEntity</span><span class="o">()</span> <span class="o">{</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="nf">UserEntity</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">,</span> <span class="n">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">UserEntity</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">,</span> <span class="nc">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">name</span> <span class="o">=</span> <span class="n">name</span><span class="o">;</span>
<span class="k">this</span><span class="o">.</span><span class="na">password</span> <span class="o">=</span> <span class="n">password</span><span class="o">;</span>
<span class="o">}</span>
@@ -640,8 +640,8 @@
<p>我们继承JPA的PagingAndSortingRepository来实现ORM操作</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Repository</span>
-<span class="kd">public</span> <span class="kd">interface</span> <span class="nc">UserRepository</span> <span class="kd">extends</span> <span class="n">PagingAndSortingRepository</span><span class="o"><</span><span class="n">UserEntity</span><span class="o">,</span> <span class="n">Long</span><span class="o">></span> <span class="o">{</span>
- <span class="n">UserEntity</span> <span class="nf">findByName</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kd">interface</span> <span class="nc">UserRepository</span> <span class="kd">extends</span> <span class="nc">PagingAndSortingRepository</span><span class="o"><</span><span class="nc">UserEntity</span><span class="o">,</span> <span class="nc">Long</span><span class="o">></span> <span class="o">{</span>
+ <span class="nc">UserEntity</span> <span class="nf">findByName</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -663,9 +663,9 @@
<h6 id="定义jwt接口">定义JWT接口</h6>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">TokenStore</span> <span class="o">{</span>
- <span class="n">String</span> <span class="nf">generate</span><span class="o">(</span><span class="n">String</span> <span class="n">userName</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">generate</span><span class="o">(</span><span class="nc">String</span> <span class="n">userName</span><span class="o">);</span>
- <span class="kt">boolean</span> <span class="nf">validate</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">);</span>
+ <span class="kt">boolean</span> <span class="nf">validate</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -676,10 +676,10 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Component</span>
<span class="nd">@Component</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">JwtTokenStore</span> <span class="kd">implements</span> <span class="n">TokenStore</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">LOGGER</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">JwtTokenStore</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">JwtTokenStore</span> <span class="kd">implements</span> <span class="nc">TokenStore</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="no">LOGGER</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">JwtTokenStore</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">secretKey</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">String</span> <span class="n">secretKey</span><span class="o">;</span>
<span class="kd">private</span> <span class="kd">final</span> <span class="kt">int</span> <span class="n">secondsToExpire</span><span class="o">;</span>
@@ -688,25 +688,25 @@
<span class="k">this</span><span class="o">.</span><span class="na">secondsToExpire</span> <span class="o">=</span> <span class="mi">60</span> <span class="o">*</span> <span class="mi">60</span> <span class="o">*</span> <span class="mi">24</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="nf">JwtTokenStore</span><span class="o">(</span><span class="n">String</span> <span class="n">secretKey</span><span class="o">,</span> <span class="kt">int</span> <span class="n">secondsToExpire</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">JwtTokenStore</span><span class="o">(</span><span class="nc">String</span> <span class="n">secretKey</span><span class="o">,</span> <span class="kt">int</span> <span class="n">secondsToExpire</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">secretKey</span> <span class="o">=</span> <span class="n">secretKey</span><span class="o">;</span>
<span class="k">this</span><span class="o">.</span><span class="na">secondsToExpire</span> <span class="o">=</span> <span class="n">secondsToExpire</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">generate</span><span class="o">(</span><span class="n">String</span> <span class="n">userName</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">Jwts</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">setSubject</span><span class="o">(</span><span class="n">userName</span><span class="o">)</span>
- <span class="o">.</span><span class="na">setExpiration</span><span class="o">(</span><span class="n">Date</span><span class="o">.</span><span class="na">from</span><span class="o">(</span><span class="n">ZonedDateTime</span><span class="o">.</span><span class="na">now</span><span class="o">().</span><span class="na">plusSeconds</span><span class="o">(</span><span class="n">secondsToExpire</span><span class="o">).</span><span class="na">toInstant</span><span class="o">()))</span>
- <span class="o">.</span><span class="na">signWith</span><span class="o">(</span><span class="n">HS512</span><span class="o">,</span> <span class="n">secretKey</span><span class="o">).</span><span class="na">compact</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">generate</span><span class="o">(</span><span class="nc">String</span> <span class="n">userName</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="nc">Jwts</span><span class="o">.</span><span class="na">builder</span><span class="o">().</span><span class="na">setSubject</span><span class="o">(</span><span class="n">userName</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">setExpiration</span><span class="o">(</span><span class="nc">Date</span><span class="o">.</span><span class="na">from</span><span class="o">(</span><span class="nc">ZonedDateTime</span><span class="o">.</span><span class="na">now</span><span class="o">().</span><span class="na">plusSeconds</span><span class="o">(</span><span class="n">secondsToExpire</span><span class="o">).</span><span class="na">toInstant</span><span class="o">()))</span>
+ <span class="o">.</span><span class="na">signWith</span><span class="o">(</span><span class="no">HS512</span><span class="o">,</span> <span class="n">secretKey</span><span class="o">).</span><span class="na">compact</span><span class="o">();</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">validate</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">validate</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="k">try</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">StringUtils</span><span class="o">.</span><span class="na">isNotEmpty</span><span class="o">(</span><span class="n">Jwts</span><span class="o">.</span><span class="na">parser</span><span class="o">()</span>
+ <span class="k">return</span> <span class="nc">StringUtils</span><span class="o">.</span><span class="na">isNotEmpty</span><span class="o">(</span><span class="nc">Jwts</span><span class="o">.</span><span class="na">parser</span><span class="o">()</span>
<span class="o">.</span><span class="na">setSigningKey</span><span class="o">(</span><span class="n">secretKey</span><span class="o">).</span><span class="na">parseClaimsJws</span><span class="o">(</span><span class="n">token</span><span class="o">).</span><span class="na">getBody</span><span class="o">().</span><span class="na">getSubject</span><span class="o">());</span>
- <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">JwtException</span> <span class="o">|</span> <span class="n">IllegalArgumentException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">LOGGER</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"validateToken token : "</span> <span class="o">+</span> <span class="n">token</span> <span class="o">+</span> <span class="s">" failed"</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
+ <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">JwtException</span> <span class="o">|</span> <span class="nc">IllegalArgumentException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+ <span class="no">LOGGER</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"validateToken token : "</span> <span class="o">+</span> <span class="n">token</span> <span class="o">+</span> <span class="s">" failed"</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
<span class="o">}</span>
<span class="k">return</span> <span class="kc">false</span><span class="o">;</span>
<span class="o">}</span>
@@ -717,8 +717,8 @@
<h6 id="定义userservice接口">定义UserService接口</h6>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">UserService</span> <span class="o">{</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">Boolean</span><span class="o">></span> <span class="nf">logon</span><span class="o">(</span><span class="n">UserDTO</span> <span class="n">user</span><span class="o">);</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">Boolean</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span><span class="n">UserDTO</span> <span class="n">user</span><span class="o">);</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">Boolean</span><span class="o">></span> <span class="nf">logon</span><span class="o">(</span><span class="nc">UserDTO</span> <span class="n">user</span><span class="o">);</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">Boolean</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span><span class="nc">UserDTO</span> <span class="n">user</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -726,17 +726,17 @@
<p>logon用于新用户注册，login用于用户登录验证，UserDTO用于参数传递：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">UserDTO</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="n">name</span><span class="o">;</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="n">password</span><span class="o">;</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="n">name</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="n">password</span><span class="o">;</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">getPassword</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">getPassword</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">password</span><span class="o">;</span>
<span class="o">}</span>
<span class="kd">public</span> <span class="nf">UserDTO</span><span class="o">()</span> <span class="o">{</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="nf">UserDTO</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">,</span> <span class="n">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">UserDTO</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">,</span> <span class="nc">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">name</span> <span class="o">=</span> <span class="n">name</span><span class="o">;</span>
<span class="k">this</span><span class="o">.</span><span class="na">password</span> <span class="o">=</span> <span class="n">password</span><span class="o">;</span>
<span class="o">}</span>
@@ -748,58 +748,58 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"user"</span><span class="o">)</span>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">UserServiceImpl</span> <span class="kd">implements</span> <span class="n">UserService</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">UserRepository</span> <span class="n">repository</span><span class="o">;</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">UserServiceImpl</span> <span class="kd">implements</span> <span class="nc">UserService</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">UserRepository</span> <span class="n">repository</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">TokenStore</span> <span class="n">tokenStore</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">TokenStore</span> <span class="n">tokenStore</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="kd">public</span> <span class="nf">UserServiceImpl</span><span class="o">(</span><span class="n">UserRepository</span> <span class="n">repository</span><span class="o">,</span> <span class="n">TokenStore</span> <span class="n">tokenStore</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">UserServiceImpl</span><span class="o">(</span><span class="nc">UserRepository</span> <span class="n">repository</span><span class="o">,</span> <span class="nc">TokenStore</span> <span class="n">tokenStore</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">repository</span> <span class="o">=</span> <span class="n">repository</span><span class="o">;</span>
<span class="k">this</span><span class="o">.</span><span class="na">tokenStore</span> <span class="o">=</span> <span class="n">tokenStore</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
<span class="nd">@PostMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"logon"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">Boolean</span><span class="o">></span> <span class="nf">logon</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">UserDTO</span> <span class="n">user</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">Boolean</span><span class="o">></span> <span class="nf">logon</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">UserDTO</span> <span class="n">user</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">validateUser</span><span class="o">(</span><span class="n">user</span><span class="o">))</span> <span class="o">{</span>
- <span class="n">UserEntity</span> <span class="n">dbUser</span> <span class="o">=</span> <span class="n">repository</span><span class="o">.</span><span class="na">findByName</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">());</span>
+ <span class="nc">UserEntity</span> <span class="n">dbUser</span> <span class="o">=</span> <span class="n">repository</span><span class="o">.</span><span class="na">findByName</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">());</span>
<span class="k">if</span> <span class="o">(</span><span class="n">dbUser</span> <span class="o">==</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">UserEntity</span> <span class="n">entity</span> <span class="o">=</span> <span class="k">new</span> <span class="n">UserEntity</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">(),</span> <span class="n">user</span><span class="o">.</span><span class="na">getPassword</span><span class="o">());</span>
+ <span class="nc">UserEntity</span> <span class="n">entity</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">UserEntity</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">(),</span> <span class="n">user</span><span class="o">.</span><span class="na">getPassword</span><span class="o">());</span>
<span class="n">repository</span><span class="o">.</span><span class="na">save</span><span class="o">(</span><span class="n">entity</span><span class="o">);</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">ResponseEntity</span><span class="o"><>(</span><span class="kc">true</span><span class="o">,</span> <span class="n">HttpStatus</span><span class="o">.</span><span class="na">OK</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">ResponseEntity</span><span class="o"><>(</span><span class="kc">true</span><span class="o">,</span> <span class="nc">HttpStatus</span><span class="o">.</span><span class="na">OK</span><span class="o">);</span>
<span class="o">}</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"user name had exist"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"user name had exist"</span><span class="o">);</span>
<span class="o">}</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"incorrect user"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"incorrect user"</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Override</span>
<span class="nd">@PostMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"login"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">Boolean</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">UserDTO</span> <span class="n">user</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">Boolean</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">UserDTO</span> <span class="n">user</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">validateUser</span><span class="o">(</span><span class="n">user</span><span class="o">))</span> <span class="o">{</span>
- <span class="n">UserEntity</span> <span class="n">dbUser</span> <span class="o">=</span> <span class="n">repository</span><span class="o">.</span><span class="na">findByName</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">());</span>
+ <span class="nc">UserEntity</span> <span class="n">dbUser</span> <span class="o">=</span> <span class="n">repository</span><span class="o">.</span><span class="na">findByName</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">());</span>
<span class="k">if</span> <span class="o">(</span><span class="n">dbUser</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">dbUser</span><span class="o">.</span><span class="na">getPassword</span><span class="o">().</span><span class="na">equals</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getPassword</span><span class="o">()))</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">tokenStore</span><span class="o">.</span><span class="na">generate</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">());</span>
- <span class="n">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="n">generateAuthenticationHeaders</span><span class="o">(</span><span class="n">token</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">tokenStore</span><span class="o">.</span><span class="na">generate</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">());</span>
+ <span class="nc">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="n">generateAuthenticationHeaders</span><span class="o">(</span><span class="n">token</span><span class="o">);</span>
<span class="c1">//add authentication header</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">ResponseEntity</span><span class="o"><>(</span><span class="kc">true</span><span class="o">,</span> <span class="n">headers</span><span class="o">,</span> <span class="n">HttpStatus</span><span class="o">.</span><span class="na">OK</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">ResponseEntity</span><span class="o"><>(</span><span class="kc">true</span><span class="o">,</span> <span class="n">headers</span><span class="o">,</span> <span class="nc">HttpStatus</span><span class="o">.</span><span class="na">OK</span><span class="o">);</span>
<span class="o">}</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"wrong password"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"wrong password"</span><span class="o">);</span>
<span class="o">}</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"user name not exist"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"user name not exist"</span><span class="o">);</span>
<span class="o">}</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"incorrect user"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"incorrect user"</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="kt">boolean</span> <span class="nf">validateUser</span><span class="o">(</span><span class="n">UserDTO</span> <span class="n">user</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">user</span> <span class="o">!=</span> <span class="kc">null</span> <span class="o">&&</span> <span class="n">StringUtils</span><span class="o">.</span><span class="na">isNotEmpty</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">())</span> <span class="o">&&</span> <span class="n">StringUtils</span><span class="o">.</span><span class="na">isNotEm [...]
+ <span class="kd">private</span> <span class="kt">boolean</span> <span class="nf">validateUser</span><span class="o">(</span><span class="nc">UserDTO</span> <span class="n">user</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="n">user</span> <span class="o">!=</span> <span class="kc">null</span> <span class="o">&&</span> <span class="nc">StringUtils</span><span class="o">.</span><span class="na">isNotEmpty</span><span class="o">(</span><span class="n">user</span><span class="o">.</span><span class="na">getName</span><span class="o">())</span> <span class="o">&&</span> <span class="nc">StringUtils</span><span class="o">.</span><span class="na">isNot [...]
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">HttpHeaders</span> <span class="nf">generateAuthenticationHeaders</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HttpHeaders</span><span class="o">();</span>
- <span class="n">headers</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="n">AUTHORIZATION</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="nc">HttpHeaders</span> <span class="nf">generateAuthenticationHeaders</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HttpHeaders</span><span class="o">();</span>
+ <span class="n">headers</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="no">AUTHORIZATION</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
<span class="k">return</span> <span class="n">headers</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -880,8 +880,8 @@
<h5 id="第二步编写调度器dispatcher">第二步：编写调度器Dispatcher</h5>
<p>Edge服务的核心就是调度器Dispatcher，ServiceComb Edge Core中的Dispatcher基于高性能的Vertx Reactive，轻松应对百万量级API请求的挑战；只需要继承AbstractEdgeDispatcher抽象类，添加对应的逻辑即可：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">EdgeDispatcher</span> <span class="kd">extends</span> <span class="n">AbstractEdgeDispatcher</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">LOGGER</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">EdgeDispatcher</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">EdgeDispatcher</span> <span class="kd">extends</span> <span class="nc">AbstractEdgeDispatcher</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="no">LOGGER</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">EdgeDispatcher</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
<span class="c1">//此Dispatcher的优先级，Order级越小，路由策略优先级越高</span>
<span class="kd">public</span> <span class="kt">int</span> <span class="nf">getOrder</span><span class="o">()</span> <span class="o">{</span>
@@ -889,30 +889,30 @@
<span class="o">}</span>
<span class="c1">//初始化Dispatcher的路由策略</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="n">Router</span> <span class="n">router</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="nc">Router</span> <span class="n">router</span><span class="o">)</span> <span class="o">{</span>
<span class="c1">///捕获 {ServiceComb微服务Name}/{服务路径&参数} 的URL</span>
- <span class="n">String</span> <span class="n">regex</span> <span class="o">=</span> <span class="s">"/([^\\\\/]+)/(.*)"</span><span class="o">;</span>
- <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
+ <span class="nc">String</span> <span class="n">regex</span> <span class="o">=</span> <span class="s">"/([^\\\\/]+)/(.*)"</span><span class="o">;</span>
+ <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="nc">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">createBodyHandler</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">failureHandler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onFailure</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onRequest</span><span clas [...]
<span class="o">}</span>
<span class="c1">//处理请求，请注意</span>
- <span class="kd">private</span> <span class="kt">void</span> <span class="nf">onRequest</span><span class="o">(</span><span class="n">RoutingContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">></span> <span class="n">pathParams</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">pathParams</span><span class="o">();</span>
+ <span class="kd">private</span> <span class="kt">void</span> <span class="nf">onRequest</span><span class="o">(</span><span class="nc">RoutingContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">String</span><span class="o">></span> <span class="n">pathParams</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">pathParams</span><span class="o">();</span>
<span class="c1">//从匹配的param0拿到{ServiceComb微服务Name}</span>
- <span class="kd">final</span> <span class="n">String</span> <span class="n">service</span> <span class="o">=</span> <span class="n">pathParams</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="s">"param0"</span><span class="o">);</span>
+ <span class="kd">final</span> <span class="nc">String</span> <span class="n">service</span> <span class="o">=</span> <span class="n">pathParams</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="s">"param0"</span><span class="o">);</span>
<span class="c1">//从匹配的param1拿到{服务路径&参数}</span>
- <span class="n">String</span> <span class="n">path</span> <span class="o">=</span> <span class="s">"/"</span> <span class="o">+</span> <span class="n">pathParams</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="s">"param1"</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">path</span> <span class="o">=</span> <span class="s">"/"</span> <span class="o">+</span> <span class="n">pathParams</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="s">"param1"</span><span class="o">);</span>
<span class="c1">//还记得我们之前说的做出一点点改进吗？引入一个自定义配置edge.routing-short-path.{简称}，映射微服务名；如果简称没有配置，那么就认为直接是微服务的名</span>
- <span class="kd">final</span> <span class="n">String</span> <span class="n">serviceName</span> <span class="o">=</span> <span class="n">DynamicPropertyFactory</span><span class="o">.</span><span class="na">getInstance</span><span class="o">()</span>
+ <span class="kd">final</span> <span class="nc">String</span> <span class="n">serviceName</span> <span class="o">=</span> <span class="nc">DynamicPropertyFactory</span><span class="o">.</span><span class="na">getInstance</span><span class="o">()</span>
<span class="o">.</span><span class="na">getStringProperty</span><span class="o">(</span><span class="s">"edge.routing-short-path."</span> <span class="o">+</span> <span class="n">service</span><span class="o">,</span> <span class="n">service</span><span class="o">).</span><span class="na">get</span><span class="o">();</span>
<span class="c1">//创建一个Edge转发</span>
- <span class="n">EdgeInvocation</span> <span class="n">edgeInvocation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">EdgeInvocation</span><span class="o">();</span>
+ <span class="nc">EdgeInvocation</span> <span class="n">edgeInvocation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">EdgeInvocation</span><span class="o">();</span>
<span class="c1">//允许接受任意版本的微服务实例作为Provider，未来我们会使用此（设置版本）能力实现灰度发布</span>
- <span class="n">edgeInvocation</span><span class="o">.</span><span class="na">setVersionRule</span><span class="o">(</span><span class="n">DefinitionConst</span><span class="o">.</span><span class="na">VERSION_RULE_ALL</span><span class="o">);</span>
+ <span class="n">edgeInvocation</span><span class="o">.</span><span class="na">setVersionRule</span><span class="o">(</span><span class="nc">DefinitionConst</span><span class="o">.</span><span class="na">VERSION_RULE_ALL</span><span class="o">);</span>
<span class="n">edgeInvocation</span><span class="o">.</span><span class="na">init</span><span class="o">(</span><span class="n">serviceName</span><span class="o">,</span> <span class="n">context</span><span class="o">,</span> <span class="n">path</span><span class="o">,</span> <span class="n">httpServerFilters</span><span class="o">);</span>
<span class="n">edgeInvocation</span><span class="o">.</span><span class="na">edgeInvoke</span><span class="o">();</span>
<span class="o">}</span>
@@ -1015,27 +1015,27 @@
<h5 id="第一步发布认证服务">第一步：发布认证服务</h5>
<h6 id="定义authenticationservice">定义AuthenticationService</h6>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">AuthenticationService</span> <span class="o">{</span>
- <span class="n">String</span> <span class="nf">validate</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">validate</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
<h6 id="实现并发布authenticationservice">实现并发布AuthenticationService</h6>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"authentication"</span><span class="o">)</span>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">AuthenticationServiceImpl</span> <span class="kd">implements</span> <span class="n">AuthenticationService</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">AuthenticationServiceImpl</span> <span class="kd">implements</span> <span class="nc">AuthenticationService</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">TokenStore</span> <span class="n">tokenStore</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">TokenStore</span> <span class="n">tokenStore</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="kd">public</span> <span class="nf">AuthenticationServiceImpl</span><span class="o">(</span><span class="n">TokenStore</span> <span class="n">tokenStore</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">AuthenticationServiceImpl</span><span class="o">(</span><span class="nc">TokenStore</span> <span class="n">tokenStore</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">tokenStore</span> <span class="o">=</span> <span class="n">tokenStore</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
<span class="nd">@GetMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"validate"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">validate</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">userName</span> <span class="o">=</span> <span class="n">tokenStore</span><span class="o">.</span><span class="na">validate</span><span class="o">(</span><span class="n">token</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">validate</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">String</span> <span class="n">userName</span> <span class="o">=</span> <span class="n">tokenStore</span><span class="o">.</span><span class="na">validate</span><span class="o">(</span><span class="n">token</span><span class="o">);</span>
<span class="k">if</span> <span class="o">(</span><span class="n">userName</span> <span class="o">==</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"incorrect token"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"incorrect token"</span><span class="o">);</span>
<span class="o">}</span>
<span class="k">return</span> <span class="n">userName</span><span class="o">;</span>
<span class="o">}</span>
@@ -1043,16 +1043,16 @@
</code></pre></div></div>
<h5 id="第二步实现统一认证authenticationfilter">第二步：实现统一认证AuthenticationFilter</h5>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">AuthenticationFilter</span> <span class="kd">implements</span> <span class="n">HttpServerFilter</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">AuthenticationFilter</span> <span class="kd">implements</span> <span class="nc">HttpServerFilter</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">RestTemplate</span> <span class="n">template</span> <span class="o">=</span> <span class="n">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">RestTemplate</span> <span class="n">template</span> <span class="o">=</span> <span class="nc">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">USER_SERVICE_NAME</span> <span class="o">=</span> <span class="s">"user-service"</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">USER_SERVICE_NAME</span> <span class="o">=</span> <span class="s">"user-service"</span><span class="o">;</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">EDGE_AUTHENTICATION_NAME</span> <span class="o">=</span> <span class="s">"edge-authentication-name"</span><span class="o">;</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">EDGE_AUTHENTICATION_NAME</span> <span class="o">=</span> <span class="s">"edge-authentication-name"</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Set</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">NOT_REQUIRED_VERIFICATION_USER_SERVICE_METHODS</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashSet</span><span class="o"><>(</span>
- <span class="n">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="s">"login"</span><span class="o">,</span> <span class="s">"logon"</span><span class="o">,</span> <span class="s">"validate"</span><span class="o">));</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Set</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="no">NOT_REQUIRED_VERIFICATION_USER_SERVICE_METHODS</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashSet</span><span class="o"><>(</span>
+ <span class="nc">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="s">"login"</span><span class="o">,</span> <span class="s">"logon"</span><span class="o">,</span> <span class="s">"validate"</span><span class="o">));</span>
<span class="nd">@Override</span>
<span class="kd">public</span> <span class="kt">int</span> <span class="nf">getOrder</span><span class="o">()</span> <span class="o">{</span>
@@ -1060,30 +1060,30 @@
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">Response</span> <span class="nf">afterReceiveRequest</span><span class="o">(</span><span class="n">Invocation</span> <span class="n">invocation</span><span class="o">,</span> <span class="n">HttpServletRequestEx</span> <span class="n">httpServletRequestEx</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">Response</span> <span class="nf">afterReceiveRequest</span><span class="o">(</span><span class="nc">Invocation</span> <span class="n">invocation</span><span class="o">,</span> <span class="nc">HttpServletRequestEx</span> <span class="n">httpServletRequestEx</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">isInvocationNeedValidate</span><span class="o">(</span><span class="n">invocation</span><span class="o">.</span><span class="na">getMicroserviceName</span><span class="o">(),</span> <span class="n">invocation</span><span class="o">.</span><span class="na">getOperationName</span><span class="o">()))</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">httpServletRequestEx</span><span class="o">.</span><span class="na">getHeader</span><span class="o">(</span><span class="n">AUTHORIZATION</span><span class="o">);</span>
- <span class="k">if</span> <span class="o">(</span><span class="n">StringUtils</span><span class="o">.</span><span class="na">isNotEmpty</span><span class="o">(</span><span class="n">token</span><span class="o">))</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">userName</span> <span class="o">=</span> <span class="n">template</span>
- <span class="o">.</span><span class="na">getForObject</span><span class="o">(</span><span class="s">"cse://"</span> <span class="o">+</span> <span class="n">USER_SERVICE_NAME</span> <span class="o">+</span> <span class="s">"/validate?token={token}"</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
- <span class="k">if</span> <span class="o">(</span><span class="n">StringUtils</span><span class="o">.</span><span class="na">isNotEmpty</span><span class="o">(</span><span class="n">userName</span><span class="o">))</span> <span class="o">{</span>
+ <span class="nc">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">httpServletRequestEx</span><span class="o">.</span><span class="na">getHeader</span><span class="o">(</span><span class="no">AUTHORIZATION</span><span class="o">);</span>
+ <span class="k">if</span> <span class="o">(</span><span class="nc">StringUtils</span><span class="o">.</span><span class="na">isNotEmpty</span><span class="o">(</span><span class="n">token</span><span class="o">))</span> <span class="o">{</span>
+ <span class="nc">String</span> <span class="n">userName</span> <span class="o">=</span> <span class="n">template</span>
+ <span class="o">.</span><span class="na">getForObject</span><span class="o">(</span><span class="s">"cse://"</span> <span class="o">+</span> <span class="no">USER_SERVICE_NAME</span> <span class="o">+</span> <span class="s">"/validate?token={token}"</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
+ <span class="k">if</span> <span class="o">(</span><span class="nc">StringUtils</span><span class="o">.</span><span class="na">isNotEmpty</span><span class="o">(</span><span class="n">userName</span><span class="o">))</span> <span class="o">{</span>
<span class="c1">//Add header</span>
- <span class="n">invocation</span><span class="o">.</span><span class="na">getContext</span><span class="o">().</span><span class="na">put</span><span class="o">(</span><span class="n">EDGE_AUTHENTICATION_NAME</span><span class="o">,</span> <span class="n">userName</span><span class="o">);</span>
+ <span class="n">invocation</span><span class="o">.</span><span class="na">getContext</span><span class="o">().</span><span class="na">put</span><span class="o">(</span><span class="no">EDGE_AUTHENTICATION_NAME</span><span class="o">,</span> <span class="n">userName</span><span class="o">);</span>
<span class="o">}</span> <span class="k">else</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">Response</span>
- <span class="o">.</span><span class="na">failResp</span><span class="o">(</span><span class="k">new</span> <span class="n">InvocationException</span><span class="o">(</span><span class="n">Status</span><span class="o">.</span><span class="na">UNAUTHORIZED</span><span class="o">,</span> <span class="s">"authentication failed, invalid token"</span><span class="o">));</span>
+ <span class="k">return</span> <span class="nc">Response</span>
+ <span class="o">.</span><span class="na">failResp</span><span class="o">(</span><span class="k">new</span> <span class="nc">InvocationException</span><span class="o">(</span><span class="nc">Status</span><span class="o">.</span><span class="na">UNAUTHORIZED</span><span class="o">,</span> <span class="s">"authentication failed, invalid token"</span><span class="o">));</span>
<span class="o">}</span>
<span class="o">}</span> <span class="k">else</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">Response</span><span class="o">.</span><span class="na">failResp</span><span class="o">(</span>
- <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">Status</span><span class="o">.</span><span class="na">UNAUTHORIZED</span><span class="o">,</span> <span class="s">"authentication failed, missing AUTHORIZATION header"</span><span class="o">));</span>
+ <span class="k">return</span> <span class="nc">Response</span><span class="o">.</span><span class="na">failResp</span><span class="o">(</span>
+ <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="nc">Status</span><span class="o">.</span><span class="na">UNAUTHORIZED</span><span class="o">,</span> <span class="s">"authentication failed, missing AUTHORIZATION header"</span><span class="o">));</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="kt">boolean</span> <span class="nf">isInvocationNeedValidate</span><span class="o">(</span><span class="n">String</span> <span class="n">serviceName</span><span class="o">,</span> <span class="n">String</span> <span class="n">operationPath</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">if</span> <span class="o">(</span><span class="n">USER_SERVICE_NAME</span><span class="o">.</span><span class="na">equals</span><span class="o">(</span><span class="n">serviceName</span><span class="o">))</span> <span class="o">{</span>
- <span class="k">for</span> <span class="o">(</span><span class="n">String</span> <span class="n">method</span> <span class="o">:</span> <span class="n">NOT_REQUIRED_VERIFICATION_USER_SERVICE_METHODS</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="kt">boolean</span> <span class="nf">isInvocationNeedValidate</span><span class="o">(</span><span class="nc">String</span> <span class="n">serviceName</span><span class="o">,</span> <span class="nc">String</span> <span class="n">operationPath</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">if</span> <span class="o">(</span><span class="no">USER_SERVICE_NAME</span><span class="o">.</span><span class="na">equals</span><span class="o">(</span><span class="n">serviceName</span><span class="o">))</span> <span class="o">{</span>
+ <span class="k">for</span> <span class="o">(</span><span class="nc">String</span> <span class="n">method</span> <span class="o">:</span> <span class="no">NOT_REQUIRED_VERIFICATION_USER_SERVICE_METHODS</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">operationPath</span><span class="o">.</span><span class="na">startsWith</span><span class="o">(</span><span class="n">method</span><span class="o">))</span> <span class="o">{</span>
<span class="k">return</span> <span class="kc">false</span><span class="o">;</span>
<span class="o">}</span>
@@ -1102,31 +1102,31 @@
<p>现有的<code class="highlighter-rouge">login</code>和<code class="highlighter-rouge">logon</code>都无需认证，因此我们在用户微服务中增加需要认证的修改密码的功能用于验证统一认证。</p>
<h6 id="在userservice中添加修改密码">在UserService中添加修改密码</h6>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">UserService</span> <span class="o">{</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">Boolean</span><span class="o">></span> <span class="nf">logon</span><span class="o">(</span><span class="n">UserDTO</span> <span class="n">user</span><span class="o">);</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">Boolean</span><span class="o">></span> <span class="nf">logon</span><span class="o">(</span><span class="nc">UserDTO</span> <span class="n">user</span><span class="o">);</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">Boolean</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span><span class="n">UserDTO</span> <span class="n">user</span><span class="o">);</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">Boolean</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span><span class="nc">UserDTO</span> <span class="n">user</span><span class="o">);</span>
<span class="c1">//需要认证的修改密码功能</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">Boolean</span><span class="o">></span> <span class="nf">changePassword</span><span class="o">(</span><span class="n">UserUpdateDTO</span> <span class="n">userUpdate</span><span class="o">);</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">Boolean</span><span class="o">></span> <span class="nf">changePassword</span><span class="o">(</span><span class="nc">UserUpdateDTO</span> <span class="n">userUpdate</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
<h6 id="在userserviceimpl中实现修改密码">在UserServiceImpl中实现修改密码</h6>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Override</span>
<span class="nd">@PostMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"changePassword"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">Boolean</span><span class="o">></span> <span class="nf">changePassword</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">UserUpdateDTO</span> <span class="n">userUpdate</span><span class="o">)</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">Boolean</span><span class="o">></span> <span class="nf">changePassword</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">UserUpdateDTO</span> <span class="n">userUpdate</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">validateUserUpdate</span><span class="o">(</span><span class="n">userUpdate</span><span class="o">))</span> <span class="o">{</span>
- <span class="n">UserEntity</span> <span class="n">dbUser</span> <span class="o">=</span> <span class="n">repository</span><span class="o">.</span><span class="na">findByName</span><span class="o">(</span><span class="n">userUpdate</span><span class="o">.</span><span class="na">getName</span><span class="o">());</span>
+ <span class="nc">UserEntity</span> <span class="n">dbUser</span> <span class="o">=</span> <span class="n">repository</span><span class="o">.</span><span class="na">findByName</span><span class="o">(</span><span class="n">userUpdate</span><span class="o">.</span><span class="na">getName</span><span class="o">());</span>
<span class="k">if</span> <span class="o">(</span><span class="n">dbUser</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">dbUser</span><span class="o">.</span><span class="na">getPassword</span><span class="o">().</span><span class="na">equals</span><span class="o">(</span><span class="n">userUpdate</span><span class="o">.</span><span class="na">getOldPassword</span><span class="o">()))</span> <span class="o">{</span>
<span class="n">dbUser</span><span class="o">.</span><span class="na">setPassword</span><span class="o">(</span><span class="n">userUpdate</span><span class="o">.</span><span class="na">getNewPassword</span><span class="o">());</span>
<span class="n">repository</span><span class="o">.</span><span class="na">save</span><span class="o">(</span><span class="n">dbUser</span><span class="o">);</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">ResponseEntity</span><span class="o"><>(</span><span class="kc">true</span><span class="o">,</span> <span class="n">HttpStatus</span><span class="o">.</span><span class="na">OK</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">ResponseEntity</span><span class="o"><>(</span><span class="kc">true</span><span class="o">,</span> <span class="nc">HttpStatus</span><span class="o">.</span><span class="na">OK</span><span class="o">);</span>
<span class="o">}</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"wrong password"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"wrong password"</span><span class="o">);</span>
<span class="o">}</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"user name not exist"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"user name not exist"</span><span class="o">);</span>
<span class="o">}</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">BAD_REQUEST</span><span class="o">,</span> <span class="s">"incorrect user"</span><span class="o">);</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="no">BAD_REQUEST</span><span class="o">,</span> <span class="s">"incorrect user"</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/cn/docs/customized-tracing-with-servicecomb/index.html b/content/cn/docs/customized-tracing-with-servicecomb/index.html
index 8f35f0f..a6a74f8 100644
--- a/content/cn/docs/customized-tracing-with-servicecomb/index.html
+++ b/content/cn/docs/customized-tracing-with-servicecomb/index.html
@@ -432,8 +432,8 @@
<span class="nd">@EnableZipkinTracing</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">CalculatorApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">CalculatorApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -442,7 +442,7 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.apache.servicecomb.tracing.Span</span><span class="o">;</span>
<span class="nd">@Service</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorServiceImpl</span> <span class="kd">implements</span> <span class="n">CalculatorService</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorServiceImpl</span> <span class="kd">implements</span> <span class="nc">CalculatorService</span> <span class="o">{</span>
<span class="cm">/**
* {@inheritDoc}
@@ -459,7 +459,7 @@
<span class="o">}</span>
<span class="kd">private</span> <span class="kt">double</span> <span class="nf">roundToOnePrecision</span><span class="o">(</span><span class="kt">double</span> <span class="n">value</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="k">new</span> <span class="nf">BigDecimal</span><span class="o">(</span><span class="n">value</span><span class="o">).</span><span class="na">setScale</span><span class="o">(</span><span class="mi">1</span><span class="o">,</span> <span class="n">RoundingMode</span><span class="o">.</span><span class="na">HALF_UP</span><span class="o">).</span><span class="na">doubleValue</span><span class="o">();</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nf">BigDecimal</span><span class="o">(</span><span class="n">value</span><span class="o">).</span><span class="na">setScale</span><span class="o">(</span><span class="mi">1</span><span class="o">,</span> <span class="nc">RoundingMode</span><span class="o">.</span><span class="na">HALF_UP</span><span class="o">).</span><span class="na">doubleValue</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -474,8 +474,8 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kt">double</span> <span class="nf">calculate</span><span class="o">(</span><span class="kt">double</span> <span class="n">height</span><span class="o">,</span> <span class="kt">double</span> <span class="n">weight</span><span class="o">)</span> <span class="o">{</span>
<span class="k">try</span><span class="o">{</span>
- <span class="n">Thread</span><span class="o">.</span><span class="na">currentThread</span><span class="o">().</span><span class="na">sleep</span><span class="o">(</span><span class="mi">5000</span><span class="o">);</span>
- <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">Exception</span> <span class="n">e</span><span class="o">){</span>
+ <span class="nc">Thread</span><span class="o">.</span><span class="na">currentThread</span><span class="o">().</span><span class="na">sleep</span><span class="o">(</span><span class="mi">5000</span><span class="o">);</span>
+ <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">Exception</span> <span class="n">e</span><span class="o">){</span>
<span class="o">}</span>
diff --git a/content/cn/docs/distributed-transaction-of-services-2/index.html b/content/cn/docs/distributed-transaction-of-services-2/index.html
index bc6a239..734734e 100644
--- a/content/cn/docs/distributed-transaction-of-services-2/index.html
+++ b/content/cn/docs/distributed-transaction-of-services-2/index.html
@@ -452,8 +452,8 @@
<span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableOmega</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">Application</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">Application</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -464,15 +464,15 @@
<span class="nd">@SagaStart</span>
<span class="nd">@PostMapping</span><span class="o">(</span><span class="s">"/booking/{name}/{rooms}/{cars}"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="n">String</span> <span class="nf">order</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="n">String</span> <span class="n">name</span><span class="o">,</span> <span class="nd">@PathVariable</span> <span class="n">Integer</span> <span class="n">rooms</span><span class="o">,</span> <span class="nd">@PathVariable</span> <span class="n">Integer</span> <span class="n">cars</span><span class="o">)</span> <span class="o [...]
+<span class="kd">public</span> <span class="nc">String</span> <span class="nf">order</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="nc">String</span> <span class="n">name</span><span class="o">,</span> <span class="nd">@PathVariable</span> <span class="nc">Integer</span> <span class="n">rooms</span><span class="o">,</span> <span class="nd">@PathVariable</span> <span class="nc">Integer</span> <span class="n">cars</span><span class="o">)</span> <span clas [...]
<span class="c1">// Calling the car service</span>
<span class="n">template</span><span class="o">.</span><span class="na">postForEntity</span><span class="o">(</span>
<span class="n">carServiceUrl</span> <span class="o">+</span> <span class="s">"/order/{name}/{cars}"</span><span class="o">,</span>
- <span class="kc">null</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">name</span><span class="o">,</span> <span class="n">cars</span><span class="o">);</span>
+ <span class="kc">null</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">name</span><span class="o">,</span> <span class="n">cars</span><span class="o">);</span>
<span class="c1">// Calling the hotel service</span>
<span class="n">template</span><span class="o">.</span><span class="na">postForEntity</span><span class="o">(</span>
<span class="n">hotelServiceUrl</span> <span class="o">+</span> <span class="s">"/order/{name}/{rooms}"</span><span class="o">,</span>
- <span class="kc">null</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">name</span><span class="o">,</span> <span class="n">rooms</span><span class="o">);</span>
+ <span class="kc">null</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">name</span><span class="o">,</span> <span class="n">rooms</span><span class="o">);</span>
<span class="k">return</span> <span class="n">name</span> <span class="o">+</span> <span class="s">" booking "</span> <span class="o">+</span> <span class="n">rooms</span> <span class="o">+</span> <span class="s">" rooms and "</span> <span class="o">+</span> <span class="n">cars</span> <span class="o">+</span> <span class="s">" cars OK"</span><span class="o">;</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -482,13 +482,13 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.apache.servicecomb.pack.omega.transaction.annotations.Compensable</span><span class="o">;</span>
<span class="nd">@Compensable</span><span class="o">(</span><span class="n">compensationMethod</span> <span class="o">=</span> <span class="s">"cancel"</span><span class="o">)</span>
-<span class="kt">void</span> <span class="nf">order</span><span class="o">(</span><span class="n">CarBooking</span> <span class="n">booking</span><span class="o">)</span> <span class="o">{</span>
+<span class="kt">void</span> <span class="nf">order</span><span class="o">(</span><span class="nc">CarBooking</span> <span class="n">booking</span><span class="o">)</span> <span class="o">{</span>
<span class="n">booking</span><span class="o">.</span><span class="na">confirm</span><span class="o">();</span>
<span class="n">bookings</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">booking</span><span class="o">.</span><span class="na">getId</span><span class="o">(),</span> <span class="n">booking</span><span class="o">);</span>
<span class="o">}</span>
-<span class="kt">void</span> <span class="nf">cancel</span><span class="o">(</span><span class="n">CarBooking</span> <span class="n">booking</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Integer</span> <span class="n">id</span> <span class="o">=</span> <span class="n">booking</span><span class="o">.</span><span class="na">getId</span><span class="o">();</span>
+<span class="kt">void</span> <span class="nf">cancel</span><span class="o">(</span><span class="nc">CarBooking</span> <span class="n">booking</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Integer</span> <span class="n">id</span> <span class="o">=</span> <span class="n">booking</span><span class="o">.</span><span class="na">getId</span><span class="o">();</span>
<span class="k">if</span> <span class="o">(</span><span class="n">bookings</span><span class="o">.</span><span class="na">containsKey</span><span class="o">(</span><span class="n">id</span><span class="o">))</span> <span class="o">{</span>
<span class="n">bookings</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="n">id</span><span class="o">).</span><span class="na">cancel</span><span class="o">();</span>
<span class="o">}</span>
@@ -539,8 +539,8 @@
<span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableOmega</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">TccOrderingApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">TccOrderingApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">TccOrderingApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -552,18 +552,18 @@
<span class="nd">@TccStart</span>
<span class="nd">@PostMapping</span><span class="o">(</span><span class="s">"/order/{userName}/{productName}/{productUnit}/{unitPrice}"</span><span class="o">)</span>
<span class="nd">@ResponseBody</span>
-<span class="kd">public</span> <span class="n">String</span> <span class="nf">order</span><span class="o">(</span>
- <span class="nd">@PathVariable</span> <span class="n">String</span> <span class="n">userName</span><span class="o">,</span>
- <span class="nd">@PathVariable</span> <span class="n">String</span> <span class="n">productName</span><span class="o">,</span> <span class="nd">@PathVariable</span> <span class="n">Integer</span> <span class="n">productUnit</span><span class="o">,</span> <span class="nd">@PathVariable</span> <span class="n">Integer</span> <span class="n">unitPrice</span><span class="o">)</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="nc">String</span> <span class="nf">order</span><span class="o">(</span>
+ <span class="nd">@PathVariable</span> <span class="nc">String</span> <span class="n">userName</span><span class="o">,</span>
+ <span class="nd">@PathVariable</span> <span class="nc">String</span> <span class="n">productName</span><span class="o">,</span> <span class="nd">@PathVariable</span> <span class="nc">Integer</span> <span class="n">productUnit</span><span class="o">,</span> <span class="nd">@PathVariable</span> <span class="nc">Integer</span> <span class="n">unitPrice</span><span class="o">)</span> <span class="o">{</span>
<span class="c1">// Calling the inventory service</span>
<span class="n">restTemplate</span><span class="o">.</span><span class="na">postForEntity</span><span class="o">(</span>
<span class="n">inventoryServiceUrl</span> <span class="o">+</span> <span class="s">"/order/{userName}/{productName}/{productUnit}"</span><span class="o">,</span>
- <span class="kc">null</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">userName</span><span class="o">,</span> <span class="n">productName</span><span class="o">,</span> <span class="n">productUnit</span><span class="o">);</span>
+ <span class="kc">null</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">userName</span><span class="o">,</span> <span class="n">productName</span><span class="o">,</span> <span class="n">productUnit</span><span class="o">);</span>
<span class="kt">int</span> <span class="n">amount</span> <span class="o">=</span> <span class="n">productUnit</span> <span class="o">*</span> <span class="n">unitPrice</span><span class="o">;</span>
<span class="c1">// Calling the payment service</span>
<span class="n">restTemplate</span><span class="o">.</span><span class="na">postForEntity</span><span class="o">(</span><span class="n">paymentServiceUrl</span> <span class="o">+</span> <span class="s">"/pay/{userName}/{amount}"</span><span class="o">,</span>
- <span class="kc">null</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">userName</span><span class="o">,</span> <span class="n">amount</span><span class="o">);</span>
+ <span class="kc">null</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">userName</span><span class="o">,</span> <span class="n">amount</span><span class="o">);</span>
<span class="k">return</span> <span class="n">userName</span> <span class="o">+</span> <span class="s">" ordering "</span> <span class="o">+</span> <span class="n">productName</span> <span class="o">+</span> <span class="s">" with "</span> <span class="o">+</span> <span class="n">productUnit</span> <span class="o">+</span> <span class="s">" OK"</span><span class="o">;</span>
<span class="o">}</span>
@@ -576,8 +576,8 @@
<span class="nd">@Participate</span><span class="o">(</span><span class="n">confirmMethod</span> <span class="o">=</span> <span class="s">"confirm"</span><span class="o">,</span> <span class="n">cancelMethod</span> <span class="o">=</span> <span class="s">"cancel"</span><span class="o">)</span>
<span class="nd">@Transactional</span>
-<span class="kd">public</span> <span class="kt">void</span> <span class="nf">pay</span><span class="o">(</span><span class="n">Payment</span> <span class="n">payment</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Account</span> <span class="n">account</span> <span class="o">=</span> <span class="n">getAccount</span><span class="o">(</span><span class="n">payment</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">pay</span><span class="o">(</span><span class="nc">Payment</span> <span class="n">payment</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Account</span> <span class="n">account</span> <span class="o">=</span> <span class="n">getAccount</span><span class="o">(</span><span class="n">payment</span><span class="o">);</span>
<span class="k">if</span> <span class="o">(</span><span class="n">account</span><span class="o">.</span><span class="na">getCredit</span><span class="o">()</span> <span class="o">>=</span> <span class="n">payment</span><span class="o">.</span><span class="na">getAmount</span><span class="o">())</span> <span class="o">{</span>
<span class="n">account</span><span class="o">.</span><span class="na">setCredit</span><span class="o">(</span><span class="n">account</span><span class="o">.</span><span class="na">getCredit</span><span class="o">()</span> <span class="o">-</span> <span class="n">payment</span><span class="o">.</span><span class="na">getAmount</span><span class="o">());</span>
<span class="n">accountDao</span><span class="o">.</span><span class="na">saveAndFlush</span><span class="o">(</span><span class="n">account</span><span class="o">);</span>
@@ -588,17 +588,17 @@
<span class="o">}</span>
<span class="nd">@Transactional</span>
-<span class="n">Account</span> <span class="nf">getAccount</span><span class="o">(</span><span class="n">Payment</span> <span class="n">payment</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Account</span> <span class="n">account</span> <span class="o">=</span> <span class="n">accountDao</span><span class="o">.</span><span class="na">findByUserName</span><span class="o">(</span><span class="n">payment</span><span class="o">.</span><span class="na">getUserName</span><span class="o">());</span>
- <span class="k">if</span> <span class="o">(</span><span class="n">Objects</span><span class="o">.</span><span class="na">isNull</span><span class="o">(</span><span class="n">account</span><span class="o">))</span> <span class="o">{</span>
+<span class="nc">Account</span> <span class="nf">getAccount</span><span class="o">(</span><span class="nc">Payment</span> <span class="n">payment</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Account</span> <span class="n">account</span> <span class="o">=</span> <span class="n">accountDao</span><span class="o">.</span><span class="na">findByUserName</span><span class="o">(</span><span class="n">payment</span><span class="o">.</span><span class="na">getUserName</span><span class="o">());</span>
+ <span class="k">if</span> <span class="o">(</span><span class="nc">Objects</span><span class="o">.</span><span class="na">isNull</span><span class="o">(</span><span class="n">account</span><span class="o">))</span> <span class="o">{</span>
<span class="k">throw</span> <span class="k">new</span> <span class="nf">IllegalArgumentException</span><span class="o">(</span><span class="s">"Cannot find the account!"</span><span class="o">);</span>
<span class="o">}</span>
<span class="k">return</span> <span class="n">account</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Transactional</span>
-<span class="kd">public</span> <span class="kt">void</span> <span class="nf">confirm</span><span class="o">(</span><span class="n">Payment</span> <span class="n">payment</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Account</span> <span class="n">account</span> <span class="o">=</span> <span class="n">getAccount</span><span class="o">(</span><span class="n">payment</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">confirm</span><span class="o">(</span><span class="nc">Payment</span> <span class="n">payment</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Account</span> <span class="n">account</span> <span class="o">=</span> <span class="n">getAccount</span><span class="o">(</span><span class="n">payment</span><span class="o">);</span>
<span class="n">payment</span><span class="o">.</span><span class="na">setConfirmed</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="n">payment</span><span class="o">.</span><span class="na">setCancelled</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
<span class="n">account</span><span class="o">.</span><span class="na">setBalance</span><span class="o">(</span><span class="n">account</span><span class="o">.</span><span class="na">getBalance</span><span class="o">()</span> <span class="o">-</span> <span class="n">payment</span><span class="o">.</span><span class="na">getAmount</span><span class="o">());</span>
@@ -609,8 +609,8 @@
<span class="o">}</span>
<span class="nd">@Transactional</span>
-<span class="kd">public</span> <span class="kt">void</span> <span class="nf">cancel</span><span class="o">(</span><span class="n">Payment</span> <span class="n">payment</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Account</span> <span class="n">account</span> <span class="o">=</span> <span class="n">getAccount</span><span class="o">(</span><span class="n">payment</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">cancel</span><span class="o">(</span><span class="nc">Payment</span> <span class="n">payment</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Account</span> <span class="n">account</span> <span class="o">=</span> <span class="n">getAccount</span><span class="o">(</span><span class="n">payment</span><span class="o">);</span>
<span class="n">account</span><span class="o">.</span><span class="na">setCredit</span><span class="o">(</span><span class="n">account</span><span class="o">.</span><span class="na">getCredit</span><span class="o">()</span> <span class="o">+</span> <span class="n">payment</span><span class="o">.</span><span class="na">getAmount</span><span class="o">());</span>
<span class="n">accountDao</span><span class="o">.</span><span class="na">saveAndFlush</span><span class="o">(</span><span class="n">account</span><span class="o">);</span>
<span class="n">payment</span><span class="o">.</span><span class="na">setBalance</span><span class="o">(</span><span class="n">account</span><span class="o">.</span><span class="na">getBalance</span><span class="o">());</span>
@@ -627,8 +627,8 @@
<span class="nd">@Participate</span><span class="o">(</span><span class="n">confirmMethod</span> <span class="o">=</span> <span class="s">"confirm"</span><span class="o">,</span> <span class="n">cancelMethod</span> <span class="o">=</span> <span class="s">"cancel"</span><span class="o">)</span>
<span class="nd">@Transactional</span>
-<span class="kd">public</span> <span class="kt">void</span> <span class="nf">reserve</span><span class="o">(</span><span class="n">ProductOrder</span> <span class="n">order</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Product</span> <span class="n">product</span> <span class="o">=</span> <span class="n">getProduct</span><span class="o">(</span><span class="n">order</span><span class="o">.</span><span class="na">getProductName</span><span class="o">());</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">reserve</span><span class="o">(</span><span class="nc">ProductOrder</span> <span class="n">order</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Product</span> <span class="n">product</span> <span class="o">=</span> <span class="n">getProduct</span><span class="o">(</span><span class="n">order</span><span class="o">.</span><span class="na">getProductName</span><span class="o">());</span>
<span class="k">if</span> <span class="o">(</span><span class="n">product</span><span class="o">.</span><span class="na">getInStock</span><span class="o">()</span> <span class="o">>=</span> <span class="n">order</span><span class="o">.</span><span class="na">getUnits</span><span class="o">())</span> <span class="o">{</span>
<span class="n">product</span><span class="o">.</span><span class="na">setInStock</span><span class="o">(</span><span class="n">product</span><span class="o">.</span><span class="na">getInStock</span><span class="o">()</span> <span class="o">-</span> <span class="n">order</span><span class="o">.</span><span class="na">getUnits</span><span class="o">());</span>
<span class="n">productDao</span><span class="o">.</span><span class="na">saveAndFlush</span><span class="o">(</span><span class="n">product</span><span class="o">);</span>
@@ -638,22 +638,22 @@
<span class="o">}</span>
<span class="o">}</span>
-<span class="kd">public</span> <span class="kt">void</span> <span class="nf">confirm</span><span class="o">(</span><span class="n">ProductOrder</span> <span class="n">order</span><span class="o">)</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">confirm</span><span class="o">(</span><span class="nc">ProductOrder</span> <span class="n">order</span><span class="o">)</span> <span class="o">{</span>
<span class="n">order</span><span class="o">.</span><span class="na">setConfirmed</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Transactional</span>
-<span class="kd">public</span> <span class="kt">void</span> <span class="nf">cancel</span><span class="o">(</span><span class="n">ProductOrder</span> <span class="n">order</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Product</span> <span class="n">product</span> <span class="o">=</span> <span class="n">productDao</span><span class="o">.</span><span class="na">findProduceByName</span><span class="o">(</span><span class="n">order</span><span class="o">.</span><span class="na">getProductName</span><span class="o">());</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">cancel</span><span class="o">(</span><span class="nc">ProductOrder</span> <span class="n">order</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Product</span> <span class="n">product</span> <span class="o">=</span> <span class="n">productDao</span><span class="o">.</span><span class="na">findProduceByName</span><span class="o">(</span><span class="n">order</span><span class="o">.</span><span class="na">getProductName</span><span class="o">());</span>
<span class="n">product</span><span class="o">.</span><span class="na">setInStock</span><span class="o">(</span><span class="n">product</span><span class="o">.</span><span class="na">getInStock</span><span class="o">()</span> <span class="o">+</span> <span class="n">order</span><span class="o">.</span><span class="na">getUnits</span><span class="o">());</span>
<span class="n">productDao</span><span class="o">.</span><span class="na">saveAndFlush</span><span class="o">(</span><span class="n">product</span><span class="o">);</span>
<span class="n">order</span><span class="o">.</span><span class="na">setCancelled</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Transactional</span>
-<span class="kd">private</span> <span class="n">Product</span> <span class="nf">getProduct</span><span class="o">(</span><span class="n">String</span> <span class="n">productName</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">Product</span> <span class="n">product</span> <span class="o">=</span> <span class="n">productDao</span><span class="o">.</span><span class="na">findProduceByName</span><span class="o">(</span><span class="n">productName</span><span class="o">);</span>
- <span class="k">if</span> <span class="o">(</span><span class="n">Objects</span><span class="o">.</span><span class="na">isNull</span><span class="o">(</span><span class="n">product</span><span class="o">))</span> <span class="o">{</span>
+<span class="kd">private</span> <span class="nc">Product</span> <span class="nf">getProduct</span><span class="o">(</span><span class="nc">String</span> <span class="n">productName</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Product</span> <span class="n">product</span> <span class="o">=</span> <span class="n">productDao</span><span class="o">.</span><span class="na">findProduceByName</span><span class="o">(</span><span class="n">productName</span><span class="o">);</span>
+ <span class="k">if</span> <span class="o">(</span><span class="nc">Objects</span><span class="o">.</span><span class="na">isNull</span><span class="o">(</span><span class="n">product</span><span class="o">))</span> <span class="o">{</span>
<span class="k">throw</span> <span class="k">new</span> <span class="nf">IllegalArgumentException</span><span class="o">(</span><span class="s">"Product not exists at all!"</span><span class="o">);</span>
<span class="o">}</span>
<span class="k">return</span> <span class="n">product</span><span class="o">;</span>
diff --git a/content/cn/docs/getting-started/index.html b/content/cn/docs/getting-started/index.html
index 34febcc..66d4600 100644
--- a/content/cn/docs/getting-started/index.html
+++ b/content/cn/docs/getting-started/index.html
@@ -549,7 +549,7 @@
<h2 id="入门">入门</h2>
<p>Apache ServiceComb 是一个微服务的开源解决方案。其包含多个组件，通过组件之间的搭配，可以灵活的应对不同的场景。本指南可以帮助你快速的使用 Apache ServiceComb，针对初次使用的用户，这是开始尝试的最佳入口。</p>
<ol>
- <li>下载 <a href="/release/">ServiceComb 发布版本</a>组件</li>
+ <li>下载 <a href="/cn/release/">ServiceComb 发布版本</a>组件</li>
<li><a href="/cn/docs/service-center/install/">服务中心环境安装</a></li>
<li><a href="/cn/docs/service-center/registration-discovery/">服务注册与发现</a></li>
<li>相应开发语言的快速入门说明进行使用
diff --git a/content/cn/docs/how-to-do-microservice-accept-test/index.html b/content/cn/docs/how-to-do-microservice-accept-test/index.html
index 4f7494b..420cdaa 100644
--- a/content/cn/docs/how-to-do-microservice-accept-test/index.html
+++ b/content/cn/docs/how-to-do-microservice-accept-test/index.html
@@ -427,29 +427,29 @@
<p>下面是Product的Schema：</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
<p>下面是ProductPrice的Schema：</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"price"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<number>"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"price"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<number>"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
<p>Product Service返回的Schema则是：</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"products"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"products"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"price"</span><span class="p">:</span><span class="w"> </span><span class="err"><number></span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"<string>"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"price"</span><span class="p">:</span><span class="w"> </span><span class="err"><number></span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">]</span><span class="w">
</span><span class="p">}</span><span class="w">
@@ -575,16 +575,16 @@ ENDRULE
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">Stepdefs</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="n">List</span><span class="o"><</span><span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">>></span> <span class="n">answer</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="nc">List</span><span class="o"><</span><span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">String</span><span class="o">>></span> <span class="n">answer</span><span class="o">;</span>
<span class="nd">@Given</span><span class="o">(</span><span class="s">"^Product Service is up and running$"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">productServiceIsUpAndRunning</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">probe</span><span class="o">(</span><span class="s">"Product Service"</span><span class="o">,</span> <span class="n">PRODUCT_ADDRESS</span><span class="o">);</span>
+ <span class="n">probe</span><span class="o">(</span><span class="s">"Product Service"</span><span class="o">,</span> <span class="no">PRODUCT_ADDRESS</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@And</span><span class="o">(</span><span class="s">"^Product Price Service is up and running$"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">productPriceServiceIsUpAndRunning</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">probe</span><span class="o">(</span><span class="s">"Product Price Service"</span><span class="o">,</span> <span class="n">PRODUCT_PRICE_ADDRESS</span><span class="o">);</span>
+ <span class="n">probe</span><span class="o">(</span><span class="s">"Product Price Service"</span><span class="o">,</span> <span class="no">PRODUCT_PRICE_ADDRESS</span><span class="o">);</span>
<span class="n">clearBytemanScript</span><span class="o">();</span>
<span class="o">}</span>
@@ -592,22 +592,22 @@ ENDRULE
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">queryProductList</span><span class="o">()</span> <span class="o">{</span>
<span class="n">answer</span> <span class="o">=</span> <span class="n">given</span><span class="o">()</span>
<span class="o">.</span><span class="na">when</span><span class="o">()</span>
- <span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="n">PRODUCT_ADDRESS</span> <span class="o">+</span> <span class="s">"/products"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="no">PRODUCT_ADDRESS</span> <span class="o">+</span> <span class="s">"/products"</span><span class="o">)</span>
<span class="o">.</span><span class="na">then</span><span class="o">()</span>
<span class="o">.</span><span class="na">statusCode</span><span class="o">(</span><span class="n">is</span><span class="o">(</span><span class="mi">200</span><span class="o">))</span>
<span class="o">.</span><span class="na">extract</span><span class="o">()</span>
<span class="o">.</span><span class="na">body</span><span class="o">()</span>
<span class="o">.</span><span class="na">jsonPath</span><span class="o">()</span>
- <span class="o">.</span><span class="na">getList</span><span class="o">(</span><span class="s">"products"</span><span class="o">,</span> <span class="n">Map</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="o">.</span><span class="na">getList</span><span class="o">(</span><span class="s">"products"</span><span class="o">,</span> <span class="nc">Map</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Given</span><span class="o">(</span><span class="s">"^Install the byteman script ([A-Za-z0-9_\\.]+) to Product Price Service$"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">injectExceptionIntoProductPriceService</span><span class="o">(</span><span class="n">String</span> <span class="n">bytemanScript</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">injectExceptionIntoProductPriceService</span><span class="o">(</span><span class="nc">String</span> <span class="n">bytemanScript</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="n">injectBytemanScript</span><span class="o">(</span><span class="s">"target/test-classes/"</span> <span class="o">+</span> <span class="n">bytemanScript</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Then</span><span class="o">(</span><span class="s">"^Get following products$"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">compareResult</span><span class="o">(</span><span class="n">List</span><span class="o"><</span><span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">>></span> <span class="n">expected</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">compareResult</span><span class="o">(</span><span class="nc">List</span><span class="o"><</span><span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">String</span><span class="o">>></span> <span class="n">expected</span><span class="o">)</span> <span class="o">{</span>
<span class="n">assertThat</span><span class="o">(</span><span class="n">answer</span><span class="o">).</span><span class="na">containsExactlyInAnyOrderElementsOf</span><span class="o">(</span><span class="n">expected</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/cn/docs/linuxcon-workshop-demo/index.html b/content/cn/docs/linuxcon-workshop-demo/index.html
index 052ae6c..e7a579b 100644
--- a/content/cn/docs/linuxcon-workshop-demo/index.html
+++ b/content/cn/docs/linuxcon-workshop-demo/index.html
@@ -515,7 +515,7 @@
<span class="o">}</span>
<span class="nd">@Service</span>
-<span class="kd">class</span> <span class="nc">FibonacciServiceImpl</span> <span class="kd">implements</span> <span class="n">FibonacciService</span> <span class="o">{</span>
+<span class="kd">class</span> <span class="nc">FibonacciServiceImpl</span> <span class="kd">implements</span> <span class="nc">FibonacciService</span> <span class="o">{</span>
<span class="nd">@Override</span>
<span class="kd">public</span> <span class="kt">long</span> <span class="nf">term</span><span class="o">(</span><span class="kt">int</span> <span class="n">n</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">n</span> <span class="o">==</span> <span class="mi">0</span><span class="o">)</span> <span class="o">{</span>
@@ -551,17 +551,17 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"fibonacciRestEndpoint"</span><span class="o">)</span>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/fibonacci"</span><span class="o">)</span>
<span class="nd">@Controller</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">FibonacciRestEndpoint</span> <span class="kd">implements</span> <span class="n">FibonacciEndpoint</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">FibonacciRestEndpoint</span> <span class="kd">implements</span> <span class="nc">FibonacciEndpoint</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="n">FibonacciRestEndpoint</span><span class="o">(</span><span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">FibonacciRestEndpoint</span><span class="o">(</span><span class="nc">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">fibonacciService</span> <span class="o">=</span> <span class="n">fibonacciService</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/term"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/term"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
<span class="nd">@ResponseBody</span>
<span class="kd">public</span> <span class="kt">long</span> <span class="nf">term</span><span class="o">(</span><span class="kt">int</span> <span class="n">n</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">fibonacciService</span><span class="o">.</span><span class="na">term</span><span class="o">(</span><span class="n">n</span><span class="o">);</span>
@@ -570,12 +570,12 @@
</code></pre></div></div>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RpcSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"fibonacciRpcEndpoint"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">FibonacciRpcEndpoint</span> <span class="kd">implements</span> <span class="n">FibonacciEndpoint</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">FibonacciRpcEndpoint</span> <span class="kd">implements</span> <span class="nc">FibonacciEndpoint</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="kd">public</span> <span class="nf">FibonacciRpcEndpoint</span><span class="o">(</span><span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">FibonacciRpcEndpoint</span><span class="o">(</span><span class="nc">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">fibonacciService</span> <span class="o">=</span> <span class="n">fibonacciService</span><span class="o">;</span>
<span class="o">}</span>
@@ -612,8 +612,8 @@
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">WorkerApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">WorkerApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">WorkerApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -649,11 +649,11 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="kt">long</span> <span class="nf">ancestorsOfQueenAt</span><span class="o">(</span><span class="kt">int</span> <span class="n">generation</span><span class="o">);</span>
<span class="o">}</span>
-<span class="kd">class</span> <span class="nc">BeekeeperServiceImpl</span> <span class="kd">implements</span> <span class="n">BeekeeperService</span> <span class="o">{</span>
+<span class="kd">class</span> <span class="nc">BeekeeperServiceImpl</span> <span class="kd">implements</span> <span class="nc">BeekeeperService</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
- <span class="n">BeekeeperServiceImpl</span><span class="o">(</span><span class="n">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">BeekeeperServiceImpl</span><span class="o">(</span><span class="nc">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">fibonacciCalculator</span> <span class="o">=</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
<span class="o">}</span>
@@ -684,10 +684,10 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="kd">class</span> <span class="nc">BeekeeperConfig</span> <span class="o">{</span>
<span class="nd">@RpcReference</span><span class="o">(</span><span class="n">microserviceName</span> <span class="o">=</span> <span class="s">"worker"</span><span class="o">,</span> <span class="n">schemaId</span> <span class="o">=</span> <span class="s">"fibonacciRpcEndpoint"</span><span class="o">)</span>
- <span class="kd">private</span> <span class="n">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="nc">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
<span class="nd">@Bean</span>
- <span class="n">BeekeeperService</span> <span class="nf">beekeeperService</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">BeekeeperService</span> <span class="nf">beekeeperService</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="k">new</span> <span class="nf">BeekeeperServiceImpl</span><span class="o">(</span><span class="n">fibonacciCalculator</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -704,18 +704,18 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@Controller</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">BeekeeperController</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">BeekeeperController</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">BeekeeperController</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">BeekeeperService</span> <span class="n">beekeeperService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">BeekeeperService</span> <span class="n">beekeeperService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="n">BeekeeperController</span><span class="o">(</span><span class="n">BeekeeperService</span> <span class="n">beekeeperService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">BeekeeperController</span><span class="o">(</span><span class="nc">BeekeeperService</span> <span class="n">beekeeperService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">beekeeperService</span> <span class="o">=</span> <span class="n">beekeeperService</span><span class="o">;</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/drone/ancestors/{generation}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">GET</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">APPLICATION_JSON_UTF8_VALUE</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/drone/ancestors/{generation}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="no">GET</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="no">APPLICATION_JSON_UTF8_VALUE</span><span class="o">)</span>
<span class="nd">@ResponseBody</span>
- <span class="kd">public</span> <span class="n">Ancestor</span> <span class="nf">ancestorsOfDrone</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="kt">int</span> <span class="n">generation</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">Ancestor</span> <span class="nf">ancestorsOfDrone</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="kt">int</span> <span class="n">generation</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span>
<span class="s">"Received request to find the number of ancestors of drone at generation {}"</span><span class="o">,</span>
<span class="n">generation</span><span class="o">);</span>
@@ -723,9 +723,9 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="k">return</span> <span class="k">new</span> <span class="nf">Ancestor</span><span class="o">(</span><span class="n">beekeeperService</span><span class="o">.</span><span class="na">ancestorsOfDroneAt</span><span class="o">(</span><span class="n">generation</span><span class="o">));</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/queen/ancestors/{generation}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">GET</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">APPLICATION_JSON_UTF8_VALUE</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/queen/ancestors/{generation}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="no">GET</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="no">APPLICATION_JSON_UTF8_VALUE</span><span class="o">)</span>
<span class="nd">@ResponseBody</span>
- <span class="kd">public</span> <span class="n">Ancestor</span> <span class="nf">ancestorsOfQueen</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="kt">int</span> <span class="n">generation</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">Ancestor</span> <span class="nf">ancestorsOfQueen</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="kt">int</span> <span class="n">generation</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span>
<span class="s">"Received request to find the number of ancestors of queen at generation {}"</span><span class="o">,</span>
<span class="n">generation</span><span class="o">);</span>
@@ -737,10 +737,10 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="kd">class</span> <span class="nc">Ancestor</span> <span class="o">{</span>
<span class="kd">private</span> <span class="kt">long</span> <span class="n">ancestors</span><span class="o">;</span>
- <span class="n">Ancestor</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">Ancestor</span><span class="o">()</span> <span class="o">{</span>
<span class="o">}</span>
- <span class="n">Ancestor</span><span class="o">(</span><span class="kt">long</span> <span class="n">ancestors</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Ancestor</span><span class="o">(</span><span class="kt">long</span> <span class="n">ancestors</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">ancestors</span> <span class="o">=</span> <span class="n">ancestors</span><span class="o">;</span>
<span class="o">}</span>
@@ -782,8 +782,8 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">BeekeeperApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">BeekeeperApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">BeekeeperApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -799,9 +799,9 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
请求都需要带上返回的JWT token，而 <code class="highlighter-rouge">validate</code> 方法将验证token以确认其有效。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">AuthenticationService</span> <span class="o">{</span>
- <span class="n">String</span> <span class="nf">authenticate</span><span class="o">(</span><span class="n">String</span> <span class="n">username</span><span class="o">,</span> <span class="n">String</span> <span class="n">password</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">authenticate</span><span class="o">(</span><span class="nc">String</span> <span class="n">username</span><span class="o">,</span> <span class="nc">String</span> <span class="n">password</span><span class="o">);</span>
- <span class="n">String</span> <span class="nf">validate</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">validate</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -814,57 +814,57 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/rest"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">AuthenticationController</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">AuthenticationController</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">AuthenticationController</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">USERNAME</span> <span class="o">=</span> <span class="s">"username"</span><span class="o">;</span>
- <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">PASSWORD</span> <span class="o">=</span> <span class="s">"password"</span><span class="o">;</span>
- <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">TOKEN</span> <span class="o">=</span> <span class="s">"token"</span><span class="o">;</span>
+ <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">USERNAME</span> <span class="o">=</span> <span class="s">"username"</span><span class="o">;</span>
+ <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">PASSWORD</span> <span class="o">=</span> <span class="s">"password"</span><span class="o">;</span>
+ <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">TOKEN</span> <span class="o">=</span> <span class="s">"token"</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="n">AuthenticationController</span><span class="o">(</span><span class="n">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">AuthenticationController</span><span class="o">(</span><span class="nc">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">authenticationService</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">;</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/login"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">POST</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">TEXT_PLAIN_VALUE</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span>
- <span class="nd">@RequestParam</span><span class="o">(</span><span class="n">USERNAME</span><span class="o">)</span> <span class="n">String</span> <span class="n">username</span><span class="o">,</span>
- <span class="nd">@RequestParam</span><span class="o">(</span><span class="n">PASSWORD</span><span class="o">)</span> <span class="n">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/login"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="no">POST</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="no">TEXT_PLAIN_VALUE</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span>
+ <span class="nd">@RequestParam</span><span class="o">(</span><span class="no">USERNAME</span><span class="o">)</span> <span class="nc">String</span> <span class="n">username</span><span class="o">,</span>
+ <span class="nd">@RequestParam</span><span class="o">(</span><span class="no">PASSWORD</span><span class="o">)</span> <span class="nc">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Received login request from user {}"</span><span class="o">,</span> <span class="n">username</span><span class="o">);</span>
- <span class="n">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">authenticate</span><span class="o">(</span><span class="n">username</span><span class="o">,</span> <span class="n">password</span><span class="o">);</span>
- <span class="n">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HttpHeaders</span><span class="o">();</span>
- <span class="n">headers</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="n">AUTHORIZATION</span><span class="o">,</span> <span class="n">TOKEN_PREFIX</span> <span class="o">+</span> <span class="n">token</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">authenticate</span><span class="o">(</span><span class="n">username</span><span class="o">,</span> <span class="n">password</span><span class="o">);</span>
+ <span class="nc">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HttpHeaders</span><span class="o">();</span>
+ <span class="n">headers</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="no">AUTHORIZATION</span><span class="o">,</span> <span class="no">TOKEN_PREFIX</span> <span class="o">+</span> <span class="n">token</span><span class="o">);</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Authenticated user {} successfully"</span><span class="o">,</span> <span class="n">username</span><span class="o">);</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">ResponseEntity</span><span class="o"><>(</span><span class="s">"Welcome, "</span> <span class="o">+</span> <span class="n">username</span><span class="o">,</span> <span class="n">headers</span><span class="o">,</span> <span class="n">OK</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">ResponseEntity</span><span class="o"><>(</span><span class="s">"Welcome, "</span> <span class="o">+</span> <span class="n">username</span><span class="o">,</span> <span class="n">headers</span><span class="o">,</span> <span class="no">OK</span><span class="o">);</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/validate"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">POST</span><span class="o">,</span> <span class="n">consumes</span> <span class="o">=</span> <span class="n">APPLICATION_JSON_UTF8_VALUE</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">TE [...]
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/validate"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="no">POST</span><span class="o">,</span> <span class="n">consumes</span> <span class="o">=</span> <span class="no">APPLICATION_JSON_UTF8_VALUE</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="no" [...]
<span class="nd">@ResponseBody</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">validate</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Token</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">validate</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Token</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Received validation request of token {}"</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
<span class="k">return</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">validate</span><span class="o">(</span><span class="n">token</span><span class="o">.</span><span class="na">getToken</span><span class="o">());</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="kd">class</span> <span class="nc">Token</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="n">token</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="n">token</span><span class="o">;</span>
- <span class="n">Token</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">Token</span><span class="o">()</span> <span class="o">{</span>
<span class="o">}</span>
- <span class="n">Token</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Token</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">token</span> <span class="o">=</span> <span class="n">token</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">getToken</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">getToken</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">token</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">toString</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">toString</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Token{"</span> <span class="o">+</span>
<span class="s">"token='"</span> <span class="o">+</span> <span class="n">token</span> <span class="o">+</span> <span class="sc">'\''</span> <span class="o">+</span>
<span class="sc">'}'</span><span class="o">;</span>
@@ -878,8 +878,8 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">DoormanApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">DoormanApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">DoormanApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -939,33 +939,33 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Service</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">AuthenticationService</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">AuthenticationService</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">DOORMAN_ADDRESS</span> <span class="o">=</span> <span class="s">"cse://doorman"</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">AuthenticationService</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">DOORMAN_ADDRESS</span> <span class="o">=</span> <span class="s">"cse://doorman"</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">RestTemplate</span> <span class="n">restTemplate</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">RestTemplate</span> <span class="n">restTemplate</span><span class="o">;</span>
- <span class="n">AuthenticationService</span><span class="o">()</span> <span class="o">{</span>
- <span class="k">this</span><span class="o">.</span><span class="na">restTemplate</span> <span class="o">=</span> <span class="n">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
+ <span class="nc">AuthenticationService</span><span class="o">()</span> <span class="o">{</span>
+ <span class="k">this</span><span class="o">.</span><span class="na">restTemplate</span> <span class="o">=</span> <span class="nc">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
- <span class="k">this</span><span class="o">.</span><span class="na">restTemplate</span><span class="o">.</span><span class="na">setErrorHandler</span><span class="o">(</span><span class="k">new</span> <span class="n">ResponseErrorHandler</span><span class="o">()</span> <span class="o">{</span>
+ <span class="k">this</span><span class="o">.</span><span class="na">restTemplate</span><span class="o">.</span><span class="na">setErrorHandler</span><span class="o">(</span><span class="k">new</span> <span class="nc">ResponseErrorHandler</span><span class="o">()</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">hasError</span><span class="o">(</span><span class="n">ClientHttpResponse</span> <span class="n">clientHttpResponse</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">IOException</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">hasError</span><span class="o">(</span><span class="nc">ClientHttpResponse</span> <span class="n">clientHttpResponse</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">IOException</span> <span class="o">{</span>
<span class="k">return</span> <span class="kc">false</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">handleError</span><span class="o">(</span><span class="n">ClientHttpResponse</span> <span class="n">clientHttpResponse</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">IOException</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">handleError</span><span class="o">(</span><span class="nc">ClientHttpResponse</span> <span class="n">clientHttpResponse</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">IOException</span> <span class="o">{</span>
<span class="o">}</span>
<span class="o">});</span>
<span class="o">}</span>
<span class="nd">@HystrixCommand</span><span class="o">(</span><span class="n">fallbackMethod</span> <span class="o">=</span> <span class="s">"timeout"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">validate</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="nf">validate</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Validating token {}"</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">restTemplate</span><span class="o">.</span><span class="na">postForEntity</span><span class="o">(</span>
- <span class="n">DOORMAN_ADDRESS</span> <span class="o">+</span> <span class="s">"/rest/validate"</span><span class="o">,</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">restTemplate</span><span class="o">.</span><span class="na">postForEntity</span><span class="o">(</span>
+ <span class="no">DOORMAN_ADDRESS</span> <span class="o">+</span> <span class="s">"/rest/validate"</span><span class="o">,</span>
<span class="n">validationRequest</span><span class="o">(</span><span class="n">token</span><span class="o">),</span>
- <span class="n">String</span><span class="o">.</span><span class="na">class</span>
+ <span class="nc">String</span><span class="o">.</span><span class="na">class</span>
<span class="o">);</span>
<span class="k">if</span> <span class="o">(!</span><span class="n">responseEntity</span><span class="o">.</span><span class="na">getStatusCode</span><span class="o">().</span><span class="na">is2xxSuccessful</span><span class="o">())</span> <span class="o">{</span>
@@ -975,16 +975,16 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="k">return</span> <span class="n">responseEntity</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">timeout</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="nf">timeout</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">warn</span><span class="o">(</span><span class="s">"Request to validate token {} timed out"</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">ResponseEntity</span><span class="o"><>(</span><span class="n">REQUEST_TIMEOUT</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">ResponseEntity</span><span class="o"><>(</span><span class="no">REQUEST_TIMEOUT</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">HttpEntity</span><span class="o"><</span><span class="n">Token</span><span class="o">></span> <span class="nf">validationRequest</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HttpHeaders</span><span class="o">();</span>
- <span class="n">headers</span><span class="o">.</span><span class="na">setContentType</span><span class="o">(</span><span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON_UTF8</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="nc">HttpEntity</span><span class="o"><</span><span class="nc">Token</span><span class="o">></span> <span class="nf">validationRequest</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HttpHeaders</span><span class="o">();</span>
+ <span class="n">headers</span><span class="o">.</span><span class="na">setContentType</span><span class="o">(</span><span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON_UTF8</span><span class="o">);</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">HttpEntity</span><span class="o"><>(</span><span class="k">new</span> <span class="n">Token</span><span class="o">(</span><span class="n">token</span><span class="o">),</span> <span class="n">headers</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">HttpEntity</span><span class="o"><>(</span><span class="k">new</span> <span class="nc">Token</span><span class="o">(</span><span class="n">token</span><span class="o">),</span> <span class="n">headers</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -994,26 +994,26 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
若用户合法则路由用户请求到对应服务，否则返回 <code class="highlighter-rouge">403 forbidden</code>。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Component</span>
-<span class="kd">class</span> <span class="nc">AuthenticationAwareFilter</span> <span class="kd">extends</span> <span class="n">ZuulFilter</span> <span class="o">{</span>
+<span class="kd">class</span> <span class="nc">AuthenticationAwareFilter</span> <span class="kd">extends</span> <span class="nc">ZuulFilter</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">AuthenticationAwareFilter</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">AuthenticationAwareFilter</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">LOGIN_PATH</span> <span class="o">=</span> <span class="s">"/login"</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">LOGIN_PATH</span> <span class="o">=</span> <span class="s">"/login"</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">PathExtractor</span> <span class="n">pathExtractor</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">PathExtractor</span> <span class="n">pathExtractor</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="n">AuthenticationAwareFilter</span><span class="o">(</span>
- <span class="n">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">,</span>
- <span class="n">PathExtractor</span> <span class="n">pathExtractor</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">AuthenticationAwareFilter</span><span class="o">(</span>
+ <span class="nc">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">,</span>
+ <span class="nc">PathExtractor</span> <span class="n">pathExtractor</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">authenticationService</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">;</span>
<span class="k">this</span><span class="o">.</span><span class="na">pathExtractor</span> <span class="o">=</span> <span class="n">pathExtractor</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">filterType</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">filterType</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"pre"</span><span class="o">;</span>
<span class="o">}</span>
@@ -1024,26 +1024,26 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@Override</span>
<span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">shouldFilter</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">path</span> <span class="o">=</span> <span class="n">pathExtractor</span><span class="o">.</span><span class="na">path</span><span class="o">(</span><span class="n">RequestContext</span><span class="o">.</span><span class="na">getCurrentContext</span><span class="o">());</span>
+ <span class="nc">String</span> <span class="n">path</span> <span class="o">=</span> <span class="n">pathExtractor</span><span class="o">.</span><span class="na">path</span><span class="o">(</span><span class="nc">RequestContext</span><span class="o">.</span><span class="na">getCurrentContext</span><span class="o">());</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Received request with query path: {}"</span><span class="o">,</span> <span class="n">path</span><span class="o">);</span>
- <span class="k">return</span> <span class="o">!</span><span class="n">path</span><span class="o">.</span><span class="na">endsWith</span><span class="o">(</span><span class="n">LOGIN_PATH</span><span class="o">);</span>
+ <span class="k">return</span> <span class="o">!</span><span class="n">path</span><span class="o">.</span><span class="na">endsWith</span><span class="o">(</span><span class="no">LOGIN_PATH</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">Object</span> <span class="nf">run</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">Object</span> <span class="nf">run</span><span class="o">()</span> <span class="o">{</span>
<span class="n">filter</span><span class="o">();</span>
<span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
<span class="o">}</span>
<span class="kd">private</span> <span class="kt">void</span> <span class="nf">filter</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">RequestContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">RequestContext</span><span class="o">.</span><span class="na">getCurrentContext</span><span class="o">();</span>
+ <span class="nc">RequestContext</span> <span class="n">context</span> <span class="o">=</span> <span class="nc">RequestContext</span><span class="o">.</span><span class="na">getCurrentContext</span><span class="o">();</span>
<span class="k">if</span> <span class="o">(</span><span class="n">doesNotContainToken</span><span class="o">(</span><span class="n">context</span><span class="o">))</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">warn</span><span class="o">(</span><span class="s">"No token found in request header"</span><span class="o">);</span>
<span class="n">rejectRequest</span><span class="o">(</span><span class="n">context</span><span class="o">);</span>
<span class="o">}</span> <span class="k">else</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">token</span><span class="o">(</span><span class="n">context</span><span class="o">);</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">validate</span><span class="o">(</span><span class="n">token</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">token</span><span class="o">(</span><span class="n">context</span><span class="o">);</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">validate</span><span class="o">(</span><span class="n">token</span><span class="o">);</span>
<span class="k">if</span> <span class="o">(!</span><span class="n">responseEntity</span><span class="o">.</span><span class="na">getStatusCode</span><span class="o">().</span><span class="na">is2xxSuccessful</span><span class="o">())</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">warn</span><span class="o">(</span><span class="s">"Unauthorized token {} and request rejected"</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
<span class="n">rejectRequest</span><span class="o">(</span><span class="n">context</span><span class="o">);</span>
@@ -1053,22 +1053,22 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="o">}</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="kt">void</span> <span class="nf">rejectRequest</span><span class="o">(</span><span class="n">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">context</span><span class="o">.</span><span class="na">setResponseStatusCode</span><span class="o">(</span><span class="n">SC_FORBIDDEN</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kt">void</span> <span class="nf">rejectRequest</span><span class="o">(</span><span class="nc">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="n">context</span><span class="o">.</span><span class="na">setResponseStatusCode</span><span class="o">(</span><span class="no">SC_FORBIDDEN</span><span class="o">);</span>
<span class="n">context</span><span class="o">.</span><span class="na">setSendZuulResponse</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="kt">boolean</span> <span class="nf">doesNotContainToken</span><span class="o">(</span><span class="n">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="kt">boolean</span> <span class="nf">doesNotContainToken</span><span class="o">(</span><span class="nc">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">)</span> <span class="o">==</span> <span class="kc">null</span>
- <span class="o">||</span> <span class="o">!</span><span class="n">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">).</span><span class="na">startsWith</span><span class="o">(</span><span class="n">TOKEN_PREFIX</span><span class="o">);</span>
+ <span class="o">||</span> <span class="o">!</span><span class="n">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">).</span><span class="na">startsWith</span><span class="o">(</span><span class="no">TOKEN_PREFIX</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="nf">token</span><span class="o">(</span><span class="n">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">).</span><span class="na">replace</span><span class="o">(</span><span class="n">TOKEN_PREFIX</span><span class="o">,</span> <span class="s">""</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="nf">token</span><span class="o">(</span><span class="nc">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">).</span><span class="na">replace</span><span class="o">(</span><span class="no">TOKEN_PREFIX</span><span class="o">,</span> <span class="s">""</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="n">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">context</span><span class="o">.</span><span class="na">getRequest</span><span class="o">().</span><span class="na">getHeader</span><span class="o">(</span><span class="n">AUTHORIZATION</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="nc">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="n">context</span><span class="o">.</span><span class="na">getRequest</span><span class="o">().</span><span class="na">getHeader</span><span class="o">(</span><span class="no">AUTHORIZATION</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -1082,8 +1082,8 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ManagerApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">ManagerApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">ManagerApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/cn/docs/loadtest-saga-with-kubernetes.html b/content/cn/docs/loadtest-saga-with-kubernetes.html
index a9bc292..aca169f 100644
--- a/content/cn/docs/loadtest-saga-with-kubernetes.html
+++ b/content/cn/docs/loadtest-saga-with-kubernetes.html
@@ -418,7 +418,7 @@
<p>我们的demo项目由Java编写、maven作为依赖管理工具，在项目中引入了fabric8插件，编译程序时可以顺便将jar包构建成docker镜像。首先，我们构建alpha-server镜像：</p>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span><span class="nb">cd </span>alpha/alpha-server
-<span class="nv">$ </span>mvn clean install <span class="nt">-Pdocker</span>
+<span class="nv">$ </span>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span>
</code></pre></div></div>
<p>然后进入demo项目路径<code class="highlighter-rouge">saga-demo/saga-spring-demo</code>，执行相同的maven构建命令，构建完成后，我们可以看到产生了4个相关镜像：</p>
diff --git a/content/cn/docs/mersher-quick-start-advance/index.html b/content/cn/docs/mesher-quick-start-advance/index.html
similarity index 99%
rename from content/cn/docs/mersher-quick-start-advance/index.html
rename to content/cn/docs/mesher-quick-start-advance/index.html
index 86c8155..dc77abf 100644
--- a/content/cn/docs/mersher-quick-start-advance/index.html
+++ b/content/cn/docs/mesher-quick-start-advance/index.html
@@ -628,7 +628,7 @@
<ul>
<p class="header">贡献</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">报告本网页问题</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mesher-quick-start-advance.md">在Github上编辑此页</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mersher-quick-start-advance.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
<li><a href="/cn/security">安全</a></li>
</ul>
diff --git a/content/cn/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html b/content/cn/docs/mesher-quick-start-advance/mesher-distributed-tracing/index.html
similarity index 99%
rename from content/cn/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
rename to content/cn/docs/mesher-quick-start-advance/mesher-distributed-tracing/index.html
index 73937c5..5b64297 100644
--- a/content/cn/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
+++ b/content/cn/docs/mesher-quick-start-advance/mesher-distributed-tracing/index.html
@@ -660,7 +660,7 @@
<ul>
<p class="header">贡献</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">报告本网页问题</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mesher-distributed-tracing.md">在Github上编辑此页</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mersher-distributed-tracing.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
<li><a href="/cn/security">安全</a></li>
</ul>
diff --git a/content/cn/docs/mersher-quick-start-advance/mersher-flow-control/index.html b/content/cn/docs/mesher-quick-start-advance/mesher-flow-control/index.html
similarity index 98%
rename from content/cn/docs/mersher-quick-start-advance/mersher-flow-control/index.html
rename to content/cn/docs/mesher-quick-start-advance/mesher-flow-control/index.html
index 71a5677..7bc9460 100644
--- a/content/cn/docs/mersher-quick-start-advance/mersher-flow-control/index.html
+++ b/content/cn/docs/mesher-quick-start-advance/mesher-flow-control/index.html
@@ -555,9 +555,9 @@
<span class="na">qps</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span> <span class="c1"># enable rate limiting or not</span>
<span class="na">global</span><span class="pi">:</span>
- <span class="na">limit</span><span class="pi">:</span> <span class="s">0</span> <span class="c1"># default limit of provider</span>
+ <span class="na">limit</span><span class="pi">:</span> <span class="m">0</span> <span class="c1"># default limit of provider</span>
<span class="na">limit</span><span class="pi">:</span>
- <span class="na">Server</span><span class="pi">:</span> <span class="s">0</span> <span class="c1"># rate limit for request from a provider</span>
+ <span class="na">Server</span><span class="pi">:</span> <span class="m">0</span> <span class="c1"># rate limit for request from a provider</span>
</code></pre></div> </div>
<p>该频率限制标识每秒接受的请求为0，即不提供服务。</p>
@@ -653,7 +653,7 @@
<ul>
<p class="header">贡献</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">报告本网页问题</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mesher-flow-control.md">在Github上编辑此页</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mersher-flow-control.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
<li><a href="/cn/security">安全</a></li>
</ul>
diff --git a/content/cn/docs/mersher-quick-start-advance/mersher-load-balance/index.html b/content/cn/docs/mesher-quick-start-advance/mesher-load-balance/index.html
similarity index 99%
rename from content/cn/docs/mersher-quick-start-advance/mersher-load-balance/index.html
rename to content/cn/docs/mesher-quick-start-advance/mesher-load-balance/index.html
index 51f0ab5..a2145cb 100644
--- a/content/cn/docs/mersher-quick-start-advance/mersher-load-balance/index.html
+++ b/content/cn/docs/mesher-quick-start-advance/mesher-load-balance/index.html
@@ -661,7 +661,7 @@ listenAddress: 127.0.0.1:30102 <span class="nt">-----</span>》 listenAddress:
<ul>
<p class="header">贡献</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">报告本网页问题</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mesher-load-balance.md">在Github上编辑此页</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mersher-load-balance.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
<li><a href="/cn/security">安全</a></li>
</ul>
diff --git a/content/cn/docs/mersher-quick-start-advance/mersher-service-management/index.html b/content/cn/docs/mesher-quick-start-advance/mesher-service-management/index.html
similarity index 97%
rename from content/cn/docs/mersher-quick-start-advance/mersher-service-management/index.html
rename to content/cn/docs/mesher-quick-start-advance/mesher-service-management/index.html
index 49bb34c..c7f90d1 100644
--- a/content/cn/docs/mersher-quick-start-advance/mersher-service-management/index.html
+++ b/content/cn/docs/mesher-quick-start-advance/mesher-service-management/index.html
@@ -559,14 +559,14 @@
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">routeRule</span><span class="pi">:</span>
<span class="na">calculator</span><span class="pi">:</span> <span class="c1">#service name</span>
- <span class="pi">-</span> <span class="na">precedence</span><span class="pi">:</span> <span class="s">2</span> <span class="c1">#precedence of route rule</span>
+ <span class="pi">-</span> <span class="na">precedence</span><span class="pi">:</span> <span class="m">2</span> <span class="c1">#precedence of route rule</span>
<span class="na">route</span><span class="pi">:</span> <span class="c1">#route rule list</span>
<span class="pi">-</span> <span class="na">tags</span><span class="pi">:</span>
<span class="na">version</span><span class="pi">:</span> <span class="s">1.1.1</span>
- <span class="na">weight</span><span class="pi">:</span> <span class="s">70</span> <span class="c1">#weight of 20%</span>
+ <span class="na">weight</span><span class="pi">:</span> <span class="m">70</span> <span class="c1">#weight of 20%</span>
<span class="pi">-</span> <span class="na">tags</span><span class="pi">:</span>
<span class="na">version</span><span class="pi">:</span> <span class="s">1.1.2</span>
- <span class="na">weight</span><span class="pi">:</span> <span class="s">30</span> <span class="c1">#weight of 20%</span>
+ <span class="na">weight</span><span class="pi">:</span> <span class="m">30</span> <span class="c1">#weight of 20%</span>
</code></pre></div> </div>
</li>
</ul>
@@ -589,20 +589,20 @@
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">timeout</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
- <span class="na">timeoutInMilliseconds</span><span class="pi">:</span> <span class="s">1000</span> <span class="c1">#超时时间</span>
- <span class="na">maxConcurrentRequests</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">timeoutInMilliseconds</span><span class="pi">:</span> <span class="m">1000</span> <span class="c1">#超时时间</span>
+ <span class="na">maxConcurrentRequests</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">circuitBreaker</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
<span class="na">forceOpen</span><span class="pi">:</span> <span class="no">false</span>
<span class="na">forceClosed</span><span class="pi">:</span> <span class="no">false</span>
- <span class="na">sleepWindowInMilliseconds</span><span class="pi">:</span> <span class="s">10000</span> <span class="c1">#熔断恢复时间10秒</span>
- <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="s">1</span> <span class="c1">#请求量限制</span>
- <span class="na">errorThresholdPercentage</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">sleepWindowInMilliseconds</span><span class="pi">:</span> <span class="m">10000</span> <span class="c1">#熔断恢复时间10秒</span>
+ <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="m">1</span> <span class="c1">#请求量限制</span>
+ <span class="na">errorThresholdPercentage</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">fallback</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
- <span class="na">maxConcurrentRequests</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">maxConcurrentRequests</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">fallbackpolicy</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">policy</span><span class="pi">:</span> <span class="s">returnnull</span>
@@ -707,7 +707,7 @@
<ul>
<p class="header">贡献</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">报告本网页问题</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mesher-service-management.md">在Github上编辑此页</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mersher-service-management.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
<li><a href="/cn/security">安全</a></li>
</ul>
diff --git a/content/cn/docs/mersher-quick-start/index.html b/content/cn/docs/mesher-quick-start/index.html
similarity index 97%
rename from content/cn/docs/mersher-quick-start/index.html
rename to content/cn/docs/mesher-quick-start/index.html
index 86dd944..44c2c22 100644
--- a/content/cn/docs/mersher-quick-start/index.html
+++ b/content/cn/docs/mesher-quick-start/index.html
@@ -625,9 +625,9 @@ docker run <span class="nt">-d</span> <span class="nt">-p</span> 30100:30100 ser
<li>
<p>2、 创建 <strong>mesher_webapp</strong> 用于为<strong>httpserver_webapp</strong>服务： 在mesher目录下执行下列linux命令创建mesher_webapp，此处除了可执行文件，还需要拷贝conf</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mkdir /usr/local/src/mesher_webapp
-cp ./mesher /usr/local/src/mesher_webapp
-cp <span class="nt">-r</span> ./conf /usr/local/src/mesher_webapp
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">mkdir</span> /usr/local/src/mesher_webapp
+<span class="nb">cp</span> ./mesher /usr/local/src/mesher_webapp
+<span class="nb">cp</span> <span class="nt">-r</span> ./conf /usr/local/src/mesher_webapp
</code></pre></div> </div>
<p>更改conf中配置文件，microservice.yaml中的<strong>服务name</strong>，从hellomesher改为<strong>webapp</strong>；更改chassis.yaml中监听的服务地址，从本地回环（127.0.0.1）地址改为<strong>内网ip</strong>（linux下通过ifconfig查看，如192.168.88.64）:</p>
@@ -640,9 +640,9 @@ listenAddress: 127.0.0.1:30102 <span class="nt">-----</span>》 listenAddress:
<li>
<p>3、 创建<strong>mesher_calculator</strong></p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mkdir /usr/local/src/mesher_calculator
-cp ./mesher /usr/local/src/mesher_calculator
-cp <span class="nt">-r</span> ./conf /usr/local/src/mesher_calculator
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">mkdir</span> /usr/local/src/mesher_calculator
+<span class="nb">cp</span> ./mesher /usr/local/src/mesher_calculator
+<span class="nb">cp</span> <span class="nt">-r</span> ./conf /usr/local/src/mesher_calculator
</code></pre></div> </div>
<p>更改conf中配置文件，分别更改<strong>microservice.yaml</strong>中的<strong>服务name</strong>为体质指数微服务名<strong>calculator</strong>；<br />
@@ -669,8 +669,8 @@ listenAddress: 127.0.0.1:30102 <span class="nt">-----</span>》 listenAddress:
<p>5、 启动<strong>httpserver_webapp</strong>服务：</p>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/httpserver_webapp
-npm install
-<span class="nb">export </span><span class="nv">http_proxy</span><span class="o">=</span>http://127.0.0.1:30101
+npm <span class="nb">install
+export </span><span class="nv">http_proxy</span><span class="o">=</span>http://127.0.0.1:30101
node ./httpserver_webapp.js
</code></pre></div> </div>
</li>
@@ -775,7 +775,7 @@ node ./httpserver_webapp.js
<ul>
<p class="header">贡献</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">报告本网页问题</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mesher-quick-start.md">在Github上编辑此页</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/cn/mersher-quick-start.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
<li><a href="/cn/security">安全</a></li>
</ul>
diff --git a/content/cn/docs/open-design/index.html b/content/cn/docs/open-design/index.html
index c32a3ed..1776c1d 100644
--- a/content/cn/docs/open-design/index.html
+++ b/content/cn/docs/open-design/index.html
@@ -459,14 +459,14 @@
<p><strong>RPC 方式的 Provider</strong></p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RpcSchema</span><span class="o">(</span><span class="n">schemaId</span><span class="o">=</span><span class="s">"hello"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span><span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span><span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">){</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">){</span>
<span class="k">return</span><span class="s">"Hello"</span><span class="o">+</span><span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">){</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">){</span>
<span class="k">return</span><span class="s">"Helloperson"</span><span class="o">+</span><span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -478,20 +478,20 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span><span class="o">=</span><span class="s">"jaxrsHello"</span><span class="o">)</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/jaxrshello"</span><span class="o">)</span>
-<span class="nd">@Produces</span><span class="o">(</span><span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">JaxrsHelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span><span class="o">{</span>
+<span class="nd">@Produces</span><span class="o">(</span><span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">JaxrsHelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span><span class="o">{</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/sayhi"</span><span class="o">)</span>
<span class="nd">@POST</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">){</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">){</span>
<span class="k">return</span><span class="s">"Hello"</span><span class="o">+</span><span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/sayhello"</span><span class="o">)</span>
<span class="nd">@POST</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">){</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">){</span>
<span class="k">return</span><span class="s">"Helloperson"</span><span class="o">+</span><span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -502,18 +502,18 @@
<p><em>代码片段来自于 <a href="https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/springmvc-sample">Apache ServiceComb Spring MVC sample</a></em></p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span><span class="o">=</span><span class="s">"springmvcHello"</span><span class="o">)</span>
-<span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span><span class="o">=</span><span class="s">"/springmvchello"</span><span class="o">,</span><span class="n">produces</span><span class="o">=</span><span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringmvcHelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span><span class="o">{</span>
+<span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span><span class="o">=</span><span class="s">"/springmvchello"</span><span class="o">,</span><span class="n">produces</span><span class="o">=</span><span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringmvcHelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span><span class="o">{</span>
<span class="nd">@Override</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span><span class="o">=</span><span class="s">"/sayhi"</span><span class="o">,</span><span class="n">method</span><span class="o">=</span><span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span><span class="o">=</span><span class="s">"name"</span><span class="o">)</span><span class="n">String</span> <span class="n">name</span><span class="o">){</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span><span class="o">=</span><span class="s">"/sayhi"</span><span class="o">,</span><span class="n">method</span><span class="o">=</span><span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span><span class="o">=</span><span class="s">"name"</span><span class="o">)</span><span class="nc">String</span> <span class="n">name</span><span class="o">){</span>
<span class="k">return</span><span class="s">"Hello"</span><span class="o">+</span><span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span><span class="o">=</span><span class="s">"/sayhello"</span><span class="o">,</span><span class="n">method</span><span class="o">=</span><span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Person</span> <span class="n">person</span><span class="o">){</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span><span class="o">=</span><span class="s">"/sayhello"</span><span class="o">,</span><span class="n">method</span><span class="o">=</span><span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Person</span> <span class="n">person</span><span class="o">){</span>
<span class="k">return</span><span class="s">"Helloperson"</span><span class="o">+</span><span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -522,8 +522,8 @@
<p><strong>RPC 方式访问上述三种服务的 Consumer</strong></p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RpcReference</span><span class="o">(</span><span class="n">microserviceName</span><span class="o">=</span><span class="s">"hello"</span><span class="o">,</span><span class="n">schemaId</span><span class="o">=</span><span class="s">"hello"</span><span class="o">)</span>
-<span class="kd">private</span> <span class="n">Hello</span> <span class="n">hello</span><span class="o">;</span>
-<span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHi</span><span class="o">(</span><span class="s">"JavaChassis"</span><span class="o">));</span>
+<span class="kd">private</span> <span class="nc">Hello</span> <span class="n">hello</span><span class="o">;</span>
+<span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHi</span><span class="o">(</span><span class="s">"JavaChassis"</span><span class="o">));</span>
</code></pre></div></div>
<p><em>以上代码片段全部出自 <a href="https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/">Apache ServiceComb Samples</a>，有兴趣者可阅读了解或贡献更多的智慧。</em></p>
diff --git a/content/cn/docs/performance-test-on-seckill-with-jmeter/index.html b/content/cn/docs/performance-test-on-seckill-with-jmeter/index.html
index 054712c..fccb615 100644
--- a/content/cn/docs/performance-test-on-seckill-with-jmeter/index.html
+++ b/content/cn/docs/performance-test-on-seckill-with-jmeter/index.html
@@ -456,8 +456,8 @@
</p>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">admin-service</span><span class="pi">:</span>
<span class="na">mem_limit</span><span class="pi">:</span> <span class="s">4096m</span>
- <span class="na">cpu_count</span><span class="pi">:</span> <span class="s">4</span>
- <span class="na">cpu_percent</span><span class="pi">:</span> <span class="s">50</span>
+ <span class="na">cpu_count</span><span class="pi">:</span> <span class="m">4</span>
+ <span class="na">cpu_percent</span><span class="pi">:</span> <span class="m">50</span>
<span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">seckill-admin-service:0.2.0-SNAPSHOT"</span>
<span class="na">hostname</span><span class="pi">:</span> <span class="s">admin-service</span>
<span class="na">links</span><span class="pi">:</span>
diff --git a/content/cn/docs/quick-start-advance/flow-control/index.html b/content/cn/docs/quick-start-advance/flow-control/index.html
index 7c58175..d7408c2 100644
--- a/content/cn/docs/quick-start-advance/flow-control/index.html
+++ b/content/cn/docs/quick-start-advance/flow-control/index.html
@@ -577,7 +577,7 @@
<span class="na">Provider</span><span class="pi">:</span>
<span class="na">qps</span><span class="pi">:</span>
<span class="na">limit</span><span class="pi">:</span>
- <span class="na">gateway</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">gateway</span><span class="pi">:</span> <span class="m">1</span>
</code></pre></div> </div>
</li>
</ol>
diff --git a/content/cn/docs/quick-start-advance/service-management/index.html b/content/cn/docs/quick-start-advance/service-management/index.html
index d2479ac..113a1de 100644
--- a/content/cn/docs/quick-start-advance/service-management/index.html
+++ b/content/cn/docs/quick-start-advance/service-management/index.html
@@ -576,7 +576,7 @@
<span class="na">circuitBreaker</span><span class="pi">:</span>
<span class="na">Provider</span><span class="pi">:</span>
<span class="na">calculator</span><span class="pi">:</span>
- <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="s">3</span>
+ <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="m">3</span>
<span class="na">fallbackpolicy</span><span class="pi">:</span>
<span class="na">Provider</span><span class="pi">:</span>
<span class="na">policy</span><span class="pi">:</span> <span class="s">returnnull</span>
diff --git a/content/cn/docs/quick-start-bmi/index.html b/content/cn/docs/quick-start-bmi/index.html
index ed6df24..5b5fcae 100644
--- a/content/cn/docs/quick-start-bmi/index.html
+++ b/content/cn/docs/quick-start-bmi/index.html
@@ -610,7 +610,7 @@
<span class="o">}</span>
<span class="nd">@Service</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorServiceImpl</span> <span class="kd">implements</span> <span class="n">CalculatorService</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorServiceImpl</span> <span class="kd">implements</span> <span class="nc">CalculatorService</span> <span class="o">{</span>
<span class="nd">@Override</span>
<span class="kd">public</span> <span class="kt">double</span> <span class="nf">calculate</span><span class="o">(</span><span class="kt">double</span> <span class="n">height</span><span class="o">,</span> <span class="kt">double</span> <span class="n">weight</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">height</span> <span class="o"><=</span> <span class="mi">0</span> <span class="o">||</span> <span class="n">weight</span> <span class="o"><=</span> <span class="mi">0</span><span class="o">)</span> <span class="o">{</span>
@@ -637,12 +637,12 @@
<p>暴露运算服务的Restful端点：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"calculatorRestEndpoint"</span><span class="o">)</span>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorRestEndpoint</span> <span class="kd">implements</span> <span class="n">CalculatorEndpoint</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorRestEndpoint</span> <span class="kd">implements</span> <span class="nc">CalculatorEndpoint</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">CalculatorService</span> <span class="n">calculatorService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">CalculatorService</span> <span class="n">calculatorService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="kd">public</span> <span class="nf">CalculatorRestEndpoint</span><span class="o">(</span><span class="n">CalculatorService</span> <span class="n">calculatorService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">CalculatorRestEndpoint</span><span class="o">(</span><span class="nc">CalculatorService</span> <span class="n">calculatorService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">calculatorService</span> <span class="o">=</span> <span class="n">calculatorService</span><span class="o">;</span>
<span class="o">}</span>
@@ -675,8 +675,8 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">CalculatorApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">CalculatorApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -729,7 +729,7 @@
<span class="na">enabled</span><span class="pi">:</span> <span class="no">false</span>
<span class="na">server</span><span class="pi">:</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">8889</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">8889</span>
</code></pre></div></div>
<p>在 <code class="highlighter-rouge">microservice.yaml</code> 文件中配置网关服务的信息和服务注册中心的地址。</p>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">APPLICATION_ID</span><span class="pi">:</span> <span class="s">bmi</span>
@@ -749,8 +749,8 @@
<span class="nd">@EnableZuulProxy</span>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">GatewayApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">GatewayApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">GatewayApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/cn/docs/quick-start-dataconsistency/index.html b/content/cn/docs/quick-start-dataconsistency/index.html
index 07c7e9d..26ed17d 100644
--- a/content/cn/docs/quick-start-dataconsistency/index.html
+++ b/content/cn/docs/quick-start-dataconsistency/index.html
@@ -620,7 +620,7 @@
<span class="na">test</span><span class="pi">:</span> <span class="pi">[</span><span class="s2">"</span><span class="s">CMD-SHELL"</span><span class="pi">,</span> <span class="s2">"</span><span class="s">nc</span><span class="nv"> </span><span class="s">-z</span><span class="nv"> </span><span class="s">localhost</span><span class="nv"> </span><span class="s">3306</span><span class="nv"> </span><span class="s">&></span><span class="nv"> </span><span class="s">/dev/null;</s [...]
<span class="na">interval</span><span class="pi">:</span> <span class="s">30s</span>
<span class="na">timeout</span><span class="pi">:</span> <span class="s">10s</span>
- <span class="na">retries</span><span class="pi">:</span> <span class="s">5</span>
+ <span class="na">retries</span><span class="pi">:</span> <span class="m">5</span>
<span class="na">car-rental-service</span><span class="pi">:</span>
<span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">car-rental-service:0.0.2-SNAPSHOT"</span>
@@ -694,101 +694,101 @@
<p>参照 <a href="https://github.com/apache/servicecomb-saga/blob/master/docs/api/api.md">Saga API</a> 说明，设定各服务的事务、补偿、依赖和恢复参数，并保存为 <em>request.json</em> 文件</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"policy"</span><span class="p">:</span><span class="w"> </span><span class="s2">"BackwardRecovery"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"requests"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"policy"</span><span class="p">:</span><span class="w"> </span><span class="s2">"BackwardRecovery"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"requests"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-car"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"car-rental-service"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/rentals"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-car"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"car-rental-service"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/rentals"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/rentals"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/rentals"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-hotel"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hotel-reservation-service"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/reservations"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-hotel"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hotel-reservation-service"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/reservations"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/reservations"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/reservations"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-flight"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"flight-booking-service"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/bookings"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-flight"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"flight-booking-service"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/bookings"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/bookings"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/bookings"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-payment"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"payment-service"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"parents"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-payment"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"payment-service"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"parents"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="s2">"request-car"</span><span class="p">,</span><span class="w">
</span><span class="s2">"request-flight"</span><span class="p">,</span><span class="w">
</span><span class="s2">"request-hotel"</span><span class="w">
</span><span class="p">],</span><span class="w">
- </span><span class="s2">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/payments"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/payments"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/payments"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/payments"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
diff --git a/content/cn/docs/quick-start/index.html b/content/cn/docs/quick-start/index.html
index 154ee45..a59d089 100644
--- a/content/cn/docs/quick-start/index.html
+++ b/content/cn/docs/quick-start/index.html
@@ -561,11 +561,11 @@
<p>安装Maven 3.x，详情可参考<a href="https://maven.apache.org/install.html" target="_blank">Maven安装教程</a>。</p>
</li>
<li>
- <p>安装 ServiceComb Java Chassis(SDK)，执行以下指令：</p>
+ <p>下载ServiceComb-Sample</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> git clone https://github.com/apache/servicecomb-java-chassis.git
- <span class="nb">cd </span>servicecomb-java-chassis
- mvn clean install <span class="nt">-DskipTests</span>
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> git clone https://github.com/apache/servicecomb-samples.git
+ <span class="nb">cd </span>servicecomb-samples/java-chassis-samples/bmi
+ mvn clean <span class="nb">install</span>
</code></pre></div> </div>
</li>
</ul>
@@ -575,10 +575,10 @@
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>docker pull servicecomb/service-center
docker run <span class="nt">-d</span> <span class="nt">-p</span> 30100:30100 servicecomb/service-center:latest
</code></pre></div></div>
-<p><em>您可以通过阅读<a href="/cn/users/setup-environment/#运行service-center">环境配置</a>获取在本地以二进制方式运行Service Center的方法。</em></p>
+<p><em>您可以通过阅读<a href="/cn/docs/service-center/install/">环境安装</a>获取在本地以二进制方式运行Service Center的方法。</em></p>
<h2 id="创建第一个微服务">创建第一个微服务</h2>
-<p>本指南将以一个简单的 <strong>体质指数(BMI)</strong> 应用开展微服务之旅。<a href="https://baike.baidu.com/item/BMI%E6%8C%87%E6%95%B0" target="_blank">体质指数</a>主要用于衡量人体胖瘦程度。该应用主要包含两个微服务：</p>
+<p>本指南将以一个简单的 <strong>体质指数(BMI)</strong> 应用开展微服务之旅。<a href="https://baike.baidu.com/item/%E4%BD%93%E8%B4%A8%E6%8C%87%E6%95%B0" target="_blank">体质指数</a>主要用于衡量人体胖瘦程度。该应用主要包含两个微服务：</p>
<ul>
<li>
@@ -600,7 +600,7 @@ docker run <span class="nt">-d</span> <span class="nt">-p</span> 30100:30100 ser
<li>
<p>进入 <strong>体质指数</strong> 应用代码目录。</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd </span>samples/bmi
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd </span>servicecomb-samples/java-chassis-samples/bmi
</code></pre></div> </div>
<p><strong>注意</strong>：在windows开发环境下，docker是在虚拟机中启动，因此需要修改微服务的 <strong>Service Center</strong> IP地址为虚拟机IP地址。修改2个配置文件[calculator|webapp]/src/main/resources/microservice.yaml，将其中<a>http://127.0.0.1:30100</a>修改为<a>http://192.168.99.100:30100</a>，其中192.168.99.100是虚拟机IP，需要与开发环境中的虚拟机IP保持一致。</p>
</li>
diff --git a/content/cn/docs/release-note-1-0-0.html b/content/cn/docs/release-note-1-0-0.html
index 1860d04..5efda96 100644
--- a/content/cn/docs/release-note-1-0-0.html
+++ b/content/cn/docs/release-note-1-0-0.html
@@ -525,10 +525,10 @@
</ul>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/address"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="n">String</span> <span class="nf">address</span><span class="o">(</span><span class="n">Address</span> <span class="n">address</span><span class="o">)</span> <span class="o">{</span> <span class="o">...</span> <span class="o">}</span>
+<span class="kd">public</span> <span class="nc">String</span> <span class="nf">address</span><span class="o">(</span><span class="nc">Address</span> <span class="n">address</span><span class="o">)</span> <span class="o">{</span> <span class="o">...</span> <span class="o">}</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Address</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">country</span><span class="o">;</span>
- <span class="n">String</span> <span class="n">city</span><span class="o">;</span>
+ <span class="nc">String</span> <span class="n">country</span><span class="o">;</span>
+ <span class="nc">String</span> <span class="n">city</span><span class="o">;</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/cn/docs/saga_pack_design/index.html b/content/cn/docs/saga_pack_design/index.html
index 61d111d..4e139b6 100644
--- a/content/cn/docs/saga_pack_design/index.html
+++ b/content/cn/docs/saga_pack_design/index.html
@@ -510,25 +510,25 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableOmega</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">Application</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">Application</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
<p>2.2 在全局事务的起点添加 <code class="highlighter-rouge">@SagaStart</code> 的注解。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@SagaStart</span><span class="o">(</span><span class="n">timeout</span><span class="o">=</span><span class="mi">10</span><span class="o">)</span>
- <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">transferMoney</span><span class="o">(</span><span class="n">String</span> <span class="n">from</span><span class="o">,</span> <span class="n">String</span> <span class="n">to</span><span class="o">,</span> <span class="kt">int</span> <span class="n">amount</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">transferMoney</span><span class="o">(</span><span class="nc">String</span> <span class="n">from</span><span class="o">,</span> <span class="nc">String</span> <span class="n">to</span><span class="o">,</span> <span class="kt">int</span> <span class="n">amount</span><span class="o">)</span> <span class="o">{</span>
<span class="n">transferOut</span><span class="o">(</span><span class="n">from</span><span class="o">,</span> <span class="n">amount</span><span class="o">);</span>
<span class="n">transferIn</span><span class="o">(</span><span class="n">to</span><span class="o">,</span> <span class="n">amount</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div> </div>
<p>2.3 在子事务处添加 <code class="highlighter-rouge">@Compensable</code> 的注解并指明其对应的补偿方法。其中，补偿方法的形参列表需与子事务方法的形参列表保持一致。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@Compensable</span><span class="o">(</span><span class="n">timeout</span><span class="o">=</span><span class="mi">5</span><span class="o">,</span> <span class="n">compensationMethod</span><span class="o">=</span><span class="s">"cancel"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">transferOut</span><span class="o">(</span><span class="n">String</span> <span class="n">from</span><span class="o">,</span> <span class="kt">int</span> <span class="n">amount</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">transferOut</span><span class="o">(</span><span class="nc">String</span> <span class="n">from</span><span class="o">,</span> <span class="kt">int</span> <span class="n">amount</span><span class="o">)</span> <span class="o">{</span>
<span class="n">repo</span><span class="o">.</span><span class="na">reduceBalanceByUsername</span><span class="o">(</span><span class="n">from</span><span class="o">,</span> <span class="n">amount</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">cancel</span><span class="o">(</span><span class="n">String</span> <span class="n">from</span><span class="o">,</span> <span class="kt">int</span> <span class="n">amount</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">cancel</span><span class="o">(</span><span class="nc">String</span> <span class="n">from</span><span class="o">,</span> <span class="kt">int</span> <span class="n">amount</span><span class="o">)</span> <span class="o">{</span>
<span class="n">repo</span><span class="o">.</span><span class="na">addBalanceByUsername</span><span class="o">(</span><span class="n">from</span><span class="o">,</span> <span class="n">amount</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/cn/docs/saga_with_cucumber/index.html b/content/cn/docs/saga_with_cucumber/index.html
index f40c771..87b6fea 100644
--- a/content/cn/docs/saga_with_cucumber/index.html
+++ b/content/cn/docs/saga_with_cucumber/index.html
@@ -460,14 +460,14 @@
<p>在step_definition中使用正则的方式对应feature中定义的的测试条件，触发测试并验证结果。如：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Given</span><span class="o">(</span><span class="s">"^Car Service is up and running$"</span><span class="o">,</span> <span class="o">()</span> <span class="o">-></span> <span class="o">{</span>
- <span class="n">probe</span><span class="o">(</span><span class="n">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="n">CAR_SERVICE_ADDRESS</span><span class="o">));</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Given</span><span class="o">(</span><span class="s">"^Car Service is up and running$"</span><span class="o">,</span> <span class="o">()</span> <span class="o">-></span> <span class="o">{</span>
+ <span class="n">probe</span><span class="o">(</span><span class="nc">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="no">CAR_SERVICE_ADDRESS</span><span class="o">));</span>
<span class="o">});</span>
</code></pre></div> </div>
<p>上面代码对应feature中第一个测试前提条件<code class="highlighter-rouge">Given car service is up and running</code>，<code class="highlighter-rouge">probe</code>函数式方位<code class="highlighter-rouge">Car</code>服务的一个Rest接口验证返回状态码来判断<code class="highlighter-rouge">Car</code>是否正常启动运行。接下来四个<code class="highlighter-rouge">Given</code>与此类似。</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">When</span><span class="o">(</span><span class="s">"^User ([A-Za-z]+) requests to book ([0-9]+) cars and ([0-9]+) rooms$"</span><span class="o">,</span> <span class="o">(</span><span class="n">username</span><span class="o">,</span> <span class="n">cars</span><span class="o">,</span> <span class="n">rooms</span><span class="o">)</span> <span class="o">-></span> <spa [...]
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">When</span><span class="o">(</span><span class="s">"^User ([A-Za-z]+) requests to book ([0-9]+) cars and ([0-9]+) rooms$"</span><span class="o">,</span> <span class="o">(</span><span class="n">username</span><span class="o">,</span> <span class="n">cars</span><span class="o">,</span> <span class="n">rooms</span><span class="o">)</span> <span class="o">-></span> <sp [...]
<span class="n">log</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Received request from user {} to book {} cars and {} rooms"</span><span class="o">,</span> <span class="n">username</span><span class="o">,</span> <span class="n">cars</span><span class="o">,</span> <span class="n">rooms</span><span class="o">);</span>
<span class="n">given</span><span class="o">()</span>
@@ -475,26 +475,26 @@
<span class="o">.</span><span class="na">pathParam</span><span class="o">(</span><span class="s">"rooms"</span><span class="o">,</span> <span class="n">rooms</span><span class="o">)</span>
<span class="o">.</span><span class="na">pathParam</span><span class="o">(</span><span class="s">"cars"</span><span class="o">,</span> <span class="n">cars</span><span class="o">)</span>
<span class="o">.</span><span class="na">when</span><span class="o">()</span>
- <span class="o">.</span><span class="na">post</span><span class="o">(</span><span class="n">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="s">"booking.service.address"</span><span class="o">)</span> <span class="o">+</span> <span class="s">"/booking/{name}/{rooms}/{cars}"</span><span class="o">);</span>
+ <span class="o">.</span><span class="na">post</span><span class="o">(</span><span class="nc">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="s">"booking.service.address"</span><span class="o">)</span> <span class="o">+</span> <span class="s">"/booking/{name}/{rooms}/{cars}"</span><span class="o">);</span>
<span class="o">});</span>
</code></pre></div> </div>
<p>此段代码解析feature中定义的<code class="highlighter-rouge">When User Sean requests to book 2 cars and 1 rooms</code>事件，解析出用户、预定车辆和房间数量参数并向<code class="highlighter-rouge">Booking</code>服务发出<code class="highlighter-rouge">POST</code>方法的请求，然后在下面代码的<code class="highlighter-rouge">Then</code>中验证结果：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Then</span><span class="o">(</span><span class="s">"^Alpha records the following events$"</span><span class="o">,</span> <span class="o">(</span><span class="n">DataTable</span> <span class="n">dataTable</span><span class="o">)</span> <span class="o">-></span> <span class="o">{</span>
- <span class="n">Consumer</span><span class="o"><</span><span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">>[]></span> <span class="n">columnStrippingConsumer</span> <span class="o">=</span> <span class="n">dataMap</span> <span class="o">-></span> <span class="o">{</span>
- <span class="k">for</span> <span class="o">(</span><span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">></span> <span class="n">map</span> <span class="o">:</span> <span class="n">dataMap</span><span class="o">)</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Then</span><span class="o">(</span><span class="s">"^Alpha records the following events$"</span><span class="o">,</span> <span class="o">(</span><span class="nc">DataTable</span> <span class="n">dataTable</span><span class="o">)</span> <span class="o">-></span> <span class="o">{</span>
+ <span class="nc">Consumer</span><span class="o"><</span><span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">String</span><span class="o">>[]></span> <span class="n">columnStrippingConsumer</span> <span class="o">=</span> <span class="n">dataMap</span> <span class="o">-></span> <span class="o">{</span>
+ <span class="k">for</span> <span class="o">(</span><span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">String</span><span class="o">></span> <span class="n">map</span> <span class="o">:</span> <span class="n">dataMap</span><span class="o">)</span>
<span class="n">map</span><span class="o">.</span><span class="na">keySet</span><span class="o">().</span><span class="na">retainAll</span><span class="o">(</span><span class="n">dataTable</span><span class="o">.</span><span class="na">topCells</span><span class="o">());</span>
<span class="o">};</span>
- <span class="n">dataMatches</span><span class="o">(</span><span class="n">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="n">ALPHA_REST_ADDRESS</span><span class="o">)</span> <span class="o">+</span> <span class="s">"/events"</span><span class="o">,</span> <span class="n">dataTable</span><span class="o">,</span> <span class="n">columnStrippingConsumer</span><span class="o">);</span>
+ <span class="n">dataMatches</span><span class="o">(</span><span class="nc">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="no">ALPHA_REST_ADDRESS</span><span class="o">)</span> <span class="o">+</span> <span class="s">"/events"</span><span class="o">,</span> <span class="n">dataTable</span><span class="o">,</span> <span class="n">columnStrippingConsumer</span><span class="o">);</span>
<span class="o">});</span>
- <span class="n">And</span><span class="o">(</span><span class="s">"^Car Service contains the following booking orders$"</span><span class="o">,</span> <span class="o">(</span><span class="n">DataTable</span> <span class="n">dataTable</span><span class="o">)</span> <span class="o">-></span> <span class="o">{</span>
- <span class="n">dataMatches</span><span class="o">(</span><span class="n">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="n">CAR_SERVICE_ADDRESS</span><span class="o">)</span> <span class="o">+</span> <span class="s">"/bookings"</span><span class="o">,</span> <span class="n">dataTable</span><span class="o">,</span> <span class="n">NO_OP_CONSUMER</span><span class="o">);</span>
+ <span class="nc">And</span><span class="o">(</span><span class="s">"^Car Service contains the following booking orders$"</span><span class="o">,</span> <span class="o">(</span><span class="nc">DataTable</span> <span class="n">dataTable</span><span class="o">)</span> <span class="o">-></span> <span class="o">{</span>
+ <span class="n">dataMatches</span><span class="o">(</span><span class="nc">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="no">CAR_SERVICE_ADDRESS</span><span class="o">)</span> <span class="o">+</span> <span class="s">"/bookings"</span><span class="o">,</span> <span class="n">dataTable</span><span class="o">,</span> <span class="no">NO_OP_CONSUMER</span><span class="o">);</span>
<span class="o">});</span>
- <span class="n">And</span><span class="o">(</span><span class="s">"^Hotel Service contains the following booking orders$"</span><span class="o">,</span> <span class="o">(</span><span class="n">DataTable</span> <span class="n">dataTable</span><span class="o">)</span> <span class="o">-></span> <span class="o">{</span>
- <span class="n">dataMatches</span><span class="o">(</span><span class="n">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="n">HOTEL_SERVICE_ADDRESS</span><span class="o">)</span> <span class="o">+</span> <span class="s">"/bookings"</span><span class="o">,</span> <span class="n">dataTable</span><span class="o">,</span> <span class="n">NO_OP_CONSUMER</span><span class="o">);</span>
+ <span class="nc">And</span><span class="o">(</span><span class="s">"^Hotel Service contains the following booking orders$"</span><span class="o">,</span> <span class="o">(</span><span class="nc">DataTable</span> <span class="n">dataTable</span><span class="o">)</span> <span class="o">-></span> <span class="o">{</span>
+ <span class="n">dataMatches</span><span class="o">(</span><span class="nc">System</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="no">HOTEL_SERVICE_ADDRESS</span><span class="o">)</span> <span class="o">+</span> <span class="s">"/bookings"</span><span class="o">,</span> <span class="n">dataTable</span><span class="o">,</span> <span class="no">NO_OP_CONSUMER</span><span class="o">);</span>
<span class="o">});</span>
</code></pre></div> </div>
@@ -513,7 +513,7 @@
<p>由于房源紧张，限制每个用户最多预订2间房，当用户预订超过2间时会抛出异常：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Compensable</span><span class="o">(</span><span class="n">compensationMethod</span> <span class="o">=</span> <span class="s">"cancel"</span><span class="o">)</span>
- <span class="kt">void</span> <span class="nf">order</span><span class="o">(</span><span class="n">HotelBooking</span> <span class="n">booking</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kt">void</span> <span class="nf">order</span><span class="o">(</span><span class="nc">HotelBooking</span> <span class="n">booking</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">booking</span><span class="o">.</span><span class="na">getAmount</span><span class="o">()</span> <span class="o">></span> <span class="mi">2</span><span class="o">)</span> <span class="o">{</span>
<span class="k">throw</span> <span class="k">new</span> <span class="nf">IllegalArgumentException</span><span class="o">(</span><span class="s">"can not order the rooms large than two"</span><span class="o">);</span>
<span class="o">}</span>
@@ -587,7 +587,7 @@
<p>除了上面例子中通过命令行指定javaagent指定byteman 规则文件的加载方式外，还可以通过Java代码的方式加载，如下</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Submit</span> <span class="n">bm</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Submit</span><span class="o">(</span><span class="n">address</span><span class="o">,</span> <span class="n">port</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Submit</span> <span class="n">bm</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Submit</span><span class="o">(</span><span class="n">address</span><span class="o">,</span> <span class="n">port</span><span class="o">);</span>
<span class="n">bm</span><span class="o">.</span><span class="na">addRulesFromFiles</span><span class="o">(</span><span class="n">rules</span><span class="o">);</span>
</code></pre></div> </div>
@@ -610,7 +610,7 @@
<span class="s">METHOD timeout</span>
<span class="s">AT EXIT</span>
<span class="s">IF TRUE</span>
-<span class="s">DO RETURN 5</span>
+<span class="s">DO RETURN </span><span class="m">5</span>
<span class="s">ENDRULE</span>
<span class="s">RULE sleep when postBooking until timeout happens</span>
@@ -658,11 +658,11 @@
<li>
<p>step_definition解析</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Given</span><span class="o">(</span><span class="s">"^Install the byteman script ([A-Za-z0-9_\\.]+) to ([A-Za-z]+) Service$"</span><span class="o">,</span> <span class="o">(</span><span class="n">String</span> <span class="n">script</span><span class="o">,</span> <span class="n">String</span> <span class="n">service</span><span class="o">)</span> <span class="o">->< [...]
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Given</span><span class="o">(</span><span class="s">"^Install the byteman script ([A-Za-z0-9_\\.]+) to ([A-Za-z]+) Service$"</span><span class="o">,</span> <span class="o">(</span><span class="nc">String</span> <span class="n">script</span><span class="o">,</span> <span class="nc">String</span> <span class="n">service</span><span class="o">)</span> <span class="o">-&g [...]
<span class="n">log</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Install the byteman script {} to {} service"</span><span class="o">,</span> <span class="n">script</span><span class="o">,</span> <span class="n">service</span><span class="o">);</span>
- <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">rules</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o"><>();</span>
+ <span class="nc">List</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="n">rules</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ArrayList</span><span class="o"><>();</span>
<span class="n">rules</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="s">"target/test-classes/"</span> <span class="o">+</span> <span class="n">script</span><span class="o">);</span>
- <span class="n">Submit</span> <span class="n">bm</span> <span class="o">=</span> <span class="n">getBytemanSubmit</span><span class="o">(</span><span class="n">service</span><span class="o">);</span>
+ <span class="nc">Submit</span> <span class="n">bm</span> <span class="o">=</span> <span class="n">getBytemanSubmit</span><span class="o">(</span><span class="n">service</span><span class="o">);</span>
<span class="n">bm</span><span class="o">.</span><span class="na">addRulesFromFiles</span><span class="o">(</span><span class="n">rules</span><span class="o">);</span>
<span class="o">});</span>
</code></pre></div> </div>
diff --git a/content/cn/docs/seckill-development-journey-part-III/index.html b/content/cn/docs/seckill-development-journey-part-III/index.html
index 625cf5a..093612d 100644
--- a/content/cn/docs/seckill-development-journey-part-III/index.html
+++ b/content/cn/docs/seckill-development-journey-part-III/index.html
@@ -432,7 +432,7 @@
<p> 之前的版本由于没有引入Event Sourcing，Event实体只需要直接写入数据库即可，现在需要将Event发布给Message Broker，为了支持云服务（<a href="http://www.hwclouds.com/">华为云</a>）提供的分布式消息服务，我们定义了通用消息发布接口：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">SecKillMessagePublisher</span> <span class="o">{</span>
- <span class="kt">void</span> <span class="nf">publishMessage</span><span class="o">(</span><span class="n">String</span> <span class="n">messageContent</span><span class="o">);</span>
+ <span class="kt">void</span> <span class="nf">publishMessage</span><span class="o">(</span><span class="nc">String</span> <span class="n">messageContent</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -447,7 +447,7 @@
<p> 同样，为了支持云服务（<a href="http://www.hwclouds.com/">华为云</a>）提供的分布式消息服务，我们定义了通用消息订阅接口：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">SecKillMessageSubscriber</span> <span class="o">{</span>
- <span class="kt">void</span> <span class="nf">subscribeMessage</span><span class="o">(</span><span class="n">String</span> <span class="n">messageContent</span><span class="o">);</span>
+ <span class="kt">void</span> <span class="nf">subscribeMessage</span><span class="o">(</span><span class="nc">String</span> <span class="n">messageContent</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/cn/docs/servicecomb-pack-cluster/index.html b/content/cn/docs/servicecomb-pack-cluster/index.html
index fe0765a..7bae352 100644
--- a/content/cn/docs/servicecomb-pack-cluster/index.html
+++ b/content/cn/docs/servicecomb-pack-cluster/index.html
@@ -455,21 +455,21 @@
<p>事务扫描是通过 <code class="highlighter-rouge">EventScanner.java</code> 实现的，并且在 <code class="highlighter-rouge">AlphaConfig.java</code> 中进行初始化，可以看到在 <code class="highlighter-rouge">new EventScanner</code> 代码执行前进行了eventScannerEnabled判断，这个参数就是通过<code class="highlighter-rouge">alpha.event.scanner.enabled</code> 指定的（默认是true），然后传入了<code class="highlighter-rouge">nodeStatus</code> 对象，这个对象就记录着这个节点的状态（主节点或者从节点），后边会讲解 <code class="highlighter-rouge">nodeStatus</code> 是如何构造的。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Bean</span>
-<span class="n">TxConsistentService</span> <span class="nf">txConsistentService</span><span class="o">(</span>
+<span class="nc">TxConsistentService</span> <span class="nf">txConsistentService</span><span class="o">(</span>
<span class="nd">@Value</span><span class="o">(</span><span class="s">"${alpha.event.pollingInterval:500}"</span><span class="o">)</span> <span class="kt">int</span> <span class="n">eventPollingInterval</span><span class="o">,</span>
<span class="nd">@Value</span><span class="o">(</span><span class="s">"${alpha.event.scanner.enabled:true}"</span><span class="o">)</span> <span class="kt">boolean</span> <span class="n">eventScannerEnabled</span><span class="o">,</span>
- <span class="n">ScheduledExecutorService</span> <span class="n">scheduler</span><span class="o">,</span>
- <span class="n">TxEventRepository</span> <span class="n">eventRepository</span><span class="o">,</span>
- <span class="n">CommandRepository</span> <span class="n">commandRepository</span><span class="o">,</span>
- <span class="n">TxTimeoutRepository</span> <span class="n">timeoutRepository</span><span class="o">,</span>
- <span class="n">OmegaCallback</span> <span class="n">omegaCallback</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">ScheduledExecutorService</span> <span class="n">scheduler</span><span class="o">,</span>
+ <span class="nc">TxEventRepository</span> <span class="n">eventRepository</span><span class="o">,</span>
+ <span class="nc">CommandRepository</span> <span class="n">commandRepository</span><span class="o">,</span>
+ <span class="nc">TxTimeoutRepository</span> <span class="n">timeoutRepository</span><span class="o">,</span>
+ <span class="nc">OmegaCallback</span> <span class="n">omegaCallback</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">eventScannerEnabled</span><span class="o">)</span> <span class="o">{</span>
<span class="k">new</span> <span class="nf">EventScanner</span><span class="o">(</span><span class="n">scheduler</span><span class="o">,</span>
<span class="n">eventRepository</span><span class="o">,</span> <span class="n">commandRepository</span><span class="o">,</span> <span class="n">timeoutRepository</span><span class="o">,</span>
<span class="n">omegaCallback</span><span class="o">,</span> <span class="n">eventPollingInterval</span><span class="o">,</span> <span class="n">nodeStatus</span><span class="o">).</span><span class="na">run</span><span class="o">();</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Starting the EventScanner."</span><span class="o">);</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Starting the EventScanner."</span><span class="o">);</span>
<span class="o">}</span>
- <span class="n">TxConsistentService</span> <span class="n">consistentService</span> <span class="o">=</span> <span class="k">new</span> <span class="n">TxConsistentService</span><span class="o">(</span><span class="n">eventRepository</span><span class="o">);</span>
+ <span class="nc">TxConsistentService</span> <span class="n">consistentService</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">TxConsistentService</span><span class="o">(</span><span class="n">eventRepository</span><span class="o">);</span>
<span class="k">return</span> <span class="n">consistentService</span><span class="o">;</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -493,29 +493,29 @@
<span class="o">},</span>
<span class="mi">0</span><span class="o">,</span>
<span class="n">eventPollingInterval</span><span class="o">,</span>
- <span class="n">MILLISECONDS</span><span class="o">);</span>
+ <span class="no">MILLISECONDS</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
<p>我们在 <code class="highlighter-rouge">AlphaConfig.java</code> 中通过以下方式创建实例，以确保无论您是否指定了 <code class="highlighter-rouge">alpha.cluster.master.enabled</code> 参数事务扫描都可以正常工作，在这里可以看到当我们开启了集群模式后节点刚启动的时候状态是Slave，下面会说明状态是如何切换到Master的。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Bean</span>
-<span class="n">NodeStatus</span> <span class="nf">nodeStatus</span> <span class="o">(){</span>
+<span class="nc">NodeStatus</span> <span class="nf">nodeStatus</span> <span class="o">(){</span>
<span class="k">if</span><span class="o">(</span><span class="n">masterEnabled</span><span class="o">){</span>
- <span class="k">return</span> <span class="k">new</span> <span class="nf">NodeStatus</span><span class="o">(</span><span class="n">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">SLAVE</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nf">NodeStatus</span><span class="o">(</span><span class="nc">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">SLAVE</span><span class="o">);</span>
<span class="o">}</span><span class="k">else</span><span class="o">{</span>
- <span class="k">return</span> <span class="k">new</span> <span class="nf">NodeStatus</span><span class="o">(</span><span class="n">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">MASTER</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nf">NodeStatus</span><span class="o">(</span><span class="nc">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">MASTER</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="nd">@Autowired</span>
-<span class="n">NodeStatus</span> <span class="n">nodeStatus</span><span class="o">;</span>
+<span class="nc">NodeStatus</span> <span class="n">nodeStatus</span><span class="o">;</span>
</code></pre></div></div>
<p>控制节点状态切换的是 <code class="highlighter-rouge">ClusterLockService.java</code> ,这个服务会定时执行锁抢占，抢占成功后设置本节点为Master，否则为Slave</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Autowired</span>
-<span class="n">LockProvider</span> <span class="n">lockProvider</span><span class="o">;</span>
+<span class="nc">LockProvider</span> <span class="n">lockProvider</span><span class="o">;</span>
<span class="o">...</span>
<span class="o">...</span>
<span class="nd">@Scheduled</span><span class="o">(</span><span class="n">cron</span> <span class="o">=</span> <span class="s">"0/1 * * * * ?"</span><span class="o">)</span>
@@ -525,15 +525,15 @@
<span class="k">if</span> <span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">locker</span><span class="o">.</span><span class="na">isPresent</span><span class="o">())</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(!</span><span class="k">this</span><span class="o">.</span><span class="na">locked</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">locked</span> <span class="o">=</span> <span class="kc">true</span><span class="o">;</span>
- <span class="n">nodeStatus</span><span class="o">.</span><span class="na">setTypeEnum</span><span class="o">(</span><span class="n">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">MASTER</span><span class="o">);</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Master Node"</span><span class="o">);</span>
+ <span class="n">nodeStatus</span><span class="o">.</span><span class="na">setTypeEnum</span><span class="o">(</span><span class="nc">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">MASTER</span><span class="o">);</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Master Node"</span><span class="o">);</span>
<span class="o">}</span>
<span class="c1">//Keep locked</span>
<span class="o">}</span> <span class="k">else</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">locked</span> <span class="o">||</span> <span class="o">!</span><span class="n">lockExecuted</span><span class="o">)</span> <span class="o">{</span>
<span class="n">locked</span> <span class="o">=</span> <span class="kc">false</span><span class="o">;</span>
- <span class="n">nodeStatus</span><span class="o">.</span><span class="na">setTypeEnum</span><span class="o">(</span><span class="n">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">SLAVE</span><span class="o">);</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Slave Node"</span><span class="o">);</span>
+ <span class="n">nodeStatus</span><span class="o">.</span><span class="na">setTypeEnum</span><span class="o">(</span><span class="nc">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">SLAVE</span><span class="o">);</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Slave Node"</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="n">lockExecuted</span> <span class="o">=</span> <span class="kc">true</span><span class="o">;</span>
@@ -616,10 +616,10 @@
</ul>
<div class="language-sql highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">CREATE</span> <span class="k">TABLE</span> <span class="n">IF</span> <span class="k">NOT</span> <span class="k">EXISTS</span> <span class="n">master_lock</span> <span class="p">(</span>
- <span class="n">serviceName</span> <span class="n">varchar</span><span class="p">(</span><span class="mi">36</span><span class="p">)</span> <span class="k">not</span> <span class="k">NULL</span><span class="p">,</span>
- <span class="n">expireTime</span> <span class="n">datetime</span> <span class="k">NOT</span> <span class="k">NULL</span> <span class="k">DEFAULT</span> <span class="k">CURRENT_TIMESTAMP</span><span class="p">,</span>
- <span class="n">lockedTime</span> <span class="n">datetime</span> <span class="k">NOT</span> <span class="k">NULL</span> <span class="k">DEFAULT</span> <span class="k">CURRENT_TIMESTAMP</span><span class="p">,</span>
- <span class="n">instanceId</span> <span class="n">varchar</span><span class="p">(</span><span class="mi">255</span><span class="p">)</span> <span class="k">not</span> <span class="k">NULL</span><span class="p">,</span>
+ <span class="n">serviceName</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">36</span><span class="p">)</span> <span class="k">not</span> <span class="k">NULL</span><span class="p">,</span>
+ <span class="n">expireTime</span> <span class="nb">datetime</span> <span class="k">NOT</span> <span class="k">NULL</span> <span class="k">DEFAULT</span> <span class="k">CURRENT_TIMESTAMP</span><span class="p">,</span>
+ <span class="n">lockedTime</span> <span class="nb">datetime</span> <span class="k">NOT</span> <span class="k">NULL</span> <span class="k">DEFAULT</span> <span class="k">CURRENT_TIMESTAMP</span><span class="p">,</span>
+ <span class="n">instanceId</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">255</span><span class="p">)</span> <span class="k">not</span> <span class="k">NULL</span><span class="p">,</span>
<span class="k">PRIMARY</span> <span class="k">KEY</span> <span class="p">(</span><span class="n">serviceName</span><span class="p">)</span>
<span class="p">)</span> <span class="n">ENGINE</span><span class="o">=</span><span class="n">InnoDB</span> <span class="k">DEFAULT</span> <span class="n">CHARSET</span><span class="o">=</span><span class="n">utf8</span><span class="p">;</span>
</code></pre></div></div>
@@ -654,10 +654,10 @@
<span class="o">+</span> <span class="s">"VALUES "</span>
<span class="o">+</span> <span class="s">"(?1, ?2, ?3, ?4)"</span><span class="o">,</span> <span class="n">nativeQuery</span> <span class="o">=</span> <span class="kc">true</span><span class="o">)</span>
<span class="kt">int</span> <span class="nf">initLock</span><span class="o">(</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"serviceName"</span><span class="o">)</span> <span class="n">String</span> <span class="n">serviceName</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"expireTime"</span><span class="o">)</span> <span class="n">Date</span> <span class="n">expireTime</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"lockedTime"</span><span class="o">)</span> <span class="n">Date</span> <span class="n">lockedTime</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"instanceId"</span><span class="o">)</span> <span class="n">String</span> <span class="n">instanceId</span><span class="o">);</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"serviceName"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">serviceName</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"expireTime"</span><span class="o">)</span> <span class="nc">Date</span> <span class="n">expireTime</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"lockedTime"</span><span class="o">)</span> <span class="nc">Date</span> <span class="n">lockedTime</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"instanceId"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">instanceId</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>
@@ -676,10 +676,10 @@
<span class="o">+</span> <span class="s">",t.instanceId = :instanceId "</span>
<span class="o">+</span> <span class="s">"WHERE t.serviceName = :serviceName AND (t.expireTime <= :lockedTime OR t.instanceId = :instanceId)"</span><span class="o">)</span>
<span class="kt">int</span> <span class="nf">updateLock</span><span class="o">(</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"serviceName"</span><span class="o">)</span> <span class="n">String</span> <span class="n">serviceName</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"lockedTime"</span><span class="o">)</span> <span class="n">Date</span> <span class="n">lockedTime</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"expireTime"</span><span class="o">)</span> <span class="n">Date</span> <span class="n">expireTime</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"instanceId"</span><span class="o">)</span> <span class="n">String</span> <span class="n">instanceId</span><span class="o">);</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"serviceName"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">serviceName</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"lockedTime"</span><span class="o">)</span> <span class="nc">Date</span> <span class="n">lockedTime</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"expireTime"</span><span class="o">)</span> <span class="nc">Date</span> <span class="n">expireTime</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"instanceId"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">instanceId</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>
diff --git a/content/cn/docs/servicecomb-pack-consul/index.html b/content/cn/docs/servicecomb-pack-consul/index.html
index efa3824..48090ed 100644
--- a/content/cn/docs/servicecomb-pack-consul/index.html
+++ b/content/cn/docs/servicecomb-pack-consul/index.html
@@ -444,22 +444,22 @@
<p>执行命令行 <code class="highlighter-rouge">curl http://0.0.0.0:8500/v1/agent/services</code> 可以看到已经将 Alpha 的 gRPC 地址和端口注册到 Consul 的 Tags 中</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"ID"</span><span class="p">:</span><span class="w"> </span><span class="s2">"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Service"</span><span class="p">:</span><span class="w"> </span><span class="s2">"servicecomb-alpha-server"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Tags"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"ID"</span><span class="p">:</span><span class="w"> </span><span class="s2">"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Service"</span><span class="p">:</span><span class="w"> </span><span class="s2">"servicecomb-alpha-server"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Tags"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="s2">"alpha-server-host=0.0.0.0"</span><span class="p">,</span><span class="w">
</span><span class="s2">"alpha-server-port=8080"</span><span class="p">,</span><span class="w">
</span><span class="s2">"secure=false"</span><span class="w">
</span><span class="p">],</span><span class="w">
- </span><span class="s2">"Meta"</span><span class="p">:</span><span class="w"> </span><span class="p">{},</span><span class="w">
- </span><span class="s2">"Port"</span><span class="p">:</span><span class="w"> </span><span class="mi">8090</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Address"</span><span class="p">:</span><span class="w"> </span><span class="s2">"192.168.1.116"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Weights"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"Passing"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Warning"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
+ </span><span class="nl">"Meta"</span><span class="p">:</span><span class="w"> </span><span class="p">{},</span><span class="w">
+ </span><span class="nl">"Port"</span><span class="p">:</span><span class="w"> </span><span class="mi">8090</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Address"</span><span class="p">:</span><span class="w"> </span><span class="s2">"192.168.1.116"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Weights"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"Passing"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Warning"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"EnableTagOverride"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
+ </span><span class="nl">"EnableTagOverride"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
@@ -489,7 +489,7 @@
<span class="na">discovery</span><span class="pi">:</span>
<span class="err"> </span><span class="na">register</span><span class="pi">:</span> <span class="no">false</span>
<span class="s">host</span><span class="pi">:</span> <span class="s">0.0.0.0</span>
- <span class="s">port</span><span class="pi">:</span> <span class="s">8500</span>
+ <span class="s">port</span><span class="pi">:</span> <span class="m">8500</span>
<span class="na">alpha</span><span class="pi">:</span>
<span class="na">cluster</span><span class="pi">:</span>
diff --git a/content/cn/docs/servicecomb-pack-eureka/index.html b/content/cn/docs/servicecomb-pack-eureka/index.html
index 99f0035..39eaea1 100644
--- a/content/cn/docs/servicecomb-pack-eureka/index.html
+++ b/content/cn/docs/servicecomb-pack-eureka/index.html
@@ -409,7 +409,7 @@
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/apache/servicecomb-pack.git
<span class="nb">cd </span>servicecomb-pack
-mvn clean install <span class="nt">-DskipTests</span><span class="o">=</span><span class="nb">true</span> <span class="nt">-Pspring-boot-2</span>,spring-cloud-eureka
+mvn clean <span class="nb">install</span> <span class="nt">-DskipTests</span><span class="o">=</span><span class="nb">true</span> <span class="nt">-Pspring-boot-2</span>,spring-cloud-eureka
</code></pre></div></div>
<h3 id="启动-eureka">启动 Eureka</h3>
diff --git a/content/cn/docs/servicecomb-springcloud-zuul-demo/index.html b/content/cn/docs/servicecomb-springcloud-zuul-demo/index.html
index 9b62884..1d7a53a 100644
--- a/content/cn/docs/servicecomb-springcloud-zuul-demo/index.html
+++ b/content/cn/docs/servicecomb-springcloud-zuul-demo/index.html
@@ -540,8 +540,8 @@
<span class="c1">//这个注解使Spring能够自动配置ServiceComb模块</span>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">HelloApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">HelloApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -561,7 +561,7 @@
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloController</span> <span class="o">{</span>
<span class="nd">@GetMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/hello/{name}"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">hello</span><span class="o">(</span><span class="nd">@PathVariable</span><span class="o">(</span><span class="s">"name"</span><span class="o">)</span> <span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">hello</span><span class="o">(</span><span class="nd">@PathVariable</span><span class="o">(</span><span class="s">"name"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello, "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
@@ -648,7 +648,7 @@
<span class="na">routes</span><span class="pi">:</span> <span class="c1"># 定义路由转发规则。凡是匹配/helloservice/**的路由都会转发到helloservice服务</span>
<span class="na">helloservice</span><span class="pi">:</span> <span class="s">/helloservice/**</span>
<span class="na">server</span><span class="pi">:</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">8080</span> <span class="c1">#SpringBoot框架的配置，服务启动端口</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">8080</span> <span class="c1">#SpringBoot框架的配置，服务启动端口</span>
</code></pre></div></div>
<p>新建ServiceComb配置文件src/main/resources/microservice.yaml，内容如下</p>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">APPLICATION_ID</span><span class="pi">:</span> <span class="s">helloworld</span> <span class="c1"># 应用ID</span>
@@ -674,8 +674,8 @@
<span class="nd">@EnableZuulProxy</span>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ZuulApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">ZuulApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">ZuulApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -710,21 +710,21 @@
<span class="nt"><script></span>
<span class="kd">function</span> <span class="nx">testCall</span><span class="p">()</span> <span class="p">{</span>
- <span class="kd">var</span> <span class="nx">username</span> <span class="o">=</span> <span class="nx">$</span><span class="p">(</span><span class="s2">"#username"</span><span class="p">).</span><span class="nx">val</span><span class="p">();</span>
+ <span class="kd">var</span> <span class="nx">username</span> <span class="o">=</span> <span class="nx">$</span><span class="p">(</span><span class="dl">"</span><span class="s2">#username</span><span class="dl">"</span><span class="p">).</span><span class="nx">val</span><span class="p">();</span>
<span class="k">if</span><span class="p">(</span><span class="o">!</span><span class="nx">username</span><span class="p">){</span>
<span class="k">return</span>
<span class="p">}</span>
<span class="nx">$</span><span class="p">.</span><span class="nx">ajax</span><span class="p">({</span>
- <span class="na">url</span><span class="p">:</span> <span class="s2">"/helloservice/hello/"</span><span class="o">+</span><span class="nx">username</span><span class="p">,</span>
+ <span class="na">url</span><span class="p">:</span> <span class="dl">"</span><span class="s2">/helloservice/hello/</span><span class="dl">"</span><span class="o">+</span><span class="nx">username</span><span class="p">,</span>
<span class="na">success</span><span class="p">:</span> <span class="kd">function</span> <span class="p">(</span><span class="nx">data</span><span class="p">)</span> <span class="p">{</span>
- <span class="kd">var</span> <span class="nx">resultDiv</span> <span class="o">=</span> <span class="nb">document</span><span class="p">.</span><span class="nx">getElementById</span><span class="p">(</span><span class="s2">"resultDiv"</span><span class="p">);</span>
+ <span class="kd">var</span> <span class="nx">resultDiv</span> <span class="o">=</span> <span class="nb">document</span><span class="p">.</span><span class="nx">getElementById</span><span class="p">(</span><span class="dl">"</span><span class="s2">resultDiv</span><span class="dl">"</span><span class="p">);</span>
<span class="nx">console</span><span class="p">.</span><span class="nx">log</span><span class="p">(</span><span class="nx">data</span><span class="p">)</span>
<span class="nx">resultDiv</span><span class="p">.</span><span class="nx">innerText</span> <span class="o">=</span> <span class="nx">data</span><span class="p">;</span>
<span class="p">},</span>
<span class="na">error</span><span class="p">:</span> <span class="kd">function</span> <span class="p">(</span><span class="nx">data</span><span class="p">)</span> <span class="p">{</span>
- <span class="kd">var</span> <span class="nx">resultDiv</span> <span class="o">=</span> <span class="nb">document</span><span class="p">.</span><span class="nx">getElementById</span><span class="p">(</span><span class="s2">"resultDiv"</span><span class="p">);</span>
+ <span class="kd">var</span> <span class="nx">resultDiv</span> <span class="o">=</span> <span class="nb">document</span><span class="p">.</span><span class="nx">getElementById</span><span class="p">(</span><span class="dl">"</span><span class="s2">resultDiv</span><span class="dl">"</span><span class="p">);</span>
<span class="nx">console</span><span class="p">.</span><span class="nx">log</span><span class="p">(</span><span class="nx">data</span><span class="p">)</span>
<span class="nx">resultDiv</span><span class="p">.</span><span class="nx">innerText</span> <span class="o">=</span> <span class="nx">JSON</span><span class="p">.</span><span class="nx">stringify</span><span class="p">(</span><span class="nx">data</span><span class="p">);</span>
<span class="p">}</span>
diff --git a/content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html b/content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
index e4ade1b..107aa81 100644
--- a/content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
+++ b/content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
@@ -509,7 +509,7 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
<li>
<p>在每个测试从节点上运行<em>jmeter-server</em>，其运行指令如下：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>jmeter-server <span class="nt">-Djava</span>.rmi.server.hostname<span class="o">=</span><span class="k">$(</span>ifconfig eth0 | <span class="nb">grep</span> <span class="s2">"inet addr"</span> | awk <span class="s1">'{print $2}'</span> | cut <span class="nt">-d</span> <span class="s2">":"</span> <span class="nt">-f2</span><span class="k">)</span>
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>jmeter-server <span class="nt">-Djava</span>.rmi.server.hostname<span class="o">=</span><span class="si">$(</span>ifconfig eth0 | <span class="nb">grep</span> <span class="s2">"inet addr"</span> | <span class="nb">awk</span> <span class="s1">'{print $2}'</span> | <span class="nb">cut</span> <span class="nt">-d</span> <span class="s2">":"</span> <span class="nt">-f2</span><span class="si"> [...]
</code></pre></div> </div>
</li>
<li>
diff --git a/content/cn/docs/syncer/multi-servicecenters/index.html b/content/cn/docs/syncer/multi-servicecenters/index.html
index ee8c3a9..081306f 100644
--- a/content/cn/docs/syncer/multi-servicecenters/index.html
+++ b/content/cn/docs/syncer/multi-servicecenters/index.html
@@ -591,7 +591,7 @@
<h4 id="1-编译项目">1. 编译项目</h4>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># 编译 EurekaServer 和 AccountServer</span>
<span class="nv">$ </span><span class="nb">cd </span>samples/multi-servicecenters/eureka
-<span class="nv">$ </span>mvn clean install
+<span class="nv">$ </span>mvn clean <span class="nb">install</span>
</code></pre></div></div>
<h4 id="2-启动eurekaserver">2. 启动EurekaServer：</h4>
<ul>
@@ -601,7 +601,7 @@
<span class="na">application</span><span class="pi">:</span>
<span class="na">name</span><span class="pi">:</span> <span class="s">eureka-server</span>
<span class="na">server</span><span class="pi">:</span>
-<span class="na">port </span><span class="pi">:</span> <span class="s">8761</span>
+<span class="na">port </span><span class="pi">:</span> <span class="m">8761</span>
<span class="c1"># servlet:</span>
<span class="c1"># context-path: /eureka</span>
<span class="na">eureka</span><span class="pi">:</span>
@@ -622,7 +622,7 @@
<li>启动服务
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># 启动 EurekaServer</span>
<span class="nv">$ </span><span class="nb">cd</span> <span class="k">${</span><span class="nv">project_dir</span><span class="k">}</span>/servicecomb-service-center/syncer/samples/multi-servicecenters/eureka/eureka-server/
-<span class="nv">$ </span>nohup mvn spring-boot:run & <span class="o">>></span> eureka-server.log 2>&1 &
+<span class="nv">$ </span><span class="nb">nohup </span>mvn spring-boot:run & <span class="o">>></span> eureka-server.log 2>&1 &
</code></pre></div> </div>
<p>浏览器打开http://10.0.0.10:8761，若出现如下页面，则启动成功<br />
<img src="/assets/images/docs/syncer/eureka-server-success.jpg" alt="image" /></p>
@@ -637,7 +637,7 @@
<span class="na">application</span><span class="pi">:</span>
<span class="na">name</span><span class="pi">:</span> <span class="s">account-server</span>
<span class="na">server</span><span class="pi">:</span>
-<span class="na">port</span><span class="pi">:</span> <span class="s">8090</span>
+<span class="na">port</span><span class="pi">:</span> <span class="m">8090</span>
<span class="na">eureka</span><span class="pi">:</span>
<span class="na">instance</span><span class="pi">:</span>
<span class="na">hostname</span><span class="pi">:</span> <span class="s">10.0.0.10</span>
diff --git a/content/cn/docs/toolkit/oas-validator/index.html b/content/cn/docs/toolkit/oas-validator/index.html
index 8f5c5a4..93cf746 100644
--- a/content/cn/docs/toolkit/oas-validator/index.html
+++ b/content/cn/docs/toolkit/oas-validator/index.html
@@ -866,15 +866,15 @@
<p>因此在检查兼容性的时候会将新旧OAS的<a href="https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#reference-object">Reference Object</a>做解析，然后再检查，下面是一段<a href="https://github.com/swagger-api/swagger-parser">swagger-parser</a>的例子：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">OpenAPIV3Parser</span> <span class="n">parser</span> <span class="o">=</span> <span class="k">new</span> <span class="n">OpenAPIV3Parser</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">OpenAPIV3Parser</span> <span class="n">parser</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">OpenAPIV3Parser</span><span class="o">();</span>
-<span class="n">ParseOptions</span> <span class="n">parseOptions</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ParseOptions</span><span class="o">();</span>
+<span class="nc">ParseOptions</span> <span class="n">parseOptions</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ParseOptions</span><span class="o">();</span>
<span class="n">parseOptions</span><span class="o">.</span><span class="na">setResolve</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="n">parseOptions</span><span class="o">.</span><span class="na">setResolveCombinators</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="n">parseOptions</span><span class="o">.</span><span class="na">setResolveFully</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="n">parseOptions</span><span class="o">.</span><span class="na">setFlatten</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
-<span class="n">SwaggerParseResult</span> <span class="n">parseResult</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="na">readContents</span><span class="o">(</span><span class="n">content</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="n">parseOptions</span><span class="o">);</span>
+<span class="nc">SwaggerParseResult</span> <span class="n">parseResult</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="na">readContents</span><span class="o">(</span><span class="n">content</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="n">parseOptions</span><span class="o">);</span>
</code></pre></div></div>
<p>因此，检查下来如果发现不兼容，那么所报告的位置会和原文档有所不同。</p>
diff --git a/content/cn/docs/toolkit/quick-start/index.html b/content/cn/docs/toolkit/quick-start/index.html
index ad14cbd..7273f44 100644
--- a/content/cn/docs/toolkit/quick-start/index.html
+++ b/content/cn/docs/toolkit/quick-start/index.html
@@ -571,7 +571,7 @@
<span class="nv">$ </span><span class="nb">cd </span>toolkit
<span class="c"># 构建打包</span>
-<span class="nv">$ </span>mvn clean install
+<span class="nv">$ </span>mvn clean <span class="nb">install</span>
</code></pre></div></div>
<h3 id="2-使用toolkit-maven-plugin插件">2 使用toolkit-maven-plugin插件</h3>
diff --git a/content/cn/docs/use-oas-validator-help-standardize-oas-spec/index.html b/content/cn/docs/use-oas-validator-help-standardize-oas-spec/index.html
index fa3d1a9..629d78b 100644
--- a/content/cn/docs/use-oas-validator-help-standardize-oas-spec/index.html
+++ b/content/cn/docs/use-oas-validator-help-standardize-oas-spec/index.html
@@ -463,7 +463,7 @@ $.paths./pets/{petId}.get.tags[0] : 不在$.tags所定义的范围内
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">openapi</span><span class="pi">:</span> <span class="s2">"</span><span class="s">3.0.0"</span>
<span class="na">info</span><span class="pi">:</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">1.0</span>
+ <span class="na">version</span><span class="pi">:</span> <span class="m">1.0</span>
<span class="na">title</span><span class="pi">:</span> <span class="s">Swagger Petstore</span>
<span class="na">paths</span><span class="pi">:</span>
<span class="s">/pets/{petId}</span><span class="pi">:</span>
@@ -503,7 +503,7 @@ $.paths./pets/{petId}.get.tags[0] : 不在$.tags所定义的范围内
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">openapi</span><span class="pi">:</span> <span class="s2">"</span><span class="s">3.0.0"</span>
<span class="na">info</span><span class="pi">:</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">1.1</span>
+ <span class="na">version</span><span class="pi">:</span> <span class="m">1.1</span>
<span class="na">title</span><span class="pi">:</span> <span class="s">Swagger Petstore</span>
<span class="na">paths</span><span class="pi">:</span>
<span class="s">/pets/{petId}</span><span class="pi">:</span>
diff --git a/content/cn/docs/users/application-boot-process/index.html b/content/cn/docs/users/application-boot-process/index.html
index 239cd39..8a4b6c3 100644
--- a/content/cn/docs/users/application-boot-process/index.html
+++ b/content/cn/docs/users/application-boot-process/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="程序启动逻辑">
<meta itemprop="description" content="程序启动逻辑">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/docs/users/communicate-protocol/index.html b/content/cn/docs/users/communicate-protocol/index.html
index 020178d..f1485b5 100644
--- a/content/cn/docs/users/communicate-protocol/index.html
+++ b/content/cn/docs/users/communicate-protocol/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="通信协议">
<meta itemprop="description" content="通信协议">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -583,7 +583,7 @@
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">rest</span><span class="pi">:</span>
<span class="na">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
- <span class="na">timeout</span><span class="pi">:</span> <span class="s">3000</span>
+ <span class="na">timeout</span><span class="pi">:</span> <span class="m">3000</span>
</code></pre></div></div>
<h2 id="rest-over-vertx">REST over Vertx</h2>
@@ -595,9 +595,9 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">MainServer</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="err"> </span><span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span><span class="c1">//日志初始化</span>
- <span class="err"> </span><span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="c1">// Spring bean初始化</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="err"> </span><span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span><span class="c1">//日志初始化</span>
+ <span class="err"> </span><span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="c1">// Spring bean初始化</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -692,7 +692,7 @@
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">rest</span><span class="pi">:</span>
<span class="na">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
- <span class="na">thread-count</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">thread-count</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">references</span><span class="pi">:</span>
<span class="na">hello</span><span class="pi">:</span>
<span class="na">transport</span><span class="pi">:</span> <span class="s">rest</span>
diff --git a/content/cn/docs/users/customized-tracing/index.html b/content/cn/docs/users/customized-tracing/index.html
index a7552cd..f6ff459 100644
--- a/content/cn/docs/users/customized-tracing/index.html
+++ b/content/cn/docs/users/customized-tracing/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="自定义调用链打点">
<meta itemprop="description" content="自定义调用链打点">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -431,8 +431,8 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableZipkinTracing</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ZipkinSpanTestApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">ZipkinSpanTestApplication</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">ZipkinSpanTestApplication</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -442,16 +442,16 @@
<p>在需要定制打点的方法上添加<code class="highlighter-rouge">@Span</code>注释：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Component</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SlowRepoImpl</span> <span class="kd">implements</span> <span class="n">SlowRepo</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">SlowRepoImpl</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SlowRepoImpl</span> <span class="kd">implements</span> <span class="nc">SlowRepo</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">SlowRepoImpl</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">Random</span> <span class="n">random</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Random</span><span class="o">();</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">Random</span> <span class="n">random</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Random</span><span class="o">();</span>
<span class="nd">@Span</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">crawl</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">InterruptedException</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">crawl</span><span class="o">()</span> <span class="kd">throws</span> <span class="nc">InterruptedException</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"in /crawl"</span><span class="o">);</span>
- <span class="n">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="n">random</span><span class="o">.</span><span class="na">nextInt</span><span class="o">(</span><span class="mi">200</span><span class="o">));</span>
+ <span class="nc">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="n">random</span><span class="o">.</span><span class="na">nextInt</span><span class="o">(</span><span class="mi">200</span><span class="o">));</span>
<span class="k">return</span> <span class="s">"crawled"</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -493,7 +493,7 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">static</span> <span class="kd">class</span> <span class="nc">CustomSpanTask</span> <span class="o">{</span>
<span class="nd">@Span</span><span class="o">(</span><span class="n">spanName</span> <span class="o">=</span> <span class="s">"transaction1"</span><span class="o">,</span> <span class="n">callPath</span> <span class="o">=</span> <span class="s">"startA"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">invoke</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">invoke</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"invoke the method"</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/cn/docs/users/develop-with-jax-rs/index.html b/content/cn/docs/users/develop-with-jax-rs/index.html
index 9c75e91..7932a3e 100644
--- a/content/cn/docs/users/develop-with-jax-rs/index.html
+++ b/content/cn/docs/users/develop-with-jax-rs/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="用JAX-RS开发微服务">
<meta itemprop="description" content="用JAX-RS开发微服务">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -438,17 +438,17 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.models.Person</span><span class="o">;</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/jaxrshello"</span><span class="o">)</span>
- <span class="nd">@Produces</span><span class="o">(</span><span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
+ <span class="nd">@Produces</span><span class="o">(</span><span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">JaxrsHelloImpl</span> <span class="o">{</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/sayhi"</span><span class="o">)</span>
<span class="nd">@POST</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span><span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/sayhello"</span><span class="o">)</span>
<span class="nd">@POST</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -466,7 +466,7 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">org.apache.servicecomb.provider.rest.common.RestSchema</span><span class="o">;</span>
<span class="c1">// other code omitted</span>
<span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"jaxrsHello"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="kd">class</span> <span class="nc">JaxrsHelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">class</span> <span class="nc">JaxrsHelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span> <span class="o">{</span>
<span class="c1">// other code omitted</span>
<span class="o">}</span>
</code></pre></div> </div>
@@ -496,10 +496,10 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="c1">//初始化日志， 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/cn/docs/users/develop-with-rest-template/index.html b/content/cn/docs/users/develop-with-rest-template/index.html
index 29af5fd..b5a82ab 100644
--- a/content/cn/docs/users/develop-with-rest-template/index.html
+++ b/content/cn/docs/users/develop-with-rest-template/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="使用Rest Template方式开发">
<meta itemprop="description" content="使用Rest Template方式开发">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -405,23 +405,23 @@
<span class="nd">@Component</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringmvcConsumerMain</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="n">RestTemplate</span> <span class="n">restTemplate</span> <span class="o">=</span> <span class="n">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="nc">RestTemplate</span> <span class="n">restTemplate</span> <span class="o">=</span> <span class="nc">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="n">init</span><span class="o">();</span>
- <span class="n">Person</span> <span class="n">person</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Person</span><span class="o">();</span>
+ <span class="nc">Person</span> <span class="n">person</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Person</span><span class="o">();</span>
<span class="n">person</span><span class="o">.</span><span class="na">setName</span><span class="o">(</span><span class="s">"ServiceComb/Java Chassis"</span><span class="o">);</span>
- <span class="n">String</span> <span class="n">sayHiResult</span> <span class="o">=</span> <span class="n">restTemplate</span>
- <span class="o">.</span><span class="na">postForObject</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhi?name=Java Chassis"</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">String</span> <span class="n">sayHelloResult</span> <span class="o">=</span> <span class="n">restTemplate</span>
- <span class="o">.</span><span class="na">postForObject</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhello"</span><span class="o">,</span> <span class="n">person</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"RestTemplate consumer sayhi services: "</span> <span class="o">+</span> <span class="n">sayHiResult</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"RestTemplate consumer sayhello services: "</span> <span class="o">+</span> <span class="n">sayHelloResult</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">sayHiResult</span> <span class="o">=</span> <span class="n">restTemplate</span>
+ <span class="o">.</span><span class="na">postForObject</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhi?name=Java Chassis"</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">sayHelloResult</span> <span class="o">=</span> <span class="n">restTemplate</span>
+ <span class="o">.</span><span class="na">postForObject</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhello"</span><span class="o">,</span> <span class="n">person</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"RestTemplate consumer sayhi services: "</span> <span class="o">+</span> <span class="n">sayHiResult</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"RestTemplate consumer sayhello services: "</span> <span class="o">+</span> <span class="n">sayHelloResult</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/cn/docs/users/develop-with-rpc/index.html b/content/cn/docs/users/develop-with-rpc/index.html
index 50ceb88..5d8e2d4 100644
--- a/content/cn/docs/users/develop-with-rpc/index.html
+++ b/content/cn/docs/users/develop-with-rpc/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="使用RPC方式开发">
<meta itemprop="description" content="使用RPC方式开发">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -404,19 +404,19 @@
<span class="nd">@Component</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CodeFirstConsumerMain</span> <span class="o">{</span>
<span class="nd">@RpcReference</span><span class="o">(</span><span class="n">microserviceName</span> <span class="o">=</span> <span class="s">"codefirst"</span><span class="o">,</span> <span class="n">schemaId</span> <span class="o">=</span> <span class="s">"codeFirstHello"</span><span class="o">)</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="n">Hello</span> <span class="n">hello</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="nc">Hello</span> <span class="n">hello</span><span class="o">;</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="n">init</span><span class="o">();</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHi</span><span class="o">(</span><span class="s">"Java Chassis"</span><span class="o">));</span>
- <span class="n">Person</span> <span class="n">person</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Person</span><span class="o">();</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHi</span><span class="o">(</span><span class="s">"Java Chassis"</span><span class="o">));</span>
+ <span class="nc">Person</span> <span class="n">person</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Person</span><span class="o">();</span>
<span class="n">person</span><span class="o">.</span><span class="na">setName</span><span class="o">(</span><span class="s">"ServiceComb/Java Chassis"</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHello</span><span class="o">(</span><span class="n">person</span><span class="o">));</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHello</span><span class="o">(</span><span class="n">person</span><span class="o">));</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -434,24 +434,24 @@
<p>然后就可以使用<code class="highlighter-rouge">BeanUtils.getBean</code>直接获取服务提供者的服务接口<code class="highlighter-rouge">Hello</code>：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Hello</span> <span class="n">hello</span> <span class="o">=</span> <span class="n">BeanUtils</span><span class="o">.</span><span class="na">getBean</span><span class="o">(</span><span class="s">"hello"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Hello</span> <span class="n">hello</span> <span class="o">=</span> <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">getBean</span><span class="o">(</span><span class="s">"hello"</span><span class="o">);</span>
</code></pre></div></div>
<h4 id="方式2获取bean再获取接口">方式2：获取Bean，再获取接口</h4>
<p>先使用<code class="highlighter-rouge">BeanUtils.getBean</code>获取到CodeFirstConsumerMain这个Bean：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">//Spring Bean 实例默认名为类名的小写</span>
-<span class="n">CodeFirstConsumerMain</span> <span class="n">consumer</span> <span class="o">=</span> <span class="n">BeanUtils</span><span class="o">.</span><span class="na">getBean</span><span class="o">(</span><span class="s">"codeFirstConsumerMain"</span><span class="o">);</span>
+<span class="nc">CodeFirstConsumerMain</span> <span class="n">consumer</span> <span class="o">=</span> <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">getBean</span><span class="o">(</span><span class="s">"codeFirstConsumerMain"</span><span class="o">);</span>
</code></pre></div></div>
<p>然后按Getter的方式获取hello：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Hello</span> <span class="nf">getHello</span><span class="o">()</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="nc">Hello</span> <span class="nf">getHello</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">hello</span><span class="o">;</span>
<span class="o">}</span>
</code></pre></div></div>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Hello</span> <span class="n">hello</span> <span class="o">=</span> <span class="n">consumer</span><span class="o">.</span><span class="na">getHello</span><span class="o">()</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Hello</span> <span class="n">hello</span> <span class="o">=</span> <span class="n">consumer</span><span class="o">.</span><span class="na">getHello</span><span class="o">()</span>
</code></pre></div></div>
<blockquote>
diff --git a/content/cn/docs/users/develop-with-spring-boot-starter/index.html b/content/cn/docs/users/develop-with-spring-boot-starter/index.html
index f542684..d363bd0 100644
--- a/content/cn/docs/users/develop-with-spring-boot-starter/index.html
+++ b/content/cn/docs/users/develop-with-spring-boot-starter/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="用Spring Boot Starter开发微服务">
<meta itemprop="description" content="用Spring Boot Starter开发微服务">
- <meta itemprop="dateModified" content="April 24, 2018">
+ <meta itemprop="dateModified" content="April 23, 2018">
<div class="page__inner-wrap">
@@ -441,15 +441,15 @@
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestParam</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.models.Person</span><span class="o">;</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/springmvchello"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/springmvchello"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringmvcHelloImpl</span> <span class="o">{</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhi"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"name"</span><span class="o">)</span> <span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhi"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"name"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span> <span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span> <span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="err"> </span><span class="o">}</span>
<span class="o">}</span>
@@ -510,8 +510,8 @@ Spring Boot已经包含了默认的Bean扫描策略，如果能够保证Spring B
<span class="c1">//EnableServiceComb注解用于在Spring Boot程序内拉起ServiceComb</span>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">Application</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">Application</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/cn/docs/users/develop-with-springmvc/index.html b/content/cn/docs/users/develop-with-springmvc/index.html
index 72d69d9..2cffac9 100644
--- a/content/cn/docs/users/develop-with-springmvc/index.html
+++ b/content/cn/docs/users/develop-with-springmvc/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="用SpringMVC开发微服务">
<meta itemprop="description" content="用SpringMVC开发微服务">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -438,15 +438,15 @@
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestParam</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.models.Person</span><span class="o">;</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/springmvchello"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/springmvchello"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringmvcHelloImpl</span> <span class="o">{</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhi"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"name"</span><span class="o">)</span> <span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhi"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"name"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span> <span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span> <span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="err"> </span><span class="o">}</span>
<span class="o">}</span>
@@ -495,10 +495,10 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="c1">//初始化日志， 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/cn/docs/users/develop-with-transparent-rpc/index.html b/content/cn/docs/users/develop-with-transparent-rpc/index.html
index 219acef..beb66f4 100644
--- a/content/cn/docs/users/develop-with-transparent-rpc/index.html
+++ b/content/cn/docs/users/develop-with-transparent-rpc/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="用透明RPC开发微服务">
<meta itemprop="description" content="用透明RPC开发微服务">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -431,8 +431,8 @@
<p>根据开发之前定义好的契约，编写Java业务接口，代码如下：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">interface</span> <span class="nc">Hello</span> <span class="o">{</span>
- <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">);</span>
- <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div> </div>
</li>
@@ -444,14 +444,14 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.Hello</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.models.Person</span><span class="o">;</span>
- <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -487,14 +487,14 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.apache.servicecomb.provider.pojo.RpcSchema</span><span class="o">;</span>
<span class="nd">@RpcSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"pojoHello"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -537,10 +537,10 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="c1">//初始化日志， 加载Bean(包括它们的参数), 以及注册Service, 更多信息可以参见文档 : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/cn/docs/users/distributed-tracing/index.html b/content/cn/docs/users/distributed-tracing/index.html
index b50ca9c..3722b8f 100644
--- a/content/cn/docs/users/distributed-tracing/index.html
+++ b/content/cn/docs/users/distributed-tracing/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="分布式调用链追踪">
<meta itemprop="description" content="分布式调用链追踪">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/docs/users/dynamic-config/index.html b/content/cn/docs/users/dynamic-config/index.html
index 960c559..812cdf7 100644
--- a/content/cn/docs/users/dynamic-config/index.html
+++ b/content/cn/docs/users/dynamic-config/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="动态配置">
<meta itemprop="description" content="动态配置">
- <meta itemprop="dateModified" content="January 12, 2018">
+ <meta itemprop="dateModified" content="January 11, 2018">
<div class="page__inner-wrap">
@@ -458,7 +458,7 @@
<span class="na">clusters</span><span class="pi">:</span> <span class="s">default</span>
<span class="na">namespace</span><span class="pi">:</span> <span class="s">application</span>
<span class="na">token</span><span class="pi">:</span> <span class="s">testtoken</span>
- <span class="na">refreshInterval</span><span class="pi">:</span> <span class="s">10</span>
+ <span class="na">refreshInterval</span><span class="pi">:</span> <span class="m">10</span>
</code></pre></div></div>
<p> <code class="highlighter-rouge">apollo.config</code>下的配置项是用户创建的应用参数，包括服务地址，用户名，集群，namespace，token等参数。这些参数可以在配置中心页面项目信息栏中查到。需要注意的是<code class="highlighter-rouge">refreshInterval: 10</code>表示应用会每隔10秒去配置中心查询一次最新的配置信息，不配置此项默认刷新周期为30秒。
<code class="highlighter-rouge">serviceName</code>对应Apollo中的第三发应用ID: <code class="highlighter-rouge">AppId</code>.</p>
@@ -470,14 +470,14 @@
<p> 代码中可以使用<code class="highlighter-rouge">DynamicPropertyFactory.getInstance().getProperty()</code>方法来获取具体的配置项值，<code class="highlighter-rouge">getProperty</code>方法可以根据配置项具体的类型来灵活使用，比如<code class="highlighter-rouge">getIntProperty()</code>,<code class="highlighter-rouge">getStringProperty()</code>等。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">XXX</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="k">while</span> <span class="o">(</span><span class="kc">true</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">DynamicIntProperty</span> <span class="n">timeout</span> <span class="o">=</span> <span class="n">DynamicPropertyFactory</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span>
+ <span class="nc">DynamicIntProperty</span> <span class="n">timeout</span> <span class="o">=</span> <span class="nc">DynamicPropertyFactory</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span>
<span class="n">getIntProperty</span><span class="o">(</span><span class="s">"timeout"</span><span class="o">,</span> <span class="o">-</span><span class="mi">1</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">timeout</span><span class="o">);</span>
- <span class="n">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="mi">3000</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">timeout</span><span class="o">);</span>
+ <span class="nc">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="mi">3000</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/cn/docs/users/edge-in-1.0.0-m1/index.html b/content/cn/docs/users/edge-in-1.0.0-m1/index.html
index eb7954a..014dbab 100644
--- a/content/cn/docs/users/edge-in-1.0.0-m1/index.html
+++ b/content/cn/docs/users/edge-in-1.0.0-m1/index.html
@@ -438,14 +438,14 @@
<h4 id="init方法">init方法</h4>
<p>初始化Dispatcher的路由规则，使用的是<a href="https://vertx.io/docs/vertx-web/java/#_routing_by_exact_path">Vertx路由规则</a>，例如我们添加两条匹配策略：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="n">Router</span> <span class="n">router</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">regex</span> <span class="o">=</span> <span class="s">"/([^\\\\/]+)/([^\\\\/]+)/(.*)"</span><span class="o">;</span>
- <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="nc">Router</span> <span class="n">router</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">String</span> <span class="n">regex</span> <span class="o">=</span> <span class="s">"/([^\\\\/]+)/([^\\\\/]+)/(.*)"</span><span class="o">;</span>
+ <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="nc">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">createBodyHandler</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">failureHandler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onFailure</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onRequest</span><span class= [...]
<span class="n">regex</span> <span class="o">=</span> <span class="s">"/([^\\\\/]+)/(.*)"</span><span class="o">;</span>
- <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
+ <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="nc">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">createBodyHandler</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">failureHandler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onFailure</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onRequest</span><span class= [...]
<span class="o">}</span>
@@ -458,11 +458,11 @@
<h4 id="onrequest方法">onRequest方法</h4>
<p>转发策略，方法原型为：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">void</span> <span class="nf">onRequest</span><span class="o">(</span><span class="n">RoutingContext</span> <span class="n">context</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">void</span> <span class="nf">onRequest</span><span class="o">(</span><span class="nc">RoutingContext</span> <span class="n">context</span><span class="o">)</span>
</code></pre></div></div>
<p>从context中可以获取到请求目标微服务名，path等信息，之后创建EdgeInvocation并初始化，完成调用：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">EdgeInvocation</span> <span class="n">edgeInvocation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">EdgeInvocation</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">EdgeInvocation</span> <span class="n">edgeInvocation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">EdgeInvocation</span><span class="o">();</span>
<span class="n">edgeInvocation</span><span class="o">.</span><span class="na">setVersionRule</span><span class="o">(</span><span class="n">versionRule</span><span class="o">);</span>
<span class="n">edgeInvocation</span><span class="o">.</span><span class="na">init</span><span class="o">(</span><span class="n">serviceName</span><span class="o">,</span> <span class="n">context</span><span class="o">,</span> <span class="n">path</span><span class="o">,</span> <span class="n">httpServerFilters</span><span class="o">);</span>
<span class="n">edgeInvocation</span><span class="o">.</span><span class="na">edgeInvoke</span><span class="o">();</span>
diff --git a/content/cn/docs/users/edging-service/nginx/index.html b/content/cn/docs/users/edging-service/nginx/index.html
index f3714a2..c9afa41 100644
--- a/content/cn/docs/users/edging-service/nginx/index.html
+++ b/content/cn/docs/users/edging-service/nginx/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="使用confd和Nginx做边缘服务">
<meta itemprop="description" content="使用confd和Nginx做边缘服务">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -475,23 +475,23 @@
<ul>
<li>获取所有微服务信息
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">List</span><span class="o"><</span><span class="n">Microservice</span><span class="o">></span> <span class="nf">getAllMicroservices</span><span class="o">();</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">List</span><span class="o"><</span><span class="nc">Microservice</span><span class="o">></span> <span class="nf">getAllMicroservices</span><span class="o">();</span>
</code></pre></div> </div>
</li>
<li>获取微服务唯一标识
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">String</span> <span class="nf">getMicroserviceId</span><span class="o">(</span><span class="n">String</span> <span class="n">appId</span><span class="o">,</span> <span class="n">String</span> <span class="n">microserviceName</span><span class="o">,</span> <span class="n">String</span> <span class="n">versionRule</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">String</span> <span class="nf">getMicroserviceId</span><span class="o">(</span><span class="nc">String</span> <span class="n">appId</span><span class="o">,</span> <span class="nc">String</span> <span class="n">microserviceName</span><span class="o">,</span> <span class="nc">String</span> <span class="n">versionRule</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>根据微服务唯一标识查询微服务静态信息
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Microservice</span> <span class="nf">getMicroservice</span><span class="o">(</span><span class="n">String</span> <span class="n">microserviceId</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Microservice</span> <span class="nf">getMicroservice</span><span class="o">(</span><span class="nc">String</span> <span class="n">microserviceId</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>根据多个微服务唯一标识查询所有微服务实例信息
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">List</span><span class="o"><</span><span class="n">MicroserviceInstance</span><span class="o">></span> <span class="nf">getMicroserviceInstance</span><span class="o">(</span><span class="n">String</span> <span class="n">consumerId</span><span class="o">,</span> <span class="n">String</span> <span class="n">providerId</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">List</span><span class="o"><</span><span class="nc">MicroserviceInstance</span><span class="o">></span> <span class="nf">getMicroserviceInstance</span><span class="o">(</span><span class="nc">String</span> <span class="n">consumerId</span><span class="o">,</span> <span class="nc">String</span> <span class="n">providerId</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>按照app+interface+version查询实例endpoints信息
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">List</span><span class="o"><</span><span class="n">MicroserviceInstance</span><span class="o">></span> <span class="nf">findServiceInstance</span><span class="o">(</span><span class="n">String</span> <span class="n">consumerId</span><span class="o">,</span> <span class="n">String</span> <span class="n">appId</span><span class="o">,</span> <span class="n">String</spa [...]
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">List</span><span class="o"><</span><span class="nc">MicroserviceInstance</span><span class="o">></span> <span class="nf">findServiceInstance</span><span class="o">(</span><span class="nc">String</span> <span class="n">consumerId</span><span class="o">,</span> <span class="nc">String</span> <span class="n">appId</span><span class="o">,</span> <span class="nc">String [...]
</code></pre></div> </div>
</li>
</ul>
diff --git a/content/cn/docs/users/edging-service/zuul/index.html b/content/cn/docs/users/edging-service/zuul/index.html
index 0c47dc2..8f15714 100644
--- a/content/cn/docs/users/edging-service/zuul/index.html
+++ b/content/cn/docs/users/edging-service/zuul/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="使用Zuul做边缘服务">
<meta itemprop="description" content="使用Zuul做边缘服务">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -454,8 +454,8 @@
<span class="nd">@EnableServiceComb</span>
<span class="nd">@EnableZuulProxy</span><span class="c1">//新增注解</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ZuulMain</span><span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span><span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">ZuulMain</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span><span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">ZuulMain</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
@@ -464,7 +464,7 @@
<p><strong>步骤 3</strong>在application.yml文件中定义路由策略：</p>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">server</span><span class="pi">:</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">8754</span> <span class="c1">#api gateway服务端口</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">8754</span> <span class="c1">#api gateway服务端口</span>
<span class="na">zuul</span><span class="pi">:</span>
<span class="na">routes</span><span class="pi">:</span> <span class="c1">#路由策略</span>
<span class="na">discoveryServer</span><span class="pi">:</span> <span class="s">/myServer/**</span> <span class="c1">#路由规则</span>
diff --git a/content/cn/docs/users/healthcheck/index.html b/content/cn/docs/users/healthcheck/index.html
index 8e3c069..6e18027 100644
--- a/content/cn/docs/users/healthcheck/index.html
+++ b/content/cn/docs/users/healthcheck/index.html
@@ -420,28 +420,28 @@
</table>
<p>例如：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MySqlHealthChecker</span> <span class="kd">implements</span> <span class="n">HealthChecker</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MySqlHealthChecker</span> <span class="kd">implements</span> <span class="nc">HealthChecker</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"mysql"</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">HealthCheckResult</span> <span class="nf">check</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">HealthCheckResult</span> <span class="nf">check</span><span class="o">()</span> <span class="o">{</span>
<span class="c1">//add your health check code here</span>
- <span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+ <span class="nc">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
<span class="k">try</span> <span class="o">{</span>
- <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="s">"jdbc:mysql://localhost:3306/test_db?useSSL=false"</span><span class="o">,</span> <span class="s">"root"</span><span class="o">,</span> <span class="s">"pwd"</span><span class="o">);</span>
+ <span class="n">connection</span> <span class="o">=</span> <span class="nc">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="s">"jdbc:mysql://localhost:3306/test_db?useSSL=false"</span><span class="o">,</span> <span class="s">"root"</span><span class="o">,</span> <span class="s">"pwd"</span><span class="o">);</span>
<span class="k">return</span> <span class="k">new</span> <span class="nf">HealthCheckResult</span><span class="o">(</span><span class="kc">true</span><span class="o">,</span> <span class="s">"local mysql health check"</span><span class="o">,</span> <span class="s">""</span><span class="o">);</span>
- <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">SQLException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">error</span><span class="o">(</span><span class="s">"Cannot connect the localhost mysql. "</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
+ <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">SQLException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">error</span><span class="o">(</span><span class="s">"Cannot connect the localhost mysql. "</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
<span class="k">return</span> <span class="k">new</span> <span class="nf">HealthCheckResult</span><span class="o">(</span><span class="kc">false</span><span class="o">,</span> <span class="s">"local mysql health check"</span><span class="o">,</span> <span class="n">e</span><span class="o">.</span><span class="na">toString</span><span class="o">());</span>
<span class="o">}</span> <span class="k">finally</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">connection</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
<span class="k">try</span> <span class="o">{</span>
<span class="n">connection</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
- <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">SQLException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">error</span><span class="o">(</span><span class="s">"Close connect the localhost mysql error. "</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
+ <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">SQLException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">error</span><span class="o">(</span><span class="s">"Close connect the localhost mysql error. "</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/cn/docs/users/invoke-control/index.html b/content/cn/docs/users/invoke-control/index.html
index d212981..4d5bb07 100644
--- a/content/cn/docs/users/invoke-control/index.html
+++ b/content/cn/docs/users/invoke-control/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="调用控制">
<meta itemprop="description" content="调用控制">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/docs/users/local-develop-test/index.html b/content/cn/docs/users/local-develop-test/index.html
index 42e07cb..2544207 100644
--- a/content/cn/docs/users/local-develop-test/index.html
+++ b/content/cn/docs/users/local-develop-test/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="本地开发与测试">
<meta itemprop="description" content="本地开发与测试">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -441,10 +441,10 @@
<p><strong>步骤 2</strong>在服务消费者Main函数首末添加如下代码：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">xxxClient</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">System</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="s">"local.registry.file"</span><span class="o">,</span> <span class="s">"/path/registry.yaml"</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="s">"local.registry.file"</span><span class="o">,</span> <span class="s">"/path/registry.yaml"</span><span class="o">);</span>
<span class="c1">//your code</span>
- <span class="n">System</span><span class="o">.</span><span class="na">clearProperty</span><span class="o">(</span><span class="s">"local.registry.file"</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">clearProperty</span><span class="o">(</span><span class="s">"local.registry.file"</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div> </div>
</li>
diff --git a/content/cn/docs/users/manage_springcloud_application_using_sc_and_gs/index.html b/content/cn/docs/users/manage_springcloud_application_using_sc_and_gs/index.html
index b7d555b..38352bd 100644
--- a/content/cn/docs/users/manage_springcloud_application_using_sc_and_gs/index.html
+++ b/content/cn/docs/users/manage_springcloud_application_using_sc_and_gs/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="使用Service Center和治理中心管理Spring Cloud应用">
<meta itemprop="description" content="使用Service Center和治理中心管理Spring Cloud应用">
- <meta itemprop="dateModified" content="April 24, 2018">
+ <meta itemprop="dateModified" content="April 23, 2018">
<div class="page__inner-wrap">
@@ -508,8 +508,8 @@
<span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableServiceComb</span> <span class="c1">//新增注解</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">xxxServer</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">xxxServer</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">xxxServer</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
@@ -519,11 +519,11 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="c1">// ControllerImpl.class:</span>
<span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"test"</span><span class="o">)</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/compute"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">MediaType</span><span class="o">.</span><span class="na">TEXT_PLAIN</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/compute"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="nc">MediaType</span><span class="o">.</span><span class="na">TEXT_PLAIN</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ControllerImpl</span> <span class="o">{</span>
<span class="nd">@ResponseBody</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/hello/{name}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">add</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/hello/{name}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">add</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"hello"</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/cn/docs/users/metrics-in-0.5.0/index.html b/content/cn/docs/users/metrics-in-0.5.0/index.html
index 78a097e..5875a32 100644
--- a/content/cn/docs/users/metrics-in-0.5.0/index.html
+++ b/content/cn/docs/users/metrics-in-0.5.0/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="0.5.0版本中的监控">
<meta itemprop="description" content="0.5.0版本中的监控">
- <meta itemprop="dateModified" content="December 30, 2017">
+ <meta itemprop="dateModified" content="December 29, 2017">
<div class="page__inner-wrap">
@@ -403,7 +403,7 @@
<p>0.5.0版本的Metrics会在Java Chassis的Invocation中埋入计数器，也会使用Hystrix收集TPS和Latency，同时收集微服务实例的CPU使用率和内存使用量，最终通过输出日志的方式输出收集到的Metrics数据。<br />
输入日志使用的是SLF4J作为日志框架，未与任何具体的日志框架绑定，我们会通过定向Logger名输出的方式将不同的Metrics输出为一个个独立的文件，因此需要在你的日志配置中添加对应的配置项，<a href="https://stackoverflow.com/questions/9652032/how-can-i-create-2-separate-log-files-with-one-log4j-config-file">这篇文章</a>详细说明了如果使用Log4j作为日志实现如何配置，而<a href="https://stackoverflow.com/questions/36643692/log4j2-multiple-appenders-the-same-output-is-written-to-multiple-files">这篇文章</a>则详细介绍了如果使用Log4j2作为日志需要如何配置。<br />
Logger名指的是LoggerFactory.getLogger后的第一个参数：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">log</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="s">"${Logger名}"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">log</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="s">"${Logger名}"</span><span class="o">);</span>
<span class="n">log</span><span class="o">.</span><span class="na">trace</span><span class="o">(</span><span class="s">"${Metric数据}"</span><span class="o">);</span>
</code></pre></div></div>
<p><strong>为不影响调试，log的输出级别为trace</strong></p>
@@ -491,9 +491,9 @@ Logger名指的是LoggerFactory.getLogger后的第一个参数：</p>
<span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">metrics</span><span class="pi">:</span>
<span class="c1">#metrics数据采集时间（同样是写文件间隔），单位秒</span>
- <span class="na">polltime</span><span class="pi">:</span> <span class="s">5</span>
+ <span class="na">polltime</span><span class="pi">:</span> <span class="m">5</span>
<span class="c1">#如果metric是浮点数，输出结果保留几位小数，默认为1</span>
- <span class="na">round_places</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">round_places</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">file</span><span class="pi">:</span>
<span class="c1">#是否启用文件输出</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
diff --git a/content/cn/docs/users/metrics-in-1.0.0-m1/index.html b/content/cn/docs/users/metrics-in-1.0.0-m1/index.html
index 6e089c5..657188a 100644
--- a/content/cn/docs/users/metrics-in-1.0.0-m1/index.html
+++ b/content/cn/docs/users/metrics-in-1.0.0-m1/index.html
@@ -630,7 +630,7 @@ name包括：</p>
<span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">metrics</span><span class="pi">:</span>
<span class="c1">#时间窗间隔，单位毫秒,默认为5000（5秒）</span>
- <span class="na">window_time</span><span class="pi">:</span> <span class="s">5000</span>
+ <span class="na">window_time</span><span class="pi">:</span> <span class="m">5000</span>
</code></pre></div></div>
<p><strong>为了降低Metrics理解和使用难度，我们暂时不支持多周期</strong></p>
@@ -652,12 +652,12 @@ name包括：</p>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/metrics"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">MetricsPublisher</span> <span class="o">{</span>
<span class="nd">@ApiResponses</span><span class="o">({</span>
- <span class="nd">@ApiResponse</span><span class="o">(</span><span class="n">code</span> <span class="o">=</span> <span class="mi">400</span><span class="o">,</span> <span class="n">response</span> <span class="o">=</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">message</span> <span class="o">=</span> <span class="s">"illegal request content"</span><span class="o">),</span>
+ <span class="nd">@ApiResponse</span><span class="o">(</span><span class="n">code</span> <span class="o">=</span> <span class="mi">400</span><span class="o">,</span> <span class="n">response</span> <span class="o">=</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">message</span> <span class="o">=</span> <span class="s">"illegal request content"</span><span class="o">),</span>
<span class="o">})</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
<span class="nd">@CrossOrigin</span>
- <span class="kd">public</span> <span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">Double</span><span class="o">></span> <span class="nf">measure</span><span class="o">()</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">Double</span><span class="o">></span> <span class="nf">measure</span><span class="o">()</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -673,8 +673,8 @@ name包括：</p>
<h3 id="直接获取">直接获取</h3>
<p>从上面的代码可以看到，数据提供的入口是org.apache.servicecomb.metrics.core.MonitorManager，因此如果你希望自己开发数据发布程序，只需要获取它即可。</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">MonitorManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
-<span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="na">measure</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">MonitorManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+<span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="na">measure</span><span class="o">();</span>
</code></pre></div></div>
<p><strong>提示：Servo已经被Netflix标记为DEPRECATED，我们将在1.0.0-m2中使用Netflix spectator替换，获取数据的接口会有调整</strong></p>
@@ -682,7 +682,7 @@ name包括：</p>
<h2 id="如何使用数据">如何使用数据</h2>
<p>Metrics数据将以Map<String, Double>的形式输出，为了能够方便用户获取指定Metric的值，提供了org.apache.servicecomb.foundation.metrics.publish.MetricsLoader工具类：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="c1">//模拟MonitorManager.getInstance().measure()获取所有的Metrics值</span>
- <span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o"><>();</span>
+ <span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashMap</span><span class="o"><>();</span>
<span class="n">metrics</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"X(K1=1,K2=2,K3=3)"</span><span class="o">,</span> <span class="mf">100.0</span><span class="o">);</span>
<span class="n">metrics</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"X(K1=1,K2=20,K3=30)"</span><span class="o">,</span> <span class="mf">200.0</span><span class="o">);</span>
<span class="n">metrics</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"X(K1=2,K2=200,K3=300)"</span><span class="o">,</span> <span class="mf">300.0</span><span class="o">);</span>
@@ -694,10 +694,10 @@ name包括：</p>
<span class="n">metrics</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"Y(K1=1000,K2=2000,K3=3000)"</span><span class="o">,</span> <span class="mf">800.0</span><span class="o">);</span>
<span class="c1">//创建一个MetricsLoader加载所有的Metrics值</span>
- <span class="n">MetricsLoader</span> <span class="n">loader</span> <span class="o">=</span> <span class="k">new</span> <span class="n">MetricsLoader</span><span class="o">(</span><span class="n">metrics</span><span class="o">);</span>
+ <span class="nc">MetricsLoader</span> <span class="n">loader</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">MetricsLoader</span><span class="o">(</span><span class="n">metrics</span><span class="o">);</span>
<span class="c1">//获取name为X的所有Metrics并且按K1,K2两个Tag层次分组</span>
- <span class="n">MetricNode</span> <span class="n">node</span> <span class="o">=</span> <span class="n">loader</span><span class="o">.</span><span class="na">getMetricTree</span><span class="o">(</span><span class="s">"X"</span><span class="o">,</span><span class="s">"K1"</span><span class="o">,</span><span class="s">"K2"</span><span class="o">);</span>
+ <span class="nc">MetricNode</span> <span class="n">node</span> <span class="o">=</span> <span class="n">loader</span><span class="o">.</span><span class="na">getMetricTree</span><span class="o">(</span><span class="s">"X"</span><span class="o">,</span><span class="s">"K1"</span><span class="o">,</span><span class="s">"K2"</span><span class="o">);</span>
<span class="c1">//获取K1=1且K2=20的所有Metrics，因为node是按K1和K2的层次分组的</span>
<span class="n">node</span><span class="o">.</span><span class="na">getChildrenNode</span><span class="o">(</span><span class="s">"1"</span><span class="o">).</span><span class="na">getChildrenNode</span><span class="o">(</span><span class="s">"20"</span><span class="o">).</span><span class="na">getMetrics</span><span class="o">();</span>
@@ -739,13 +739,13 @@ name包括：</p>
<p>以处理订单这个场景为例：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">OrderController</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">Counter</span> <span class="n">orderCount</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">Counter</span> <span class="n">orderTps</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">Timer</span> <span class="n">averageLatency</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">MaxGauge</span> <span class="n">maxLatency</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">Counter</span> <span class="n">orderCount</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">Counter</span> <span class="n">orderTps</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">Timer</span> <span class="n">averageLatency</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">MaxGauge</span> <span class="n">maxLatency</span><span class="o">;</span>
- <span class="n">OrderController</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">MonitorManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+ <span class="nc">OrderController</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">MonitorManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
<span class="c1">//"商品名","levis jeans"与"型号","512" 是两个自定义Tag的name和value，支持定义多Tag</span>
<span class="k">this</span><span class="o">.</span><span class="na">orderCount</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"订单数量"</span><span class="o">,</span> <span class="s">"商品名"</span><span class="o">,</span> <span class="s">"levis jeans"</span><span class="o">,</span> <span class="s">"型号"</span><span class="o">,</span> <span class="s">"512"</span><span class="o">) [...]
<span class="k">this</span><span class="o">.</span><span class="na">orderTps</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="na">getCounter</span><span class="o">(</span><span class="nl">StepCounter:</span><span class="o">:</span><span class="k">new</span><span class="o">,</span> <span class="s">"生成订单"</span><span class="o">,</span> <span class="s">"统计项"</span><span class="o">,</span> <span class="s">"事务每秒"</span><span class="o">);</span>
@@ -754,11 +754,11 @@ name包括：</p>
<span class="o">}</span>
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">makeOrder</span><span class="o">()</span> <span class="o">{</span>
- <span class="kt">long</span> <span class="n">startTime</span> <span class="o">=</span> <span class="n">System</span><span class="o">.</span><span class="na">nanoTime</span><span class="o">();</span>
+ <span class="kt">long</span> <span class="n">startTime</span> <span class="o">=</span> <span class="nc">System</span><span class="o">.</span><span class="na">nanoTime</span><span class="o">();</span>
<span class="c1">//处理订单逻辑</span>
<span class="c1">//...</span>
<span class="c1">//处理完毕</span>
- <span class="kt">long</span> <span class="n">totalTime</span> <span class="o">=</span> <span class="n">System</span><span class="o">.</span><span class="na">nanoTime</span><span class="o">()</span> <span class="o">-</span> <span class="n">startTime</span><span class="err">；</span>
+ <span class="kt">long</span> <span class="n">totalTime</span> <span class="o">=</span> <span class="nc">System</span><span class="o">.</span><span class="na">nanoTime</span><span class="o">()</span> <span class="o">-</span> <span class="n">startTime</span><span class="err">；</span>
<span class="c1">//增加订单数量</span>
<span class="k">this</span><span class="o">.</span><span class="na">orderCount</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
@@ -767,10 +767,10 @@ name包括：</p>
<span class="k">this</span><span class="o">.</span><span class="na">orderTps</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
<span class="c1">//记录订单生成处理时间</span>
- <span class="k">this</span><span class="o">.</span><span class="na">averageLatency</span><span class="o">.</span><span class="na">record</span><span class="o">(</span><span class="n">totalTime</span><span class="o">,</span> <span class="n">TimeUnit</span><span class="o">.</span><span class="na">NANOSECONDS</span><span class="o">);</span>
+ <span class="k">this</span><span class="o">.</span><span class="na">averageLatency</span><span class="o">.</span><span class="na">record</span><span class="o">(</span><span class="n">totalTime</span><span class="o">,</span> <span class="nc">TimeUnit</span><span class="o">.</span><span class="na">NANOSECONDS</span><span class="o">);</span>
<span class="c1">//记录最大订单生成时间，因为惯用毫秒作为最终输出，因此我们转换一下单位</span>
- <span class="k">this</span><span class="o">.</span><span class="na">maxLatency</span><span class="o">.</span><span class="na">update</span><span class="o">(</span><span class="n">TimeUnit</span><span class="o">.</span><span class="na">NANOSECONDS</span><span class="o">.</span><span class="na">toMillis</span><span class="o">(</span><span class="n">totalTime</span><span class="o">));</span>
+ <span class="k">this</span><span class="o">.</span><span class="na">maxLatency</span><span class="o">.</span><span class="na">update</span><span class="o">(</span><span class="nc">TimeUnit</span><span class="o">.</span><span class="na">NANOSECONDS</span><span class="o">.</span><span class="na">toMillis</span><span class="o">(</span><span class="n">totalTime</span><span class="o">));</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -779,7 +779,7 @@ name包括：</p>
<p>1.通过MonitorManager获取Monitor传递name和tag数组，最终输出的ID是它们连接后的字符串，所以请保持唯一性，上面的例子输出的Metrics为：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span><span class="n">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span><span class="nc">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">();</span>
<span class="c1">//metrics的keySet()将包含：</span>
<span class="c1">// 订单数量(商品名=levis jeans,型号=512)</span>
@@ -790,15 +790,15 @@ name包括：</p>
<p>2.MonitorManager获取Monitor的方法均为<strong>获取或创建</strong>，因此多次传递相同的name和tag数组返回的是同一个计数器：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Counter</span> <span class="n">counter1</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"订单数量"</span><span class="o">,</span> <span class="s">"商品名"</span><span class="o">,</span> <span class="s">"lev [...]
-<span class="n">Counter</span> <span class="n">counter2</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"订单数量"</span><span class="o">,</span> <span class="s">"商品名"</span><span class="o">,</span> <span class="s">"levis jeans"</span><span class="o">,</span> <span class="s">"型号"</span><span class="o">,</span> <spa [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Counter</span> <span class="n">counter1</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"订单数量"</span><span class="o">,</span> <span class="s">"商品名"</span><span class="o">,</span> <span class="s">"l [...]
+<span class="nc">Counter</span> <span class="n">counter2</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"订单数量"</span><span class="o">,</span> <span class="s">"商品名"</span><span class="o">,</span> <span class="s">"levis jeans"</span><span class="o">,</span> <span class="s">"型号"</span><span class="o">,</span> <s [...]
<span class="n">counter1</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
<span class="n">counter2</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
-<span class="n">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mi">2</span><span class="o">,</span><span class="n">counter1</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
-<span class="n">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mi">2</span><span class="o">,</span><span class="n">counter2</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
-<span class="n">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mf">2.0</span><span class="o">,</span><span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="s">"订单数量(商品名=levis jeans,型号=512)"</span><span class="o">),</span><span class="mi">0</ [...]
+<span class="nc">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mi">2</span><span class="o">,</span><span class="n">counter1</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+<span class="nc">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mi">2</span><span class="o">,</span><span class="n">counter2</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+<span class="nc">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mf">2.0</span><span class="o">,</span><span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="s">"订单数量(商品名=levis jeans,型号=512)"</span><span class="o">),</span><span class="mi">0 [...]
</code></pre></div></div>
<p><strong>获取Monitor的方法性能较低，请在初始化阶段一次获取所需的Monitor，然后将它们缓存起来，请参照前面OrderController的做法。</strong></p>
diff --git a/content/cn/docs/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html b/content/cn/docs/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
index 60d8692..bf9783f 100644
--- a/content/cn/docs/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
+++ b/content/cn/docs/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
@@ -429,7 +429,7 @@ Prometheus推荐Pull模式拉取Metrics数据，被监控微服务作为Producer
<span class="na">metrics</span><span class="pi">:</span>
<span class="na">prometheus</span><span class="pi">:</span>
<span class="c1">#prometheus provider的端口</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">9696</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">9696</span>
</code></pre></div></div>
<p><em>如果不做配置，默认端口为9696</em></p>
<h3 id="依赖配置">依赖配置</h3>
diff --git a/content/cn/docs/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html b/content/cn/docs/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
index 3078036..9761d1b 100644
--- a/content/cn/docs/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
+++ b/content/cn/docs/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
@@ -428,15 +428,15 @@
<span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">metrics</span><span class="pi">:</span>
<span class="c1">#1.0.0-m1日志输出间隔配置项，单位毫秒</span>
- <span class="na">window_time</span><span class="pi">:</span> <span class="s">5000</span>
+ <span class="na">window_time</span><span class="pi">:</span> <span class="m">5000</span>
<span class="c1">#如果metric是浮点数，输出结果保留几位小数，默认为1</span>
- <span class="na">round_places</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">round_places</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">file</span><span class="pi">:</span>
<span class="c1">#日志根目录</span>
<span class="na">root_path</span><span class="pi">:</span> <span class="s">./log/metric/</span>
<span class="na">rolling</span><span class="pi">:</span>
<span class="c1">#最大保留文件数</span>
- <span class="na">max_file_count</span><span class="pi">:</span> <span class="s">10</span>
+ <span class="na">max_file_count</span><span class="pi">:</span> <span class="m">10</span>
<span class="c1">#文件最大大小，单位可以是KB，MB和GB</span>
<span class="na">max_file_size </span><span class="pi">:</span> <span class="s">10MB</span>
</code></pre></div></div>
diff --git a/content/cn/docs/users/run-mode/index.html b/content/cn/docs/users/run-mode/index.html
index 29c0d27..ba758d4 100644
--- a/content/cn/docs/users/run-mode/index.html
+++ b/content/cn/docs/users/run-mode/index.html
@@ -401,9 +401,9 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.BeanUtils</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">MainServer</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="err"> </span><span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="err">#日志初始化</span>
- <span class="err"> </span><span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="err">#</span> <span class="n">Spring</span> <span class="n">bean</span><span class="err">初始化</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="err"> </span><span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="err">#日志初始化</span>
+ <span class="err"> </span><span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="err">#</span> <span class="nc">Spring</span> <span class="n">bean</span><span class="err">初始化</span>
<span class="c1">// other codes omitted</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/cn/docs/users/service-configurations/index.html b/content/cn/docs/users/service-configurations/index.html
index cbe2b83..c9b65d8 100644
--- a/content/cn/docs/users/service-configurations/index.html
+++ b/content/cn/docs/users/service-configurations/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="服务配置">
<meta itemprop="description" content="服务配置">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -621,11 +621,11 @@
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">timeout</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
- <span class="na">timeoutInMilliseconds</span><span class="pi">:</span> <span class="s">30000</span>
+ <span class="na">timeoutInMilliseconds</span><span class="pi">:</span> <span class="m">30000</span>
<span class="na">circuitBreaker</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
- <span class="na">sleepWindowInMilliseconds</span><span class="pi">:</span> <span class="s">15000</span>
- <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="s">20</span>
+ <span class="na">sleepWindowInMilliseconds</span><span class="pi">:</span> <span class="m">15000</span>
+ <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="m">20</span>
<span class="na">fallback</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
diff --git a/content/cn/docs/users/service-contract/index.html b/content/cn/docs/users/service-contract/index.html
index b354d77..6d7b393 100644
--- a/content/cn/docs/users/service-contract/index.html
+++ b/content/cn/docs/users/service-contract/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="服务契约">
<meta itemprop="description" content="服务契约">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/docs/users/service-definition/index.html b/content/cn/docs/users/service-definition/index.html
index a286844..3ace1e3 100644
--- a/content/cn/docs/users/service-definition/index.html
+++ b/content/cn/docs/users/service-definition/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="服务定义">
<meta itemprop="description" content="服务定义">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/docs/users/service-heartbeat/index.html b/content/cn/docs/users/service-heartbeat/index.html
index d4fe256..476de0c 100644
--- a/content/cn/docs/users/service-heartbeat/index.html
+++ b/content/cn/docs/users/service-heartbeat/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="服务心跳">
<meta itemprop="description" content="服务心跳">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -397,12 +397,12 @@
<p><code class="highlighter-rouge">ServiceRegistryClient</code>提供了发送心跳的方法<code class="highlighter-rouge">heartbeat</code>，用户直接调用即可，示例代码如下：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="c1">// 首先需要注册微服务和实例</span>
<span class="c1">// 发送心跳，不然实例会消失</span>
<span class="k">while</span> <span class="o">(</span><span class="kc">true</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"heartbeat sended:"</span> <span class="o">+</span> <span class="n">client</span><span class="o">.</span><span class="na">heartbeat</span><span class="o">(</span><span class="n">service2</span><span class="o">.</span><span class="na">getServiceId</span><span class="o">(),</span> <span class="n">instance</span><s [...]
- <span class="n">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="mi">3000</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"heartbeat sended:"</span> <span class="o">+</span> <span class="n">client</span><span class="o">.</span><span class="na">heartbeat</span><span class="o">(</span><span class="n">service2</span><span class="o">.</span><span class="na">getServiceId</span><span class="o">(),</span> <span class="n">instance</span>< [...]
+ <span class="nc">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="mi">3000</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/cn/docs/users/service-interface-constraints/index.html b/content/cn/docs/users/service-interface-constraints/index.html
index e173342..4af950d 100644
--- a/content/cn/docs/users/service-interface-constraints/index.html
+++ b/content/cn/docs/users/service-interface-constraints/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="服务接口约束">
<meta itemprop="description" content="服务接口约束">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -386,18 +386,18 @@
<h2 id="接口约束说明">接口约束说明</h2>
<p>Java Chassis对于接口的使用约束建立在一个简单的原则上：接口定义即接口使用说明，不用通过查看代码实现，就能识别如何调用这个接口。举个例子：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Person</span> <span class="nf">query</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">);</span>
-<span class="kd">public</span> <span class="n">Object</span> <span class="nf">query</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">);</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Person</span> <span class="o">{</span><span class="n">String</span> <span class="n">name</span><span class="o">;}</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="nc">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
+<span class="kd">public</span> <span class="nc">Object</span> <span class="nf">query</span><span class="o">(</span><span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Person</span> <span class="o">{</span><span class="nc">String</span> <span class="n">name</span><span class="o">;}</span>
</code></pre></div></div>
<p>显然如果调用接口一，我们知道要传递一个String类型的id参数，返回值是一个Person类型，Person里面存在String类型的name等参数。如果调用接口二，我们不知道怎么处理返回值，必须参考服务提供者的文档说明。可以看出，我们是站在使用者视角这边的，以更容易被使用作为参考。</p>
<p>当我们要将接口发布为REST接口的时候，可以通过使用swagger文件，指定id使用RequestParam或者PathVariable或者RequestBody进行传递，也可以使用SpringMVC或者JAX RS提供的标签来描述。</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@RequestParam</span> <span class="n">String</span> <span class="n">id</span><span class="o">);</span>
-<span class="kd">public</span> <span class="n">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="n">String</span> <span class="n">id</span><span class="o">);</span>
-<span class="kd">public</span> <span class="n">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">String</span> <span class="n">id</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="nc">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@RequestParam</span> <span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
+<span class="kd">public</span> <span class="nc">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
+<span class="kd">public</span> <span class="nc">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
</code></pre></div></div>
<p>通常，我们会将简单的数据类型，比如String, int等在RequestParam或者PathVariable传递，而把复杂的数据类型使用JSON编码以后在RequestBody传递，以减少HTTP协议限制可能给开发者带来的各种问题。</p>
@@ -413,14 +413,14 @@
</code></pre></div> </div>
</li>
<li>泛型
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">PersonHolder</span><span class="o"><</span><span class="n">T</span><span class="o">></span> <span class="o">{...}</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">PersonHolder</span><span class="o"><</span><span class="no">T</span><span class="o">></span> <span class="o">{...}</span>
</code></pre></div> </div>
</li>
<li>
<p>上述类型的集合类型或者没指定类型的集合，比如：<code class="highlighter-rouge">List<IPerson>, Map<String, PersonHolder<?>>, List, Map</code>等。 <code class="highlighter-rouge">List<String>, List<Person></code>这些具体类型是支持的。</p>
</li>
<li>包含上述类型作为属性的类型
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">GroupOfPerson</span> <span class="o">{</span><span class="n">IPerson</span> <span class="n">master</span> <span class="o">...}</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">GroupOfPerson</span> <span class="o">{</span><span class="nc">IPerson</span> <span class="n">master</span> <span class="o">...}</span>
</code></pre></div> </div>
</li>
</ul>
diff --git a/content/cn/docs/users/setup-environment/index.html b/content/cn/docs/users/setup-environment/index.html
index d5180d7..a557671 100644
--- a/content/cn/docs/users/setup-environment/index.html
+++ b/content/cn/docs/users/setup-environment/index.html
@@ -532,38 +532,38 @@ manager_cluster = "10.12.0.4:2379"
</code></pre></div></div>
<p>将会返回下面的内容 :</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"instances"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"instances"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"instanceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e9e976f9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e99f4cf9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"endpoints"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"instanceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e9e976f9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e99f4cf9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"endpoints"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="s2">"rest://10.12.0.1:30100"</span><span class="w">
</span><span class="p">],</span><span class="w">
- </span><span class="s2">"hostName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"service_center_10_12_0_1"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"UP"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"interval"</span><span class="p">:</span><span class="w"> </span><span class="mi">30</span><span class="p">,</span><span class="w">
- </span><span class="s2">"times"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="w">
+ </span><span class="nl">"hostName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"service_center_10_12_0_1"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"UP"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"interval"</span><span class="p">:</span><span class="w"> </span><span class="mi">30</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"times"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012543"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"modTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012543"</span><span class="w">
+ </span><span class="nl">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012543"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"modTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012543"</span><span class="w">
</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"instanceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"16d4cb35f9e011e7a58a286ed488ff9f"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e99f4cf9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"endpoints"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"instanceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"16d4cb35f9e011e7a58a286ed488ff9f"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e99f4cf9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"endpoints"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="s2">"rest://10.12.0.2:30100"</span><span class="w">
</span><span class="p">],</span><span class="w">
- </span><span class="s2">"hostName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"service_center_10_12_0_2"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"UP"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"interval"</span><span class="p">:</span><span class="w"> </span><span class="mi">30</span><span class="p">,</span><span class="w">
- </span><span class="s2">"times"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="w">
+ </span><span class="nl">"hostName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"service_center_10_12_0_2"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"UP"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"interval"</span><span class="p">:</span><span class="w"> </span><span class="mi">30</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"times"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012650"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"modTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012650"</span><span class="w">
+ </span><span class="nl">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012650"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"modTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012650"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">]</span><span class="w">
</span><span class="p">}</span><span class="w">
diff --git a/content/cn/docs/users/use-service-contract/index.html b/content/cn/docs/users/use-service-contract/index.html
index 20d6af9..d825b37 100644
--- a/content/cn/docs/users/use-service-contract/index.html
+++ b/content/cn/docs/users/use-service-contract/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="使用服务契约">
<meta itemprop="description" content="使用服务契约">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/docs/users/use-tls/index.html b/content/cn/docs/users/use-tls/index.html
index 049eebb..430a53e 100644
--- a/content/cn/docs/users/use-tls/index.html
+++ b/content/cn/docs/users/use-tls/index.html
@@ -357,7 +357,7 @@
<meta itemprop="headline" content="使用TLS通信">
<meta itemprop="description" content="使用TLS通信">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/faqs/faqs-huawei-cloud/index.html b/content/cn/faqs/faqs-huawei-cloud/index.html
index 5e27ed6..d5404ff 100644
--- a/content/cn/faqs/faqs-huawei-cloud/index.html
+++ b/content/cn/faqs/faqs-huawei-cloud/index.html
@@ -308,7 +308,7 @@
<meta itemprop="headline" content="华为公有云常见问题">
<meta itemprop="description" content="华为公有云常见问题">
- <meta itemprop="dateModified" content="October 30, 2017">
+ <meta itemprop="dateModified" content="October 29, 2017">
<div class="page__inner-wrap">
diff --git a/content/cn/faqs/index.html b/content/cn/faqs/index.html
index 50a2141..1595048 100644
--- a/content/cn/faqs/index.html
+++ b/content/cn/faqs/index.html
@@ -308,7 +308,7 @@
<meta itemprop="headline" content="常见问题">
<meta itemprop="description" content="常见问题">
- <meta itemprop="dateModified" content="October 30, 2017">
+ <meta itemprop="dateModified" content="October 29, 2017">
<div class="page__inner-wrap">
@@ -390,7 +390,7 @@
<p>A: 对于正常的返回值，可以通过SwaggerAnnotation实现，例如：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@ApiResponse</span><span class="o">(</span><span class="n">code</span> <span class="o">=</span> <span class="mi">300</span><span class="o">,</span> <span class="n">response</span> <span class="o">=</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">message</span> <span class="o">=</span> <span [...]
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@ApiResponse</span><span class="o">(</span><span class="n">code</span> <span class="o">=</span> <span class="mi">300</span><span class="o">,</span> <span class="n">response</span> <span class="o">=</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">message</span> <span class="o">=</span> <spa [...]
<span class="kd">public</span> <span class="kt">int</span> <span class="nf">test</span><span class="o">(</span><span class="kt">int</span> <span class="n">x</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="mi">100</span><span class="o">;</span>
<span class="o">}</span>
@@ -398,17 +398,17 @@
<p>对于异常的返回值，可以通过抛出自定义的InvocationException实现，例如：、</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="n">String</span> <span class="nf">testException</span><span class="o">(</span><span class="kt">int</span> <span class="n">code</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">strCode</span> <span class="o">=</span> <span class="n">String</span><span class="o">.</span><span class="na">valueOf</span><span class="o">(</span><span class="n">code</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="nc">String</span> <span class="nf">testException</span><span class="o">(</span><span class="kt">int</span> <span class="n">code</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">String</span> <span class="n">strCode</span> <span class="o">=</span> <span class="nc">String</span><span class="o">.</span><span class="na">valueOf</span><span class="o">(</span><span class="n">code</span><span class="o">);</span>
<span class="k">switch</span> <span class="o">(</span><span class="n">code</span><span class="o">)</span> <span class="o">{</span>
<span class="k">case</span> <span class="mi">200</span><span class="o">:</span>
<span class="k">return</span> <span class="n">strCode</span><span class="o">;</span>
<span class="k">case</span> <span class="mi">456</span><span class="o">:</span>
<span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">code</span><span class="o">,</span> <span class="n">strCode</span><span class="o">,</span> <span class="n">strCode</span> <span class="o">+</span> <span class="s">" error"</span><span class="o">);</span>
<span class="k">case</span> <span class="mi">556</span><span class="o">:</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">code</span><span class="o">,</span> <span class="n">strCode</span><span class="o">,</span> <span class="n">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="n">strCode</span> <span class="o">+</span> <span class="s">" error"</span><span class="o">));</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">code</span><span class="o">,</span> <span class="n">strCode</span><span class="o">,</span> <span class="nc">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="n">strCode</span> <span class="o">+</span> <span class="s">" error"</span><span class="o">));</span>
<span class="k">case</span> <span class="mi">557</span><span class="o">:</span>
- <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">code</span><span class="o">,</span> <span class="n">strCode</span><span class="o">,</span> <span class="n">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="n">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="n">strCode</span> <span cl [...]
+ <span class="k">throw</span> <span class="k">new</span> <span class="nf">InvocationException</span><span class="o">(</span><span class="n">code</span><span class="o">,</span> <span class="n">strCode</span><span class="o">,</span> <span class="nc">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="nc">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="n">strCode</span> <span [...]
<span class="k">default</span><span class="o">:</span>
<span class="k">break</span><span class="o">;</span>
<span class="o">}</span>
@@ -564,17 +564,17 @@
<p>A:
透传数据塞入：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">CseHttpEntity</span><span class="o"><</span><span class="n">xxxx</span><span class="o">.</span><span class="na">class</span><span class="o">></span> <span class="n">httpEntity</span> <span class="o">=</span> <span class="k">new</span> <span class="n">CseHttpEntity</span><span class="o"><>(</span><span class="n">xxx</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">CseHttpEntity</span><span class="o"><</span><span class="n">xxxx</span><span class="o">.</span><span class="na">class</span><span class="o">></span> <span class="n">httpEntity</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">CseHttpEntity</span><span class="o"><>(</span><span class="n">xxx</span><span class="o">);</span>
<span class="c1">//透传内容</span>
<span class="n">httpEntity</span><span class="o">.</span><span class="na">addContext</span><span class="o">(</span><span class="s">"contextKey"</span><span class="o">,</span><span class="s">"contextValue"</span><span class="o">);</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">().</span><span class="na">exchange</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhello"</span><span class="o">,</span><span class="n">HttpMethod</span><span cl [...]
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="nc">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">().</span><span class="na">exchange</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhello"</span><span class="o">,</span><span class="nc">HttpMethod</span><spa [...]
</code></pre></div> </div>
<p>透传数据获取：</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@Override</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span><span class="o">=</span><span class="s">"/sayhello"</span><span class="o">,</span><span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Person</span> <span class="n">person</span><span class="o">,</span><span class="n">InvocationContext</span> <span class="n">context</span><span class="o">){</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span><span class="o">=</span><span class="s">"/sayhello"</span><span class="o">,</span><span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Person</span> <span class="n">person</span><span class="o">,</span><span class="nc">InvocationContext</span> <span class="n">context</span><span class="o">){</span>
<span class="c1">//透传数据获取</span>
<span class="n">context</span><span class="o">.</span><span class="na">getContext</span><span class="o">();</span>
<span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
@@ -586,11 +586,11 @@
<p>A:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@Override</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span><span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Person</span> <span class="n">person</span><span class="o">){</span>
- <span class="n">InvocationContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextUtils</span><span class="o">.</span><span class="na">getInvocationContext</span><span class="o">();</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span><span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Person</span> <span class="n">person</span><span class="o">){</span>
+ <span class="nc">InvocationContext</span> <span class="n">context</span> <span class="o">=</span> <span class="nc">ContextUtils</span><span class="o">.</span><span class="na">getInvocationContext</span><span class="o">();</span>
<span class="c1">//自定义状态码</span>
- <span class="n">context</span><span class="o">.</span><span class="na">setStatus</span><span class="o">(</span><span class="n">Status</span><span class="o">.</span><span class="na">CREATED</span><span class="o">);</span>
+ <span class="n">context</span><span class="o">.</span><span class="na">setStatus</span><span class="o">(</span><span class="nc">Status</span><span class="o">.</span><span class="na">CREATED</span><span class="o">);</span>
<span class="k">return</span> <span class="s">"Hello person "</span><span class="o">+</span><span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
</code></pre></div> </div>
@@ -608,10 +608,10 @@
<p>A: 如果使用http rest方式（使用transport-rest-vertx依赖）可以用下面这种方式获取：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">AbstractProducerContextArgMapper</span> <span class="n">httpRequestCreator</span> <span class="o">=</span> <span class="o">(</span><span class="n">AbstractProducerContextArgMapper</span><span class="o">)</span><span class="n">invocation</span><span class="o">.</span><span class="na">getHandlerContext</span><span class="o">().</span><span class="na">get</span><span class=" [...]
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">AbstractProducerContextArgMapper</span> <span class="n">httpRequestCreator</span> <span class="o">=</span> <span class="o">(</span><span class="nc">AbstractProducerContextArgMapper</span><span class="o">)</span><span class="n">invocation</span><span class="o">.</span><span class="na">getHandlerContext</span><span class="o">().</span><span class="na">get</span><span class [...]
<span class="k">if</span><span class="o">(</span><span class="n">httpRequestCreator</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">){</span>
- <span class="n">HttpServletRequest</span> <span class="n">req</span> <span class="o">=</span> <span class="o">(</span><span class="n">HttpServletRequest</span><span class="o">)</span><span class="n">httpRequestCreator</span><span class="o">.</span><span class="na">createContextArg</span><span class="o">(</span><span class="n">invocation</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">req</span><span class="o">.</span><span class="na">getRemoteHost</span><span class="o">());</span>
+ <span class="nc">HttpServletRequest</span> <span class="n">req</span> <span class="o">=</span> <span class="o">(</span><span class="nc">HttpServletRequest</span><span class="o">)</span><span class="n">httpRequestCreator</span><span class="o">.</span><span class="na">createContextArg</span><span class="o">(</span><span class="n">invocation</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">req</span><span class="o">.</span><span class="na">getRemoteHost</span><span class="o">());</span>
<span class="o">}</span>
</code></pre></div> </div>
@@ -743,7 +743,7 @@
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">request</span><span class="pi">:</span>
- <span class="na">timeout</span><span class="pi">:</span> <span class="s">30000</span>
+ <span class="na">timeout</span><span class="pi">:</span> <span class="m">30000</span>
</code></pre></div> </div>
</li>
<li>
@@ -844,8 +844,8 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">OutputForTest</span><span class="o">{</span>
<span class="nd">@JsonIgnore</span>
-<span class="kd">private</span> <span class="n">String</span> <span class="n">outputId</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
-<span class="kd">private</span> <span class="n">String</span> <span class="n">inputId</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+<span class="kd">private</span> <span class="nc">String</span> <span class="n">outputId</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+<span class="kd">private</span> <span class="nc">String</span> <span class="n">inputId</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
<span class="o">...</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/cn/release/mesher-release-notes/index.html b/content/cn/release/mesher-release-notes/index.html
index 5132627..1faca08 100644
--- a/content/cn/release/mesher-release-notes/index.html
+++ b/content/cn/release/mesher-release-notes/index.html
@@ -543,7 +543,7 @@
<ul>
<li>[<a href="https://issues.apache.org/jira/browse/SCB-1410">SCB-1410</a>] - mesher config for tracing didn't work.
</li>
-<li>[<a href="https://issues.apache.org/jira/browse/SCB-1415">SCB-1415</a>] - mesher relies on go-chassis/go-chassis-plugins.But go-chassis-plugins can not compile because of dependent packages missing
+<li>[<a href="https://issues.apache.org/jira/browse/SCB-1415">SCB-1415</a>] - mesher relies on go-chassis/go-chassis-plugins.But go-chassis-plugins can not compile because of dependent packages missing
</li>
</ul>
diff --git a/content/developers/release-validation-guide/index.html b/content/developers/release-validation-guide/index.html
index bd12708..6ae7ce6 100644
--- a/content/developers/release-validation-guide/index.html
+++ b/content/developers/release-validation-guide/index.html
@@ -499,7 +499,7 @@
<p>Verify the Hash:</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>sha512sum <span class="nt">-c</span> xxx-src.zip.sha512
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">sha512sum</span> <span class="nt">-c</span> xxx-src.zip.sha512
</code></pre></div></div>
<p>Then <code class="highlighter-rouge">OK</code> will output if verified successfully.</p>
@@ -512,12 +512,12 @@
<p>Run test case under source code root:</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean install <span class="nt">-Pdocker</span> <span class="nt">-Pit</span>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span> <span class="nt">-Pit</span>
</code></pre></div></div>
<blockquote>
<p>Hint: If the OS of environment is Windows:</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean install <span class="nt">-Pdocker</span> <span class="nt">-Pit</span> <span class="nt">-Pdocker-machine</span>
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span> <span class="nt">-Pit</span> <span class="nt">-Pdocker-machine</span>
</code></pre></div> </div>
</blockquote>
@@ -526,7 +526,7 @@
<h3 id="verify-the-staging-repository">Verify the Staging Repository</h3>
<p>First need delete all ServiceComb cache in local maven repo:</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>rm <span class="nt">-rf</span> /root/.m2/repository/org/apache/servicecomb/
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">rm</span> <span class="nt">-rf</span> /root/.m2/repository/org/apache/servicecomb/
</code></pre></div></div>
<blockquote>
@@ -571,12 +571,12 @@
<p>After that, enter <strong>demo folder under the source code(not root folder of source code)</strong> and run:</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean install <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span>
</code></pre></div></div>
<blockquote>
<p>Hint: If the OS of environment is Windows:</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean install <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span> <span class="nt">-Pdocker-machine</span>
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean <span class="nb">install</span> <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span> <span class="nt">-Pdocker-machine</span>
</code></pre></div> </div>
</blockquote>
diff --git a/content/developers/submit-codes/index.html b/content/developers/submit-codes/index.html
index 06d86ae..89d2a98 100644
--- a/content/developers/submit-codes/index.html
+++ b/content/developers/submit-codes/index.html
@@ -417,7 +417,7 @@
<meta itemprop="headline" content="Howto Submit Code">
<meta itemprop="description" content="Howto submit code for SerivceComb">
- <meta itemprop="dateModified" content="September 10, 2017">
+ <meta itemprop="dateModified" content="September 08, 2017">
<div class="page__inner-wrap">
diff --git a/content/developers/use-jira/index.html b/content/developers/use-jira/index.html
index 3e20fee..f633b03 100644
--- a/content/developers/use-jira/index.html
+++ b/content/developers/use-jira/index.html
@@ -417,7 +417,7 @@
<meta itemprop="headline" content="Howto Use JIRA">
<meta itemprop="description" content="How to use JIRA">
- <meta itemprop="dateModified" content="March 01, 2018">
+ <meta itemprop="dateModified" content="February 28, 2018">
<div class="page__inner-wrap">
diff --git a/content/docs/autoscale-on-company/index.html b/content/docs/autoscale-on-company/index.html
index 036590b..4170a8e 100644
--- a/content/docs/autoscale-on-company/index.html
+++ b/content/docs/autoscale-on-company/index.html
@@ -412,7 +412,7 @@
</code></pre></div></div>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">spec</span><span class="pi">:</span>
- <span class="na">replicas</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">replicas</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">template</span><span class="pi">:</span>
<span class="na">metadata</span><span class="pi">:</span>
<span class="na">labels</span><span class="pi">:</span>
diff --git a/content/docs/company-on-kubernetes/index.html b/content/docs/company-on-kubernetes/index.html
index 6f49e1a..7435478 100644
--- a/content/docs/company-on-kubernetes/index.html
+++ b/content/docs/company-on-kubernetes/index.html
@@ -449,9 +449,9 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<span class="s">spec</span><span class="pi">:</span>
<span class="na">ports</span><span class="pi">:</span>
<span class="err"> </span><span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">30100"</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">30100</span>
- <span class="na">targetPort</span><span class="pi">:</span> <span class="s">30100</span>
- <span class="s">selector</span><span class="pi">:</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">30100</span>
+ <span class="na">targetPort</span><span class="pi">:</span> <span class="m">30100</span>
+ <span class="na">selector</span><span class="pi">:</span>
<span class="s">io.kompose.service</span><span class="pi">:</span> <span class="s">company-bulletin-board</span>
<span class="na">status</span><span class="pi">:</span>
<span class="na">loadBalancer</span><span class="pi">:</span> <span class="pi">{}</span>
@@ -469,7 +469,7 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<span class="err"> </span><span class="s">io.kompose.service</span><span class="pi">:</span> <span class="s">company-worker</span>
<span class="s">name</span><span class="pi">:</span> <span class="s">company-worker</span>
<span class="na">spec</span><span class="pi">:</span>
- <span class="na">replicas</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">replicas</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">strategy</span><span class="pi">:</span> <span class="pi">{}</span>
<span class="na">template</span><span class="pi">:</span>
<span class="err"> </span><span class="na">metadata</span><span class="pi">:</span>
@@ -486,8 +486,8 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<span class="na">image</span><span class="pi">:</span> <span class="s">servicecomb/worker:0.0.1-SNAPSHOT</span>
<span class="na">name</span><span class="pi">:</span> <span class="s">company-worker</span>
<span class="na">ports</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">containerPort</span><span class="pi">:</span> <span class="s">7070</span>
- <span class="pi">-</span> <span class="na">containerPort</span><span class="pi">:</span> <span class="s">8080</span>
+ <span class="pi">-</span> <span class="na">containerPort</span><span class="pi">:</span> <span class="m">7070</span>
+ <span class="pi">-</span> <span class="na">containerPort</span><span class="pi">:</span> <span class="m">8080</span>
<span class="na">resources</span><span class="pi">:</span> <span class="pi">{}</span>
<span class="na">restartPolicy</span><span class="pi">:</span> <span class="s">Always</span>
<span class="na">status</span><span class="pi">:</span> <span class="pi">{}</span>
@@ -500,10 +500,10 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">spec</span><span class="pi">:</span>
<span class="na">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">8083"</span>
-<span class="err"> </span><span class="na">port</span><span class="pi">:</span> <span class="s">8083</span>
- <span class="err"> </span><span class="s">targetPort</span><span class="pi">:</span> <span class="s">8080</span>
- <span class="err"> </span><span class="s">nodePort</span><span class="pi">:</span> <span class="s">30301</span>
- <span class="err"> </span><span class="s">protocol</span><span class="pi">:</span> <span class="s">TCP</span>
+<span class="err"> </span><span class="na">port</span><span class="pi">:</span> <span class="m">8083</span>
+<span class="err"> </span><span class="na">targetPort</span><span class="pi">:</span> <span class="m">8080</span>
+<span class="err"> </span><span class="na">nodePort</span><span class="pi">:</span> <span class="m">30301</span>
+<span class="err"> </span><span class="na">protocol</span><span class="pi">:</span> <span class="s">TCP</span>
<span class="s">type</span><span class="pi">:</span> <span class="s">NodePort</span>
</code></pre></div></div>
diff --git a/content/docs/howto-upgrade-topzipkin2/index.html b/content/docs/howto-upgrade-topzipkin2/index.html
index beecba9..93987b4 100644
--- a/content/docs/howto-upgrade-topzipkin2/index.html
+++ b/content/docs/howto-upgrade-topzipkin2/index.html
@@ -444,9 +444,9 @@
<h3 id="modify-the-maven-dependencies-to-use-the-target-version-of-related-libraries">Modify the maven dependencies to use the target version of related libraries.</h3>
<p>Change the group <code class="highlighter-rouge">io.zipkin.java</code> and <code class="highlighter-rouge">io.zipkin.reporter</code> to <code class="highlighter-rouge">io.zipkin.zipkin2</code> and <code class="highlighter-rouge">io.zipkin.reporter2</code> respectively.</p>
-<div class="language-diff highlighter-rouge"><div class="highlight"><pre class="highlight"><code>java-chassis-dependencies/pom.xml
-<span class="gu">@@ -50,8 +50,8 @@
-</span> <cxf.version>3.1.6</cxf.version>
+<div class="language-diff highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">java-chassis-dependencies/pom.xml
+@@ -50,8 +50,8 @@</span>
+ <cxf.version>3.1.6</cxf.version>
<logback.version>1.1.7</logback.version>
<brave.version>4.13.1</brave.version>
<span class="gd">- <zipkin.version>1.24.0</zipkin.version>
@@ -456,8 +456,8 @@
</span> </properties>
<dependencyManagement>
-<span class="gu">@@ -646,7 +646,7 @@
-</span>
+<span class="p">@@ -646,7 +646,7 @@</span>
+
<!-- zipkin dependencies -->
<dependency>
<span class="gd">- <groupId>io.zipkin.java</groupId>
@@ -465,8 +465,8 @@
</span> <artifactId>zipkin</artifactId>
<version>${zipkin.version}</version>
</dependency>
-<span class="gu">@@ -661,7 +661,7 @@
-</span> <version>${brave.version}</version>
+<span class="p">@@ -661,7 +661,7 @@</span>
+ <version>${brave.version}</version>
</dependency>
<dependency>
<span class="gd">- <groupId>io.zipkin.reporter</groupId>
@@ -476,8 +476,8 @@
</dependency>
handlers/handler-tracing-zipkin/pom.xml
-<span class="gu">@@ -50,7 +50,7 @@
-</span> <artifactId>brave</artifactId>
+<span class="p">@@ -50,7 +50,7 @@</span>
+ <artifactId>brave</artifactId>
</dependency>
<dependency>
<span class="gd">- <groupId>io.zipkin.reporter</groupId>
@@ -492,9 +492,9 @@ handlers/handler-tracing-zipkin/pom.xml
<p>Change the zipkin.xxx import to zipkin2.xxx on imports, and most importantly, use <code class="highlighter-rouge">spanReporter()</code> instead of <code class="highlighter-rouge">reporter()</code> for generating reporter for brave, change the api path to /api/v2/xxx when creating sender.</p>
-<div class="language-diff highlighter-rouge"><div class="highlight"><pre class="highlight"><code>handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java
-<span class="gu">@@ -31,11 +31,11 @@
-</span> import brave.http.HttpTracing;
+<div class="language-diff highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java
+@@ -31,11 +31,11 @@</span>
+ import brave.http.HttpTracing;
import brave.propagation.CurrentTraceContext;
import org.apache.servicecomb.config.DynamicProperties;
<span class="gd">-import zipkin.Span;
@@ -510,8 +510,8 @@ handlers/handler-tracing-zipkin/pom.xml
</span>
@Configuration
class TracingConfiguration {
-<span class="gu">@@ -56,14 +56,15 @@ Sender sender(DynamicProperties dynamicProperties) {
-</span> return AsyncReporter.builder(sender).build();
+<span class="p">@@ -56,14 +56,15 @@</span> Sender sender(DynamicProperties dynamicProperties) {
+ return AsyncReporter.builder(sender).build();
}
<span class="gi">+
@@ -543,12 +543,12 @@ handlers/handler-tracing-zipkin/pom.xml
<p>But this will not work. In <code class="highlighter-rouge">zipkin2.Reporter</code>, the <code class="highlighter-rouge">create(sender)</code> is actually equivalent to <code class="highlighter-rouge">builder(sender).build()</code></p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">static</span> <span class="n">AsyncReporter</span><span class="o"><</span><span class="n">Span</span><span class="o">></span> <span class="nf">create</span><span class="o">(</span><span class="n">Sender</span> <span class="n">sender</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="o">(</span><span class="k">new</span> <span class="n">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span><span class="o">(</span><span class="n">sender</span><span class="o">)).</span><span class="na">build</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">static</span> <span class="nc">AsyncReporter</span><span class="o"><</span><span class="nc">Span</span><span class="o">></span> <span class="nf">create</span><span class="o">(</span><span class="nc">Sender</span> <span class="n">sender</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="o">(</span><span class="k">new</span> <span class="nc">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span><span class="o">(</span><span class="n">sender</span><span class="o">)).</span><span class="na">build</span><span class="o">();</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="n">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span> <span class="nf">builder</span><span class="o">(</span><span class="n">Sender</span> <span class="n">sender</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span><span class="o">(</span><span class="n">sender</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="nc">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span> <span class="nf">builder</span><span class="o">(</span><span class="nc">Sender</span> <span class="n">sender</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span><span class="o">(</span><span class="n">sender</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -556,9 +556,9 @@ handlers/handler-tracing-zipkin/pom.xml
<p>We do not use zipkin.Span in our production code, but we do use it in our tests. Those changes are quite straight forward, we just change the accessing of fields to calling methods as described in the What’s Changed section.</p>
-<div class="language-diff highlighter-rouge"><div class="highlight"><pre class="highlight"><code>tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
-<span class="gu">@@ -45,7 +45,7 @@
-</span> import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication;
+<div class="language-diff highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
+@@ -45,7 +45,7 @@</span>
+ import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication;
import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.CustomSpanTask;
import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.SomeSlowTask;
<span class="gd">-import zipkin.Span;
@@ -566,8 +566,8 @@ handlers/handler-tracing-zipkin/pom.xml
</span>
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {ZipkinSpanTestApplication.class, TracingConfig.class})
-<span class="gu">@@ -74,8 +74,8 @@ public void reportedSpanContainsAnnotatedMethodInfo() throws Exception {
-</span>
+<span class="p">@@ -74,8 +74,8 @@</span> public void reportedSpanContainsAnnotatedMethodInfo() throws Exception {
+
await().atMost(2, SECONDS).until(() -> !spans.isEmpty());
<span class="gd">- zipkin.Span span = spans.poll();
@@ -577,8 +577,8 @@ handlers/handler-tracing-zipkin/pom.xml
</span> assertThat(tracedValues(span), contains(SomeSlowTask.class.getMethod("crawl").toString()));
}
-<span class="gu">@@ -84,17 +84,17 @@ public void reportCustomSpanInfomation() throws Exception {
-</span> customSpanTask.invoke();
+<span class="p">@@ -84,17 +84,17 @@</span> public void reportCustomSpanInfomation() throws Exception {
+ customSpanTask.invoke();
await().atMost(2, SECONDS).until(() -> !spans.isEmpty());
<span class="gd">- zipkin.Span span = spans.poll();
@@ -602,8 +602,8 @@ handlers/handler-tracing-zipkin/pom.xml
</span> .distinct()
.collect(Collectors.toList());
}
-<span class="gu">@@ -110,7 +110,7 @@ public void reportCustomSpanInfomation() throws Exception {
-</span> Tracing tracing(Queue<Span> spans) {
+<span class="p">@@ -110,7 +110,7 @@</span> public void reportCustomSpanInfomation() throws Exception {
+ Tracing tracing(Queue<Span> spans) {
return Tracing.newBuilder()
.currentTraceContext(new StrictCurrentTraceContext())
<span class="gd">- .reporter(spans::add)
@@ -619,9 +619,9 @@ handlers/handler-tracing-zipkin/pom.xml
<p>Supporting v1 api is built into zipkin2, so we do not need to rely on the v1 libraries. Just use the <code class="highlighter-rouge">SpanBytesEncoder.JSON_V1</code> when building reporter and change the sender api path.</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">sender</span> <span class="o">=</span> <span class="n">URLConnectionSender</span><span class="o">.</span><span class="na">create</span><span class="o">(</span><span class="s">"http://localhost:9411/api/v1/spans"</span><span class="o">)</span>
-<span class="n">reporter</span> <span class="o">=</span> <span class="n">AsyncReporter</span><span class="o">.</span><span class="na">builder</span><span class="o">(</span><span class="n">sender</span><span class="o">)</span>
- <span class="o">.</span><span class="na">build</span><span class="o">(</span><span class="n">SpanBytesEncoder</span><span class="o">.</span><span class="na">JSON_V1</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">sender</span> <span class="o">=</span> <span class="nc">URLConnectionSender</span><span class="o">.</span><span class="na">create</span><span class="o">(</span><span class="s">"http://localhost:9411/api/v1/spans"</span><span class="o">)</span>
+<span class="n">reporter</span> <span class="o">=</span> <span class="nc">AsyncReporter</span><span class="o">.</span><span class="na">builder</span><span class="o">(</span><span class="n">sender</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">build</span><span class="o">(</span><span class="nc">SpanBytesEncoder</span><span class="o">.</span><span class="na">JSON_V1</span><span class="o">);</span>
</code></pre></div></div>
<p>That’s all, for the complete changes, please refer the <a href="https://github.com/apache/incubator-servicecomb-java-chassis/pull/488">pull request</a> for the complete changes.</p>
diff --git a/content/docs/linuxcon-workshop-demo/index.html b/content/docs/linuxcon-workshop-demo/index.html
index 64bba4c..6ca0cab 100644
--- a/content/docs/linuxcon-workshop-demo/index.html
+++ b/content/docs/linuxcon-workshop-demo/index.html
@@ -512,7 +512,7 @@
<span class="o">}</span>
<span class="nd">@Service</span>
-<span class="kd">class</span> <span class="nc">FibonacciServiceImpl</span> <span class="kd">implements</span> <span class="n">FibonacciService</span> <span class="o">{</span>
+<span class="kd">class</span> <span class="nc">FibonacciServiceImpl</span> <span class="kd">implements</span> <span class="nc">FibonacciService</span> <span class="o">{</span>
<span class="nd">@Override</span>
<span class="kd">public</span> <span class="kt">long</span> <span class="nf">term</span><span class="o">(</span><span class="kt">int</span> <span class="n">n</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">n</span> <span class="o">==</span> <span class="mi">0</span><span class="o">)</span> <span class="o">{</span>
@@ -548,17 +548,17 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"fibonacciRestEndpoint"</span><span class="o">)</span>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/fibonacci"</span><span class="o">)</span>
<span class="nd">@Controller</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">FibonacciRestEndpoint</span> <span class="kd">implements</span> <span class="n">FibonacciEndpoint</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">FibonacciRestEndpoint</span> <span class="kd">implements</span> <span class="nc">FibonacciEndpoint</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="n">FibonacciRestEndpoint</span><span class="o">(</span><span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">FibonacciRestEndpoint</span><span class="o">(</span><span class="nc">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">fibonacciService</span> <span class="o">=</span> <span class="n">fibonacciService</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/term"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/term"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
<span class="nd">@ResponseBody</span>
<span class="kd">public</span> <span class="kt">long</span> <span class="nf">term</span><span class="o">(</span><span class="kt">int</span> <span class="n">n</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">fibonacciService</span><span class="o">.</span><span class="na">term</span><span class="o">(</span><span class="n">n</span><span class="o">);</span>
@@ -567,12 +567,12 @@
</code></pre></div></div>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RpcSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"fibonacciRpcEndpoint"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">FibonacciRpcEndpoint</span> <span class="kd">implements</span> <span class="n">FibonacciEndpoint</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">FibonacciRpcEndpoint</span> <span class="kd">implements</span> <span class="nc">FibonacciEndpoint</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="kd">public</span> <span class="nf">FibonacciRpcEndpoint</span><span class="o">(</span><span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">FibonacciRpcEndpoint</span><span class="o">(</span><span class="nc">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">fibonacciService</span> <span class="o">=</span> <span class="n">fibonacciService</span><span class="o">;</span>
<span class="o">}</span>
@@ -609,8 +609,8 @@
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">WorkerApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">WorkerApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">WorkerApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -646,11 +646,11 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="kt">long</span> <span class="nf">ancestorsOfQueenAt</span><span class="o">(</span><span class="kt">int</span> <span class="n">generation</span><span class="o">);</span>
<span class="o">}</span>
-<span class="kd">class</span> <span class="nc">BeekeeperServiceImpl</span> <span class="kd">implements</span> <span class="n">BeekeeperService</span> <span class="o">{</span>
+<span class="kd">class</span> <span class="nc">BeekeeperServiceImpl</span> <span class="kd">implements</span> <span class="nc">BeekeeperService</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
- <span class="n">BeekeeperServiceImpl</span><span class="o">(</span><span class="n">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">BeekeeperServiceImpl</span><span class="o">(</span><span class="nc">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">fibonacciCalculator</span> <span class="o">=</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
<span class="o">}</span>
@@ -681,10 +681,10 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="kd">class</span> <span class="nc">BeekeeperConfig</span> <span class="o">{</span>
<span class="nd">@RpcReference</span><span class="o">(</span><span class="n">microserviceName</span> <span class="o">=</span> <span class="s">"worker"</span><span class="o">,</span> <span class="n">schemaId</span> <span class="o">=</span> <span class="s">"fibonacciRpcEndpoint"</span><span class="o">)</span>
- <span class="kd">private</span> <span class="n">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="nc">FibonacciCalculator</span> <span class="n">fibonacciCalculator</span><span class="o">;</span>
<span class="nd">@Bean</span>
- <span class="n">BeekeeperService</span> <span class="nf">beekeeperService</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">BeekeeperService</span> <span class="nf">beekeeperService</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="k">new</span> <span class="nf">BeekeeperServiceImpl</span><span class="o">(</span><span class="n">fibonacciCalculator</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -701,18 +701,18 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@Controller</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">BeekeeperController</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">BeekeeperController</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">BeekeeperController</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">BeekeeperService</span> <span class="n">beekeeperService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">BeekeeperService</span> <span class="n">beekeeperService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="n">BeekeeperController</span><span class="o">(</span><span class="n">BeekeeperService</span> <span class="n">beekeeperService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">BeekeeperController</span><span class="o">(</span><span class="nc">BeekeeperService</span> <span class="n">beekeeperService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">beekeeperService</span> <span class="o">=</span> <span class="n">beekeeperService</span><span class="o">;</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/drone/ancestors/{generation}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">GET</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">APPLICATION_JSON_UTF8_VALUE</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/drone/ancestors/{generation}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="no">GET</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="no">APPLICATION_JSON_UTF8_VALUE</span><span class="o">)</span>
<span class="nd">@ResponseBody</span>
- <span class="kd">public</span> <span class="n">Ancestor</span> <span class="nf">ancestorsOfDrone</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="kt">int</span> <span class="n">generation</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">Ancestor</span> <span class="nf">ancestorsOfDrone</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="kt">int</span> <span class="n">generation</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span>
<span class="s">"Received request to find the number of ancestors of drone at generation {}"</span><span class="o">,</span>
<span class="n">generation</span><span class="o">);</span>
@@ -720,9 +720,9 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="k">return</span> <span class="k">new</span> <span class="nf">Ancestor</span><span class="o">(</span><span class="n">beekeeperService</span><span class="o">.</span><span class="na">ancestorsOfDroneAt</span><span class="o">(</span><span class="n">generation</span><span class="o">));</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/queen/ancestors/{generation}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">GET</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">APPLICATION_JSON_UTF8_VALUE</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/queen/ancestors/{generation}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="no">GET</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="no">APPLICATION_JSON_UTF8_VALUE</span><span class="o">)</span>
<span class="nd">@ResponseBody</span>
- <span class="kd">public</span> <span class="n">Ancestor</span> <span class="nf">ancestorsOfQueen</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="kt">int</span> <span class="n">generation</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">Ancestor</span> <span class="nf">ancestorsOfQueen</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="kt">int</span> <span class="n">generation</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span>
<span class="s">"Received request to find the number of ancestors of queen at generation {}"</span><span class="o">,</span>
<span class="n">generation</span><span class="o">);</span>
@@ -734,10 +734,10 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="kd">class</span> <span class="nc">Ancestor</span> <span class="o">{</span>
<span class="kd">private</span> <span class="kt">long</span> <span class="n">ancestors</span><span class="o">;</span>
- <span class="n">Ancestor</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">Ancestor</span><span class="o">()</span> <span class="o">{</span>
<span class="o">}</span>
- <span class="n">Ancestor</span><span class="o">(</span><span class="kt">long</span> <span class="n">ancestors</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Ancestor</span><span class="o">(</span><span class="kt">long</span> <span class="n">ancestors</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">ancestors</span> <span class="o">=</span> <span class="n">ancestors</span><span class="o">;</span>
<span class="o">}</span>
@@ -779,8 +779,8 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">BeekeeperApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">BeekeeperApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">BeekeeperApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -796,9 +796,9 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
请求都需要带上返回的JWT token，而 <code class="highlighter-rouge">validate</code> 方法将验证token以确认其有效。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">AuthenticationService</span> <span class="o">{</span>
- <span class="n">String</span> <span class="nf">authenticate</span><span class="o">(</span><span class="n">String</span> <span class="n">username</span><span class="o">,</span> <span class="n">String</span> <span class="n">password</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">authenticate</span><span class="o">(</span><span class="nc">String</span> <span class="n">username</span><span class="o">,</span> <span class="nc">String</span> <span class="n">password</span><span class="o">);</span>
- <span class="n">String</span> <span class="nf">validate</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">validate</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -811,57 +811,57 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/rest"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">AuthenticationController</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">AuthenticationController</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">AuthenticationController</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">USERNAME</span> <span class="o">=</span> <span class="s">"username"</span><span class="o">;</span>
- <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">PASSWORD</span> <span class="o">=</span> <span class="s">"password"</span><span class="o">;</span>
- <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">TOKEN</span> <span class="o">=</span> <span class="s">"token"</span><span class="o">;</span>
+ <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">USERNAME</span> <span class="o">=</span> <span class="s">"username"</span><span class="o">;</span>
+ <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">PASSWORD</span> <span class="o">=</span> <span class="s">"password"</span><span class="o">;</span>
+ <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">TOKEN</span> <span class="o">=</span> <span class="s">"token"</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="n">AuthenticationController</span><span class="o">(</span><span class="n">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">AuthenticationController</span><span class="o">(</span><span class="nc">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">authenticationService</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">;</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/login"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">POST</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">TEXT_PLAIN_VALUE</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span>
- <span class="nd">@RequestParam</span><span class="o">(</span><span class="n">USERNAME</span><span class="o">)</span> <span class="n">String</span> <span class="n">username</span><span class="o">,</span>
- <span class="nd">@RequestParam</span><span class="o">(</span><span class="n">PASSWORD</span><span class="o">)</span> <span class="n">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/login"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="no">POST</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="no">TEXT_PLAIN_VALUE</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="nf">login</span><span class="o">(</span>
+ <span class="nd">@RequestParam</span><span class="o">(</span><span class="no">USERNAME</span><span class="o">)</span> <span class="nc">String</span> <span class="n">username</span><span class="o">,</span>
+ <span class="nd">@RequestParam</span><span class="o">(</span><span class="no">PASSWORD</span><span class="o">)</span> <span class="nc">String</span> <span class="n">password</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Received login request from user {}"</span><span class="o">,</span> <span class="n">username</span><span class="o">);</span>
- <span class="n">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">authenticate</span><span class="o">(</span><span class="n">username</span><span class="o">,</span> <span class="n">password</span><span class="o">);</span>
- <span class="n">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HttpHeaders</span><span class="o">();</span>
- <span class="n">headers</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="n">AUTHORIZATION</span><span class="o">,</span> <span class="n">TOKEN_PREFIX</span> <span class="o">+</span> <span class="n">token</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">authenticate</span><span class="o">(</span><span class="n">username</span><span class="o">,</span> <span class="n">password</span><span class="o">);</span>
+ <span class="nc">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HttpHeaders</span><span class="o">();</span>
+ <span class="n">headers</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="no">AUTHORIZATION</span><span class="o">,</span> <span class="no">TOKEN_PREFIX</span> <span class="o">+</span> <span class="n">token</span><span class="o">);</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Authenticated user {} successfully"</span><span class="o">,</span> <span class="n">username</span><span class="o">);</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">ResponseEntity</span><span class="o"><>(</span><span class="s">"Welcome, "</span> <span class="o">+</span> <span class="n">username</span><span class="o">,</span> <span class="n">headers</span><span class="o">,</span> <span class="n">OK</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">ResponseEntity</span><span class="o"><>(</span><span class="s">"Welcome, "</span> <span class="o">+</span> <span class="n">username</span><span class="o">,</span> <span class="n">headers</span><span class="o">,</span> <span class="no">OK</span><span class="o">);</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/validate"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">POST</span><span class="o">,</span> <span class="n">consumes</span> <span class="o">=</span> <span class="n">APPLICATION_JSON_UTF8_VALUE</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">TE [...]
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span> <span class="o">=</span> <span class="s">"/validate"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="no">POST</span><span class="o">,</span> <span class="n">consumes</span> <span class="o">=</span> <span class="no">APPLICATION_JSON_UTF8_VALUE</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="no" [...]
<span class="nd">@ResponseBody</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">validate</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Token</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">validate</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Token</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Received validation request of token {}"</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
<span class="k">return</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">validate</span><span class="o">(</span><span class="n">token</span><span class="o">.</span><span class="na">getToken</span><span class="o">());</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="kd">class</span> <span class="nc">Token</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="n">token</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="n">token</span><span class="o">;</span>
- <span class="n">Token</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">Token</span><span class="o">()</span> <span class="o">{</span>
<span class="o">}</span>
- <span class="n">Token</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">Token</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">token</span> <span class="o">=</span> <span class="n">token</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">getToken</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">getToken</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">token</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">toString</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">toString</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Token{"</span> <span class="o">+</span>
<span class="s">"token='"</span> <span class="o">+</span> <span class="n">token</span> <span class="o">+</span> <span class="sc">'\''</span> <span class="o">+</span>
<span class="sc">'}'</span><span class="o">;</span>
@@ -875,8 +875,8 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">DoormanApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">DoormanApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">DoormanApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -936,33 +936,33 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Service</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">AuthenticationService</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">AuthenticationService</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">DOORMAN_ADDRESS</span> <span class="o">=</span> <span class="s">"cse://doorman"</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">AuthenticationService</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">DOORMAN_ADDRESS</span> <span class="o">=</span> <span class="s">"cse://doorman"</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">RestTemplate</span> <span class="n">restTemplate</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">RestTemplate</span> <span class="n">restTemplate</span><span class="o">;</span>
- <span class="n">AuthenticationService</span><span class="o">()</span> <span class="o">{</span>
- <span class="k">this</span><span class="o">.</span><span class="na">restTemplate</span> <span class="o">=</span> <span class="n">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
+ <span class="nc">AuthenticationService</span><span class="o">()</span> <span class="o">{</span>
+ <span class="k">this</span><span class="o">.</span><span class="na">restTemplate</span> <span class="o">=</span> <span class="nc">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
- <span class="k">this</span><span class="o">.</span><span class="na">restTemplate</span><span class="o">.</span><span class="na">setErrorHandler</span><span class="o">(</span><span class="k">new</span> <span class="n">ResponseErrorHandler</span><span class="o">()</span> <span class="o">{</span>
+ <span class="k">this</span><span class="o">.</span><span class="na">restTemplate</span><span class="o">.</span><span class="na">setErrorHandler</span><span class="o">(</span><span class="k">new</span> <span class="nc">ResponseErrorHandler</span><span class="o">()</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">hasError</span><span class="o">(</span><span class="n">ClientHttpResponse</span> <span class="n">clientHttpResponse</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">IOException</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">hasError</span><span class="o">(</span><span class="nc">ClientHttpResponse</span> <span class="n">clientHttpResponse</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">IOException</span> <span class="o">{</span>
<span class="k">return</span> <span class="kc">false</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">handleError</span><span class="o">(</span><span class="n">ClientHttpResponse</span> <span class="n">clientHttpResponse</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">IOException</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">handleError</span><span class="o">(</span><span class="nc">ClientHttpResponse</span> <span class="n">clientHttpResponse</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">IOException</span> <span class="o">{</span>
<span class="o">}</span>
<span class="o">});</span>
<span class="o">}</span>
<span class="nd">@HystrixCommand</span><span class="o">(</span><span class="n">fallbackMethod</span> <span class="o">=</span> <span class="s">"timeout"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">validate</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="nf">validate</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Validating token {}"</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">restTemplate</span><span class="o">.</span><span class="na">postForEntity</span><span class="o">(</span>
- <span class="n">DOORMAN_ADDRESS</span> <span class="o">+</span> <span class="s">"/rest/validate"</span><span class="o">,</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">restTemplate</span><span class="o">.</span><span class="na">postForEntity</span><span class="o">(</span>
+ <span class="no">DOORMAN_ADDRESS</span> <span class="o">+</span> <span class="s">"/rest/validate"</span><span class="o">,</span>
<span class="n">validationRequest</span><span class="o">(</span><span class="n">token</span><span class="o">),</span>
- <span class="n">String</span><span class="o">.</span><span class="na">class</span>
+ <span class="nc">String</span><span class="o">.</span><span class="na">class</span>
<span class="o">);</span>
<span class="k">if</span> <span class="o">(!</span><span class="n">responseEntity</span><span class="o">.</span><span class="na">getStatusCode</span><span class="o">().</span><span class="na">is2xxSuccessful</span><span class="o">())</span> <span class="o">{</span>
@@ -972,16 +972,16 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="k">return</span> <span class="n">responseEntity</span><span class="o">;</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">timeout</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="nf">timeout</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">warn</span><span class="o">(</span><span class="s">"Request to validate token {} timed out"</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">ResponseEntity</span><span class="o"><>(</span><span class="n">REQUEST_TIMEOUT</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">ResponseEntity</span><span class="o"><>(</span><span class="no">REQUEST_TIMEOUT</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">HttpEntity</span><span class="o"><</span><span class="n">Token</span><span class="o">></span> <span class="nf">validationRequest</span><span class="o">(</span><span class="n">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HttpHeaders</span><span class="o">();</span>
- <span class="n">headers</span><span class="o">.</span><span class="na">setContentType</span><span class="o">(</span><span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON_UTF8</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="nc">HttpEntity</span><span class="o"><</span><span class="nc">Token</span><span class="o">></span> <span class="nf">validationRequest</span><span class="o">(</span><span class="nc">String</span> <span class="n">token</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">HttpHeaders</span> <span class="n">headers</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HttpHeaders</span><span class="o">();</span>
+ <span class="n">headers</span><span class="o">.</span><span class="na">setContentType</span><span class="o">(</span><span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON_UTF8</span><span class="o">);</span>
- <span class="k">return</span> <span class="k">new</span> <span class="n">HttpEntity</span><span class="o"><>(</span><span class="k">new</span> <span class="n">Token</span><span class="o">(</span><span class="n">token</span><span class="o">),</span> <span class="n">headers</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nc">HttpEntity</span><span class="o"><>(</span><span class="k">new</span> <span class="nc">Token</span><span class="o">(</span><span class="n">token</span><span class="o">),</span> <span class="n">headers</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -991,26 +991,26 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
若用户合法则路由用户请求到对应服务，否则返回 <code class="highlighter-rouge">403 forbidden</code>。</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Component</span>
-<span class="kd">class</span> <span class="nc">AuthenticationAwareFilter</span> <span class="kd">extends</span> <span class="n">ZuulFilter</span> <span class="o">{</span>
+<span class="kd">class</span> <span class="nc">AuthenticationAwareFilter</span> <span class="kd">extends</span> <span class="nc">ZuulFilter</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">AuthenticationAwareFilter</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">AuthenticationAwareFilter</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">LOGIN_PATH</span> <span class="o">=</span> <span class="s">"/login"</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">String</span> <span class="no">LOGIN_PATH</span> <span class="o">=</span> <span class="s">"/login"</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">PathExtractor</span> <span class="n">pathExtractor</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">PathExtractor</span> <span class="n">pathExtractor</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="n">AuthenticationAwareFilter</span><span class="o">(</span>
- <span class="n">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">,</span>
- <span class="n">PathExtractor</span> <span class="n">pathExtractor</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">AuthenticationAwareFilter</span><span class="o">(</span>
+ <span class="nc">AuthenticationService</span> <span class="n">authenticationService</span><span class="o">,</span>
+ <span class="nc">PathExtractor</span> <span class="n">pathExtractor</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">authenticationService</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">;</span>
<span class="k">this</span><span class="o">.</span><span class="na">pathExtractor</span> <span class="o">=</span> <span class="n">pathExtractor</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">filterType</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">filterType</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"pre"</span><span class="o">;</span>
<span class="o">}</span>
@@ -1021,26 +1021,26 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@Override</span>
<span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">shouldFilter</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">path</span> <span class="o">=</span> <span class="n">pathExtractor</span><span class="o">.</span><span class="na">path</span><span class="o">(</span><span class="n">RequestContext</span><span class="o">.</span><span class="na">getCurrentContext</span><span class="o">());</span>
+ <span class="nc">String</span> <span class="n">path</span> <span class="o">=</span> <span class="n">pathExtractor</span><span class="o">.</span><span class="na">path</span><span class="o">(</span><span class="nc">RequestContext</span><span class="o">.</span><span class="na">getCurrentContext</span><span class="o">());</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Received request with query path: {}"</span><span class="o">,</span> <span class="n">path</span><span class="o">);</span>
- <span class="k">return</span> <span class="o">!</span><span class="n">path</span><span class="o">.</span><span class="na">endsWith</span><span class="o">(</span><span class="n">LOGIN_PATH</span><span class="o">);</span>
+ <span class="k">return</span> <span class="o">!</span><span class="n">path</span><span class="o">.</span><span class="na">endsWith</span><span class="o">(</span><span class="no">LOGIN_PATH</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">Object</span> <span class="nf">run</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">Object</span> <span class="nf">run</span><span class="o">()</span> <span class="o">{</span>
<span class="n">filter</span><span class="o">();</span>
<span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
<span class="o">}</span>
<span class="kd">private</span> <span class="kt">void</span> <span class="nf">filter</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">RequestContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">RequestContext</span><span class="o">.</span><span class="na">getCurrentContext</span><span class="o">();</span>
+ <span class="nc">RequestContext</span> <span class="n">context</span> <span class="o">=</span> <span class="nc">RequestContext</span><span class="o">.</span><span class="na">getCurrentContext</span><span class="o">();</span>
<span class="k">if</span> <span class="o">(</span><span class="n">doesNotContainToken</span><span class="o">(</span><span class="n">context</span><span class="o">))</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">warn</span><span class="o">(</span><span class="s">"No token found in request header"</span><span class="o">);</span>
<span class="n">rejectRequest</span><span class="o">(</span><span class="n">context</span><span class="o">);</span>
<span class="o">}</span> <span class="k">else</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">token</span><span class="o">(</span><span class="n">context</span><span class="o">);</span>
- <span class="n">ResponseEntity</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">validate</span><span class="o">(</span><span class="n">token</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">token</span> <span class="o">=</span> <span class="n">token</span><span class="o">(</span><span class="n">context</span><span class="o">);</span>
+ <span class="nc">ResponseEntity</span><span class="o"><</span><span class="nc">String</span><span class="o">></span> <span class="n">responseEntity</span> <span class="o">=</span> <span class="n">authenticationService</span><span class="o">.</span><span class="na">validate</span><span class="o">(</span><span class="n">token</span><span class="o">);</span>
<span class="k">if</span> <span class="o">(!</span><span class="n">responseEntity</span><span class="o">.</span><span class="na">getStatusCode</span><span class="o">().</span><span class="na">is2xxSuccessful</span><span class="o">())</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">warn</span><span class="o">(</span><span class="s">"Unauthorized token {} and request rejected"</span><span class="o">,</span> <span class="n">token</span><span class="o">);</span>
<span class="n">rejectRequest</span><span class="o">(</span><span class="n">context</span><span class="o">);</span>
@@ -1050,22 +1050,22 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="o">}</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="kt">void</span> <span class="nf">rejectRequest</span><span class="o">(</span><span class="n">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">context</span><span class="o">.</span><span class="na">setResponseStatusCode</span><span class="o">(</span><span class="n">SC_FORBIDDEN</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="kt">void</span> <span class="nf">rejectRequest</span><span class="o">(</span><span class="nc">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="n">context</span><span class="o">.</span><span class="na">setResponseStatusCode</span><span class="o">(</span><span class="no">SC_FORBIDDEN</span><span class="o">);</span>
<span class="n">context</span><span class="o">.</span><span class="na">setSendZuulResponse</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="kt">boolean</span> <span class="nf">doesNotContainToken</span><span class="o">(</span><span class="n">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="kt">boolean</span> <span class="nf">doesNotContainToken</span><span class="o">(</span><span class="nc">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">)</span> <span class="o">==</span> <span class="kc">null</span>
- <span class="o">||</span> <span class="o">!</span><span class="n">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">).</span><span class="na">startsWith</span><span class="o">(</span><span class="n">TOKEN_PREFIX</span><span class="o">);</span>
+ <span class="o">||</span> <span class="o">!</span><span class="n">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">).</span><span class="na">startsWith</span><span class="o">(</span><span class="no">TOKEN_PREFIX</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="nf">token</span><span class="o">(</span><span class="n">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">).</span><span class="na">replace</span><span class="o">(</span><span class="n">TOKEN_PREFIX</span><span class="o">,</span> <span class="s">""</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="nf">token</span><span class="o">(</span><span class="nc">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="n">context</span><span class="o">).</span><span class="na">replace</span><span class="o">(</span><span class="no">TOKEN_PREFIX</span><span class="o">,</span> <span class="s">""</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">private</span> <span class="n">String</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="n">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">context</span><span class="o">.</span><span class="na">getRequest</span><span class="o">().</span><span class="na">getHeader</span><span class="o">(</span><span class="n">AUTHORIZATION</span><span class="o">);</span>
+ <span class="kd">private</span> <span class="nc">String</span> <span class="nf">authorizationHeader</span><span class="o">(</span><span class="nc">RequestContext</span> <span class="n">context</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="n">context</span><span class="o">.</span><span class="na">getRequest</span><span class="o">().</span><span class="na">getHeader</span><span class="o">(</span><span class="no">AUTHORIZATION</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -1079,8 +1079,8 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ManagerApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">ManagerApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">ManagerApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/docs/mersher-quick-start-advance/index.html b/content/docs/mesher-quick-start-advance/index.html
similarity index 99%
rename from content/docs/mersher-quick-start-advance/index.html
rename to content/docs/mesher-quick-start-advance/index.html
index a664b1a..e66c8b6 100644
--- a/content/docs/mersher-quick-start-advance/index.html
+++ b/content/docs/mesher-quick-start-advance/index.html
@@ -627,7 +627,7 @@
<ul>
<p class="header">Contribute</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">Report a Doc Issue</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mesher-quick-start-advance.md">Edit This Page on Github</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mersher-quick-start-advance.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
<li><a href="/security">Security</a></li>
</ul>
diff --git a/content/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html b/content/docs/mesher-quick-start-advance/mesher-distributed-tracing/index.html
similarity index 99%
rename from content/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
rename to content/docs/mesher-quick-start-advance/mesher-distributed-tracing/index.html
index bd1d49f..9530d34 100644
--- a/content/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
+++ b/content/docs/mesher-quick-start-advance/mesher-distributed-tracing/index.html
@@ -661,7 +661,7 @@
<ul>
<p class="header">Contribute</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">Report a Doc Issue</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mesher-distributed-tracing.md">Edit This Page on Github</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mersher-distributed-tracing.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
<li><a href="/security">Security</a></li>
</ul>
diff --git a/content/docs/mersher-quick-start-advance/mersher-flow-control/index.html b/content/docs/mesher-quick-start-advance/mesher-flow-control/index.html
similarity index 98%
rename from content/docs/mersher-quick-start-advance/mersher-flow-control/index.html
rename to content/docs/mesher-quick-start-advance/mesher-flow-control/index.html
index cff7d85..84a19c0 100644
--- a/content/docs/mersher-quick-start-advance/mersher-flow-control/index.html
+++ b/content/docs/mesher-quick-start-advance/mesher-flow-control/index.html
@@ -554,9 +554,9 @@
<span class="na">qps</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span> <span class="c1"># enable rate limiting or not</span>
<span class="na">global</span><span class="pi">:</span>
- <span class="na">limit</span><span class="pi">:</span> <span class="s">0</span> <span class="c1"># default limit of provider</span>
+ <span class="na">limit</span><span class="pi">:</span> <span class="m">0</span> <span class="c1"># default limit of provider</span>
<span class="na">limit</span><span class="pi">:</span>
- <span class="na">Server</span><span class="pi">:</span> <span class="s">0</span> <span class="c1"># rate limit for request from a provider</span>
+ <span class="na">Server</span><span class="pi">:</span> <span class="m">0</span> <span class="c1"># rate limit for request from a provider</span>
</code></pre></div> </div>
<p>The frequency limit configuration make the request accepted per second is 0 which means no service is provided.</p>
@@ -650,7 +650,7 @@
<ul>
<p class="header">Contribute</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">Report a Doc Issue</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mesher-flow-control.md">Edit This Page on Github</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mersher-flow-control.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
<li><a href="/security">Security</a></li>
</ul>
diff --git a/content/docs/mersher-quick-start-advance/mersher-load-balance/index.html b/content/docs/mesher-quick-start-advance/mesher-load-balance/index.html
similarity index 99%
rename from content/docs/mersher-quick-start-advance/mersher-load-balance/index.html
rename to content/docs/mesher-quick-start-advance/mesher-load-balance/index.html
index 51d475e..823d4c7 100644
--- a/content/docs/mersher-quick-start-advance/mersher-load-balance/index.html
+++ b/content/docs/mesher-quick-start-advance/mesher-load-balance/index.html
@@ -666,7 +666,7 @@ listenAddress: 127.0.0.1:30102 <span class="nt">-----</span>》 listenAddress:
<ul>
<p class="header">Contribute</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">Report a Doc Issue</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mesher-load-balance.md">Edit This Page on Github</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mersher-load-balance.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
<li><a href="/security">Security</a></li>
</ul>
diff --git a/content/docs/mersher-quick-start-advance/mersher-service-management/index.html b/content/docs/mesher-quick-start-advance/mesher-service-management/index.html
similarity index 98%
rename from content/docs/mersher-quick-start-advance/mersher-service-management/index.html
rename to content/docs/mesher-quick-start-advance/mesher-service-management/index.html
index 1272036..bdb351a 100644
--- a/content/docs/mersher-quick-start-advance/mersher-service-management/index.html
+++ b/content/docs/mesher-quick-start-advance/mesher-service-management/index.html
@@ -558,14 +558,14 @@
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">routeRule</span><span class="pi">:</span>
<span class="na">calculator</span><span class="pi">:</span> <span class="c1">#service name</span>
- <span class="pi">-</span> <span class="na">precedence</span><span class="pi">:</span> <span class="s">2</span> <span class="c1">#precedence of route rule</span>
+ <span class="pi">-</span> <span class="na">precedence</span><span class="pi">:</span> <span class="m">2</span> <span class="c1">#precedence of route rule</span>
<span class="na">route</span><span class="pi">:</span> <span class="c1">#route rule list</span>
<span class="pi">-</span> <span class="na">tags</span><span class="pi">:</span>
<span class="na">version</span><span class="pi">:</span> <span class="s">1.1.1</span>
- <span class="na">weight</span><span class="pi">:</span> <span class="s">70</span> <span class="c1">#weight of 20%</span>
+ <span class="na">weight</span><span class="pi">:</span> <span class="m">70</span> <span class="c1">#weight of 20%</span>
<span class="pi">-</span> <span class="na">tags</span><span class="pi">:</span>
<span class="na">version</span><span class="pi">:</span> <span class="s">1.1.2</span>
- <span class="na">weight</span><span class="pi">:</span> <span class="s">30</span> <span class="c1">#weight of 20%</span>
+ <span class="na">weight</span><span class="pi">:</span> <span class="m">30</span> <span class="c1">#weight of 20%</span>
</code></pre></div> </div>
</li>
</ul>
@@ -589,7 +589,7 @@
<span class="na">timeout</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
<span class="na">timeoutInMilliseconds</span><span class="pi">:</span> <span class="s">1000</span>
- <span class="na">maxConcurrentRequests</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">maxConcurrentRequests</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">circuitBreaker</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
@@ -597,11 +597,11 @@
<span class="na">forceClosed</span><span class="pi">:</span> <span class="no">false</span>
<span class="na">sleepWindowInMilliseconds</span><span class="pi">:</span> <span class="s">10000</span>
<span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="s">1</span>
- <span class="na">errorThresholdPercentage</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">errorThresholdPercentage</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">fallback</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
- <span class="na">maxConcurrentRequests</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">maxConcurrentRequests</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">fallbackpolicy</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">policy</span><span class="pi">:</span> <span class="s">returnnull</span>
@@ -706,7 +706,7 @@
<ul>
<p class="header">Contribute</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">Report a Doc Issue</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mesher-service-management.md">Edit This Page on Github</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mersher-service-management.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
<li><a href="/security">Security</a></li>
</ul>
diff --git a/content/docs/mersher-quick-start/index.html b/content/docs/mesher-quick-start/index.html
similarity index 97%
rename from content/docs/mersher-quick-start/index.html
rename to content/docs/mesher-quick-start/index.html
index 0052b23..cf207df 100644
--- a/content/docs/mersher-quick-start/index.html
+++ b/content/docs/mesher-quick-start/index.html
@@ -603,9 +603,9 @@ docker run <span class="nt">-d</span> <span class="nt">-p</span> 30100:30100 ser
<li>
<p>2 Create <strong>mesher_webapp</strong> which serves for <strong>httpserver_webapp</strong>. In the mesher directory execute the following linux command to create mesher_webapp. In order to the run mesher you also need to copy the conf.</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mkdir /usr/local/src/mesher_webapp
-cp ./mesher /usr/local/src/mesher_webapp
-cp <span class="nt">-r</span> ./conf /usr/local/src/mesher_webapp
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">mkdir</span> /usr/local/src/mesher_webapp
+<span class="nb">cp</span> ./mesher /usr/local/src/mesher_webapp
+<span class="nb">cp</span> <span class="nt">-r</span> ./conf /usr/local/src/mesher_webapp
</code></pre></div> </div>
<p>Change <strong>service name</strong> in microservice.yaml from hellemesher to <strong>webapp</strong>. Change the listening service address in chassis.yaml from 127.0.0.1 to <strong>intranet ip</strong>(Viewed by cmd ifconfig in linux, such as 192.168.88.64).</p>
@@ -618,9 +618,9 @@ listenAddress: 127.0.0.1:30102 <span class="nt">-----</span>》 listenAddress:
<li>
<p>3 Create mesher_calculator service.</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mkdir /usr/local/src/mesher_calculator
-cp ./mesher /usr/local/src/mesher_calculator
-cp <span class="nt">-r</span> ./conf /usr/local/src/mesher_calculator
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">mkdir</span> /usr/local/src/mesher_calculator
+<span class="nb">cp</span> ./mesher /usr/local/src/mesher_calculator
+<span class="nb">cp</span> <span class="nt">-r</span> ./conf /usr/local/src/mesher_calculator
</code></pre></div> </div>
<p>Change the <strong>service name</strong> in conf file <strong>microservice.yaml</strong> from hellemesher to <strong>calculator</strong>.<br />
@@ -647,8 +647,8 @@ listenAddress: 127.0.0.1:30102 <span class="nt">-----</span>》 listenAddress:
<p>5 Run <strong>httpserver_webapp</strong>.</p>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/httpserver_webapp
-npm install
-<span class="nb">export </span><span class="nv">http_proxy</span><span class="o">=</span>http://127.0.0.1:30101
+npm <span class="nb">install
+export </span><span class="nv">http_proxy</span><span class="o">=</span>http://127.0.0.1:30101
node ./httpserver_webapp.js
</code></pre></div> </div>
</li>
@@ -753,7 +753,7 @@ node ./httpserver_webapp.js
<ul>
<p class="header">Contribute</p>
<li><a href="http://issues.apache.org/jira/browse/SCB">Report a Doc Issue</a></li>
- <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mesher-quick-start.md">Edit This Page on Github</a></li>
+ <li><a href="https://github.com/apache/servicecomb-website/edit/master/_docs/mersher-quick-start.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
<li><a href="/security">Security</a></li>
</ul>
diff --git a/content/docs/quick-start-advance/flow-control/index.html b/content/docs/quick-start-advance/flow-control/index.html
index 027e0b3..0722f7a 100644
--- a/content/docs/quick-start-advance/flow-control/index.html
+++ b/content/docs/quick-start-advance/flow-control/index.html
@@ -576,7 +576,7 @@
<span class="na">Provider</span><span class="pi">:</span>
<span class="na">qps</span><span class="pi">:</span>
<span class="na">limit</span><span class="pi">:</span>
- <span class="na">gateway</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">gateway</span><span class="pi">:</span> <span class="m">1</span>
</code></pre></div> </div>
</li>
</ol>
diff --git a/content/docs/quick-start-advance/service-management/index.html b/content/docs/quick-start-advance/service-management/index.html
index 1f2bae8..57fb77a 100644
--- a/content/docs/quick-start-advance/service-management/index.html
+++ b/content/docs/quick-start-advance/service-management/index.html
@@ -575,7 +575,7 @@
<span class="na">circuitBreaker</span><span class="pi">:</span>
<span class="na">Provider</span><span class="pi">:</span>
<span class="na">calculator</span><span class="pi">:</span>
- <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="s">3</span>
+ <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="m">3</span>
<span class="na">fallbackpolicy</span><span class="pi">:</span>
<span class="na">Provider</span><span class="pi">:</span>
<span class="na">policy</span><span class="pi">:</span> <span class="s">returnnull</span>
diff --git a/content/docs/quick-start-bmi/index.html b/content/docs/quick-start-bmi/index.html
index 14b75c9..afe474c 100644
--- a/content/docs/quick-start-bmi/index.html
+++ b/content/docs/quick-start-bmi/index.html
@@ -610,7 +610,7 @@
<span class="o">}</span>
<span class="nd">@Service</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorServiceImpl</span> <span class="kd">implements</span> <span class="n">CalculatorService</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorServiceImpl</span> <span class="kd">implements</span> <span class="nc">CalculatorService</span> <span class="o">{</span>
<span class="nd">@Override</span>
<span class="kd">public</span> <span class="kt">double</span> <span class="nf">calculate</span><span class="o">(</span><span class="kt">double</span> <span class="n">height</span><span class="o">,</span> <span class="kt">double</span> <span class="n">weight</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">height</span> <span class="o"><=</span> <span class="mi">0</span> <span class="o">||</span> <span class="n">weight</span> <span class="o"><=</span> <span class="mi">0</span><span class="o">)</span> <span class="o">{</span>
@@ -637,12 +637,12 @@
<p>Expose calculator service’s restful endpoint:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"calculatorRestEndpoint"</span><span class="o">)</span>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorRestEndpoint</span> <span class="kd">implements</span> <span class="n">CalculatorEndpoint</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorRestEndpoint</span> <span class="kd">implements</span> <span class="nc">CalculatorEndpoint</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">CalculatorService</span> <span class="n">calculatorService</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">CalculatorService</span> <span class="n">calculatorService</span><span class="o">;</span>
<span class="nd">@Autowired</span>
- <span class="kd">public</span> <span class="nf">CalculatorRestEndpoint</span><span class="o">(</span><span class="n">CalculatorService</span> <span class="n">calculatorService</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nf">CalculatorRestEndpoint</span><span class="o">(</span><span class="nc">CalculatorService</span> <span class="n">calculatorService</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">calculatorService</span> <span class="o">=</span> <span class="n">calculatorService</span><span class="o">;</span>
<span class="o">}</span>
@@ -674,8 +674,8 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CalculatorApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">CalculatorApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">CalculatorApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -728,7 +728,7 @@
<span class="na">enabled</span><span class="pi">:</span> <span class="no">false</span>
<span class="na">server</span><span class="pi">:</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">8889</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">8889</span>
</code></pre></div></div>
<p>Enable service discovery with zuul by putting the application information and service center address in <code class="highlighter-rouge">microservice.yaml</code>.</p>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">APPLICATION_ID</span><span class="pi">:</span> <span class="s">bmi</span>
@@ -746,8 +746,8 @@
<span class="nd">@EnableZuulProxy</span>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">GatewayApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">GatewayApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">GatewayApplication</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/docs/quick-start-dataconsistency/index.html b/content/docs/quick-start-dataconsistency/index.html
index bac1661..96b387d 100644
--- a/content/docs/quick-start-dataconsistency/index.html
+++ b/content/docs/quick-start-dataconsistency/index.html
@@ -619,7 +619,7 @@
<span class="na">test</span><span class="pi">:</span> <span class="pi">[</span><span class="s2">"</span><span class="s">CMD-SHELL"</span><span class="pi">,</span> <span class="s2">"</span><span class="s">nc</span><span class="nv"> </span><span class="s">-z</span><span class="nv"> </span><span class="s">localhost</span><span class="nv"> </span><span class="s">3306</span><span class="nv"> </span><span class="s">&></span><span class="nv"> </span><span class="s">/dev/null;</s [...]
<span class="na">interval</span><span class="pi">:</span> <span class="s">30s</span>
<span class="na">timeout</span><span class="pi">:</span> <span class="s">10s</span>
- <span class="na">retries</span><span class="pi">:</span> <span class="s">5</span>
+ <span class="na">retries</span><span class="pi">:</span> <span class="m">5</span>
<span class="na">car-rental-service</span><span class="pi">:</span>
<span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">car-rental-service:0.0.2-SNAPSHOT"</span>
@@ -693,101 +693,101 @@
<p>Use <a href="https://github.com/apache/servicecomb-saga/blob/master/docs/api/api.md">Saga API</a> to set request content and save it to <em>request.json</em></p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"policy"</span><span class="p">:</span><span class="w"> </span><span class="s2">"BackwardRecovery"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"requests"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"policy"</span><span class="p">:</span><span class="w"> </span><span class="s2">"BackwardRecovery"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"requests"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-car"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"car-rental-service"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/rentals"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-car"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"car-rental-service"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/rentals"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/rentals"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/rentals"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-hotel"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hotel-reservation-service"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/reservations"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-hotel"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hotel-reservation-service"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/reservations"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/reservations"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/reservations"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-flight"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"flight-booking-service"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/bookings"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-flight"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"flight-booking-service"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/bookings"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/bookings"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/bookings"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-payment"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"payment-service"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"parents"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"request-payment"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"rest"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"payment-service"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"parents"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="s2">"request-car"</span><span class="p">,</span><span class="w">
</span><span class="s2">"request-flight"</span><span class="p">,</span><span class="w">
</span><span class="s2">"request-hotel"</span><span class="w">
</span><span class="p">],</span><span class="w">
- </span><span class="s2">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/payments"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"post"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/payments"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/payments"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
+ </span><span class="nl">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"method"</span><span class="p">:</span><span class="w"> </span><span class="s2">"put"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"path"</span><span class="p">:</span><span class="w"> </span><span class="s2">"/payments"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"customerId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"mike"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
diff --git a/content/docs/quick-start/index.html b/content/docs/quick-start/index.html
index e52ceea..4584d55 100644
--- a/content/docs/quick-start/index.html
+++ b/content/docs/quick-start/index.html
@@ -560,11 +560,11 @@
<p>Install Maven 3.x, details can refer to <a href="https://maven.apache.org/install.html" target="_blank">Maven Installing Guide</a>.</p>
</li>
<li>
- <p>Install ServiceComb Java Chassis(SDK) by executing the following commands.</p>
+ <p>Download ServiceComb-Samples.</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> git clone https://github.com/apache/servicecomb-java-chassis.git
- <span class="nb">cd </span>servicecomb-java-chassis
- mvn clean install <span class="nt">-DskipTests</span>
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> git clone https://github.com/apache/servicecomb-samples.git
+ <span class="nb">cd </span>servicecomb-samples/java-chassis-samples/bmi
+ mvn clean <span class="nb">install</span>
</code></pre></div> </div>
</li>
</ul>
@@ -574,7 +574,7 @@
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>docker pull servicecomb/service-center
docker run <span class="nt">-d</span> <span class="nt">-p</span> 30100:30100 servicecomb/service-center:latest
</code></pre></div></div>
-<p><em>Reference to <a href="/users/setup-environment/#运行service-center">service center deployment</a> to learn deploying Service Center as a local binary.</em></p>
+<p><em>Reference to <a href="/docs/service-center/install/">Install of ServiceCenter</a> to learn deploying Service Center as a local binary.</em></p>
<h2 id="create-your-first-microservice-application">Create your first microservice application</h2>
<p>Let's start the journey of microservice with a simple <strong>Body Mass Index(BMI)</strong> application. The <a href="https://en.wikipedia.org/wiki/Body_mass_index" target="_blank">BMI</a> is an attempt to quantify the amount of tissue mass in an individual. This application contains two separate microservices:</p>
@@ -599,7 +599,7 @@ docker run <span class="nt">-d</span> <span class="nt">-p</span> 30100:30100 ser
<li>
<p>Enter BMI codes directory.</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd </span>samples/bmi
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd </span>servicecomb-samples/java-chassis-samples/bmi
</code></pre></div> </div>
<p><strong>Note</strong>: In windows development environment, the docker runs inside the virtual machine. The IP address of <strong>Service Center</strong> needs to be modified as the virtual machine's IP address. Modify the 2 configuration files [calculator|webapp]/src/main/resources/microservice.yaml, changed <a>http://127.0.0.1:30100</a> to <a>http://192.168.99.100:30100</a> , where 192.168.99.100 is the virtual machine's IP address.</p>
diff --git a/content/docs/release-note-1-0-0/index.html b/content/docs/release-note-1-0-0/index.html
index b256e42..9a67a0c 100644
--- a/content/docs/release-note-1-0-0/index.html
+++ b/content/docs/release-note-1-0-0/index.html
@@ -469,10 +469,10 @@
</ul>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/address"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="n">String</span> <span class="nf">address</span><span class="o">(</span><span class="n">Address</span> <span class="n">address</span><span class="o">)</span> <span class="o">{</span> <span class="o">...</span> <span class="o">}</span>
+<span class="kd">public</span> <span class="nc">String</span> <span class="nf">address</span><span class="o">(</span><span class="nc">Address</span> <span class="n">address</span><span class="o">)</span> <span class="o">{</span> <span class="o">...</span> <span class="o">}</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Address</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">country</span><span class="o">;</span>
- <span class="n">String</span> <span class="n">city</span><span class="o">;</span>
+ <span class="nc">String</span> <span class="n">country</span><span class="o">;</span>
+ <span class="nc">String</span> <span class="n">city</span><span class="o">;</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/docs/seckill-development-journey-part-III/index.html b/content/docs/seckill-development-journey-part-III/index.html
index 4d04c66..c000f17 100644
--- a/content/docs/seckill-development-journey-part-III/index.html
+++ b/content/docs/seckill-development-journey-part-III/index.html
@@ -431,7 +431,7 @@
<h4 id="command-micro-service-message-publisher-component">Command micro-service Message Publisher component</h4>
<p>Since the Event Sourcing was not introduced before, the PromotionEvent entity only needed to write to the database directly. Now it is necessary to publish PromotionEvent to Message Broker. Considering that future we will be replaced by Distributed Message Service (DMS) as Message Broker in order to deploy to <a href="http://www.hwclouds.com/">Huawei Cloud</a>, We defined the generic message publish interface:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">SecKillMessagePublisher</span> <span class="o">{</span>
- <span class="kt">void</span> <span class="nf">publishMessage</span><span class="o">(</span><span class="n">String</span> <span class="n">messageContent</span><span class="o">);</span>
+ <span class="kt">void</span> <span class="nf">publishMessage</span><span class="o">(</span><span class="nc">String</span> <span class="n">messageContent</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -445,7 +445,7 @@
<p>Also considering that future we will be replaced by Distributed Message Service (DMS) as Message Broker in order to deploy to <a href="http://www.hwclouds.com/">Huawei Cloud</a>, We defined the generic message subscribe interface:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">SecKillMessageSubscriber</span> <span class="o">{</span>
-<span class="kt">void</span> <span class="nf">subscribeMessage</span><span class="o">(</span><span class="n">String</span> <span class="n">messageContent</span><span class="o">);</span>
+<span class="kt">void</span> <span class="nf">subscribeMessage</span><span class="o">(</span><span class="nc">String</span> <span class="n">messageContent</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div> </div>
</li>
diff --git a/content/docs/servicecomb-pack-cluster/index.html b/content/docs/servicecomb-pack-cluster/index.html
index 6ad7a61..28dea3d 100644
--- a/content/docs/servicecomb-pack-cluster/index.html
+++ b/content/docs/servicecomb-pack-cluster/index.html
@@ -452,21 +452,21 @@ We implemented database-based distributed lock in version 0.4.0 version, event s
<p>Event scanning is implemented by <code class="highlighter-rouge">EventScanner.java</code> , initialize it in <code class="highlighter-rouge">AlphaConfig.java</code> , you can enable it by setting the parameter ‘alpha.event.scanner.enabled=true’, it will be instantiated EventScanner. The variable nodeStatus is the node type(Master or Slave). Later, I will introduce how <code class="highlighter-rouge">nodeStatus</code> is initialized.</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Bean</span>
-<span class="n">TxConsistentService</span> <span class="nf">txConsistentService</span><span class="o">(</span>
+<span class="nc">TxConsistentService</span> <span class="nf">txConsistentService</span><span class="o">(</span>
<span class="nd">@Value</span><span class="o">(</span><span class="s">"${alpha.event.pollingInterval:500}"</span><span class="o">)</span> <span class="kt">int</span> <span class="n">eventPollingInterval</span><span class="o">,</span>
<span class="nd">@Value</span><span class="o">(</span><span class="s">"${alpha.event.scanner.enabled:true}"</span><span class="o">)</span> <span class="kt">boolean</span> <span class="n">eventScannerEnabled</span><span class="o">,</span>
- <span class="n">ScheduledExecutorService</span> <span class="n">scheduler</span><span class="o">,</span>
- <span class="n">TxEventRepository</span> <span class="n">eventRepository</span><span class="o">,</span>
- <span class="n">CommandRepository</span> <span class="n">commandRepository</span><span class="o">,</span>
- <span class="n">TxTimeoutRepository</span> <span class="n">timeoutRepository</span><span class="o">,</span>
- <span class="n">OmegaCallback</span> <span class="n">omegaCallback</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">ScheduledExecutorService</span> <span class="n">scheduler</span><span class="o">,</span>
+ <span class="nc">TxEventRepository</span> <span class="n">eventRepository</span><span class="o">,</span>
+ <span class="nc">CommandRepository</span> <span class="n">commandRepository</span><span class="o">,</span>
+ <span class="nc">TxTimeoutRepository</span> <span class="n">timeoutRepository</span><span class="o">,</span>
+ <span class="nc">OmegaCallback</span> <span class="n">omegaCallback</span><span class="o">)</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">eventScannerEnabled</span><span class="o">)</span> <span class="o">{</span>
<span class="k">new</span> <span class="nf">EventScanner</span><span class="o">(</span><span class="n">scheduler</span><span class="o">,</span>
<span class="n">eventRepository</span><span class="o">,</span> <span class="n">commandRepository</span><span class="o">,</span> <span class="n">timeoutRepository</span><span class="o">,</span>
<span class="n">omegaCallback</span><span class="o">,</span> <span class="n">eventPollingInterval</span><span class="o">,</span> <span class="n">nodeStatus</span><span class="o">).</span><span class="na">run</span><span class="o">();</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Starting the EventScanner."</span><span class="o">);</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Starting the EventScanner."</span><span class="o">);</span>
<span class="o">}</span>
- <span class="n">TxConsistentService</span> <span class="n">consistentService</span> <span class="o">=</span> <span class="k">new</span> <span class="n">TxConsistentService</span><span class="o">(</span><span class="n">eventRepository</span><span class="o">);</span>
+ <span class="nc">TxConsistentService</span> <span class="n">consistentService</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">TxConsistentService</span><span class="o">(</span><span class="n">eventRepository</span><span class="o">);</span>
<span class="k">return</span> <span class="n">consistentService</span><span class="o">;</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -490,29 +490,29 @@ We implemented database-based distributed lock in version 0.4.0 version, event s
<span class="o">},</span>
<span class="mi">0</span><span class="o">,</span>
<span class="n">eventPollingInterval</span><span class="o">,</span>
- <span class="n">MILLISECONDS</span><span class="o">);</span>
+ <span class="no">MILLISECONDS</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div></div>
<p>Construct NodeStatus in <code class="highlighter-rouge">AlphaConfig.java</code> by the following to ensure that the event scan will work regardless of whether you have configured the <code class="highlighter-rouge">alpha.cluster.master.enabled</code> parameter, Here you can see the node is a slave just after startup when cluster mode is enabled. Later, I will introduce how to switch to master.</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@Bean</span>
- <span class="n">NodeStatus</span> <span class="nf">nodeStatus</span> <span class="o">(){</span>
+ <span class="nc">NodeStatus</span> <span class="nf">nodeStatus</span> <span class="o">(){</span>
<span class="k">if</span><span class="o">(</span><span class="n">masterEnabled</span><span class="o">){</span>
- <span class="k">return</span> <span class="k">new</span> <span class="nf">NodeStatus</span><span class="o">(</span><span class="n">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">SLAVE</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nf">NodeStatus</span><span class="o">(</span><span class="nc">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">SLAVE</span><span class="o">);</span>
<span class="o">}</span><span class="k">else</span><span class="o">{</span>
- <span class="k">return</span> <span class="k">new</span> <span class="nf">NodeStatus</span><span class="o">(</span><span class="n">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">MASTER</span><span class="o">);</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nf">NodeStatus</span><span class="o">(</span><span class="nc">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">MASTER</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="nd">@Autowired</span>
- <span class="n">NodeStatus</span> <span class="n">nodeStatus</span><span class="o">;</span>
+ <span class="nc">NodeStatus</span> <span class="n">nodeStatus</span><span class="o">;</span>
</code></pre></div></div>
<p><code class="highlighter-rouge">ClusterLockService.java</code> is in charge of node state switching, It periodically perform lock preemption and set the node as a master after successful preemption.</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@Autowired</span>
- <span class="n">LockProvider</span> <span class="n">lockProvider</span><span class="o">;</span>
+ <span class="nc">LockProvider</span> <span class="n">lockProvider</span><span class="o">;</span>
<span class="o">...</span>
<span class="o">...</span>
<span class="nd">@Scheduled</span><span class="o">(</span><span class="n">cron</span> <span class="o">=</span> <span class="s">"0/1 * * * * ?"</span><span class="o">)</span>
@@ -522,15 +522,15 @@ We implemented database-based distributed lock in version 0.4.0 version, event s
<span class="k">if</span> <span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">locker</span><span class="o">.</span><span class="na">isPresent</span><span class="o">())</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(!</span><span class="k">this</span><span class="o">.</span><span class="na">locked</span><span class="o">)</span> <span class="o">{</span>
<span class="k">this</span><span class="o">.</span><span class="na">locked</span> <span class="o">=</span> <span class="kc">true</span><span class="o">;</span>
- <span class="n">nodeStatus</span><span class="o">.</span><span class="na">setTypeEnum</span><span class="o">(</span><span class="n">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">MASTER</span><span class="o">);</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Master Node"</span><span class="o">);</span>
+ <span class="n">nodeStatus</span><span class="o">.</span><span class="na">setTypeEnum</span><span class="o">(</span><span class="nc">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">MASTER</span><span class="o">);</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Master Node"</span><span class="o">);</span>
<span class="o">}</span>
<span class="c1">//Keep locked</span>
<span class="o">}</span> <span class="k">else</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">locked</span> <span class="o">||</span> <span class="o">!</span><span class="n">lockExecuted</span><span class="o">)</span> <span class="o">{</span>
<span class="n">locked</span> <span class="o">=</span> <span class="kc">false</span><span class="o">;</span>
- <span class="n">nodeStatus</span><span class="o">.</span><span class="na">setTypeEnum</span><span class="o">(</span><span class="n">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">SLAVE</span><span class="o">);</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Slave Node"</span><span class="o">);</span>
+ <span class="n">nodeStatus</span><span class="o">.</span><span class="na">setTypeEnum</span><span class="o">(</span><span class="nc">NodeStatus</span><span class="o">.</span><span class="na">TypeEnum</span><span class="o">.</span><span class="na">SLAVE</span><span class="o">);</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"Slave Node"</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="n">lockExecuted</span> <span class="o">=</span> <span class="kc">true</span><span class="o">;</span>
@@ -613,10 +613,10 @@ We implemented database-based distributed lock in version 0.4.0 version, event s
</ul>
<div class="language-sql highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">CREATE</span> <span class="k">TABLE</span> <span class="n">IF</span> <span class="k">NOT</span> <span class="k">EXISTS</span> <span class="n">master_lock</span> <span class="p">(</span>
- <span class="n">serviceName</span> <span class="n">varchar</span><span class="p">(</span><span class="mi">36</span><span class="p">)</span> <span class="k">not</span> <span class="k">NULL</span><span class="p">,</span>
- <span class="n">expireTime</span> <span class="n">datetime</span> <span class="k">NOT</span> <span class="k">NULL</span> <span class="k">DEFAULT</span> <span class="k">CURRENT_TIMESTAMP</span><span class="p">,</span>
- <span class="n">lockedTime</span> <span class="n">datetime</span> <span class="k">NOT</span> <span class="k">NULL</span> <span class="k">DEFAULT</span> <span class="k">CURRENT_TIMESTAMP</span><span class="p">,</span>
- <span class="n">instanceId</span> <span class="n">varchar</span><span class="p">(</span><span class="mi">255</span><span class="p">)</span> <span class="k">not</span> <span class="k">NULL</span><span class="p">,</span>
+ <span class="n">serviceName</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">36</span><span class="p">)</span> <span class="k">not</span> <span class="k">NULL</span><span class="p">,</span>
+ <span class="n">expireTime</span> <span class="nb">datetime</span> <span class="k">NOT</span> <span class="k">NULL</span> <span class="k">DEFAULT</span> <span class="k">CURRENT_TIMESTAMP</span><span class="p">,</span>
+ <span class="n">lockedTime</span> <span class="nb">datetime</span> <span class="k">NOT</span> <span class="k">NULL</span> <span class="k">DEFAULT</span> <span class="k">CURRENT_TIMESTAMP</span><span class="p">,</span>
+ <span class="n">instanceId</span> <span class="nb">varchar</span><span class="p">(</span><span class="mi">255</span><span class="p">)</span> <span class="k">not</span> <span class="k">NULL</span><span class="p">,</span>
<span class="k">PRIMARY</span> <span class="k">KEY</span> <span class="p">(</span><span class="n">serviceName</span><span class="p">)</span>
<span class="p">)</span> <span class="n">ENGINE</span><span class="o">=</span><span class="n">InnoDB</span> <span class="k">DEFAULT</span> <span class="n">CHARSET</span><span class="o">=</span><span class="n">utf8</span><span class="p">;</span>
</code></pre></div></div>
@@ -651,10 +651,10 @@ We implemented database-based distributed lock in version 0.4.0 version, event s
<span class="o">+</span> <span class="s">"VALUES "</span>
<span class="o">+</span> <span class="s">"(?1, ?2, ?3, ?4)"</span><span class="o">,</span> <span class="n">nativeQuery</span> <span class="o">=</span> <span class="kc">true</span><span class="o">)</span>
<span class="kt">int</span> <span class="nf">initLock</span><span class="o">(</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"serviceName"</span><span class="o">)</span> <span class="n">String</span> <span class="n">serviceName</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"expireTime"</span><span class="o">)</span> <span class="n">Date</span> <span class="n">expireTime</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"lockedTime"</span><span class="o">)</span> <span class="n">Date</span> <span class="n">lockedTime</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"instanceId"</span><span class="o">)</span> <span class="n">String</span> <span class="n">instanceId</span><span class="o">);</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"serviceName"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">serviceName</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"expireTime"</span><span class="o">)</span> <span class="nc">Date</span> <span class="n">expireTime</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"lockedTime"</span><span class="o">)</span> <span class="nc">Date</span> <span class="n">lockedTime</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"instanceId"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">instanceId</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>
@@ -673,10 +673,10 @@ We implemented database-based distributed lock in version 0.4.0 version, event s
<span class="o">+</span> <span class="s">",t.instanceId = :instanceId "</span>
<span class="o">+</span> <span class="s">"WHERE t.serviceName = :serviceName AND (t.expireTime <= :lockedTime OR t.instanceId = :instanceId)"</span><span class="o">)</span>
<span class="kt">int</span> <span class="nf">updateLock</span><span class="o">(</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"serviceName"</span><span class="o">)</span> <span class="n">String</span> <span class="n">serviceName</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"lockedTime"</span><span class="o">)</span> <span class="n">Date</span> <span class="n">lockedTime</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"expireTime"</span><span class="o">)</span> <span class="n">Date</span> <span class="n">expireTime</span><span class="o">,</span>
- <span class="nd">@Param</span><span class="o">(</span><span class="s">"instanceId"</span><span class="o">)</span> <span class="n">String</span> <span class="n">instanceId</span><span class="o">);</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"serviceName"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">serviceName</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"lockedTime"</span><span class="o">)</span> <span class="nc">Date</span> <span class="n">lockedTime</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"expireTime"</span><span class="o">)</span> <span class="nc">Date</span> <span class="n">expireTime</span><span class="o">,</span>
+ <span class="nd">@Param</span><span class="o">(</span><span class="s">"instanceId"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">instanceId</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>
diff --git a/content/docs/servicecomb-pack-consul/index.html b/content/docs/servicecomb-pack-consul/index.html
index 5c827cf..0687b42 100644
--- a/content/docs/servicecomb-pack-consul/index.html
+++ b/content/docs/servicecomb-pack-consul/index.html
@@ -441,22 +441,22 @@
<p>Use <code class="highlighter-rouge">curl http://0.0.0.0:8500/v1/agent/services</code> You can see that Alpha’s gRPC address and port have been registered in Consul’s Tags</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"ID"</span><span class="p">:</span><span class="w"> </span><span class="s2">"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Service"</span><span class="p">:</span><span class="w"> </span><span class="s2">"servicecomb-alpha-server"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Tags"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"ID"</span><span class="p">:</span><span class="w"> </span><span class="s2">"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Service"</span><span class="p">:</span><span class="w"> </span><span class="s2">"servicecomb-alpha-server"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Tags"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="s2">"alpha-server-host=0.0.0.0"</span><span class="p">,</span><span class="w">
</span><span class="s2">"alpha-server-port=8080"</span><span class="p">,</span><span class="w">
</span><span class="s2">"secure=false"</span><span class="w">
</span><span class="p">],</span><span class="w">
- </span><span class="s2">"Meta"</span><span class="p">:</span><span class="w"> </span><span class="p">{},</span><span class="w">
- </span><span class="s2">"Port"</span><span class="p">:</span><span class="w"> </span><span class="mi">8090</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Address"</span><span class="p">:</span><span class="w"> </span><span class="s2">"192.168.1.116"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Weights"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"Passing"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
- </span><span class="s2">"Warning"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
+ </span><span class="nl">"Meta"</span><span class="p">:</span><span class="w"> </span><span class="p">{},</span><span class="w">
+ </span><span class="nl">"Port"</span><span class="p">:</span><span class="w"> </span><span class="mi">8090</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Address"</span><span class="p">:</span><span class="w"> </span><span class="s2">"192.168.1.116"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Weights"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"Passing"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"Warning"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"EnableTagOverride"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
+ </span><span class="nl">"EnableTagOverride"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
@@ -486,7 +486,7 @@
<span class="na">discovery</span><span class="pi">:</span>
<span class="err"> </span><span class="na">register</span><span class="pi">:</span> <span class="no">false</span>
<span class="s">host</span><span class="pi">:</span> <span class="s">0.0.0.0</span>
- <span class="s">port</span><span class="pi">:</span> <span class="s">8500</span>
+ <span class="s">port</span><span class="pi">:</span> <span class="m">8500</span>
<span class="na">alpha</span><span class="pi">:</span>
<span class="na">cluster</span><span class="pi">:</span>
diff --git a/content/docs/servicecomb-pack-eureka/index.html b/content/docs/servicecomb-pack-eureka/index.html
index 18a21d2..55966c6 100644
--- a/content/docs/servicecomb-pack-eureka/index.html
+++ b/content/docs/servicecomb-pack-eureka/index.html
@@ -406,7 +406,7 @@
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/apache/servicecomb-pack.git
<span class="nb">cd </span>servicecomb-pack
-mvn clean install <span class="nt">-DskipTests</span><span class="o">=</span><span class="nb">true</span> <span class="nt">-Pspring-boot-2</span>,spring-cloud-eureka
+mvn clean <span class="nb">install</span> <span class="nt">-DskipTests</span><span class="o">=</span><span class="nb">true</span> <span class="nt">-Pspring-boot-2</span>,spring-cloud-eureka
</code></pre></div></div>
<h3 id="run-eureka">Run Eureka</h3>
diff --git a/content/docs/stress-test-on-company-with-jmeter-in-k8s/index.html b/content/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
index 1bde7bb..85cf30e 100644
--- a/content/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
+++ b/content/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
@@ -507,7 +507,7 @@ fig-4 CPU Load on various concurrency</p>
<li>
<p>run JMeter slave on each test node, the command is as follows:</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>jmeter-server <span class="nt">-Djava</span>.rmi.server.hostname<span class="o">=</span><span class="k">$(</span>ifconfig eth0 | <span class="nb">grep</span> <span class="s2">"inet addr"</span> | awk <span class="s1">'{print $2}'</span> | cut <span class="nt">-d</span> <span class="s2">":"</span> <span class="nt">-f2</span><span class="k">)</span>
+ <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>jmeter-server <span class="nt">-Djava</span>.rmi.server.hostname<span class="o">=</span><span class="si">$(</span>ifconfig eth0 | <span class="nb">grep</span> <span class="s2">"inet addr"</span> | <span class="nb">awk</span> <span class="s1">'{print $2}'</span> | <span class="nb">cut</span> <span class="nt">-d</span> <span class="s2">":"</span> <span class="nt">-f2</span><span class="si"> [...]
</code></pre></div> </div>
</li>
<li>
diff --git a/content/docs/syncer/multi-servicecenters/index.html b/content/docs/syncer/multi-servicecenters/index.html
index 41d1ecd..ec705aa 100644
--- a/content/docs/syncer/multi-servicecenters/index.html
+++ b/content/docs/syncer/multi-servicecenters/index.html
@@ -589,7 +589,7 @@
<p>One of the machines： 10.0.0.10</p>
<h4 id="1-compile-eurekaserver-and-accountserver">1. Compile EurekaServer and AccountServer</h4>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span><span class="nb">cd </span>samples/multi-servicecenters/eureka
-<span class="nv">$ </span>mvn clean install
+<span class="nv">$ </span>mvn clean <span class="nb">install</span>
</code></pre></div></div>
<h4 id="2-run-eurekaserver">2. Run EurekaServer：</h4>
<ul>
@@ -599,7 +599,7 @@
<span class="na">application</span><span class="pi">:</span>
<span class="na">name</span><span class="pi">:</span> <span class="s">eureka-server</span>
<span class="na">server</span><span class="pi">:</span>
-<span class="na">port </span><span class="pi">:</span> <span class="s">8761</span>
+<span class="na">port </span><span class="pi">:</span> <span class="m">8761</span>
<span class="c1"># servlet:</span>
<span class="c1"># context-path: /eureka</span>
<span class="na">eureka</span><span class="pi">:</span>
@@ -619,7 +619,7 @@
</li>
<li>Run server
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span><span class="nb">cd</span> <span class="k">${</span><span class="nv">project_dir</span><span class="k">}</span>/servicecomb-service-center/syncer/samples/multi-servicecenters/eureka/eureka-server/
-<span class="nv">$ </span>nohup mvn spring-boot:run & <span class="o">>></span> eureka-server.log 2>&1 &
+<span class="nv">$ </span><span class="nb">nohup </span>mvn spring-boot:run & <span class="o">>></span> eureka-server.log 2>&1 &
</code></pre></div> </div>
<p>Open http://10.0.0.10:8761 in the browser, this is successful if the following page appears.<br />
<img src="/assets/images/docs/syncer/eureka-server-success.jpg" alt="image" /></p>
@@ -634,7 +634,7 @@
<span class="na">application</span><span class="pi">:</span>
<span class="na">name</span><span class="pi">:</span> <span class="s">account-server</span>
<span class="na">server</span><span class="pi">:</span>
-<span class="na">port</span><span class="pi">:</span> <span class="s">8090</span>
+<span class="na">port</span><span class="pi">:</span> <span class="m">8090</span>
<span class="na">eureka</span><span class="pi">:</span>
<span class="na">instance</span><span class="pi">:</span>
<span class="na">hostname</span><span class="pi">:</span> <span class="s">10.0.0.10</span>
diff --git a/content/docs/toolkit/oas-validator/index.html b/content/docs/toolkit/oas-validator/index.html
index 98f170c..9ab5a69 100644
--- a/content/docs/toolkit/oas-validator/index.html
+++ b/content/docs/toolkit/oas-validator/index.html
@@ -864,15 +864,15 @@
<p>So, when do compatibility check we resolve <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#reference-object">Reference Object</a> in old and new OAS first, then do the check, below is the code snippet using <a href="https://github.com/swagger-api/swagger-parser">swagger-parser</a>:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">OpenAPIV3Parser</span> <span class="n">parser</span> <span class="o">=</span> <span class="k">new</span> <span class="n">OpenAPIV3Parser</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">OpenAPIV3Parser</span> <span class="n">parser</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">OpenAPIV3Parser</span><span class="o">();</span>
-<span class="n">ParseOptions</span> <span class="n">parseOptions</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ParseOptions</span><span class="o">();</span>
+<span class="nc">ParseOptions</span> <span class="n">parseOptions</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">ParseOptions</span><span class="o">();</span>
<span class="n">parseOptions</span><span class="o">.</span><span class="na">setResolve</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="n">parseOptions</span><span class="o">.</span><span class="na">setResolveCombinators</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="n">parseOptions</span><span class="o">.</span><span class="na">setResolveFully</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
<span class="n">parseOptions</span><span class="o">.</span><span class="na">setFlatten</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
-<span class="n">SwaggerParseResult</span> <span class="n">parseResult</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="na">readContents</span><span class="o">(</span><span class="n">content</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="n">parseOptions</span><span class="o">);</span>
+<span class="nc">SwaggerParseResult</span> <span class="n">parseResult</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="na">readContents</span><span class="o">(</span><span class="n">content</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="n">parseOptions</span><span class="o">);</span>
</code></pre></div></div>
<p>So if compatibility violations be found, the reported location will be different from the location in origin OAS spec.</p>
diff --git a/content/docs/toolkit/quick-start/index.html b/content/docs/toolkit/quick-start/index.html
index 1c02927..489e621 100644
--- a/content/docs/toolkit/quick-start/index.html
+++ b/content/docs/toolkit/quick-start/index.html
@@ -568,7 +568,7 @@
<span class="nv">$ </span><span class="nb">cd </span>toolkit
<span class="c"># Build package</span>
-<span class="nv">$ </span>mvn clean install
+<span class="nv">$ </span>mvn clean <span class="nb">install</span>
</code></pre></div></div>
<h3 id="2-use-the-toolkit-maven-plugin-plugin">2 Use the toolkit-maven-plugin plugin</h3>
diff --git a/content/docs/users/application-boot-process/index.html b/content/docs/users/application-boot-process/index.html
index 2b31046..b216bc5 100644
--- a/content/docs/users/application-boot-process/index.html
+++ b/content/docs/users/application-boot-process/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Application Boot-up Process">
<meta itemprop="description" content="Application Boot-up Process">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/docs/users/communicate-protocol/index.html b/content/docs/users/communicate-protocol/index.html
index bdc9a93..14604df 100644
--- a/content/docs/users/communicate-protocol/index.html
+++ b/content/docs/users/communicate-protocol/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Communication Protocol">
<meta itemprop="description" content="Communication Protocol">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -621,7 +621,7 @@
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">rest</span><span class="pi">:</span>
<span class="na">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
- <span class="na">timeout</span><span class="pi">:</span> <span class="s">3000</span>
+ <span class="na">timeout</span><span class="pi">:</span> <span class="m">3000</span>
</code></pre></div></div>
<h2 id="rest-over-vertx">REST over Vertx</h2>
@@ -633,9 +633,9 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">MainServer</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="err"> </span><span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span><span class="c1">//Log initialization</span>
- <span class="err"> </span><span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="c1">// Spring bean initialization</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="err"> </span><span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span><span class="c1">//Log initialization</span>
+ <span class="err"> </span><span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="c1">// Spring bean initialization</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -730,7 +730,7 @@
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">rest</span><span class="pi">:</span>
<span class="na">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
- <span class="na">thread-count</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="na">thread-count</span><span class="pi">:</span> <span class="m">1</span>
<span class="na">references</span><span class="pi">:</span>
<span class="na">hello</span><span class="pi">:</span>
<span class="na">transport</span><span class="pi">:</span> <span class="s">rest</span>
diff --git a/content/docs/users/customized-tracing/index.html b/content/docs/users/customized-tracing/index.html
index 5f12438..7db5ff3 100644
--- a/content/docs/users/customized-tracing/index.html
+++ b/content/docs/users/customized-tracing/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Customized Tracing">
<meta itemprop="description" content="Dotting for Customized Tracing">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -470,8 +470,8 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableZipkinTracing</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ZipkinSpanTestApplication</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">ZipkinSpanTestApplication</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">ZipkinSpanTestApplication</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -481,16 +481,16 @@
<p>Add the <code class="highlighter-rouge">@Span</code> annotation to the method that requires dotting customization:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Component</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SlowRepoImpl</span> <span class="kd">implements</span> <span class="n">SlowRepo</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="n">SlowRepoImpl</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SlowRepoImpl</span> <span class="kd">implements</span> <span class="nc">SlowRepo</span> <span class="o">{</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="nc">Logger</span> <span class="n">logger</span> <span class="o">=</span> <span class="nc">LoggerFactory</span><span class="o">.</span><span class="na">getLogger</span><span class="o">(</span><span class="nc">SlowRepoImpl</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">Random</span> <span class="n">random</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Random</span><span class="o">();</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">Random</span> <span class="n">random</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Random</span><span class="o">();</span>
<span class="nd">@Span</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">crawl</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">InterruptedException</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">crawl</span><span class="o">()</span> <span class="kd">throws</span> <span class="nc">InterruptedException</span> <span class="o">{</span>
<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"in /crawl"</span><span class="o">);</span>
- <span class="n">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="n">random</span><span class="o">.</span><span class="na">nextInt</span><span class="o">(</span><span class="mi">200</span><span class="o">));</span>
+ <span class="nc">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="n">random</span><span class="o">.</span><span class="na">nextInt</span><span class="o">(</span><span class="mi">200</span><span class="o">));</span>
<span class="k">return</span> <span class="s">"crawled"</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -534,7 +534,7 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">static</span> <span class="kd">class</span> <span class="nc">CustomSpanTask</span> <span class="o">{</span>
<span class="nd">@Span</span><span class="o">(</span><span class="n">spanName</span> <span class="o">=</span> <span class="s">"transaction1"</span><span class="o">,</span> <span class="n">callPath</span> <span class="o">=</span> <span class="s">"startA"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">invoke</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">invoke</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"invoke the method"</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/docs/users/develop-with-jax-rs/index.html b/content/docs/users/develop-with-jax-rs/index.html
index a6251dc..5ac8c66 100644
--- a/content/docs/users/develop-with-jax-rs/index.html
+++ b/content/docs/users/develop-with-jax-rs/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Develop Microservice with JAX-RS">
<meta itemprop="description" content="Develop Microservice with JAX-RS">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -474,17 +474,17 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.models.Person</span><span class="o">;</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/jaxrshello"</span><span class="o">)</span>
- <span class="nd">@Produces</span><span class="o">(</span><span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
+ <span class="nd">@Produces</span><span class="o">(</span><span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">JaxrsHelloImpl</span> <span class="o">{</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/sayhi"</span><span class="o">)</span>
<span class="nd">@POST</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span><span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Path</span><span class="o">(</span><span class="s">"/sayhello"</span><span class="o">)</span>
<span class="nd">@POST</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -500,7 +500,7 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">org.apache.servicecomb.provider.rest.common.RestSchema</span><span class="o">;</span>
<span class="c1">// other code omitted</span>
<span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"jaxrsHello"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="kd">class</span> <span class="nc">JaxrsHelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">class</span> <span class="nc">JaxrsHelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span> <span class="o">{</span>
<span class="c1">// other code omitted</span>
<span class="o">}</span>
</code></pre></div> </div>
@@ -530,10 +530,10 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="c1">//initializing log, loading bean(including its parameters), and registering service, more detail can be found here : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/docs/users/develop-with-rest-template/index.html b/content/docs/users/develop-with-rest-template/index.html
index f563bbf..d62b8d7 100644
--- a/content/docs/users/develop-with-rest-template/index.html
+++ b/content/docs/users/develop-with-rest-template/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Develop with Rest Template">
<meta itemprop="description" content="Develop with Rest Template">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -444,23 +444,23 @@
<span class="nd">@Component</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringmvcConsumerMain</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="n">RestTemplate</span> <span class="n">restTemplate</span> <span class="o">=</span> <span class="n">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="nc">RestTemplate</span> <span class="n">restTemplate</span> <span class="o">=</span> <span class="nc">RestTemplateBuilder</span><span class="o">.</span><span class="na">create</span><span class="o">();</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="n">init</span><span class="o">();</span>
- <span class="n">Person</span> <span class="n">person</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Person</span><span class="o">();</span>
+ <span class="nc">Person</span> <span class="n">person</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Person</span><span class="o">();</span>
<span class="n">person</span><span class="o">.</span><span class="na">setName</span><span class="o">(</span><span class="s">"ServiceComb/Java Chassis"</span><span class="o">);</span>
- <span class="n">String</span> <span class="n">sayHiResult</span> <span class="o">=</span> <span class="n">restTemplate</span>
- <span class="o">.</span><span class="na">postForObject</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhi?name=Java Chassis"</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">String</span> <span class="n">sayHelloResult</span> <span class="o">=</span> <span class="n">restTemplate</span>
- <span class="o">.</span><span class="na">postForObject</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhello"</span><span class="o">,</span> <span class="n">person</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"RestTemplate consumer sayhi services: "</span> <span class="o">+</span> <span class="n">sayHiResult</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"RestTemplate consumer sayhello services: "</span> <span class="o">+</span> <span class="n">sayHelloResult</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">sayHiResult</span> <span class="o">=</span> <span class="n">restTemplate</span>
+ <span class="o">.</span><span class="na">postForObject</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhi?name=Java Chassis"</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="n">sayHelloResult</span> <span class="o">=</span> <span class="n">restTemplate</span>
+ <span class="o">.</span><span class="na">postForObject</span><span class="o">(</span><span class="s">"cse://springmvc/springmvchello/sayhello"</span><span class="o">,</span> <span class="n">person</span><span class="o">,</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"RestTemplate consumer sayhi services: "</span> <span class="o">+</span> <span class="n">sayHiResult</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"RestTemplate consumer sayhello services: "</span> <span class="o">+</span> <span class="n">sayHelloResult</span><span class="o">);</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/docs/users/develop-with-rpc/index.html b/content/docs/users/develop-with-rpc/index.html
index 8ea3eae..4ce88b7 100644
--- a/content/docs/users/develop-with-rpc/index.html
+++ b/content/docs/users/develop-with-rpc/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Develop with RPC">
<meta itemprop="description" content="Develop with RPC">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -443,19 +443,19 @@
<span class="nd">@Component</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">CodeFirstConsumerMain</span> <span class="o">{</span>
<span class="nd">@RpcReference</span><span class="o">(</span><span class="n">microserviceName</span> <span class="o">=</span> <span class="s">"codefirst"</span><span class="o">,</span> <span class="n">schemaId</span> <span class="o">=</span> <span class="s">"codeFirstHello"</span><span class="o">)</span>
- <span class="kd">private</span> <span class="kd">static</span> <span class="n">Hello</span> <span class="n">hello</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">static</span> <span class="nc">Hello</span> <span class="n">hello</span><span class="o">;</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="n">init</span><span class="o">();</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHi</span><span class="o">(</span><span class="s">"Java Chassis"</span><span class="o">));</span>
- <span class="n">Person</span> <span class="n">person</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Person</span><span class="o">();</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHi</span><span class="o">(</span><span class="s">"Java Chassis"</span><span class="o">));</span>
+ <span class="nc">Person</span> <span class="n">person</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Person</span><span class="o">();</span>
<span class="n">person</span><span class="o">.</span><span class="na">setName</span><span class="o">(</span><span class="s">"ServiceComb/Java Chassis"</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHello</span><span class="o">(</span><span class="n">person</span><span class="o">));</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">hello</span><span class="o">.</span><span class="na">sayHello</span><span class="o">(</span><span class="n">person</span><span class="o">));</span>
<span class="o">}</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -474,24 +474,24 @@
<p>Then use <code class="highlighter-rouge">BeanUtils.getBean</code> to get <code class="highlighter-rouge">Hello</code> provider:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Hello</span> <span class="n">hello</span> <span class="o">=</span> <span class="n">BeanUtils</span><span class="o">.</span><span class="na">getBean</span><span class="o">(</span><span class="s">"hello"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Hello</span> <span class="n">hello</span> <span class="o">=</span> <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">getBean</span><span class="o">(</span><span class="s">"hello"</span><span class="o">);</span>
</code></pre></div></div>
<h4 id="second-way-get-bean-then-use-field">Second way: get Bean, then use field</h4>
<p>First use <code class="highlighter-rouge">BeanUtils.getBean</code> to get Bean of <code class="highlighter-rouge">CodeFirstConsumerMain</code>:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">//Default instance name of Spring Bean is same as class name with first char low-cased</span>
-<span class="n">CodeFirstConsumerMain</span> <span class="n">consumer</span> <span class="o">=</span> <span class="n">BeanUtils</span><span class="o">.</span><span class="na">getBean</span><span class="o">(</span><span class="s">"codeFirstConsumerMain"</span><span class="o">);</span>
+<span class="nc">CodeFirstConsumerMain</span> <span class="n">consumer</span> <span class="o">=</span> <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">getBean</span><span class="o">(</span><span class="s">"codeFirstConsumerMain"</span><span class="o">);</span>
</code></pre></div></div>
<p>Then get <code class="highlighter-rouge">hello</code> via Getter：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Hello</span> <span class="nf">getHello</span><span class="o">()</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="nc">Hello</span> <span class="nf">getHello</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">hello</span><span class="o">;</span>
<span class="o">}</span>
</code></pre></div></div>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Hello</span> <span class="n">hello</span> <span class="o">=</span> <span class="n">consumer</span><span class="o">.</span><span class="na">getHello</span><span class="o">()</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Hello</span> <span class="n">hello</span> <span class="o">=</span> <span class="n">consumer</span><span class="o">.</span><span class="na">getHello</span><span class="o">()</span>
</code></pre></div></div>
<blockquote>
diff --git a/content/docs/users/develop-with-spring-boot-starter/index.html b/content/docs/users/develop-with-spring-boot-starter/index.html
index 716fadf..cfb355d 100644
--- a/content/docs/users/develop-with-spring-boot-starter/index.html
+++ b/content/docs/users/develop-with-spring-boot-starter/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Develop Microservice with Spring Boot Starter">
<meta itemprop="description" content="Develop Microservice with Spring Boot Starter">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -475,15 +475,15 @@
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestParam</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.models.Person</span><span class="o">;</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/springmvchello"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/springmvchello"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringmvcHelloImpl</span> <span class="o">{</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhi"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"name"</span><span class="o">)</span> <span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhi"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"name"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span> <span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span> <span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="err"> </span><span class="o">}</span>
<span class="o">}</span>
@@ -542,8 +542,8 @@ Spring Boot had include a default Bean discovery policy, if Spring Boot can foun
<span class="c1">//EnableServiceComb annotation is used to init ServiceComb in Spring Boot</span>
<span class="nd">@EnableServiceComb</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">Application</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">Application</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/docs/users/develop-with-springmvc/index.html b/content/docs/users/develop-with-springmvc/index.html
index b583d0f..34eac5c 100644
--- a/content/docs/users/develop-with-springmvc/index.html
+++ b/content/docs/users/develop-with-springmvc/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Develop Microservice with SpringMVC">
<meta itemprop="description" content="Develop Microservice with SpringMVC">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -474,15 +474,15 @@
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestParam</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.models.Person</span><span class="o">;</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/springmvchello"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/springmvchello"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="nc">MediaType</span><span class="o">.</span><span class="na">APPLICATION_JSON</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringmvcHelloImpl</span> <span class="o">{</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhi"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"name"</span><span class="o">)</span> <span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhi"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nd">@RequestParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"name"</span><span class="o">)</span> <span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span> <span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/sayhello"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">POST</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="err"> </span> <span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="err"> </span><span class="o">}</span>
<span class="o">}</span>
@@ -529,10 +529,10 @@
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="c1">//initializing log, loading bean(including its parameters), and registering service, more detail can be found here : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/docs/users/develop-with-transparent-rpc/index.html b/content/docs/users/develop-with-transparent-rpc/index.html
index dd3a370..ceea3bb 100644
--- a/content/docs/users/develop-with-transparent-rpc/index.html
+++ b/content/docs/users/develop-with-transparent-rpc/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Develop Microservice with Transparent RPC">
<meta itemprop="description" content="Develop Microservice with Transparent RPC">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -467,8 +467,8 @@
<p><strong>Step 2</strong> Define a service API. Compile the Java API definition based on the API definition defined before development. The code is as follows:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">interface</span> <span class="nc">Hello</span> <span class="o">{</span>
- <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">);</span>
- <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">);</span>
+ <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div> </div>
</li>
@@ -478,14 +478,14 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.Hello</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.samples.common.schema.models.Person</span><span class="o">;</span>
- <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -519,14 +519,14 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.apache.servicecomb.provider.pojo.RpcSchema</span><span class="o">;</span>
<span class="nd">@RpcSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"pojoHello"</span><span class="o">)</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="n">Hello</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloImpl</span> <span class="kd">implements</span> <span class="nc">Hello</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHi</span><span class="o">(</span><span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello "</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="n">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">sayHello</span><span class="o">(</span><span class="nc">Person</span> <span class="n">person</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"Hello person "</span> <span class="o">+</span> <span class="n">person</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -569,10 +569,10 @@ Different from the Spring MVC and JAX-RS development modes, the transparent RPC
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Application</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="c1">//initializing log, loading bean(including its parameters), and registering service, more detail can be found here : https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/bootup.html</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/docs/users/distributed-tracing/index.html b/content/docs/users/distributed-tracing/index.html
index 5cc5878..6028dd0 100644
--- a/content/docs/users/distributed-tracing/index.html
+++ b/content/docs/users/distributed-tracing/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Distributed Tracing">
<meta itemprop="description" content="Distributed Tracing">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/docs/users/dynamic-config/index.html b/content/docs/users/dynamic-config/index.html
index 5667bc7..34f2392 100644
--- a/content/docs/users/dynamic-config/index.html
+++ b/content/docs/users/dynamic-config/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Dynamic Configuration">
<meta itemprop="description" content="Dynamic Configuration">
- <meta itemprop="dateModified" content="January 16, 2018">
+ <meta itemprop="dateModified" content="January 15, 2018">
<div class="page__inner-wrap">
@@ -497,7 +497,7 @@
<span class="na">clusters</span><span class="pi">:</span> <span class="s">default</span>
<span class="na">namespace</span><span class="pi">:</span> <span class="s">application</span>
<span class="na">token</span><span class="pi">:</span> <span class="s">testtoken</span>
- <span class="na">refreshInterval</span><span class="pi">:</span> <span class="s">10</span>
+ <span class="na">refreshInterval</span><span class="pi">:</span> <span class="m">10</span>
</code></pre></div></div>
<p> Configurations under <code class="highlighter-rouge">apollo.config</code> are parameters of the project that users created above, including serviceName, env, clusters, namespace, token and refreshInterval. Pay attention to <code class="highlighter-rouge">refreshInterval: 10</code>, it means service will fetch latest configuration items every each 10 seconds, default refresh cycle is 30 second if no value is configured here.
<code class="highlighter-rouge">serviceName</code> need to be <code class="highlighter-rouge">AppId</code> in apollo, please pay attention to that.</p>
@@ -509,14 +509,14 @@
<p> You can use<code class="highlighter-rouge">DynamicPropertyFactory.getInstance().getProperty()</code> to get the value of configuration items.</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Demo</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
- <span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
+ <span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
<span class="k">while</span> <span class="o">(</span><span class="kc">true</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">DynamicIntProperty</span> <span class="n">timeout</span> <span class="o">=</span> <span class="n">DynamicPropertyFactory</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span>
+ <span class="nc">DynamicIntProperty</span> <span class="n">timeout</span> <span class="o">=</span> <span class="nc">DynamicPropertyFactory</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span>
<span class="n">getIntProperty</span><span class="o">(</span><span class="s">"timeout"</span><span class="o">,</span> <span class="o">-</span><span class="mi">1</span><span class="o">);</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">timeout</span><span class="o">);</span>
- <span class="n">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="mi">3000</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">timeout</span><span class="o">);</span>
+ <span class="nc">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="mi">3000</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/docs/users/edge-in-1.0.0-m1/index.html b/content/docs/users/edge-in-1.0.0-m1/index.html
index 06b411e..fca4560 100644
--- a/content/docs/users/edge-in-1.0.0-m1/index.html
+++ b/content/docs/users/edge-in-1.0.0-m1/index.html
@@ -478,14 +478,14 @@
<h4 id="init-method">init Method</h4>
<p>Init routing rules of the Dispatcher, we use <a href="https://vertx.io/docs/vertx-web/java/#_routing_by_exact_path">Vertx Routing Rule</a>, for example we add two routing rules like:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="n">Router</span> <span class="n">router</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">String</span> <span class="n">regex</span> <span class="o">=</span> <span class="s">"/([^\\\\/]+)/([^\\\\/]+)/(.*)"</span><span class="o">;</span>
- <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">(</span><span class="nc">Router</span> <span class="n">router</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">String</span> <span class="n">regex</span> <span class="o">=</span> <span class="s">"/([^\\\\/]+)/([^\\\\/]+)/(.*)"</span><span class="o">;</span>
+ <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="nc">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">createBodyHandler</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">failureHandler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onFailure</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onRequest</span><span class= [...]
<span class="n">regex</span> <span class="o">=</span> <span class="s">"/([^\\\\/]+)/(.*)"</span><span class="o">;</span>
- <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
+ <span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="nc">CookieHandler</span><span class="o">.</span><span class="na">create</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="n">createBodyHandler</span><span class="o">());</span>
<span class="n">router</span><span class="o">.</span><span class="na">routeWithRegex</span><span class="o">(</span><span class="n">regex</span><span class="o">).</span><span class="na">failureHandler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onFailure</span><span class="o">).</span><span class="na">handler</span><span class="o">(</span><span class="k">this</span><span class="o">::</span><span class="n">onRequest</span><span class= [...]
<span class="o">}</span>
@@ -498,11 +498,11 @@
<h4 id="onrequest-method">onRequest Method</h4>
<p>Implement of redirection:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">void</span> <span class="nf">onRequest</span><span class="o">(</span><span class="n">RoutingContext</span> <span class="n">context</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">void</span> <span class="nf">onRequest</span><span class="o">(</span><span class="nc">RoutingContext</span> <span class="n">context</span><span class="o">)</span>
</code></pre></div></div>
<p>You can get micro-service name, path etc from context, then create and init a new EdgeInvocation for invoke:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">EdgeInvocation</span> <span class="n">edgeInvocation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">EdgeInvocation</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">EdgeInvocation</span> <span class="n">edgeInvocation</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">EdgeInvocation</span><span class="o">();</span>
<span class="n">edgeInvocation</span><span class="o">.</span><span class="na">setVersionRule</span><span class="o">(</span><span class="n">versionRule</span><span class="o">);</span>
<span class="n">edgeInvocation</span><span class="o">.</span><span class="na">init</span><span class="o">(</span><span class="n">serviceName</span><span class="o">,</span> <span class="n">context</span><span class="o">,</span> <span class="n">path</span><span class="o">,</span> <span class="n">httpServerFilters</span><span class="o">);</span>
<span class="n">edgeInvocation</span><span class="o">.</span><span class="na">edgeInvoke</span><span class="o">();</span>
diff --git a/content/docs/users/edging-service/nginx/index.html b/content/docs/users/edging-service/nginx/index.html
index 9f0cbf5..758ec50 100644
--- a/content/docs/users/edging-service/nginx/index.html
+++ b/content/docs/users/edging-service/nginx/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Using Confd and Nginx for Edge Service">
<meta itemprop="description" content="Using Confd and Nginx for Edge Service">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -518,23 +518,23 @@
<ul>
<li>Obtain all microservice information
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">List</span><span class="o"><</span><span class="n">Microservice</span><span class="o">></span> <span class="nf">getAllMicroservices</span><span class="o">();</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">List</span><span class="o"><</span><span class="nc">Microservice</span><span class="o">></span> <span class="nf">getAllMicroservices</span><span class="o">();</span>
</code></pre></div> </div>
</li>
<li>Obtain the unique ID of the microservice.
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">String</span> <span class="nf">getMicroserviceId</span><span class="o">(</span><span class="n">String</span> <span class="n">appId</span><span class="o">,</span> <span class="n">String</span> <span class="n">microserviceName</span><span class="o">,</span> <span class="n">String</span> <span class="n">versionRule</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">String</span> <span class="nf">getMicroserviceId</span><span class="o">(</span><span class="nc">String</span> <span class="n">appId</span><span class="o">,</span> <span class="nc">String</span> <span class="n">microserviceName</span><span class="o">,</span> <span class="nc">String</span> <span class="n">versionRule</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>Query the microservice static information based on the unique ID of the microservice.
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">Microservice</span> <span class="nf">getMicroservice</span><span class="o">(</span><span class="n">String</span> <span class="n">microserviceId</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">Microservice</span> <span class="nf">getMicroservice</span><span class="o">(</span><span class="nc">String</span> <span class="n">microserviceId</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>Query all the microservice instance information based on the unique IDs of the microservices.
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">List</span><span class="o"><</span><span class="n">MicroserviceInstance</span><span class="o">></span> <span class="nf">getMicroserviceInstance</span><span class="o">(</span><span class="n">String</span> <span class="n">consumerId</span><span class="o">,</span> <span class="n">String</span> <span class="n">providerId</span><span class="o">);</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">List</span><span class="o"><</span><span class="nc">MicroserviceInstance</span><span class="o">></span> <span class="nf">getMicroserviceInstance</span><span class="o">(</span><span class="nc">String</span> <span class="n">consumerId</span><span class="o">,</span> <span class="nc">String</span> <span class="n">providerId</span><span class="o">);</span>
</code></pre></div> </div>
</li>
<li>Query the instance end points information based on the application, interface, and version.
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">List</span><span class="o"><</span><span class="n">MicroserviceInstance</span><span class="o">></span> <span class="nf">findServiceInstance</span><span class="o">(</span><span class="n">String</span> <span class="n">consumerId</span><span class="o">,</span> <span class="n">String</span> <span class="n">appId</span><span class="o">,</span> <span class="n">String</spa [...]
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nc">List</span><span class="o"><</span><span class="nc">MicroserviceInstance</span><span class="o">></span> <span class="nf">findServiceInstance</span><span class="o">(</span><span class="nc">String</span> <span class="n">consumerId</span><span class="o">,</span> <span class="nc">String</span> <span class="n">appId</span><span class="o">,</span> <span class="nc">String [...]
</code></pre></div> </div>
</li>
</ul>
diff --git a/content/docs/users/edging-service/zuul/index.html b/content/docs/users/edging-service/zuul/index.html
index 9b05d5a..58c075b 100644
--- a/content/docs/users/edging-service/zuul/index.html
+++ b/content/docs/users/edging-service/zuul/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Using Zuul for Edge Service">
<meta itemprop="description" content="Using Zuul for Edge Service">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -493,8 +493,8 @@
<span class="nd">@EnableServiceComb</span>
<span class="nd">@EnableZuulProxy</span><span class="c1">//new Annotation</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ZuulMain</span><span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span><span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">ZuulMain</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span><span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="nc">ZuulMain</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
@@ -503,7 +503,7 @@
<p><strong>Step 3</strong> Define a routing policy in the application.yaml file</p>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">server</span><span class="pi">:</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">8754</span> <span class="c1">#api gateway service port number</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">8754</span> <span class="c1">#api gateway service port number</span>
<span class="na">zuul</span><span class="pi">:</span>
<span class="na">routes</span><span class="pi">:</span> <span class="c1">#Routing policy</span>
<span class="na">discoveryServer</span><span class="pi">:</span> <span class="s">/myServer/**</span> <span class="c1">#Routing rule</span>
diff --git a/content/docs/users/faq/index.html b/content/docs/users/faq/index.html
index d952775..eab4dd0 100644
--- a/content/docs/users/faq/index.html
+++ b/content/docs/users/faq/index.html
@@ -451,7 +451,7 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestController</span>
<span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"worker"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">WorkerController</span> <span class="o">{</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span><span class="o">=</span><span class="s">"/count"</span><span class="o">,</span> <span class="n">method</span><span class="o">=</span><span class="n">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span><span class="o">=</span><span class="s">"/count"</span><span class="o">,</span> <span class="n">method</span><span class="o">=</span><span class="nc">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
<span class="kd">public</span> <span class="kt">int</span> <span class="nf">getWorkerNumbers</span><span class="o">()</span> <span class="o">{</span>
<span class="o">...</span>
<span class="o">}</span>
diff --git a/content/docs/users/healthcheck/index.html b/content/docs/users/healthcheck/index.html
index 0501b46..9659ca2 100644
--- a/content/docs/users/healthcheck/index.html
+++ b/content/docs/users/healthcheck/index.html
@@ -459,28 +459,28 @@
</table>
<p>Example:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MySqlHealthChecker</span> <span class="kd">implements</span> <span class="n">HealthChecker</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MySqlHealthChecker</span> <span class="kd">implements</span> <span class="nc">HealthChecker</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"mysql"</span><span class="o">;</span>
<span class="o">}</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">HealthCheckResult</span> <span class="nf">check</span><span class="o">()</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="nc">HealthCheckResult</span> <span class="nf">check</span><span class="o">()</span> <span class="o">{</span>
<span class="c1">//add your health check code here</span>
- <span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+ <span class="nc">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
<span class="k">try</span> <span class="o">{</span>
- <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="s">"jdbc:mysql://localhost:3306/test_db?useSSL=false"</span><span class="o">,</span> <span class="s">"root"</span><span class="o">,</span> <span class="s">"pwd"</span><span class="o">);</span>
+ <span class="n">connection</span> <span class="o">=</span> <span class="nc">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="s">"jdbc:mysql://localhost:3306/test_db?useSSL=false"</span><span class="o">,</span> <span class="s">"root"</span><span class="o">,</span> <span class="s">"pwd"</span><span class="o">);</span>
<span class="k">return</span> <span class="k">new</span> <span class="nf">HealthCheckResult</span><span class="o">(</span><span class="kc">true</span><span class="o">,</span> <span class="s">"local mysql health check"</span><span class="o">,</span> <span class="s">""</span><span class="o">);</span>
- <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">SQLException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">error</span><span class="o">(</span><span class="s">"Cannot connect the localhost mysql. "</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
+ <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">SQLException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">error</span><span class="o">(</span><span class="s">"Cannot connect the localhost mysql. "</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
<span class="k">return</span> <span class="k">new</span> <span class="nf">HealthCheckResult</span><span class="o">(</span><span class="kc">false</span><span class="o">,</span> <span class="s">"local mysql health check"</span><span class="o">,</span> <span class="n">e</span><span class="o">.</span><span class="na">toString</span><span class="o">());</span>
<span class="o">}</span> <span class="k">finally</span> <span class="o">{</span>
<span class="k">if</span> <span class="o">(</span><span class="n">connection</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
<span class="k">try</span> <span class="o">{</span>
<span class="n">connection</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
- <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">SQLException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">LOG</span><span class="o">.</span><span class="na">error</span><span class="o">(</span><span class="s">"Close connect the localhost mysql error. "</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
+ <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="nc">SQLException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+ <span class="no">LOG</span><span class="o">.</span><span class="na">error</span><span class="o">(</span><span class="s">"Close connect the localhost mysql error. "</span><span class="o">,</span> <span class="n">e</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/docs/users/invoke-control/index.html b/content/docs/users/invoke-control/index.html
index 7ee67c0..55d8955 100644
--- a/content/docs/users/invoke-control/index.html
+++ b/content/docs/users/invoke-control/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Invoke Control">
<meta itemprop="description" content="Invoke Control">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/docs/users/local-develop-test/index.html b/content/docs/users/local-develop-test/index.html
index ee64dbd..6b60e84 100644
--- a/content/docs/users/local-develop-test/index.html
+++ b/content/docs/users/local-develop-test/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Local Development and Test">
<meta itemprop="description" content="Local Development and Test">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -480,10 +480,10 @@
<p><strong>Step 2</strong> Add the following code to the end of the Main function for service consumers.</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">xxxClient</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">System</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="s">"local.registry.file"</span><span class="o">,</span> <span class="s">"/path/registry.yaml"</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="s">"local.registry.file"</span><span class="o">,</span> <span class="s">"/path/registry.yaml"</span><span class="o">);</span>
<span class="c1">//your code</span>
- <span class="n">System</span><span class="o">.</span><span class="na">clearProperty</span><span class="o">(</span><span class="s">"local.registry.file"</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">clearProperty</span><span class="o">(</span><span class="s">"local.registry.file"</span><span class="o">);</span>
<span class="o">}</span>
</code></pre></div> </div>
diff --git a/content/docs/users/manage_springcloud_application_using_sc_and_gs/index.html b/content/docs/users/manage_springcloud_application_using_sc_and_gs/index.html
index 19111fe..3e9a3ca 100644
--- a/content/docs/users/manage_springcloud_application_using_sc_and_gs/index.html
+++ b/content/docs/users/manage_springcloud_application_using_sc_and_gs/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Using the Service Center and Governance Center to Manage the Spring Cloud Application">
<meta itemprop="description" content="Using the Service Center and Governance Center to Manage the Spring Cloud Application">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -532,7 +532,7 @@
<p>Add the following dependency to POM file:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="o"><</span><span class="n">dependency</span><span class="o">></span>
- <span class="o"><!--</span><span class="n">Use</span> <span class="n">the</span> <span class="n">configuration</span> <span class="n">center</span><span class="o">--></span>
+ <span class="o"><!--</span><span class="nc">Use</span> <span class="n">the</span> <span class="n">configuration</span> <span class="n">center</span><span class="o">--></span>
<span class="o"><</span><span class="n">group</span><span class="o">></span><span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">servicecomb</span><span class="o"></</span><span class="n">group</span><span class="o">></span>
<span class="o"><</span><span class="n">artifactId</span><span class="o">></span><span class="n">spring</span><span class="o">-</span><span class="n">boot</span><span class="o">-</span><span class="n">starter</span><span class="o">-</span><span class="n">discovery</span><span class="o"></</span><span class="n">artifactId</span><span class="o">></span>
<span class="o"></</span><span class="n">dependency</span><span class="o">></span>
@@ -545,8 +545,8 @@
<span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableServiceComb</span> <span class="c1">//new annotation</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">xxxServer</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">xxxServer</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nc">SpringApplication</span><span class="o">.</span><span class="na">run</span><span class="o">(</span><span class="n">xxxServer</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div> </div>
@@ -556,11 +556,11 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="c1">// ControllerImpl.class:</span>
<span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"test"</span><span class="o">)</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/compute"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="n">MediaType</span><span class="o">.</span><span class="na">TEXT_PLAIN</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/compute"</span><span class="o">,</span> <span class="n">produces</span> <span class="o">=</span> <span class="nc">MediaType</span><span class="o">.</span><span class="na">TEXT_PLAIN</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">ControllerImpl</span> <span class="o">{</span>
<span class="nd">@ResponseBody</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/hello/{name}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
- <span class="kd">public</span> <span class="n">String</span> <span class="nf">add</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/hello/{name}"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
+ <span class="kd">public</span> <span class="nc">String</span> <span class="nf">add</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="nc">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="s">"hello"</span> <span class="o">+</span> <span class="n">name</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/docs/users/metrics-in-1.0.0-m1/index.html b/content/docs/users/metrics-in-1.0.0-m1/index.html
index 88d4841..2e0d661 100644
--- a/content/docs/users/metrics-in-1.0.0-m1/index.html
+++ b/content/docs/users/metrics-in-1.0.0-m1/index.html
@@ -668,7 +668,7 @@ Tag name and value below:</p>
<span class="na">servicecomb</span><span class="pi">:</span>
<span class="na">metrics</span><span class="pi">:</span>
<span class="c1">#window time,same as servo.pollers,unit is millisecond,default value is 5000 (5 seconds)</span>
- <span class="na">window_time</span><span class="pi">:</span> <span class="s">5000</span>
+ <span class="na">window_time</span><span class="pi">:</span> <span class="m">5000</span>
</code></pre></div></div>
<p><strong>In order to decrease difficulty for understand and usage of metrics,we temporary do not support multi window time</strong></p>
@@ -689,12 +689,12 @@ Tag name and value below:</p>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/metrics"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">MetricsPublisher</span> <span class="o">{</span>
<span class="nd">@ApiResponses</span><span class="o">({</span>
- <span class="nd">@ApiResponse</span><span class="o">(</span><span class="n">code</span> <span class="o">=</span> <span class="mi">400</span><span class="o">,</span> <span class="n">response</span> <span class="o">=</span> <span class="n">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">message</span> <span class="o">=</span> <span class="s">"illegal request content"</span><span class="o">),</span>
+ <span class="nd">@ApiResponse</span><span class="o">(</span><span class="n">code</span> <span class="o">=</span> <span class="mi">400</span><span class="o">,</span> <span class="n">response</span> <span class="o">=</span> <span class="nc">String</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="n">message</span> <span class="o">=</span> <span class="s">"illegal request content"</span><span class="o">),</span>
<span class="o">})</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="n">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/"</span><span class="o">,</span> <span class="n">method</span> <span class="o">=</span> <span class="nc">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
<span class="nd">@CrossOrigin</span>
- <span class="kd">public</span> <span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">Double</span><span class="o">></span> <span class="nf">measure</span><span class="o">()</span> <span class="o">{</span>
- <span class="k">return</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">();</span>
+ <span class="kd">public</span> <span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">Double</span><span class="o">></span> <span class="nf">measure</span><span class="o">()</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">();</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -710,8 +710,8 @@ Tag name and value below:</p>
<h3 id="direct-programming-get">Direct programming get</h3>
<p>From above code you can known,the entry of data provider is org.apache.servicecomb.metrics.core.MonitorManager,so if you want develop your own metrics publisher,direct get it is enough.</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">MonitorManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
-<span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="na">measure</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">MonitorManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+<span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="na">measure</span><span class="o">();</span>
</code></pre></div></div>
<p><strong>Notice: Servo had marked with DEPRECATED by Netflix, we will use Netflix spectator instead in 1.0.0-m2, publish interface will be adjusted</strong></p>
@@ -719,7 +719,7 @@ Tag name and value below:</p>
<h2 id="how-to-use-metrics-data">How to Use Metrics Data</h2>
<p>Metrics data will output as Map<String,Double>,in order to let user easier fetch certain metric value,we provide org.apache.servicecomb.foundation.metrics.publish.MetricsLoader tool class:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="c1">//simulate MonitorManager.getInstance().measure() get all metrics data</span>
- <span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o"><>();</span>
+ <span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span> <span class="nc">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">HashMap</span><span class="o"><>();</span>
<span class="n">metrics</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"X(K1=1,K2=2,K3=3)"</span><span class="o">,</span> <span class="mf">100.0</span><span class="o">);</span>
<span class="n">metrics</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"X(K1=1,K2=20,K3=30)"</span><span class="o">,</span> <span class="mf">200.0</span><span class="o">);</span>
<span class="n">metrics</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"X(K1=2,K2=200,K3=300)"</span><span class="o">,</span> <span class="mf">300.0</span><span class="o">);</span>
@@ -731,10 +731,10 @@ Tag name and value below:</p>
<span class="n">metrics</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"Y(K1=1000,K2=2000,K3=3000)"</span><span class="o">,</span> <span class="mf">800.0</span><span class="o">);</span>
<span class="c1">//new MetricsLoader load all metrics data</span>
- <span class="n">MetricsLoader</span> <span class="n">loader</span> <span class="o">=</span> <span class="k">new</span> <span class="n">MetricsLoader</span><span class="o">(</span><span class="n">metrics</span><span class="o">);</span>
+ <span class="nc">MetricsLoader</span> <span class="n">loader</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">MetricsLoader</span><span class="o">(</span><span class="n">metrics</span><span class="o">);</span>
<span class="c1">//get name of 'X' Metrics then group by K1,K2</span>
- <span class="n">MetricNode</span> <span class="n">node</span> <span class="o">=</span> <span class="n">loader</span><span class="o">.</span><span class="na">getMetricTree</span><span class="o">(</span><span class="s">"X"</span><span class="o">,</span><span class="s">"K1"</span><span class="o">,</span><span class="s">"K2"</span><span class="o">);</span>
+ <span class="nc">MetricNode</span> <span class="n">node</span> <span class="o">=</span> <span class="n">loader</span><span class="o">.</span><span class="na">getMetricTree</span><span class="o">(</span><span class="s">"X"</span><span class="o">,</span><span class="s">"K1"</span><span class="o">,</span><span class="s">"K2"</span><span class="o">);</span>
<span class="c1">//get all Metrics of K1=1 and K2=20</span>
<span class="n">node</span><span class="o">.</span><span class="na">getChildrenNode</span><span class="o">(</span><span class="s">"1"</span><span class="o">).</span><span class="na">getChildrenNode</span><span class="o">(</span><span class="s">"20"</span><span class="o">).</span><span class="na">getMetrics</span><span class="o">();</span>
@@ -777,13 +777,13 @@ Tag name and value below:</p>
<p>Let us use Process Order make an example:</p>
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">OrderController</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">Counter</span> <span class="n">orderCount</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">Counter</span> <span class="n">orderTps</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">Timer</span> <span class="n">averageLatency</span><span class="o">;</span>
- <span class="kd">private</span> <span class="kd">final</span> <span class="n">MaxGauge</span> <span class="n">maxLatency</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">Counter</span> <span class="n">orderCount</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">Counter</span> <span class="n">orderTps</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">Timer</span> <span class="n">averageLatency</span><span class="o">;</span>
+ <span class="kd">private</span> <span class="kd">final</span> <span class="nc">MaxGauge</span> <span class="n">maxLatency</span><span class="o">;</span>
- <span class="n">OrderController</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">MonitorManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
+ <span class="nc">OrderController</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">MonitorManager</span> <span class="n">manager</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">();</span>
<span class="c1">//"product","levis jeans" and "model","512" are two custom Tag,support multi Tags</span>
<span class="k">this</span><span class="o">.</span><span class="na">orderCount</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"orderCount"</span><span class="o">,</span> <span class="s">"product"</span><span class="o">,</span> <span class="s">"levis jeans"</span><span class="o">,</span> <span class="s">"model"</span><span class="o">,</span> <span class="s">"512"</span><spa [...]
<span class="k">this</span><span class="o">.</span><span class="na">orderTps</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="na">getCounter</span><span class="o">(</span><span class="nl">StepCounter:</span><span class="o">:</span><span class="k">new</span><span class="o">,</span> <span class="s">"orderGenerated"</span><span class="o">,</span> <span class="s">"statistic"</span><span class="o">,</span> <span class="s">"tps"</span><span [...]
@@ -792,11 +792,11 @@ Tag name and value below:</p>
<span class="o">}</span>
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">makeOrder</span><span class="o">()</span> <span class="o">{</span>
- <span class="kt">long</span> <span class="n">startTime</span> <span class="o">=</span> <span class="n">System</span><span class="o">.</span><span class="na">nanoTime</span><span class="o">();</span>
+ <span class="kt">long</span> <span class="n">startTime</span> <span class="o">=</span> <span class="nc">System</span><span class="o">.</span><span class="na">nanoTime</span><span class="o">();</span>
<span class="c1">//process order logic</span>
<span class="c1">//...</span>
<span class="c1">//process finished</span>
- <span class="kt">long</span> <span class="n">totalTime</span> <span class="o">=</span> <span class="n">System</span><span class="o">.</span><span class="na">nanoTime</span><span class="o">()</span> <span class="o">-</span> <span class="n">startTime</span><span class="o">;</span>
+ <span class="kt">long</span> <span class="n">totalTime</span> <span class="o">=</span> <span class="nc">System</span><span class="o">.</span><span class="na">nanoTime</span><span class="o">()</span> <span class="o">-</span> <span class="n">startTime</span><span class="o">;</span>
<span class="c1">//increase order count</span>
<span class="k">this</span><span class="o">.</span><span class="na">orderCount</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
@@ -805,10 +805,10 @@ Tag name and value below:</p>
<span class="k">this</span><span class="o">.</span><span class="na">orderTps</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
<span class="c1">//record latency for average</span>
- <span class="k">this</span><span class="o">.</span><span class="na">averageLatency</span><span class="o">.</span><span class="na">record</span><span class="o">(</span><span class="n">totalTime</span><span class="o">,</span> <span class="n">TimeUnit</span><span class="o">.</span><span class="na">NANOSECONDS</span><span class="o">);</span>
+ <span class="k">this</span><span class="o">.</span><span class="na">averageLatency</span><span class="o">.</span><span class="na">record</span><span class="o">(</span><span class="n">totalTime</span><span class="o">,</span> <span class="nc">TimeUnit</span><span class="o">.</span><span class="na">NANOSECONDS</span><span class="o">);</span>
<span class="c1">//record max latency</span>
- <span class="k">this</span><span class="o">.</span><span class="na">maxLatency</span><span class="o">.</span><span class="na">update</span><span class="o">(</span><span class="n">TimeUnit</span><span class="o">.</span><span class="na">NANOSECONDS</span><span class="o">.</span><span class="na">toMillis</span><span class="o">(</span><span class="n">totalTime</span><span class="o">));</span>
+ <span class="k">this</span><span class="o">.</span><span class="na">maxLatency</span><span class="o">.</span><span class="na">update</span><span class="o">(</span><span class="nc">TimeUnit</span><span class="o">.</span><span class="na">NANOSECONDS</span><span class="o">.</span><span class="na">toMillis</span><span class="o">(</span><span class="n">totalTime</span><span class="o">));</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
@@ -817,7 +817,7 @@ Tag name and value below:</p>
<p>1.Metric ID is join name and all tags that pass to MonitorManager when getting monitor,so please keep uniqueness,metrics output of front example are:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span><span class="n">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">();</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Map</span><span class="o"><</span><span class="nc">String</span><span class="o">,</span><span class="nc">Double</span><span class="o">></span> <span class="n">metrics</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">();</span>
<span class="c1">//metrics.keySet() include：</span>
<span class="c1">// orderCount(product=levis jeans,model=512)</span>
@@ -828,15 +828,15 @@ Tag name and value below:</p>
<p>2.All get monitor method in MonitorManager act as <strong>get or new</strong>,so use same name and tags will return same one monitor:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Counter</span> <span class="n">counter1</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"orderGenerated"</span><span class="o">,</span> <span class="s">"product"</span><span class="o">,</span> <span [...]
-<span class="n">Counter</span> <span class="n">counter2</span> <span class="o">=</span> <span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"orderGenerated"</span><span class="o">,</span> <span class="s">"product"</span><span class="o">,</span> <span class="s">"levis jeans"</span><span class="o">,</span> <span class="s">"model"</span><span class= [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">Counter</span> <span class="n">counter1</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"orderGenerated"</span><span class="o">,</span> <span class="s">"product"</span><span class="o">,</span> <spa [...]
+<span class="nc">Counter</span> <span class="n">counter2</span> <span class="o">=</span> <span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">getCounter</span><span class="o">(</span><span class="s">"orderGenerated"</span><span class="o">,</span> <span class="s">"product"</span><span class="o">,</span> <span class="s">"levis jeans"</span><span class="o">,</span> <span class="s">"model"</span><span clas [...]
<span class="n">counter1</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
<span class="n">counter2</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
-<span class="n">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mi">2</span><span class="o">,</span><span class="n">counter1</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
-<span class="n">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mi">2</span><span class="o">,</span><span class="n">counter2</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
-<span class="n">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mf">2.0</span><span class="o">,</span><span class="n">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="s">"orderGenerated(product=levis jeans,model=512)"</span><span class="o">),</span><sp [...]
+<span class="nc">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mi">2</span><span class="o">,</span><span class="n">counter1</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+<span class="nc">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mi">2</span><span class="o">,</span><span class="n">counter2</span><span class="o">.</span><span class="na">getValue</span><span class="o">());</span>
+<span class="nc">Assert</span><span class="o">.</span><span class="na">assertEquals</span><span class="o">(</span><span class="mf">2.0</span><span class="o">,</span><span class="nc">MonitorManager</span><span class="o">.</span><span class="na">getInstance</span><span class="o">().</span><span class="na">measure</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="s">"orderGenerated(product=levis jeans,model=512)"</span><span class="o">),</span>< [...]
</code></pre></div></div>
<p><strong>Performance of get monitor from MonitorManager is slightly lower,so please get all monitors what needed when init,then cache them for later use,like OrderController example.</strong></p>
diff --git a/content/docs/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html b/content/docs/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
index e56227c..e52c071 100644
--- a/content/docs/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
+++ b/content/docs/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
@@ -468,7 +468,7 @@ As an integration(optional) module,the implementation code is in metrics-integra
<span class="na">metrics</span><span class="pi">:</span>
<span class="na">prometheus</span><span class="pi">:</span>
<span class="c1">#prometheus provider port</span>
- <span class="na">port</span><span class="pi">:</span> <span class="s">9696</span>
+ <span class="na">port</span><span class="pi">:</span> <span class="m">9696</span>
</code></pre></div></div>
<p><em>If do not config,default value is 9696</em></p>
<h3 id="maven-configuration">Maven Configuration</h3>
diff --git a/content/docs/users/run-mode/index.html b/content/docs/users/run-mode/index.html
index b6d5317..05434b7 100644
--- a/content/docs/users/run-mode/index.html
+++ b/content/docs/users/run-mode/index.html
@@ -444,9 +444,9 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.BeanUtils</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.Log4jUtils</span><span class="o">;</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">MainServer</span> <span class="o">{</span>
- <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
- <span class="err"> </span><span class="n">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="err">#</span><span class="n">Log</span> <span class="n">initialization</span>
- <span class="err"> </span><span class="n">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="err">#</span> <span class="n">Spring</span> <span class="n">bean</span> <span class="n">initialization</span>
+ <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
+ <span class="err"> </span><span class="nc">Log4jUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="err">#</span><span class="nc">Log</span> <span class="n">initialization</span>
+ <span class="err"> </span><span class="nc">BeanUtils</span><span class="o">.</span><span class="na">init</span><span class="o">();</span> <span class="err">#</span> <span class="nc">Spring</span> <span class="n">bean</span> <span class="n">initialization</span>
<span class="c1">// other codes omitted</span>
<span class="o">}</span>
<span class="o">}</span>
diff --git a/content/docs/users/service-configurations/index.html b/content/docs/users/service-configurations/index.html
index 96f0585..c6fd666 100644
--- a/content/docs/users/service-configurations/index.html
+++ b/content/docs/users/service-configurations/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Service Configurations">
<meta itemprop="description" content="Service Configurations">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -663,11 +663,11 @@
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">timeout</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
- <span class="na">timeoutInMilliseconds</span><span class="pi">:</span> <span class="s">30000</span>
+ <span class="na">timeoutInMilliseconds</span><span class="pi">:</span> <span class="m">30000</span>
<span class="na">circuitBreaker</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
- <span class="na">sleepWindowInMilliseconds</span><span class="pi">:</span> <span class="s">15000</span>
- <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="s">20</span>
+ <span class="na">sleepWindowInMilliseconds</span><span class="pi">:</span> <span class="m">15000</span>
+ <span class="na">requestVolumeThreshold</span><span class="pi">:</span> <span class="m">20</span>
<span class="na">fallback</span><span class="pi">:</span>
<span class="na">Consumer</span><span class="pi">:</span>
<span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
diff --git a/content/docs/users/service-contract/index.html b/content/docs/users/service-contract/index.html
index 412fa4a..f4272a1 100644
--- a/content/docs/users/service-contract/index.html
+++ b/content/docs/users/service-contract/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Service Contract">
<meta itemprop="description" content="Service Contract">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/docs/users/service-definition/index.html b/content/docs/users/service-definition/index.html
index a1c0278..95e04e2 100644
--- a/content/docs/users/service-definition/index.html
+++ b/content/docs/users/service-definition/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Service Definition">
<meta itemprop="description" content="Service Definition">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/docs/users/service-heartbeat/index.html b/content/docs/users/service-heartbeat/index.html
index 6ec4080..2b74626 100644
--- a/content/docs/users/service-heartbeat/index.html
+++ b/content/docs/users/service-heartbeat/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Service Heartbeat">
<meta itemprop="description" content="Service Heartbeat">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -433,12 +433,12 @@
<p><code class="highlighter-rouge">ServiceRegistryClient</code> provides heartbeat to send heartbeats. You can call it as required. The sample code is as follows:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="nc">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception</span> <span class="o">{</span>
<span class="c1">// Register the microservice and the instance first</span>
<span class="c1">// Send the heartbeats. Otherwise, the instances will be lost.</span>
<span class="k">while</span> <span class="o">(</span><span class="kc">true</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"heartbeat sended:"</span> <span class="o">+</span> <span class="n">client</span><span class="o">.</span><span class="na">heartbeat</span><span class="o">(</span><span class="n">service2</span><span class="o">.</span><span class="na">getServiceId</span><span class="o">(),</span> <span class="n">instance</span><s [...]
- <span class="n">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="mi">3000</span><span class="o">);</span>
+ <span class="nc">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"heartbeat sended:"</span> <span class="o">+</span> <span class="n">client</span><span class="o">.</span><span class="na">heartbeat</span><span class="o">(</span><span class="n">service2</span><span class="o">.</span><span class="na">getServiceId</span><span class="o">(),</span> <span class="n">instance</span>< [...]
+ <span class="nc">Thread</span><span class="o">.</span><span class="na">sleep</span><span class="o">(</span><span class="mi">3000</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
</code></pre></div></div>
diff --git a/content/docs/users/service-interface-constraints/index.html b/content/docs/users/service-interface-constraints/index.html
index 1287d8f..18a2974 100644
--- a/content/docs/users/service-interface-constraints/index.html
+++ b/content/docs/users/service-interface-constraints/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="API Constraints">
<meta itemprop="description" content="API Constraints">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
@@ -429,18 +429,18 @@
<p>For example:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Person</span> <span class="nf">query</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">);</span>
-<span class="kd">public</span> <span class="n">Object</span> <span class="nf">query</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">);</span>
-<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Person</span> <span class="o">{</span><span class="n">String</span> <span class="n">name</span><span class="o">;}</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="nc">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
+<span class="kd">public</span> <span class="nc">Object</span> <span class="nf">query</span><span class="o">(</span><span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">Person</span> <span class="o">{</span><span class="nc">String</span> <span class="n">name</span><span class="o">;}</span>
</code></pre></div></div>
<p>Obviously, if API 1 is called, we know that an ID parameter of String type needs to be transferred. The returned value is of Person type, which contains a string-typed name parameter. If API 2 is called, we do not know how to process the returned value, and need to refer to documents provided by the service provider. API 2 is developed in the perspective of RPC developers.</p>
<p>To release an API as a REST API, we can use the swagger file; specify the ID to be transmitted using RequestParam, PathVariable, or RequestBody; or use the label provided by SpringMVC or JAX-RS.</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@RequestParam</span> <span class="n">String</span> <span class="n">id</span><span class="o">);</span>
-<span class="kd">public</span> <span class="n">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="n">String</span> <span class="n">id</span><span class="o">);</span>
-<span class="kd">public</span> <span class="n">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="n">String</span> <span class="n">id</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="nc">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@RequestParam</span> <span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
+<span class="kd">public</span> <span class="nc">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@PathVariable</span> <span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
+<span class="kd">public</span> <span class="nc">Person</span> <span class="nf">query</span><span class="o">(</span><span class="nd">@RequestBody</span> <span class="nc">String</span> <span class="n">id</span><span class="o">);</span>
</code></pre></div></div>
<p>Generally , simple data types, such as String and int, are transmitted in RequestParam or PathVariable, and complex data types are transmitted in RequestBody after being coded using JSON, to reduce problems cause by HTTP protocol restrictions on developers.</p>
@@ -456,13 +456,13 @@
</code></pre></div> </div>
</li>
<li>Generic type
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">PersonHolder</span><span class="o"><</span><span class="n">T</span><span class="o">></span> <span class="o">{...}</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">PersonHolder</span><span class="o"><</span><span class="no">T</span><span class="o">></span> <span class="o">{...}</span>
</code></pre></div> </div>
</li>
<li>
<p>A collection type of the preceding types or a set without a specified type, such as <code class="highlighter-rouge">List<IPerson>, Map<String, PersonHolder<?>>, List, Map</code>. such as <code class="highlighter-rouge">List<String>, List<Person></code> are supported.</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">GroupOfPerson</span> <span class="o">{</span><span class="n">IPerson</span> <span class="n">master</span> <span class="o">...}</span>
+ <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">GroupOfPerson</span> <span class="o">{</span><span class="nc">IPerson</span> <span class="n">master</span> <span class="o">...}</span>
</code></pre></div> </div>
</li>
</ul>
diff --git a/content/docs/users/setup-environment/index.html b/content/docs/users/setup-environment/index.html
index 4228f80..2676344 100644
--- a/content/docs/users/setup-environment/index.html
+++ b/content/docs/users/setup-environment/index.html
@@ -572,38 +572,38 @@ manager_cluster = "10.12.0.4:2379"
</code></pre></div></div>
<p>Will return :</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"instances"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"instances"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"instanceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e9e976f9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e99f4cf9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"endpoints"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"instanceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e9e976f9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e99f4cf9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"endpoints"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="s2">"rest://10.12.0.1:30100"</span><span class="w">
</span><span class="p">],</span><span class="w">
- </span><span class="s2">"hostName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"service_center_10_12_0_1"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"UP"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"interval"</span><span class="p">:</span><span class="w"> </span><span class="mi">30</span><span class="p">,</span><span class="w">
- </span><span class="s2">"times"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="w">
+ </span><span class="nl">"hostName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"service_center_10_12_0_1"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"UP"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"interval"</span><span class="p">:</span><span class="w"> </span><span class="mi">30</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"times"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012543"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"modTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012543"</span><span class="w">
+ </span><span class="nl">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012543"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"modTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012543"</span><span class="w">
</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"instanceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"16d4cb35f9e011e7a58a286ed488ff9f"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"serviceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e99f4cf9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"endpoints"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"instanceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"16d4cb35f9e011e7a58a286ed488ff9f"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"serviceId"</span><span class="p">:</span><span class="w"> </span><span class="s2">"d6e99f4cf9df11e7a72b286ed488ff9f"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"endpoints"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="s2">"rest://10.12.0.2:30100"</span><span class="w">
</span><span class="p">],</span><span class="w">
- </span><span class="s2">"hostName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"service_center_10_12_0_2"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"UP"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
- </span><span class="s2">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"interval"</span><span class="p">:</span><span class="w"> </span><span class="mi">30</span><span class="p">,</span><span class="w">
- </span><span class="s2">"times"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="w">
+ </span><span class="nl">"hostName"</span><span class="p">:</span><span class="w"> </span><span class="s2">"service_center_10_12_0_2"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"UP"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"mode"</span><span class="p">:</span><span class="w"> </span><span class="s2">"push"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"interval"</span><span class="p">:</span><span class="w"> </span><span class="mi">30</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"times"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="w">
</span><span class="p">},</span><span class="w">
- </span><span class="s2">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012650"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"modTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012650"</span><span class="w">
+ </span><span class="nl">"timestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012650"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"modTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1516012650"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">]</span><span class="w">
</span><span class="p">}</span><span class="w">
diff --git a/content/docs/users/use-service-contract/index.html b/content/docs/users/use-service-contract/index.html
index f7781a1..3abefc7 100644
--- a/content/docs/users/use-service-contract/index.html
+++ b/content/docs/users/use-service-contract/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Service Using API Definitions">
<meta itemprop="description" content="Service Using API Definitions">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/docs/users/use-tls/index.html b/content/docs/users/use-tls/index.html
index d0228b9..c6f2eef 100644
--- a/content/docs/users/use-tls/index.html
+++ b/content/docs/users/use-tls/index.html
@@ -396,7 +396,7 @@
<meta itemprop="headline" content="Using TLS for Communication">
<meta itemprop="description" content="Using TLS for Communication">
- <meta itemprop="dateModified" content="August 16, 2017">
+ <meta itemprop="dateModified" content="August 15, 2017">
<div class="page__inner-wrap">
diff --git a/content/faqs/index.html b/content/faqs/index.html
index 5beb1cd..65d809c 100644
--- a/content/faqs/index.html
+++ b/content/faqs/index.html
@@ -362,7 +362,7 @@
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@RestController</span>
<span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"worker"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">WorkerController</span> <span class="o">{</span>
- <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span><span class="o">=</span><span class="s">"/count"</span><span class="o">,</span> <span class="n">method</span><span class="o">=</span><span class="n">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
+ <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">value</span><span class="o">=</span><span class="s">"/count"</span><span class="o">,</span> <span class="n">method</span><span class="o">=</span><span class="nc">RequestMethod</span><span class="o">.</span><span class="na">GET</span><span class="o">)</span>
<span class="kd">public</span> <span class="kt">int</span> <span class="nf">getWorkerNumbers</span><span class="o">()</span> <span class="o">{</span>
<span class="o">...</span>
<span class="o">}</span>
diff --git a/content/feed.xml b/content/feed.xml
index da01e18..0050800 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.5">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2019-11-21T16:27:35+08:00</updated><id>/feed.xml</id><title type="html">Apache ServiceComb</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{"name"=>nil, "avatar"=>" [...]
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.5">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2019-12-09T12:18:26+08:00</updated><id>/feed.xml</id><title type="html">Apache ServiceComb</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{"name"=>nil, "avatar"=>" [...]
<p>本次讲座得到北邮计算机学院闫博、徐飒等老师以及广大同学的鼎力支持和参与。报名通道开放伊始，原定200个的参会名额即被定满，经过老师们积极协调临时增加了部分名额，但是由于场地资源有限，这次没有报上名的同学，期待下次再会面啦&gt;_&lt;~~</p>
@@ -128,7 +128,7 @@ $.paths./pets/{petId}.get.tags[0] : 不在$.tags所定义的范围内
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">openapi</span><span class="pi">:</span> <span class="s2">"</span><span class="s">3.0.0"</span>
<span class="na">info</span><span class="pi">:</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">1.0</span>
+ <span class="na">version</span><span class="pi">:</span> <span class="m">1.0</span>
<span class="na">title</span><span class="pi">:</span> <span class="s">Swagger Petstore</span>
<span class="na">paths</span><span class="pi">:</span>
<span class="s">/pets/{petId}</span><span class="pi">:</span>
@@ -168,7 +168,7 @@ $.paths./pets/{petId}.get.tags[0] : 不在$.tags所定义的范围内
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">openapi</span><span class="pi">:</span> <span class="s2">"</span><span class="s">3.0.0"</span>
<span class="na">info</span><span class="pi">:</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">1.1</span>
+ <span class="na">version</span><span class="pi">:</span> <span class="m">1.1</span>
<span class="na">title</span><span class="pi">:</span> <span class="s">Swagger Petstore</span>
<span class="na">paths</span><span class="pi">:</span>
<span class="s">/pets/{petId}</span><span class="pi">:</span>
@@ -386,29 +386,29 @@ $.paths./pets/{petId}.get.tags[0] : 不在$.tags所定义的范围内
<p>下面是Product的Schema：</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
<p>下面是ProductPrice的Schema：</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"price"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;number&gt;"</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"price"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;number&gt;"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
<p>Product Service返回的Schema则是：</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="s2">"products"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+ </span><span class="nl">"products"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="p">{</span><span class="w">
- </span><span class="s2">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
- </span><span class="s2">"price"</span><span class="p">:</span><span class="w"> </span><span class="err">&lt;number&gt;</span><span class="w">
+ </span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"description"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;string&gt;"</span><span class="p">,</span><span class="w">
+ </span><span class="nl">"price"</span><span class="p">:</span><span class="w"> </span><span class="err">&lt;number&gt;</span><span class="w">
</span><span class="p">}</span><span class="w">
</span><span class="p">]</span><span class="w">
</span><span class="p">}</span><span class="w">
@@ -534,16 +534,16 @@ ENDRULE
<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">Stepdefs</span> <span class="o">{</span>
- <span class="kd">private</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;&gt;</span> <span class="n [...]
+ <span class="kd">private</span> <span class="nc">List</span><span class="o">&lt;</span><span class="nc">Map</span><span class="o">&lt;</span><span class="nc">String</span><span class="o">,</span> <span class="nc">String</span><span class="o">&gt;&gt;</span> <span class=&qu [...]
<span class="nd">@Given</span><span class="o">(</span><span class="s">"^Product Service is up and running$"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">productServiceIsUpAndRunning</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">probe</span><span class="o">(</span><span class="s">"Product Service"</span><span class="o">,</span> <span class="n">PRODUCT_ADDRESS</span><span class="o">);</span>
+ <span class="n">probe</span><span class="o">(</span><span class="s">"Product Service"</span><span class="o">,</span> <span class="no">PRODUCT_ADDRESS</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@And</span><span class="o">(</span><span class="s">"^Product Price Service is up and running$"</span><span class="o">)</span>
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">productPriceServiceIsUpAndRunning</span><span class="o">()</span> <span class="o">{</span>
- <span class="n">probe</span><span class="o">(</span><span class="s">"Product Price Service"</span><span class="o">,</span> <span class="n">PRODUCT_PRICE_ADDRESS</span><span class="o">);</span>
+ <span class="n">probe</span><span class="o">(</span><span class="s">"Product Price Service"</span><span class="o">,</span> <span class="no">PRODUCT_PRICE_ADDRESS</span><span class="o">);</span>
<span class="n">clearBytemanScript</span><span class="o">();</span>
<span class="o">}</span>
@@ -551,22 +551,22 @@ ENDRULE
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">queryProductList</span><span class="o">()</span> <span class="o">{</span>
<span class="n">answer</span> <span class="o">=</span> <span class="n">given</span><span class="o">()</span>
<span class="o">.</span><span class="na">when</span><span class="o">()</span>
- <span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="n">PRODUCT_ADDRESS</span> <span class="o">+</span> <span class="s">"/products"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="no">PRODUCT_ADDRESS</span> <span class="o">+</span> <span class="s">"/products"</span><span class="o">)</span>
<span class="o">.</span><span class="na">then</span><span class="o">()</span>
<span class="o">.</span><span class="na">statusCode</span><span class="o">(</span><span class="n">is</span><span class="o">(</span><span class="mi">200</span><span class="o">))</span>
<span class="o">.</span><span class="na">extract</span><span class="o">()</span>
<span class="o">.</span><span class="na">body</span><span class="o">()</span>
<span class="o">.</span><span class="na">jsonPath</span><span class="o">()</span>
- <span class="o">.</span><span class="na">getList</span><span class="o">(</span><span class="s">"products"</span><span class="o">,</span> <span class="n">Map</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+ <span class="o">.</span><span class="na">getList</span><span class="o">(</span><span class="s">"products"</span><span class="o">,</span> <span class="nc">Map</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Given</span><span class="o">(</span><span class="s">"^Install the byteman script ([A-Za-z0-9_\\.]+) to Product Price Service$"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">injectExceptionIntoProductPriceService</span><span class="o">(</span><span class="n">String</span> <span class="n">bytemanScript</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</ [...]
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">injectExceptionIntoProductPriceService</span><span class="o">(</span><span class="nc">String</span> <span class="n">bytemanScript</span><span class="o">)</span> <span class="kd">throws</span> <span class="nc">Exception< [...]
<span class="n">injectBytemanScript</span><span class="o">(</span><span class="s">"target/test-classes/"</span> <span class="o">+</span> <span class="n">bytemanScript</span><span class="o">);</span>
<span class="o">}</span>
<span class="nd">@Then</span><span class="o">(</span><span class="s">"^Get following products$"</span><span class="o">)</span>
- <span class="kd">public</span> <span class="kt">void</span> <span class="nf">compareResult</span><span class="o">(</span><span class="n">List</span><span class="o">&lt;</span><span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o" [...]
+ <span class="kd">public</span> <span class="kt">void</span> <span class="nf">compareResult</span><span class="o">(</span><span class="nc">List</span><span class="o">&lt;</span><span class="nc">Map</span><span class="o">&lt;</span><span class="nc">String</span><span class="o&q [...]
<span class="n">assertThat</span><span class="o">(</span><span class="n">answer</span><span class="o">).</span><span class="na">containsExactlyInAnyOrderElementsOf</span><span class="o">(</span><span class="n">expected</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -685,166 +685,166 @@ ENDRULE
<p>[8] 本项目源码 https://github.com/chanjarster/microservice-acceptance-test-demo</p>
-<p>[9] 加入Servicecomb社区 http://servicecomb.incubator.apache.org/cn/docs/join_the_community/</p></content><author><name>Qian Jia</name><email>chanjarster@gmail.com</email><uri>https://github.com/chanjarster</uri></author><category term="微服务" /><summary type="html">本文将介绍如何给微服务架构的项目做验收测试</summary></entry><entry xml:lang="en"><title type="html">Apache ServiceComb Meetup - Shanghai 2019.06.24 Report (PDF Download)</title><link href="/docs/Apache-ServiceComb-Meetup-2019-Shanghai-Ku [...]
+<p>[9] 加入Servicecomb社区 http://servicecomb.incubator.apache.org/cn/docs/join_the_community/</p></content><author><name>Qian Jia</name><email>chanjarster@gmail.com</email><uri>https://github.com/chanjarster</uri></author><category term="微服务" /><summary type="html">本文将介绍如何给微服务架构的项目做验收测试</summary></entry><entry xml:lang="cn"><title type="html">Apache ServiceComb Meetup - Shanghai 2019.06.24 Report (PDF Download)</title><link href="/cn/docs/Apache-ServiceComb-Meetup-2019-Shanghai [...]
-<p>The event invited Apache Member, Apache Committer, Huawei Cloud ServiceStage Chief Engineer, Jingdong DBA Expert, Global Top10 IT Service Provider Development Manager and other senior practitioners to share experience,the topic of the speech includes Apache community development experience, enterprise PaaS responds to complex network topology cases, car brand digital marketing system microservice practices, high-performance service communication optimization techniques and so on [...]
+<p>本次活动邀请了Apache Member、Apache Committer、华为云云服务首席工程师、京东数科专家、全球Top10 IT服务提供商开发经理等各行业的资深从业者，携手为大家分享了Apache社区开发经验、企业级PaaS应对复杂网络拓补的案例、汽车品牌数字化营销系统微服务化实践、高性能服务间通信的优化技巧等诸多微服务技术及经验，ServiceComb社区也重磅发布了一系列解决用户应用微服务化痛点的创新新品。</p>
-<p>In the process of enterprise transformation to digitalization and cloudization, microservice is the best choice. However, it is not a silver bullet. Enterprises will encounter many challenges in the process of microservice. ServiceComb will continue to closely focus on users and developers,solve the problem of microservice pain points.</p>
+<p>在企业向数字化和云化转型过程中，微服务是不二选择，然而它并不是银弹，企业在微服务化过程中会遇到诸多挑战，ServiceComb将继续紧密围绕社区用户和开发者，携手解决微服务痛点问题。</p>
-<p>Adhering to the concept of “provide a one-stop open source micro-service solution to assist enterprises, users and developers migrate applications on the cloud, archieving efficient O&amp;M and management of microservice applications”,ServiceComb community initiates a convening order to mobilize aspiring people to join the community and do something interesting together.</p>
+<p>秉承“将复杂留给自己，极简留给用户，提供一站式的微服务开源解决方案，致力于帮助企业、用户和开发者将应用轻松微服务化上云，实现对微服务应用的高效运维管理” 的发展理念，社区发起召集令，动员有志者加入社区，一起做点有意思的事情。</p>
-<p><img src="/assets/images/Community_Summoned_en.png" alt="1" /></p>
+<p><img src="/assets/images/Community_Summoned_zh.png" alt="1" /></p>
<hr />
-<p><strong>Video review:</strong> <a href="https://huaweicloud.bugu.mudu.tv/watch/ym1vkamp">Link</a></p>
+<p><strong>全场视频回顾:</strong> <a href="https://huaweicloud.bugu.mudu.tv/watch/ym1vkamp">链接</a></p>
<hr />
-<p><strong>《ServiceComb opensource way》</strong> <a href="/assets/slides/20190624/1_ServiceComb_Opensource_Way.pdf">PDF Download</a></p>
+<p><strong>《ServiceComb开源这两年》</strong> <a href="/assets/slides/20190624/1_ServiceComb_Opensource_Way.pdf">PDF下载</a></p>
-<p><strong>Speaker：</strong> <strong>Willem Jiang</strong>, Apache Member, Apache ServiceComb VP</p>
+<p><strong>主讲人：</strong> <strong>姜宁</strong>，Apache软件基金会会员，华为开源能力中心技术专家，前红帽软件首席软件工程师，有十五年企业级开源中间件开发经验，有丰富的Java开发和使用经验，函数式编程爱好者。从2006年开始一直从事Apache开源中间件项目的开发工作，先后参与Apache CXF， Apache Camel，Apache ServiceMix以及Apache ServiceComb的开发。</p>
-<p><strong>Summary：</strong> This speech summarizes the experience and gains of ServiceComb open source in the past two years. Hope that to assist guys understand open source, participate in open source, and create a better future.</p>
+<p><strong>摘要：</strong> ServiceComb正式开源已经两年了，在这两年中我们经历了代码首发时的激动，由0到1拓展社区的困惑，以及结识到结伴同行的小伙伴的快乐， 如今ServiceComb已经成长为Apache软件基金会顶级项目。本次演讲将总结回顾ServiceComb开源这两年的感悟与收获，希望能够帮助大家了解开源，参与开源，共创美好未来。</p>
<hr />
-<p><strong>《Digital marketing system microservice practice of car brands》</strong> <a href="/assets/slides/20190624/2_NTTDATA_Microservice_Practices.pdf">PDF Download</a></p>
+<p><strong>《汽车品牌的数字化营销系统微服务实践》</strong> <a href="/assets/slides/20190624/2_NTTDATA_Microservice_Practices.pdf">PDF下载</a></p>
-<p><strong>Speaker：</strong> <strong>Xiaowei Zhu</strong>, NTTDATA Shanghai Branch, Digital Marketing Development Manager</p>
+<p><strong>主讲人：</strong> <strong>朱小卫</strong>，NTTDATA中国上海分公司Digital Marketing开发经理，15年+研发经验，丰富的电商、CRM等产品服务实践经验，近三年专注于汽车整车的数字化转型解决方案。</p>
-<p><strong>Summary：</strong> This speech shares the transformation of NTTDATA into microservice, and creates a digital marketing platform for car brands, assist enterprises to flexibly respond to market demands and supporting the practice of fast changing business scenarios of digital marketing.</p>
+<p><strong>摘要：</strong> NTTDATA是全球Top10内的IT服务提供商，为汽车、制造、航空、零售、服装等行业提供全渠道整合跨渠道协同、个性化营销及服务、消费者洞察大数据分析等数字化营销解决方案，本主题主要分享NTTDATA向微服务化转型，打造集中化、标准化、智能化、便利化的汽车品牌数字营销平台，帮助企业灵活应对市场需求，支持数字营销快速、多样、变化的业务场景的实践。</p>
<hr />
-<p><strong>《Microservice practice in enterprise PaaS》</strong> <a href="/assets/slides/20190624/3_Enterprise_PaaS_Microservice_Pratices.pdf">PDF Download</a></p>
+<p><strong>《企业级PaaS中的微服务应用揭秘》</strong> <a href="/assets/slides/20190624/3_Enterprise_PaaS_Microservice_Pratices.pdf">PDF下载</a></p>
-<p><strong>Speaker：</strong> <strong>Shawn Tian</strong>, Huawei Cloud ServiceStage Chief Engineer</p>
+<p><strong>主讲人：</strong> <strong>田晓亮</strong>，10年软件行业经验，现任华为公有云服务ServiceStage首席工程师。2012年进入云计算领域，对PaaS， DevOps，APM等有深入的研究和实践经验。负责公司微服务框架的设计，开发和落地，微服务引擎云服务商用上线公有云。</p>
-<p><strong>Summary：</strong> This speech shares Huawei Cloud PaaS platform using ServiceComb to solve complex network topology problems of distributed systems, assist users complete microservice transformation.</p>
+<p><strong>摘要：</strong> 我们在公有云交付PaaS平台，帮助用户管理应用，通过流水线进行持续交付，管领应用的全生命周期，当应用系统的网络拓扑变得不断复杂后，需要引入微服务架构模式，来解决分布式系统的复杂性，本主题将讲述PaaS平台如何使用ServiceComb帮助用户完成微服务转型。</p>
<hr />
-<p><strong>《ServiceComb innovation new projects release》</strong> <a href="/assets/slides/20190624/4_Innovation_New_Project_Release.pdf">PDF Download</a></p>
+<p><strong>《微服务创新新品发布》</strong> <a href="/assets/slides/20190624/4_Innovation_New_Project_Release.pdf">PDF下载</a></p>
-<p><strong>Speaker：</strong> <strong>Mabin</strong>, Apache ServiceComb member, Huawei Open Source Software Architect</p>
+<p><strong>主讲人：</strong> <strong>马彬</strong>，ServiceComb 社区成员，华为开源软件能力中心架构师，企业应用微服务化工程师，13+年电信级中间件平台、虚拟化、嵌入式操作系统与开源软件设计开发经验。</p>
-<p><strong>Summary：</strong> This speech shares the pain points of users in the process of implementing microservices transformation, as well as ServiceComb’s innovative projects, we look forward to working with more users and developers to think about how to solve the problems in microservices together.</p>
+<p><strong>摘要：</strong> ServiceComb在Aapche毕业已经约半年时间，在这半年里面，社区并未冒进地去迸发新的项目或特性，而是选择了认真听取用户的意见。如今，ServiceComb社区确定了系列解决用户微服务化过程中痛点的方向，并且开始在社区里面继续创新孵化。本主题将和大家分享这些获取到的痛点和孵化项目，期望与用户/开发者一起思考如何一起去摆平微服务中的难题。</p>
<hr />
-<p><strong>《ShardingSphere combines ServiceComb distributed transaction solution》</strong> <a href="/assets/slides/20190624/5_ShardingSphere_Distributed_Transaction_Solution.pdf">PDF Download</a></p>
+<p><strong>《解密ShardingSphere与ServiceComb联合打造的分布式事务解决方案》</strong> <a href="/assets/slides/20190624/5_ShardingSphere_Distributed_Transaction_Solution.pdf">PDF下载</a></p>
-<p><strong>Speaker：</strong> <strong>Juan Pan</strong>, Apache ShardingSphere member, Jingdong DBA Expert</p>
+<p><strong>主讲人：</strong> <strong>潘娟</strong>，京东数科高级DBA，主要负责京东数科数据库中间件开发、数据库运维自动化平台开发、生产数据库运维工作。多次参与京东6.18、11.11等大促活动的护航工作。曾负责京东数科数据库自动化平台设计与开发，现专注于Apache ShardingSphere分布式数据库中间件开发。乐于在数据库、自动化、分布式、中间件等相关领域进行学习和探索。</p>
-<p><strong>Summary：</strong> This speech revolves around distributed transactions, explains that ShardingSphere(the first ASF distributed database middleware project) to join forces with ServiceComb(the first ASF microservice top-level project) to implement distributed transactions solution in microservice and distributed database scenarios.</p>
+<p><strong>摘要：</strong> 业务层面的微服务架构大行其道，底层分布式数据库&amp;中间件如火如荼。在微服务场景下，各服务之间数据库相互独立，不能依靠单一数据库来实现跨服务的事务一致性；在分布式数据库集群状态下，又如何实现分布式事务呢？ShardingSphere作为首个Apache基金会的分布式数据库中间件项目与首个Apache微服务顶级项目ServiceComb强强联合，共同打造微服务与分布式数据库场景下的分布式事务解决方案。
+本次分享将围绕分布式事务，并以ShardingSphere与ServiceComb联合打造的分布式事务解决方案作为核心内容进行详细阐述和讲解。</p>
<hr />
-<p><strong>《High-performance service communication practice》</strong> <a href="/assets/slides/20190624/6_Microservice_High_Performance_Communication.pdf">PDF Download</a></p>
+<p><strong>《支持10万TPS的高性能服务间通信解读》</strong> <a href="/assets/slides/20190624/6_Microservice_High_Performance_Communication.pdf">PDF下载</a></p>
-<p><strong>Speaker：</strong> <strong>Bruce Liu</strong>, Apache Commiter</p>
+<p><strong>主讲人：</strong> <strong>刘宝</strong>，Apache软件基金会 Commiter，拥有10年以上java开发框架的开发和运维经验。热爱微服务，并持续为它们开发一些常用的工具，比如进行中的servicecomb-fence项目。也喜欢分享开发和软件工程能力建设方面的一些心得，它们都发布在华为云博客和知乎专栏上面。</p>
-<p><strong>Summary：</strong> This speech combines the communication optimization practices of servicecomb-java-chassis to illustrate some common methods of performance optimization, and from a practical perspective, sharing performance optimization in terms of system reliability, resource planning, and other aspects that are not easily perceived by developers directly. .</p>
+<p><strong>摘要：</strong> 200TPS的处理能力，已经能够满足很大一部分业务系统对于性能的要求。另外一方面，优化服务器间通信的性能的收益，很容易通过优化应用代码实现或者被应用代码状况抵消，还可以低成本的通过水平扩展处理能力等方式获得，因此开发者往往不重视通信能力的优化。本次演讲结合servicecomb-java-chassis的通信优化实践，说明性能优化的一些常见手段，并实践的视角，分享性能优化在系统可靠性、资源规划等其他不容易被开发者直接感知的方面的收益。</p>
<hr />
-<p><strong>《Huawei Cloud distributed transaction solution》</strong> <a href="/assets/slides/20190624/7_HuaweiCloud_Distributed_Transaction_DTM_Practices.pdf">PDF Download</a></p>
+<p><strong>《华为云分布式事务云服务实践》</strong> <a href="/assets/slides/20190624/7_HuaweiCloud_Distributed_Transaction_DTM_Practices.pdf">PDF下载</a></p>
-<p><strong>Speaker：</strong> <strong>Jon Wang</strong>, Huawei Cloud Architect</p>
+<p><strong>主讲人：</strong> <strong>王启军</strong>，华为云PaaS团队，负责java和go微服务框架。曾任当当网架构师，主导电商平台架构设计；曾就职于搜狐负责手机微博的研发。《持续演进的Cloud Native》作者，微信公众号“奔跑中的蜗牛”博主。</p>
-<p><strong>Summary：</strong> This topic explains how to implement distributed transactions when you build microservices based on Huawei Cloud through related scenarios. How to fail back? How to deal with timeouts? Explain in detail the principles behind it.</p>
+<p><strong>摘要：</strong> 微服务架构下，服务数量暴涨，一个服务可以完成的工作会被分发到多个服务，按照“服务自治”的原则，数据访问通过接口隔离，原本的单库事务变成了分布式事务，“当你开始考虑一致性问题的时候，才能说明你开始真正的了解微服务了”，本专题通过相关场景说明当你基于华为云构建微服务的时候，如何实现分布式事务？失败如何回退？超时如何处理？详细说明其背后的原理。</p>
<hr />
-<p><strong>more questions, welcome to scan the QR code or WeChat to add “ServiceComb Assistant</strong>
-<img src="/assets/images/QRcode.png" alt="1" /></p></content><author><name>Mabin</name></author><category term="Microservice" /><category term="Meetup" /><summary type="html">Apache ServiceComb Meetup</summary></entry><entry xml:lang="cn"><title type="html">Apache ServiceComb Meetup - Shanghai 2019.06.24 Report (PDF Download)</title><link href="/cn/docs/Apache-ServiceComb-Meetup-2019-Shanghai-KubeCon+CloudNative+OSS-Report/" rel="alternate" type="text/html [...]
+<p><strong>如您有更多问题关于Aapche ServiceComb，欢迎您扫码或微信添加“ServiceComb小助手”，我们将认真对待您的每一个问题</strong>
+<img src="/assets/images/QRcode.png" alt="1" /></p></content><author><name>Mabin</name></author><category term="微服务" /><category term="Meetup" /><summary type="html">Apache ServiceComb Meetup</summary></entry><entry xml:lang="en"><title type="html">Apache ServiceComb Meetup - Shanghai 2019.06.24 Report (PDF Download)</title><link href="/docs/Apache-ServiceComb-Meetup-2019-Shanghai-KubeCon+CloudNative+OSS-Report/" rel="alternate" type="text/html" title="Apa [...]
-<p>本次活动邀请了Apache Member、Apache Committer、华为云云服务首席工程师、京东数科专家、全球Top10 IT服务提供商开发经理等各行业的资深从业者，携手为大家分享了Apache社区开发经验、企业级PaaS应对复杂网络拓补的案例、汽车品牌数字化营销系统微服务化实践、高性能服务间通信的优化技巧等诸多微服务技术及经验，ServiceComb社区也重磅发布了一系列解决用户应用微服务化痛点的创新新品。</p>
+<p>The event invited Apache Member, Apache Committer, Huawei Cloud ServiceStage Chief Engineer, Jingdong DBA Expert, Global Top10 IT Service Provider Development Manager and other senior practitioners to share experience,the topic of the speech includes Apache community development experience, enterprise PaaS responds to complex network topology cases, car brand digital marketing system microservice practices, high-performance service communication optimization techniques and so on [...]
-<p>在企业向数字化和云化转型过程中，微服务是不二选择，然而它并不是银弹，企业在微服务化过程中会遇到诸多挑战，ServiceComb将继续紧密围绕社区用户和开发者，携手解决微服务痛点问题。</p>
+<p>In the process of enterprise transformation to digitalization and cloudization, microservice is the best choice. However, it is not a silver bullet. Enterprises will encounter many challenges in the process of microservice. ServiceComb will continue to closely focus on users and developers,solve the problem of microservice pain points.</p>
-<p>秉承“将复杂留给自己，极简留给用户，提供一站式的微服务开源解决方案，致力于帮助企业、用户和开发者将应用轻松微服务化上云，实现对微服务应用的高效运维管理” 的发展理念，社区发起召集令，动员有志者加入社区，一起做点有意思的事情。</p>
+<p>Adhering to the concept of “provide a one-stop open source micro-service solution to assist enterprises, users and developers migrate applications on the cloud, archieving efficient O&amp;M and management of microservice applications”,ServiceComb community initiates a convening order to mobilize aspiring people to join the community and do something interesting together.</p>
-<p><img src="/assets/images/Community_Summoned_zh.png" alt="1" /></p>
+<p><img src="/assets/images/Community_Summoned_en.png" alt="1" /></p>
<hr />
-<p><strong>全场视频回顾:</strong> <a href="https://huaweicloud.bugu.mudu.tv/watch/ym1vkamp">链接</a></p>
+<p><strong>Video review:</strong> <a href="https://huaweicloud.bugu.mudu.tv/watch/ym1vkamp">Link</a></p>
<hr />
-<p><strong>《ServiceComb开源这两年》</strong> <a href="/assets/slides/20190624/1_ServiceComb_Opensource_Way.pdf">PDF下载</a></p>
+<p><strong>《ServiceComb opensource way》</strong> <a href="/assets/slides/20190624/1_ServiceComb_Opensource_Way.pdf">PDF Download</a></p>
-<p><strong>主讲人：</strong> <strong>姜宁</strong>，Apache软件基金会会员，华为开源能力中心技术专家，前红帽软件首席软件工程师，有十五年企业级开源中间件开发经验，有丰富的Java开发和使用经验，函数式编程爱好者。从2006年开始一直从事Apache开源中间件项目的开发工作，先后参与Apache CXF， Apache Camel，Apache ServiceMix以及Apache ServiceComb的开发。</p>
+<p><strong>Speaker：</strong> <strong>Willem Jiang</strong>, Apache Member, Apache ServiceComb VP</p>
-<p><strong>摘要：</strong> ServiceComb正式开源已经两年了，在这两年中我们经历了代码首发时的激动，由0到1拓展社区的困惑，以及结识到结伴同行的小伙伴的快乐， 如今ServiceComb已经成长为Apache软件基金会顶级项目。本次演讲将总结回顾ServiceComb开源这两年的感悟与收获，希望能够帮助大家了解开源，参与开源，共创美好未来。</p>
+<p><strong>Summary：</strong> This speech summarizes the experience and gains of ServiceComb open source in the past two years. Hope that to assist guys understand open source, participate in open source, and create a better future.</p>
<hr />
-<p><strong>《汽车品牌的数字化营销系统微服务实践》</strong> <a href="/assets/slides/20190624/2_NTTDATA_Microservice_Practices.pdf">PDF下载</a></p>
+<p><strong>《Digital marketing system microservice practice of car brands》</strong> <a href="/assets/slides/20190624/2_NTTDATA_Microservice_Practices.pdf">PDF Download</a></p>
-<p><strong>主讲人：</strong> <strong>朱小卫</strong>，NTTDATA中国上海分公司Digital Marketing开发经理，15年+研发经验，丰富的电商、CRM等产品服务实践经验，近三年专注于汽车整车的数字化转型解决方案。</p>
+<p><strong>Speaker：</strong> <strong>Xiaowei Zhu</strong>, NTTDATA Shanghai Branch, Digital Marketing Development Manager</p>
-<p><strong>摘要：</strong> NTTDATA是全球Top10内的IT服务提供商，为汽车、制造、航空、零售、服装等行业提供全渠道整合跨渠道协同、个性化营销及服务、消费者洞察大数据分析等数字化营销解决方案，本主题主要分享NTTDATA向微服务化转型，打造集中化、标准化、智能化、便利化的汽车品牌数字营销平台，帮助企业灵活应对市场需求，支持数字营销快速、多样、变化的业务场景的实践。</p>
+<p><strong>Summary：</strong> This speech shares the transformation of NTTDATA into microservice, and creates a digital marketing platform for car brands, assist enterprises to flexibly respond to market demands and supporting the practice of fast changing business scenarios of digital marketing.</p>
<hr />
-<p><strong>《企业级PaaS中的微服务应用揭秘》</strong> <a href="/assets/slides/20190624/3_Enterprise_PaaS_Microservice_Pratices.pdf">PDF下载</a></p>
+<p><strong>《Microservice practice in enterprise PaaS》</strong> <a href="/assets/slides/20190624/3_Enterprise_PaaS_Microservice_Pratices.pdf">PDF Download</a></p>
-<p><strong>主讲人：</strong> <strong>田晓亮</strong>，10年软件行业经验，现任华为公有云服务ServiceStage首席工程师。2012年进入云计算领域，对PaaS， DevOps，APM等有深入的研究和实践经验。负责公司微服务框架的设计，开发和落地，微服务引擎云服务商用上线公有云。</p>
+<p><strong>Speaker：</strong> <strong>Shawn Tian</strong>, Huawei Cloud ServiceStage Chief Engineer</p>
-<p><strong>摘要：</strong> 我们在公有云交付PaaS平台，帮助用户管理应用，通过流水线进行持续交付，管领应用的全生命周期，当应用系统的网络拓扑变得不断复杂后，需要引入微服务架构模式，来解决分布式系统的复杂性，本主题将讲述PaaS平台如何使用ServiceComb帮助用户完成微服务转型。</p>
+<p><strong>Summary：</strong> This speech shares Huawei Cloud PaaS platform using ServiceComb to solve complex network topology problems of distributed systems, assist users complete microservice transformation.</p>
<hr />
-<p><strong>《微服务创新新品发布》</strong> <a href="/assets/slides/20190624/4_Innovation_New_Project_Release.pdf">PDF下载</a></p>
+<p><strong>《ServiceComb innovation new projects release》</strong> <a href="/assets/slides/20190624/4_Innovation_New_Project_Release.pdf">PDF Download</a></p>
-<p><strong>主讲人：</strong> <strong>马彬</strong>，ServiceComb 社区成员，华为开源软件能力中心架构师，企业应用微服务化工程师，13+年电信级中间件平台、虚拟化、嵌入式操作系统与开源软件设计开发经验。</p>
+<p><strong>Speaker：</strong> <strong>Mabin</strong>, Apache ServiceComb member, Huawei Open Source Software Architect</p>
-<p><strong>摘要：</strong> ServiceComb在Aapche毕业已经约半年时间，在这半年里面，社区并未冒进地去迸发新的项目或特性，而是选择了认真听取用户的意见。如今，ServiceComb社区确定了系列解决用户微服务化过程中痛点的方向，并且开始在社区里面继续创新孵化。本主题将和大家分享这些获取到的痛点和孵化项目，期望与用户/开发者一起思考如何一起去摆平微服务中的难题。</p>
+<p><strong>Summary：</strong> This speech shares the pain points of users in the process of implementing microservices transformation, as well as ServiceComb’s innovative projects, we look forward to working with more users and developers to think about how to solve the problems in microservices together.</p>
<hr />
-<p><strong>《解密ShardingSphere与ServiceComb联合打造的分布式事务解决方案》</strong> <a href="/assets/slides/20190624/5_ShardingSphere_Distributed_Transaction_Solution.pdf">PDF下载</a></p>
+<p><strong>《ShardingSphere combines ServiceComb distributed transaction solution》</strong> <a href="/assets/slides/20190624/5_ShardingSphere_Distributed_Transaction_Solution.pdf">PDF Download</a></p>
-<p><strong>主讲人：</strong> <strong>潘娟</strong>，京东数科高级DBA，主要负责京东数科数据库中间件开发、数据库运维自动化平台开发、生产数据库运维工作。多次参与京东6.18、11.11等大促活动的护航工作。曾负责京东数科数据库自动化平台设计与开发，现专注于Apache ShardingSphere分布式数据库中间件开发。乐于在数据库、自动化、分布式、中间件等相关领域进行学习和探索。</p>
+<p><strong>Speaker：</strong> <strong>Juan Pan</strong>, Apache ShardingSphere member, Jingdong DBA Expert</p>
-<p><strong>摘要：</strong> 业务层面的微服务架构大行其道，底层分布式数据库&amp;中间件如火如荼。在微服务场景下，各服务之间数据库相互独立，不能依靠单一数据库来实现跨服务的事务一致性；在分布式数据库集群状态下，又如何实现分布式事务呢？ShardingSphere作为首个Apache基金会的分布式数据库中间件项目与首个Apache微服务顶级项目ServiceComb强强联合，共同打造微服务与分布式数据库场景下的分布式事务解决方案。
-本次分享将围绕分布式事务，并以ShardingSphere与ServiceComb联合打造的分布式事务解决方案作为核心内容进行详细阐述和讲解。</p>
+<p><strong>Summary：</strong> This speech revolves around distributed transactions, explains that ShardingSphere(the first ASF distributed database middleware project) to join forces with ServiceComb(the first ASF microservice top-level project) to implement distributed transactions solution in microservice and distributed database scenarios.</p>
<hr />
-<p><strong>《支持10万TPS的高性能服务间通信解读》</strong> <a href="/assets/slides/20190624/6_Microservice_High_Performance_Communication.pdf">PDF下载</a></p>
+<p><strong>《High-performance service communication practice》</strong> <a href="/assets/slides/20190624/6_Microservice_High_Performance_Communication.pdf">PDF Download</a></p>
-<p><strong>主讲人：</strong> <strong>刘宝</strong>，Apache软件基金会 Commiter，拥有10年以上java开发框架的开发和运维经验。热爱微服务，并持续为它们开发一些常用的工具，比如进行中的servicecomb-fence项目。也喜欢分享开发和软件工程能力建设方面的一些心得，它们都发布在华为云博客和知乎专栏上面。</p>
+<p><strong>Speaker：</strong> <strong>Bruce Liu</strong>, Apache Commiter</p>
-<p><strong>摘要：</strong> 200TPS的处理能力，已经能够满足很大一部分业务系统对于性能的要求。另外一方面，优化服务器间通信的性能的收益，很容易通过优化应用代码实现或者被应用代码状况抵消，还可以低成本的通过水平扩展处理能力等方式获得，因此开发者往往不重视通信能力的优化。本次演讲结合servicecomb-java-chassis的通信优化实践，说明性能优化的一些常见手段，并实践的视角，分享性能优化在系统可靠性、资源规划等其他不容易被开发者直接感知的方面的收益。</p>
+<p><strong>Summary：</strong> This speech combines the communication optimization practices of servicecomb-java-chassis to illustrate some common methods of performance optimization, and from a practical perspective, sharing performance optimization in terms of system reliability, resource planning, and other aspects that are not easily perceived by developers directly. .</p>
<hr />
-<p><strong>《华为云分布式事务云服务实践》</strong> <a href="/assets/slides/20190624/7_HuaweiCloud_Distributed_Transaction_DTM_Practices.pdf">PDF下载</a></p>
+<p><strong>《Huawei Cloud distributed transaction solution》</strong> <a href="/assets/slides/20190624/7_HuaweiCloud_Distributed_Transaction_DTM_Practices.pdf">PDF Download</a></p>
-<p><strong>主讲人：</strong> <strong>王启军</strong>，华为云PaaS团队，负责java和go微服务框架。曾任当当网架构师，主导电商平台架构设计；曾就职于搜狐负责手机微博的研发。《持续演进的Cloud Native》作者，微信公众号“奔跑中的蜗牛”博主。</p>
+<p><strong>Speaker：</strong> <strong>Jon Wang</strong>, Huawei Cloud Architect</p>
-<p><strong>摘要：</strong> 微服务架构下，服务数量暴涨，一个服务可以完成的工作会被分发到多个服务，按照“服务自治”的原则，数据访问通过接口隔离，原本的单库事务变成了分布式事务，“当你开始考虑一致性问题的时候，才能说明你开始真正的了解微服务了”，本专题通过相关场景说明当你基于华为云构建微服务的时候，如何实现分布式事务？失败如何回退？超时如何处理？详细说明其背后的原理。</p>
+<p><strong>Summary：</strong> This topic explains how to implement distributed transactions when you build microservices based on Huawei Cloud through related scenarios. How to fail back? How to deal with timeouts? Explain in detail the principles behind it.</p>
<hr />
-<p><strong>如您有更多问题关于Aapche ServiceComb，欢迎您扫码或微信添加“ServiceComb小助手”，我们将认真对待您的每一个问题</strong>
-<img src="/assets/images/QRcode.png" alt="1" /></p></content><author><name>Mabin</name></author><category term="微服务" /><category term="Meetup" /><summary type="html">Apache ServiceComb Meetup</summary></entry><entry xml:lang="en"><title type="html">ServiceComb Pack 0.4.0 Integrated Discovery Service : Eureka</title><link href="/docs/servicecomb-pack-eureka/" rel="alternate" type="text/html" title="ServiceComb Pack 0.4.0 Integrated Discovery Service : Eurek [...]
+<p><strong>more questions, welcome to scan the QR code or WeChat to add “ServiceComb Assistant</strong>
+<img src="/assets/images/QRcode.png" alt="1" /></p></content><author><name>Mabin</name></author><category term="Microservice" /><category term="Meetup" /><summary type="html">Apache ServiceComb Meetup</summary></entry><entry xml:lang="cn"><title type="html">ServiceComb Pack 0.4.0 集成发现服务 : Spring Cloud Eureka</title><link href="/cn/docs/servicecomb-pack-eureka/" rel="alternate" type="text/html" title="ServiceComb Pack 0.4.0 集成发现服务 : Spring Cloud Eureka" />< [...]
-<h3 id="compile-with-eureka">Compile with Eureka</h3>
+<h3 id="编译支持-eureka-的版本">编译支持 Eureka 的版本</h3>
-<p>Pack doesn’t include Eureka support by default，you can use profile <code class="highlighter-rouge">-Pspring-cloud-eureka</code> to enable the feature of eureka when building the code of Pack.</p>
+<p>默认发行版不包含 Eureka 的支持，你需要使用 <code class="highlighter-rouge">-Pspring-cloud-eureka</code> 参数编译支持 Eureka 的版本</p>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/apache/servicecomb-pack.git
<span class="nb">cd </span>servicecomb-pack
-mvn clean install <span class="nt">-DskipTests</span><span class="o">=</span><span class="nb">true</span> <span class="nt">-Pspring-boot-2</span>,spring-cloud-eureka
+mvn clean <span class="nb">install</span> <span class="nt">-DskipTests</span><span class="o">=</span><span class="nb">true</span> <span class="nt">-Pspring-boot-2</span>,spring-cloud-eureka
</code></pre></div></div>
-<h3 id="run-eureka">Run Eureka</h3>
+<h3 id="启动-eureka">启动 Eureka</h3>
<ul>
- <li>Start Eureka with Docker, please refer to the official website <a href="https://cloud.spring.io/spring-cloud-netflix/spring-cloud-netflix.html#spring-cloud-eureka-server">https://cloud.spring.io</a> for more information.</li>
+ <li>使用 Docker 启动 Eureka，更多方式请参考官方网站 <a href="https://cloud.spring.io/spring-cloud-netflix/spring-cloud-netflix.html#spring-cloud-eureka-server">https://cloud.spring.io</a></li>
</ul>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>docker run <span class="nt">-d</span> <span class="nt">-p</span> 8761:8761 springcloud/eureka
</code></pre></div></div>
<ul>
- <li>Eureka UI</li>
+ <li>访问 Eureka UI</li>
</ul>
-<p>Visit http://0.0.0.0:8761 in the browser, you can see the following page shows that Eureka is started successfully</p>
+<p>在浏览器中访问 http://0.0.0.0:8761 ，能看到如下页面表示 Eureka 启动成功</p>
<p><img src="/assets/images/2019-04-15-servicecomb-pack-eureka/eureka-main.png" alt="eureka_main" /></p>
-<h3 id="run-alpha">Run Alpha</h3>
+<h3 id="启动-alpha">启动 Alpha</h3>
-<p>Enable registration to Eureka with the configuration of <code class="highlighter-rouge">eureka.client.enabled=true</code></p>
+<p>注册中心功能通过设置 <code class="highlighter-rouge">eureka.client.enabled=true</code> 参数开启</p>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>java <span class="nt">-jar</span> alpha-server-0.4.0-exec.jar <span class="se">\</span>
<span class="nt">--server</span>.port<span class="o">=</span>8090 <span class="se">\</span>
@@ -856,13 +856,13 @@ mvn clean install <span class="nt">-DskipTests</span><s
<span class="nt">--eureka</span>.client.service-url.defaultZone<span class="o">=</span>http://0.0.0.0:8761/eureka <span class="se">\</span>
<span class="nt">--spring</span>.profiles.active<span class="o">=</span>prd
</code></pre></div></div>
-<p><strong>Note:</strong> Check out for Eureka more details <a href="https://cloud.spring.io/spring-cloud-netflix/multi/multi__service_discovery_eureka_clients.html#netflix-eureka-client-starter">Spring Cloud Netflix 2.x</a> <a href="https://cloud.spring.io/spring-cloud-netflix/1.4.x/multi/multi__service_discovery_eureka_clients.html#netflix-eureka-client-starter">Spring Cloud Netflix 1.x</a></p>
+<p><strong>注意:</strong> 更多 eureka 参数请参考 <a href="https://cloud.spring.io/spring-cloud-netflix/multi/multi__service_discovery_eureka_clients.html#netflix-eureka-client-starter">Spring Cloud Netflix 2.x</a> <a href="https://cloud.spring.io/spring-cloud-netflix/1.4.x/multi/multi__service_discovery_eureka_clients.html#netflix-eureka-client-starter">Spring Cloud Netflix 1.x</a></p>
-<p>After Alpha is launched, you can see that you have registered to Eureka</p>
+<p>Alpha 启动完毕后可以看到已经注册到 Eureka</p>
<p><img src="/assets/images/2019-04-15-servicecomb-pack-eureka/alpha_register_to_eureka.png" alt="alpha_register_to_eureka" /></p>
-<p>Use <code class="highlighter-rouge">curl http://127.0.0.1:8761/eureka/apps/</code> You can see that Alpha’s gRPC service address and port have been registered in Eureka’s Metadata</p>
+<p>执行命令 <code class="highlighter-rouge">curl http://127.0.0.1:8761/eureka/apps/</code> 可以看到已经将 Alpha 的 gRPC 地址和端口注册到 Eureka 的 Metadata 中</p>
<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;applications&gt;</span>
<span class="nt">&lt;versions__delta&gt;</span>1<span class="nt">&lt;/versions__delta&gt;</span>
@@ -907,15 +907,15 @@ mvn clean install <span class="nt">-DskipTests</span><s
<span class="nt">&lt;/applications&gt;</span>
</code></pre></div></div>
-<h3 id="configuring-the-omega-side">Configuring the Omega side</h3>
+<h3 id="配置-omega-端">配置 Omega 端</h3>
<blockquote>
- <p>ServiceComb Pack 0.4.0 Omega defaults use Spring Boot 2.x Spring and Spring Cloud Netflix 2.x, If your Omega side project base on Spring Boot 1.x you can use <code class="highlighter-rouge">-Pspring-boot-1</code> to rebuild ServiceComb Pack to Spring Boot 1.x and Spring Cloud Netflix 1.x</p>
+ <p>ServiceComb Pack 0.4.0 Omega 默认依赖 Spring Boot 2.x Spring 和 Spring Cloud Netflix 2.x ，如果你的 Omega 端项目依赖 Spring Boot 1.x 你可以使用 <code class="highlighter-rouge">-Pspring-boot-1</code> 参数重新编译 Spring Boot 1.x 和 Spring Cloud Netflix 1.x 的版本</p>
</blockquote>
-<p>Modify the original omega project</p>
+<p>修改原有 omega 端项目</p>
-<p>add dependencies</p>
+<p>增加以下依赖</p>
<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
<span class="nt">&lt;groupId&gt;</span>org.apache.servicecomb.pack<span class="nt">&lt;/groupId&gt;</span>
@@ -924,7 +924,7 @@ mvn clean install <span class="nt">-DskipTests</span><s
<span class="nt">&lt;/dependency&gt;</span>
</code></pre></div></div>
-<p>Add the following to <code class="highlighter-rouge">application.yaml</code></p>
+<p>在 <code class="highlighter-rouge">application.yaml</code> 添加下面的配置项</p>
<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">eureka</span><span class="pi">:</span>
<span class="na">client</span><span class="pi">:</span>
@@ -935,41 +935,38 @@ mvn clean install <span class="nt">-DskipTests</span><s
<span class="na">register</span><span class="pi">:</span>
<span class="na">type</span><span class="pi">:</span> <span class="s">eureka</span>
</code></pre></div></div>
-
<ul>
<li>
- <p><code class="highlighter-rouge">eureka.client.service-url.defaultZone</code> property is set to the Eureka server’s instance address, check out Spring Boot’s <a href="https://cloud.spring.io/spring-cloud-netflix/multi/multi__service_discovery_eureka_clients.html#netflix-eureka-client-starter">Spring Cloud Netflix 2.x</a> or <a href="https://cloud.spring.io/spring-cloud-netflix/1.4.x/multi/multi__service_discovery_eureka_cl [...]
+ <p><code class="highlighter-rouge">eureka.client.service-url.defaultZone</code> 配置 Eureka 注册中心的地址，更多 Eureka 客户端配置可以参考<a href="https://cloud.spring.io/spring-cloud-netflix/multi/multi__service_discovery_eureka_clients.html#netflix-eureka-client-starter">Spring Cloud Netflix 2.x</a> 或 <a href="https://cloud.spring.io/spring-cloud-netflix/1.4.x/multi/multi__service_discovery_eureka_clients.html#netflix-eureka-client-starter" [...]
</li>
<li>
- <p><code class="highlighter-rouge">alpha.cluster.register.type=eureka</code> property is omega gets alpha gRPC address from Eureka</p>
+ <p><code class="highlighter-rouge">alpha.cluster.register.type=eureka</code> 配置 Omega 获取Alpha的方式是通过 Eureka 的注册中心</p>
</li>
<li>
- <p>spring boot version compatible</p>
- </li>
-</ul>
-
-<p>If your project is not using spring boot 2.1.1, please refer to this list to add a compatible spring-cloud-starter-netflix-eureka-client version</p>
-
-<table>
- <thead>
- <tr>
- <th>spring boot</th>
- <th>spring-cloud-starter-netflix-eureka-client</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>2.1.x.RELEASE</td>
- <td>2.1.1.RELEASE</td>
- </tr>
- <tr>
- <td>2.0.x.RELEASE</td>
- <td>2.0.3.RELEASE</td>
- </tr>
- </tbody>
-</table>
-
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependencyManagement&gt;</span>
+ <p>spring boot 版本兼容</p>
+
+ <p>如果你的项目使用的不是 spring boot 2.1.1 版本，那么请参照此列表增加兼容的 spring-cloud-starter-consul-discovery 版本</p>
+
+ <table>
+ <thead>
+ <tr>
+ <th>spring boot</th>
+ <th>spring-cloud-starter-netflix-eureka-client</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>2.1.x.RELEASE</td>
+ <td>2.1.1.RELEASE</td>
+ </tr>
+ <tr>
+ <td>2.0.x.RELEASE</td>
+ <td>2.0.3.RELEASE</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependencyManagement&gt;</span>
<span class="nt">&lt;dependencies&gt;</span>
<span class="nt">&lt;dependency&gt;</span>
<span class="nt">&lt;groupId&gt;</span>org.springframework.cloud<span class="nt">&lt;/groupId&gt;</span>
@@ -978,4 +975,6 @@ mvn clean install <span class="nt">-DskipTests</span><s
<span class="nt">&lt;/dependency&gt;</span>
<span class="nt">&lt;/dependencies&gt;</span>
<span class="nt">&lt;/dependencyManagement&gt;</span>
-</code></pre></div></div></content><author><name>Zhang Lei</name><email>coolbeevip@gmail.com</email><uri>http://github.com/coolbeevip</uri></author><category term="ServiceComb Pack" /><category term="Eureka" /><category term="Discovery" /><summary type="html">ServiceComb Pack Integrated Discovery Service Eurek</summary></entry></feed>
\ No newline at end of file
+</code></pre></div> </div>
+ </li>
+</ul></content><author><name>Zhang Lei</name><email>coolbeevip@gmail.com</email><uri>http://github.com/coolbeevip</uri></author><category term="ServiceComb Pack" /><category term="Spring Cloud Eureka" /><category term="Discovery" /><summary type="html">ServiceComb Pack 集成发现服务 Eureka</summary></entry></feed>
\ No newline at end of file
diff --git a/content/release/index.html b/content/release/index.html
index 31b058a..19fc658 100644
--- a/content/release/index.html
+++ b/content/release/index.html
@@ -548,22 +548,22 @@
<p><a href="/release/toolkit-downloads/">ServiceComb toolkit 0.1.0</a> (released on 2019-09-04)</p>
</li>
<li>
- <p><a href="/release/servicecomb-pack-downloads/">ServiceComb Pack 0.5.0</a> (released on 2019-08-26)</p>
+ <p><a href="/release/pack-downloads/">ServiceComb Pack 0.5.0</a> (released on 2019-08-26)</p>
</li>
<li>
- <p><a href="/release/servicecomb-java-chassis-downloads/">ServiceComb Java-Chassis 1.3.0</a> (released on 2019-10-31)</p>
+ <p><a href="/release/java-chassis-downloads/">ServiceComb Java-Chassis 1.3.0</a> (released on 2019-10-31)</p>
</li>
<li>
- <p><a href="/release/servicecomb-saga-actuator-downloads/">ServiceComb Saga Actuator 0.3.0</a> (released on 2018-12-18)</p>
+ <p><a href="/release/saga-actuator-downloads/">ServiceComb Saga Actuator 0.3.0</a> (released on 2018-12-18)</p>
</li>
<li>
- <p><a href="/release/servicecomb-saga-downloads/">ServiceComb Saga 0.2.1</a> (released on 2018-11-23)</p>
+ <p><a href="/release/saga-downloads/">ServiceComb Saga 0.2.1</a> (released on 2018-11-23)</p>
</li>
<li>
- <p><a href="/release/servicecomb-mesher-downloads/">ServiceComb Mesher 1.6.3</a> (released on 2019-9-9)</p>
+ <p><a href="/release/mesher-downloads/">ServiceComb Mesher 1.6.3</a> (released on 2019-9-9)</p>
</li>
<li>
- <p><a href="/release/servicecomb-kie-downloads/">ServiceComb Kie 0.1.0</a> (released on 2019-10-26)</p>
+ <p><a href="/release/kie-downloads/">ServiceComb Kie 0.1.0</a> (released on 2019-10-26)</p>
</li>
</ul>
@@ -576,18 +576,18 @@
<li>
<p><a href="/release/service-center-downloads/">ServiceComb Service-Center 1.0.0-m1</a> (released on 2018-03-27)</p>
</li>
- <li><a href="/release/servicecomb-java-chassis-downloads/">ServiceComb Java-Chassis 1.2.1</a> (released on 2019-05-19)</li>
- <li><a href="/release/servicecomb-java-chassis-downloads/">ServiceComb Java-Chassis 1.2.0</a> (released on 2019-04-12)</li>
- <li><a href="/release/servicecomb-java-chassis-downloads/">ServiceComb Java-Chassis 1.1.0</a> (released on 2018-11-30)</li>
- <li><a href="/release/servicecomb-java-chassis-downloads/">ServiceComb Java-Chassis 1.0.0</a> (released on 2018-08-02)</li>
- <li><a href="/release/servicecomb-java-chassis-downloads/">ServiceComb Java-Chassis 1.0.0-m2</a> (released on 2018-06-21)</li>
+ <li><a href="/release/java-chassis-downloads/">ServiceComb Java-Chassis 1.2.1</a> (released on 2019-05-19)</li>
+ <li><a href="/release/java-chassis-downloads/">ServiceComb Java-Chassis 1.2.0</a> (released on 2019-04-12)</li>
+ <li><a href="/release/java-chassis-downloads/">ServiceComb Java-Chassis 1.1.0</a> (released on 2018-11-30)</li>
+ <li><a href="/release/java-chassis-downloads/">ServiceComb Java-Chassis 1.0.0</a> (released on 2018-08-02)</li>
+ <li><a href="/release/java-chassis-downloads/">ServiceComb Java-Chassis 1.0.0-m2</a> (released on 2018-06-21)</li>
<li>
- <p><a href="/release/servicecomb-java-chassis-downloads/">ServiceComb Java-Chassis 1.0.0-m1</a> (released on 2018-04-02)</p>
+ <p><a href="/release/java-chassis-downloads/">ServiceComb Java-Chassis 1.0.0-m1</a> (released on 2018-04-02)</p>
</li>
- <li><a href="/release/servicecomb-pack-downloads/">ServiceComb Pack 0.4.0</a> (released on 2019-04-06)</li>
- <li><a href="/release/servicecomb-pack-downloads/">ServiceComb Pack 0.3.0</a> (released on 2019-01-02)</li>
- <li><a href="/release/servicecomb-saga-downloads/">ServiceComb Saga 0.2.0</a> (released on 2018-06-21)</li>
- <li><a href="/release/servicecomb-saga-downloads/">ServiceComb Saga 0.1.0</a> (released on 2018-03-27)</li>
+ <li><a href="/release/pack-downloads/">ServiceComb Pack 0.4.0</a> (released on 2019-04-06)</li>
+ <li><a href="/release/pack-downloads/">ServiceComb Pack 0.3.0</a> (released on 2019-01-02)</li>
+ <li><a href="/release/saga-downloads/">ServiceComb Saga 0.2.0</a> (released on 2018-06-21)</li>
+ <li><a href="/release/saga-downloads/">ServiceComb Saga 0.1.0</a> (released on 2018-03-27)</li>
</ul>
<p><strong>NOTE:</strong></p>
diff --git a/content/release/mesher-release-notes/index.html b/content/release/mesher-release-notes/index.html
index ca8541c..f0ceec9 100644
--- a/content/release/mesher-release-notes/index.html
+++ b/content/release/mesher-release-notes/index.html
@@ -542,7 +542,7 @@
<ul>
<li>[<a href="https://issues.apache.org/jira/browse/SCB-1410">SCB-1410</a>] - mesher config for tracing didn't work.
</li>
-<li>[<a href="https://issues.apache.org/jira/browse/SCB-1415">SCB-1415</a>] - mesher relies on go-chassis/go-chassis-plugins.But go-chassis-plugins can not compile because of dependent packages missing
+<li>[<a href="https://issues.apache.org/jira/browse/SCB-1415">SCB-1415</a>] - mesher relies on go-chassis/go-chassis-plugins.But go-chassis-plugins can not compile because of dependent packages missing
</li>
</ul>
diff --git a/content/sitemap.xml b/content/sitemap.xml
index 0a1b8df..57039a3 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -335,19 +335,19 @@
<loc>/slides/</loc>
</url>
<url>
-<loc>/cn/docs/users/application-boot-process/</loc>
+<loc>/docs/users/application-boot-process/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/application-boot-process/</loc>
+<loc>/cn/docs/users/application-boot-process/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/developers/becomming-a-commiter</loc>
+<loc>/developers/becomming-a-commiter</loc>
<lastmod>2018-06-19T09:46:01+08:00</lastmod>
</url>
<url>
-<loc>/developers/becomming-a-commiter</loc>
+<loc>/cn/developers/becomming-a-commiter</loc>
<lastmod>2018-06-19T09:46:01+08:00</lastmod>
</url>
<url>
@@ -359,11 +359,11 @@
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/release/compatibleversion</loc>
+<loc>/release/compatibleversion</loc>
<lastmod>2018-06-21T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/release/compatibleversion</loc>
+<loc>/cn/release/compatibleversion</loc>
<lastmod>2018-06-21T08:50:43+08:00</lastmod>
</url>
<url>
@@ -395,23 +395,19 @@
<lastmod>2018-05-25T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/run-mode/</loc>
-<lastmod>2017-06-06T22:01:43+08:00</lastmod>
-</url>
-<url>
<loc>/docs/users/run-mode/</loc>
<lastmod>2017-06-06T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/develop-with-jax-rs/</loc>
-<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+<loc>/cn/docs/users/run-mode/</loc>
+<lastmod>2017-06-06T22:01:43+08:00</lastmod>
</url>
<url>
<loc>/docs/users/develop-with-jax-rs/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/develop-with-rest-template/</loc>
+<loc>/cn/docs/users/develop-with-jax-rs/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
@@ -419,7 +415,7 @@
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/develop-with-rpc/</loc>
+<loc>/cn/docs/users/develop-with-rest-template/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
@@ -427,6 +423,10 @@
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
+<loc>/cn/docs/users/develop-with-rpc/</loc>
+<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+</url>
+<url>
<loc>/cn/docs/users/develop-with-spring-boot-starter/</loc>
<lastmod>2018-04-24T03:01:43+08:00</lastmod>
</url>
@@ -435,11 +435,11 @@
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/develop-with-springmvc/</loc>
+<loc>/docs/users/develop-with-springmvc/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/develop-with-springmvc/</loc>
+<loc>/cn/docs/users/develop-with-springmvc/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
@@ -451,14 +451,18 @@
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/developers/</loc>
+<loc>/developers/</loc>
<lastmod>2017-06-24T19:18:43+08:00</lastmod>
</url>
<url>
-<loc>/developers/</loc>
+<loc>/cn/developers/</loc>
<lastmod>2017-06-24T19:18:43+08:00</lastmod>
</url>
<url>
+<loc>/cn/docs/users/distributed-tracing/</loc>
+<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+</url>
+<url>
<loc>/cn/docs/quick-start-advance/distributed-tracing/</loc>
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
@@ -467,22 +471,18 @@
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/distributed-tracing/</loc>
+<loc>/docs/users/distributed-tracing/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/distributed-tracing/</loc>
-<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+<loc>/docs/users/dynamic-config/</loc>
+<lastmod>2018-01-16T03:01:43+08:00</lastmod>
</url>
<url>
<loc>/cn/docs/users/dynamic-config/</loc>
<lastmod>2018-01-12T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/dynamic-config/</loc>
-<lastmod>2018-01-16T03:01:43+08:00</lastmod>
-</url>
-<url>
<loc>/cn/docs/users/edge-in-1.0.0-m1/</loc>
<lastmod>2018-04-03T22:01:43+08:00</lastmod>
</url>
@@ -491,14 +491,14 @@
<lastmod>2018-04-03T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/faqs/</loc>
-<lastmod>2017-10-30T03:01:43+08:00</lastmod>
-</url>
-<url>
<loc>/faqs/</loc>
<lastmod>2017-10-29T22:01:43+08:00</lastmod>
</url>
<url>
+<loc>/cn/faqs/</loc>
+<lastmod>2017-10-30T03:01:43+08:00</lastmod>
+</url>
+<url>
<loc>/docs/users/faq/</loc>
<lastmod>2017-06-06T22:01:43+08:00</lastmod>
</url>
@@ -511,11 +511,11 @@
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/getting-started/</loc>
+<loc>/docs/getting-started/</loc>
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/getting-started/</loc>
+<loc>/cn/docs/getting-started/</loc>
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
@@ -527,20 +527,20 @@
<lastmod>2017-12-30T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/</loc>
-</url>
-<url>
<loc>/</loc>
</url>
<url>
-<loc>/cn/faqs/faqs-huawei-cloud/</loc>
-<lastmod>2017-10-30T03:01:43+08:00</lastmod>
+<loc>/cn/</loc>
</url>
<url>
<loc>/faqs/faqs-huawei-cloud/</loc>
<lastmod>2017-10-29T22:01:43+08:00</lastmod>
</url>
<url>
+<loc>/cn/faqs/faqs-huawei-cloud/</loc>
+<lastmod>2017-10-30T03:01:43+08:00</lastmod>
+</url>
+<url>
<loc>/docs/users/huawei-cloud-faq/</loc>
<lastmod>2017-06-06T22:01:43+08:00</lastmod>
</url>
@@ -553,19 +553,19 @@
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/invoke-control/</loc>
+<loc>/docs/users/invoke-control/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/invoke-control/</loc>
+<loc>/cn/docs/users/invoke-control/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/release/java-chassis-downloads/</loc>
+<loc>/release/java-chassis-downloads/</loc>
<lastmod>2019-04-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/release/java-chassis-downloads/</loc>
+<loc>/cn/release/java-chassis-downloads/</loc>
<lastmod>2019-04-12T08:50:43+08:00</lastmod>
</url>
<url>
@@ -577,11 +577,11 @@
<lastmod>2019-04-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/release/kie-downloads/</loc>
+<loc>/release/kie-downloads/</loc>
<lastmod>2019-09-09T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/release/kie-downloads/</loc>
+<loc>/cn/release/kie-downloads/</loc>
<lastmod>2019-09-09T08:50:43+08:00</lastmod>
</url>
<url>
@@ -593,19 +593,23 @@
<lastmod>2019-04-06T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/quick-start-advance/load-balance/</loc>
+<loc>/docs/quick-start-advance/load-balance/</loc>
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/quick-start-advance/load-balance/</loc>
+<loc>/cn/docs/quick-start-advance/load-balance/</loc>
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
<url>
+<loc>/docs/users/local-develop-test/</loc>
+<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+</url>
+<url>
<loc>/cn/docs/users/local-develop-test/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/local-develop-test/</loc>
+<loc>/docs/users/manage_springcloud_application_using_sc_and_gs/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
@@ -613,15 +617,15 @@
<lastmod>2018-04-24T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/manage_springcloud_application_using_sc_and_gs/</loc>
-<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+<loc>/docs/mesher-quick-start-advance/mesher-distributed-tracing/</loc>
+<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
<loc>/cn/docs/mesher-quick-start-advance/mesher-distributed-tracing/</loc>
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/mesher-quick-start-advance/mesher-distributed-tracing/</loc>
+<loc>/docs/mesher-quick-start-advance/mesher-flow-control/</loc>
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
@@ -629,7 +633,7 @@
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/mesher-quick-start-advance/mesher-flow-control/</loc>
+<loc>/docs/mesher-quick-start-advance/mesher-load-balance/</loc>
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
@@ -637,10 +641,6 @@
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/mesher-quick-start-advance/mesher-load-balance/</loc>
-<lastmod>2019-08-08T22:01:43+08:00</lastmod>
-</url>
-<url>
<loc>/cn/docs/mesher-quick-start-advance/</loc>
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
@@ -649,19 +649,19 @@
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/mesher-quick-start/</loc>
+<loc>/docs/mesher-quick-start/</loc>
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/mesher-quick-start/</loc>
+<loc>/cn/docs/mesher-quick-start/</loc>
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/mesher-quick-start-advance/mesher-service-management/</loc>
+<loc>/docs/mesher-quick-start-advance/mesher-service-management/</loc>
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/mesher-quick-start-advance/mesher-service-management/</loc>
+<loc>/cn/docs/mesher-quick-start-advance/mesher-service-management/</loc>
<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
@@ -673,11 +673,11 @@
<lastmod>2019-09-09T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/release/mesher-release-notes/</loc>
+<loc>/release/mesher-release-notes/</loc>
<lastmod>2019-04-06T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/release/mesher-release-notes/</loc>
+<loc>/cn/release/mesher-release-notes/</loc>
<lastmod>2019-04-06T08:50:43+08:00</lastmod>
</url>
<url>
@@ -685,11 +685,11 @@
<lastmod>2017-12-30T02:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/metrics-in-1.0.0-m1/</loc>
+<loc>/docs/users/metrics-in-1.0.0-m1/</loc>
<lastmod>2017-12-30T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/metrics-in-1.0.0-m1/</loc>
+<loc>/cn/docs/users/metrics-in-1.0.0-m1/</loc>
<lastmod>2017-12-30T22:01:43+08:00</lastmod>
</url>
<url>
@@ -705,19 +705,19 @@
<lastmod>2017-12-29T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/syncer/multi-servicecenters/</loc>
+<loc>/docs/syncer/multi-servicecenters/</loc>
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/syncer/multi-servicecenters/</loc>
+<loc>/cn/docs/syncer/multi-servicecenters/</loc>
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/edging-service/nginx/</loc>
+<loc>/docs/users/edging-service/nginx/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/edging-service/nginx/</loc>
+<loc>/cn/docs/users/edging-service/nginx/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
@@ -729,11 +729,11 @@
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/release/pack-downloads/</loc>
+<loc>/release/pack-downloads/</loc>
<lastmod>2019-04-06T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/release/pack-downloads/</loc>
+<loc>/cn/release/pack-downloads/</loc>
<lastmod>2019-04-06T08:50:43+08:00</lastmod>
</url>
<url>
@@ -769,11 +769,15 @@
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/syncer/quick-start/</loc>
+<loc>/docs/syncer/quick-start/</loc>
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/syncer/quick-start/</loc>
+<loc>/cn/docs/quick-start/</loc>
+<lastmod>2017-09-03T22:01:43+08:00</lastmod>
+</url>
+<url>
+<loc>/cn/docs/syncer/quick-start/</loc>
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
@@ -785,10 +789,6 @@
<lastmod>2019-11-12T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/quick-start/</loc>
-<lastmod>2017-09-03T22:01:43+08:00</lastmod>
-</url>
-<url>
<loc>/docs/quick-start/</loc>
<lastmod>2017-09-06T08:50:43+08:00</lastmod>
</url>
@@ -849,19 +849,19 @@
<lastmod>2018-03-28T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/release/saga-release-notes/</loc>
+<loc>/release/saga-release-notes/</loc>
<lastmod>2018-03-28T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/release/saga-release-notes/</loc>
+<loc>/cn/release/saga-release-notes/</loc>
<lastmod>2018-03-28T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/security/</loc>
+<loc>/security/</loc>
<lastmod>2018-06-07T14:28:13+08:00</lastmod>
</url>
<url>
-<loc>/security/</loc>
+<loc>/cn/security/</loc>
<lastmod>2018-06-07T14:28:13+08:00</lastmod>
</url>
<url>
@@ -873,11 +873,11 @@
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/service-definition/</loc>
+<loc>/docs/users/service-definition/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/service-definition/</loc>
+<loc>/cn/docs/users/service-definition/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
@@ -889,27 +889,27 @@
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/service-interface-constraints/</loc>
+<loc>/docs/users/service-interface-constraints/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/service-interface-constraints/</loc>
+<loc>/cn/docs/users/service-interface-constraints/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/quick-start-advance/service-management/</loc>
+<loc>/docs/quick-start-advance/service-management/</loc>
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/quick-start-advance/service-management/</loc>
+<loc>/cn/docs/quick-start-advance/service-management/</loc>
<lastmod>2017-09-03T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/release/service-center-downloads/</loc>
+<loc>/release/service-center-downloads/</loc>
<lastmod>2019-11-06T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/release/service-center-downloads/</loc>
+<loc>/cn/release/service-center-downloads/</loc>
<lastmod>2019-11-06T08:50:43+08:00</lastmod>
</url>
<url>
@@ -921,11 +921,11 @@
<lastmod>2019-04-06T08:50:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/</loc>
+<loc>/docs/users/</loc>
<lastmod>2017-06-14T22:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/</loc>
+<loc>/cn/docs/users/</loc>
<lastmod>2017-06-14T22:01:43+08:00</lastmod>
</url>
<url>
@@ -980,19 +980,19 @@
<lastmod>2017-09-10T01:12:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/developers/team/</loc>
+<loc>/developers/team/</loc>
<lastmod>2018-06-01T19:18:43+08:00</lastmod>
</url>
<url>
-<loc>/developers/team/</loc>
+<loc>/cn/developers/team/</loc>
<lastmod>2018-06-01T19:18:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/release/toolkit-downloads/</loc>
+<loc>/release/toolkit-downloads/</loc>
<lastmod>2019-09-02T22:06:43+08:00</lastmod>
</url>
<url>
-<loc>/release/toolkit-downloads/</loc>
+<loc>/cn/release/toolkit-downloads/</loc>
<lastmod>2019-09-02T22:06:43+08:00</lastmod>
</url>
<url>
@@ -1016,19 +1016,19 @@
<lastmod>2018-03-01T16:12:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/use-service-contract/</loc>
+<loc>/docs/users/use-service-contract/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/use-service-contract/</loc>
+<loc>/cn/docs/users/use-service-contract/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/cn/docs/users/use-tls/</loc>
+<loc>/docs/users/use-tls/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/use-tls/</loc>
+<loc>/cn/docs/users/use-tls/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
@@ -1038,227 +1038,227 @@
<loc>/year-archive/</loc>
</url>
<url>
-<loc>/cn/docs/users/edging-service/zuul/</loc>
+<loc>/docs/users/edging-service/zuul/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
-<loc>/docs/users/edging-service/zuul/</loc>
+<loc>/cn/docs/users/edging-service/zuul/</loc>
<lastmod>2017-08-16T03:01:43+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20170619/LinuxCon-Workshop-company.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20170619/MSAPrinciple&EcoSystem.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20170619/ServiceCombIntroduction.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20170619/ServiceCombRoadMap.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20171026/ServiceCombIntroduce1026.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20171102/ServiceComb_PastAndPresent.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20171109/MicroservicePracticeOfHuaweiConsumerCloudBasedOnServiceComb.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20171207/Uncover_ServiceComb_Design.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20171209/PracticeOfServiceMeshOnHuaweiPublicCloud.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20171221/data.consistency.live.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180125/Service_Center_Introduction.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180127/ServiceComb_Overview.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180315/Monitor_Apache_ServiceComb_using_Apache_Skywalking_APM.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180322/ServiceComb-OSCAR.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180421/Introduction_to_ServiceComb.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180422/QConBeijing2018-Saga.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-05-08T11:16:25+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180627/1_How_Apache_works_jb.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-06-30T20:52:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180627/2_ServiceComb-introduction-jiangning.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-06-30T20:52:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180627/3_How_Smart_City_Microserviced_Based_on_ServiceComb_from_iSoftStone.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-06-30T20:52:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180627/4_Java_sdk_details_wujimin.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-06-30T20:52:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180627/5_Millions_Users_Solution_Based_on_ServiceComb_Microservices_from_Huawei_Consumer_Cloud_lilinfeng.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-06-30T20:52:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180627/6_DDD_in_Microservics_wanglei.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-07-02T09:23:48+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180627/7_Detailed_Introduction_of_Transaction_Consistency_Solution_from_ServiceComb-Saga.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-06-30T20:52:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20180627/8_Thinking_about_ServiceMesh_in_ServiceComb.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-06-30T20:52:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/1_The_Apache_Way.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/2_ApacheServiceComb(Incubating)Community_Roadmap.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/3_ServiceMesh-based_Microservices_and_Those_Based_on_a_Traditional_Architecture.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/4_ServiceComb%E2%80%99s_Exploration_of_Service_Mesh.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/5_My_Participation_in_ServiceComb.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:12+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/6_Experience_on_Fast_Microservice_Programming.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:12+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/EN/1_The_Apache_Way.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:11+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/EN/2_ApacheServiceComb(Incubating)Community_Roadmap.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:12+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/EN/3_ServiceMesh-based_Microservices_and_Those_Based_on_a_Traditional_Architecture.pdf</loc>
-<lastmod>2018-11-12T12:02:34+08:00</lastmod>
+<lastmod>2018-11-06T16:07:12+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/EN/4_ServiceComb%E2%80%99s_Exploration_of_Service_Mesh.pdf</loc>
-<lastmod>2018-11-12T12:02:35+08:00</lastmod>
+<lastmod>2018-11-06T16:07:12+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/EN/5_My_Participation_in_ServiceComb.pdf</loc>
-<lastmod>2018-11-12T12:02:35+08:00</lastmod>
+<lastmod>2018-11-06T16:07:12+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181012/EN/6_Experience_on_Fast_Microservice_Programming.pdf</loc>
-<lastmod>2018-11-12T12:02:35+08:00</lastmod>
+<lastmod>2018-11-06T16:07:12+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20181229/1_ApacheServiceComb_Community_Introduction.pdf</loc>
-<lastmod>2019-10-14T18:59:30+08:00</lastmod>
+<lastmod>2019-09-09T14:37:13+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190624/1_ServiceComb_Opensource_Way.pdf</loc>
-<lastmod>2019-10-14T18:59:30+08:00</lastmod>
+<lastmod>2019-09-09T14:37:13+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190624/2_NTTDATA_Microservice_Practices.pdf</loc>
-<lastmod>2019-10-14T18:59:30+08:00</lastmod>
+<lastmod>2019-09-09T14:37:13+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190624/3_Enterprise_PaaS_Microservice_Pratices.pdf</loc>
-<lastmod>2019-10-14T18:59:30+08:00</lastmod>
+<lastmod>2019-09-09T14:37:13+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190624/4_Innovation_New_Project_Release.pdf</loc>
-<lastmod>2019-10-14T18:59:30+08:00</lastmod>
+<lastmod>2019-09-09T14:37:14+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190624/5_ShardingSphere_Distributed_Transaction_Solution.pdf</loc>
-<lastmod>2019-10-14T18:59:30+08:00</lastmod>
+<lastmod>2019-09-09T14:37:14+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190624/6_Microservice_High_Performance_Communication.pdf</loc>
-<lastmod>2019-10-14T18:59:30+08:00</lastmod>
+<lastmod>2019-09-09T14:37:14+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190624/7_HuaweiCloud_Distributed_Transaction_DTM_Practices.pdf</loc>
-<lastmod>2019-10-14T18:59:30+08:00</lastmod>
+<lastmod>2019-09-09T14:37:14+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190920/Apache_ServiceComb-Innovative_Microservices.pdf</loc>
-<lastmod>2019-10-14T19:00:05+08:00</lastmod>
+<lastmod>2019-10-17T10:23:34+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190920/EN/Apache_ServiceComb-Innovative_Microservices.pdf</loc>
-<lastmod>2019-10-14T19:00:05+08:00</lastmod>
+<lastmod>2019-10-17T10:23:34+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190920/EN/HUAWEI_CLOUD_Microservice_Tool_Improves_Development_Efficiency.pdf</loc>
-<lastmod>2019-10-14T19:00:05+08:00</lastmod>
+<lastmod>2019-10-17T10:23:34+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190920/EN/The_Apache_Way_En.pdf</loc>
-<lastmod>2019-10-14T19:00:05+08:00</lastmod>
+<lastmod>2019-10-17T10:23:34+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190920/HUAWEI_CLOUD_Microservice_Tool_Improves_Development_Efficiency.pdf</loc>
-<lastmod>2019-10-14T19:00:05+08:00</lastmod>
+<lastmod>2019-10-17T10:23:34+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20190920/The_Apache_Way_En.pdf</loc>
-<lastmod>2019-10-14T19:00:06+08:00</lastmod>
+<lastmod>2019-10-17T10:23:34+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20191120/2.Apache_ServiceComb_builds_online_store.pdf</loc>
-<lastmod>2019-11-21T16:26:27+08:00</lastmod>
+<lastmod>2019-12-09T11:52:56+08:00</lastmod>
</url>
<url>
<loc>/assets/slides/20191120/Apache_ServiceComb.pdf</loc>
-<lastmod>2019-11-21T16:26:27+08:00</lastmod>
+<lastmod>2019-12-09T11:52:56+08:00</lastmod>
</url>
</urlset>