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 2018/06/19 06:36:52 UTC
[incubator-servicecomb-website] branch asf-site updated (a38f90d ->
d4e8552)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git.
from a38f90d publish web site
add e2e139f Add link to Apache security page
add 1dbd850 Add post on becoming a committer
new 7f27fdb Merge branch 'master' into asf-site
new d4e8552 Publish the website
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
_data/navigation.yml | 4 +
_data/ui-text.yml | 2 +
_developers/becomming-a-committer.md | 31 +++
_developers/cn/becomming-a-committer.md | 31 +++
_includes/footer.html | 1 +
content/404.html | 1 +
content/{404.html => about/language.html} | 102 ++-----
content/assets/css/main.css | 2 +-
content/assets/css/style.css | 1 -
content/cn/404.html | 1 +
.../{index.html => becomming-a-commiter.html} | 109 ++++----
content/cn/developers/contributing.html | 12 +
content/cn/developers/index.html | 12 +
content/cn/developers/release-guide/index.html | 52 ++--
.../developers/release-validation-guide/index.html | 102 ++++---
.../developers/setup-committer-rights/index.html | 12 +
.../setup-develop-environment/index.html | 24 +-
content/cn/developers/submit-codes/index.html | 71 +++--
.../cn/developers/subscribe-mail-list/index.html | 14 +-
content/cn/developers/team/index.html | 12 +
content/cn/developers/use-gitter/index.html | 14 +-
content/cn/developers/use-jira/index.html | 14 +-
.../apache-servicecomb-incubating-day/index.html | 1 +
content/cn/docs/autoscale-on-company/index.html | 85 +++---
.../index.html | 36 ++-
content/cn/docs/communication-btw-sc-ms/index.html | 1 +
content/cn/docs/company-on-kubernetes/index.html | 114 ++++----
.../cn/docs/config_center_integration/index.html | 42 +--
.../index.html | 1 +
content/cn/docs/distributed_saga_1/index.html | 1 +
content/cn/docs/distributed_saga_2/index.html | 1 +
content/cn/docs/distributed_saga_3/index.html | 1 +
.../index.html | 13 +-
.../index.html | 68 +++--
content/cn/docs/go-to-cloud/index.html | 1 +
.../index.html | 1 +
.../docs/how-to-reform-a-legacy-system/index.html | 1 +
content/cn/docs/jira_beginner_guide/index.html | 1 +
content/cn/docs/join_the_community/index.html | 1 +
content/cn/docs/linuxcon-workshop-demo/index.html | 240 +++++++++--------
.../cn/docs/maven_dependency_management/index.html | 26 +-
content/cn/docs/open-design/index.html | 44 ++--
.../index.html | 37 +--
.../distributed-tracing/index.html | 39 +--
.../quick-start-advance/flow-control/index.html | 34 +--
content/cn/docs/quick-start-advance/index.html | 1 +
.../quick-start-advance/load-balance/index.html | 6 +-
.../service-management/index.html | 38 +--
content/cn/docs/quick-start-bmi/index.html | 102 +++----
.../cn/docs/quick-start-dataconsistency/index.html | 293 +++++++++++----------
content/cn/docs/quick-start/index.html | 27 +-
content/cn/docs/saga_pack_design/index.html | 50 ++--
content/cn/docs/saga_with_cucumber/index.html | 76 +++---
.../seckill-development-journey-part-I/index.html | 1 +
.../seckill-development-journey-part-II/index.html | 1 +
.../index.html | 11 +-
.../index.html | 43 +--
.../cn/docs/tracing-with-servicecomb/index.html | 38 +--
content/cn/faqs/faqs-huawei-cloud/index.html | 31 ++-
content/cn/faqs/index.html | 177 +++++++------
content/cn/index.html | 1 +
content/cn/release/index.html | 11 +-
.../cn/release/java-chassis-downloads/index.html | 11 +-
.../release/java-chassis-release-notes/index.html | 6 +-
content/cn/release/saga-binary/index.html | 11 +-
content/cn/release/saga-downloads/index.html | 11 +-
content/cn/release/saga-release-notes/index.html | 6 +-
.../cn/release/service-center-binary/index.html | 11 +-
.../cn/release/service-center-downloads/index.html | 11 +-
.../service-center-release-notes/index.html | 6 +-
content/cn/slides/index.html | 1 +
.../cn/users/application-boot-process/index.html | 3 +-
content/cn/users/communicate-protocol/index.html | 86 +++---
content/cn/users/customized-tracing/index.html | 23 +-
content/cn/users/deploy-mode/index.html | 86 +++---
content/cn/users/develop-with-jax-rs/index.html | 28 +-
.../cn/users/develop-with-rest-template/index.html | 8 +-
content/cn/users/develop-with-rpc/index.html | 33 ++-
.../develop-with-spring-boot-starter/index.html | 32 ++-
content/cn/users/develop-with-springmvc/index.html | 32 ++-
.../users/develop-with-transparent-rpc/index.html | 38 +--
content/cn/users/distributed-tracing/index.html | 36 +--
content/cn/users/dynamic-config/index.html | 39 +--
content/cn/users/edge-in-1.0.0-m1/index.html | 26 +-
content/cn/users/edging-service/nginx/index.html | 58 ++--
content/cn/users/edging-service/zuul/index.html | 72 ++---
content/cn/users/healthcheck/index.html | 20 +-
content/cn/users/index.html | 1 +
content/cn/users/invoke-control/index.html | 16 +-
content/cn/users/local-develop-test/index.html | 34 +--
.../index.html | 59 +++--
content/cn/users/metrics-in-0.5.0/index.html | 64 +++--
content/cn/users/metrics-in-1.0.0-m1/index.html | 68 +++--
.../index.html | 54 ++--
.../index.html | 40 +--
content/cn/users/run-mode/index.html | 16 +-
content/cn/users/service-configurations/index.html | 41 +--
content/cn/users/service-contract/index.html | 104 ++++----
content/cn/users/service-definition/index.html | 32 +--
content/cn/users/service-heartbeat/index.html | 8 +-
.../users/service-interface-constraints/index.html | 28 +-
content/cn/users/setup-environment/index.html | 129 +++++----
content/cn/users/use-service-contract/index.html | 14 +-
content/cn/users/use-tls/index.html | 55 ++--
content/cn/year-archive/index.html | 1 +
.../{index.html => becomming-a-commiter.html} | 109 ++++----
content/developers/contributing.html | 12 +
content/developers/index.html | 12 +
content/developers/release-guide/index.html | 52 ++--
.../developers/release-validation-guide/index.html | 102 ++++---
.../developers/setup-committer-rights/index.html | 12 +
.../setup-develop-environment/index.html | 24 +-
content/developers/submit-codes/index.html | 76 ++++--
content/developers/team/index.html | 12 +
content/developers/use-jira/index.html | 14 +-
.../apache-servicecomb-incubating-day/index.html | 1 +
content/docs/autoscale-on-company/index.html | 85 +++---
content/docs/communication-btw-sc-ms/index.html | 1 +
content/docs/company-on-kubernetes/index.html | 114 ++++----
content/docs/distributed_saga_1/index.html | 1 +
content/docs/distributed_saga_2/index.html | 1 +
content/docs/distributed_saga_3/index.html | 1 +
content/docs/go-to-cloud/index.html | 1 +
.../docs/how-to-reform-a-legacy-system/index.html | 1 +
content/docs/howto-upgrade-topzipkin2/index.html | 31 ++-
content/docs/linuxcon-workshop-demo/index.html | 240 +++++++++--------
.../distributed-tracing/index.html | 39 +--
.../quick-start-advance/flow-control/index.html | 34 +--
content/docs/quick-start-advance/index.html | 1 +
.../quick-start-advance/load-balance/index.html | 6 +-
.../service-management/index.html | 38 +--
content/docs/quick-start-bmi/index.html | 102 +++----
.../docs/quick-start-dataconsistency/index.html | 293 +++++++++++----------
content/docs/quick-start/index.html | 27 +-
.../seckill-development-journey-part-I/index.html | 1 +
.../seckill-development-journey-part-II/index.html | 1 +
.../index.html | 11 +-
content/docs/service-center-ui/index.html | 1 +
.../service-registry-refactor-proposal/index.html | 1 +
.../index.html | 43 +--
content/docs/tracing-with-servicecomb/index.html | 38 +--
content/faqs/faqs-huawei-cloud/index.html | 29 +-
content/faqs/index.html | 16 +-
content/feed.xml | 283 +++++++++++---------
content/index.html | 1 +
content/release/index.html | 11 +-
content/release/java-chassis-downloads/index.html | 11 +-
.../release/java-chassis-release-notes/index.html | 6 +-
content/release/saga-binary/index.html | 11 +-
content/release/saga-downloads/index.html | 11 +-
content/release/saga-release-notes/index.html | 6 +-
content/release/sc-binary/index.html | 11 +-
.../release/service-center-downloads/index.html | 11 +-
.../service-center-release-notes/index.html | 6 +-
content/sitemap.xml | 196 +++++++-------
content/sitemap/index.html | 1 +
content/slides/index.html | 1 +
content/users/application-boot-process/index.html | 3 +-
content/users/communicate-protocol/index.html | 86 +++---
content/users/customized-tracing/index.html | 23 +-
content/users/develop-with-jax-rs/index.html | 28 +-
.../users/develop-with-rest-template/index.html | 8 +-
content/users/develop-with-rpc/index.html | 33 ++-
.../develop-with-spring-boot-starter/index.html | 32 ++-
content/users/develop-with-springmvc/index.html | 32 ++-
.../users/develop-with-transparent-rpc/index.html | 38 +--
content/users/distributed-tracing/index.html | 36 +--
content/users/dynamic-config/index.html | 39 +--
content/users/edge-in-1.0.0-m1/index.html | 26 +-
content/users/edging-service/nginx/index.html | 58 ++--
content/users/edging-service/zuul/index.html | 72 ++---
content/users/faq/index.html | 16 +-
content/users/healthcheck/index.html | 20 +-
content/users/huawei-cloud-faq/index.html | 29 +-
content/users/index.html | 1 +
content/users/invoke-control/index.html | 16 +-
content/users/local-develop-test/index.html | 34 +--
.../index.html | 59 +++--
content/users/metrics-in-1.0.0-m1/index.html | 68 +++--
.../index.html | 54 ++--
content/users/run-mode/index.html | 16 +-
content/users/service-configurations/index.html | 41 +--
content/users/service-contract/index.html | 104 ++++----
content/users/service-definition/index.html | 26 +-
content/users/service-heartbeat/index.html | 8 +-
.../users/service-interface-constraints/index.html | 28 +-
content/users/setup-environment/index.html | 129 +++++----
content/users/use-service-contract/index.html | 14 +-
content/users/use-tls/index.html | 55 ++--
content/year-archive/index.html | 1 +
190 files changed, 4137 insertions(+), 3023 deletions(-)
create mode 100644 _developers/becomming-a-committer.md
create mode 100644 _developers/cn/becomming-a-committer.md
copy content/{404.html => about/language.html} (74%)
delete mode 100644 content/assets/css/style.css
copy content/cn/developers/{index.html => becomming-a-commiter.html} (78%)
copy content/developers/{index.html => becomming-a-commiter.html} (78%)
[incubator-servicecomb-website] 02/02: Publish the website
Posted by ni...@apache.org.
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/incubator-servicecomb-website.git
commit d4e8552f2400c68481535f220ffca8baaadf39b2
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Tue Jun 19 14:35:50 2018 +0800
Publish the website
---
content/404.html | 1 +
content/{404.html => about/language.html} | 102 ++-----
content/assets/css/main.css | 2 +-
content/assets/css/style.css | 1 -
content/cn/404.html | 1 +
.../{index.html => becomming-a-commiter.html} | 109 ++++----
content/cn/developers/contributing.html | 12 +
content/cn/developers/index.html | 12 +
content/cn/developers/release-guide/index.html | 52 ++--
.../developers/release-validation-guide/index.html | 102 ++++---
.../developers/setup-committer-rights/index.html | 12 +
.../setup-develop-environment/index.html | 24 +-
content/cn/developers/submit-codes/index.html | 71 +++--
.../cn/developers/subscribe-mail-list/index.html | 14 +-
content/cn/developers/team/index.html | 12 +
content/cn/developers/use-gitter/index.html | 14 +-
content/cn/developers/use-jira/index.html | 14 +-
.../apache-servicecomb-incubating-day/index.html | 1 +
content/cn/docs/autoscale-on-company/index.html | 85 +++---
.../index.html | 36 ++-
content/cn/docs/communication-btw-sc-ms/index.html | 1 +
content/cn/docs/company-on-kubernetes/index.html | 114 ++++----
.../cn/docs/config_center_integration/index.html | 42 +--
.../index.html | 1 +
content/cn/docs/distributed_saga_1/index.html | 1 +
content/cn/docs/distributed_saga_2/index.html | 1 +
content/cn/docs/distributed_saga_3/index.html | 1 +
.../index.html | 13 +-
.../index.html | 68 +++--
content/cn/docs/go-to-cloud/index.html | 1 +
.../index.html | 1 +
.../docs/how-to-reform-a-legacy-system/index.html | 1 +
content/cn/docs/jira_beginner_guide/index.html | 1 +
content/cn/docs/join_the_community/index.html | 1 +
content/cn/docs/linuxcon-workshop-demo/index.html | 240 +++++++++--------
.../cn/docs/maven_dependency_management/index.html | 26 +-
content/cn/docs/open-design/index.html | 44 ++--
.../index.html | 37 +--
.../distributed-tracing/index.html | 39 +--
.../quick-start-advance/flow-control/index.html | 34 +--
content/cn/docs/quick-start-advance/index.html | 1 +
.../quick-start-advance/load-balance/index.html | 6 +-
.../service-management/index.html | 38 +--
content/cn/docs/quick-start-bmi/index.html | 102 +++----
.../cn/docs/quick-start-dataconsistency/index.html | 293 +++++++++++----------
content/cn/docs/quick-start/index.html | 27 +-
content/cn/docs/saga_pack_design/index.html | 50 ++--
content/cn/docs/saga_with_cucumber/index.html | 76 +++---
.../seckill-development-journey-part-I/index.html | 1 +
.../seckill-development-journey-part-II/index.html | 1 +
.../index.html | 11 +-
.../index.html | 43 +--
.../cn/docs/tracing-with-servicecomb/index.html | 38 +--
content/cn/faqs/faqs-huawei-cloud/index.html | 31 ++-
content/cn/faqs/index.html | 177 +++++++------
content/cn/index.html | 1 +
content/cn/release/index.html | 11 +-
.../cn/release/java-chassis-downloads/index.html | 11 +-
.../release/java-chassis-release-notes/index.html | 6 +-
content/cn/release/saga-binary/index.html | 11 +-
content/cn/release/saga-downloads/index.html | 11 +-
content/cn/release/saga-release-notes/index.html | 6 +-
.../cn/release/service-center-binary/index.html | 11 +-
.../cn/release/service-center-downloads/index.html | 11 +-
.../service-center-release-notes/index.html | 6 +-
content/cn/slides/index.html | 1 +
.../cn/users/application-boot-process/index.html | 3 +-
content/cn/users/communicate-protocol/index.html | 86 +++---
content/cn/users/customized-tracing/index.html | 23 +-
content/cn/users/deploy-mode/index.html | 86 +++---
content/cn/users/develop-with-jax-rs/index.html | 28 +-
.../cn/users/develop-with-rest-template/index.html | 8 +-
content/cn/users/develop-with-rpc/index.html | 33 ++-
.../develop-with-spring-boot-starter/index.html | 32 ++-
content/cn/users/develop-with-springmvc/index.html | 32 ++-
.../users/develop-with-transparent-rpc/index.html | 38 +--
content/cn/users/distributed-tracing/index.html | 36 +--
content/cn/users/dynamic-config/index.html | 39 +--
content/cn/users/edge-in-1.0.0-m1/index.html | 26 +-
content/cn/users/edging-service/nginx/index.html | 58 ++--
content/cn/users/edging-service/zuul/index.html | 72 ++---
content/cn/users/healthcheck/index.html | 20 +-
content/cn/users/index.html | 1 +
content/cn/users/invoke-control/index.html | 16 +-
content/cn/users/local-develop-test/index.html | 34 +--
.../index.html | 59 +++--
content/cn/users/metrics-in-0.5.0/index.html | 64 +++--
content/cn/users/metrics-in-1.0.0-m1/index.html | 68 +++--
.../index.html | 54 ++--
.../index.html | 40 +--
content/cn/users/run-mode/index.html | 16 +-
content/cn/users/service-configurations/index.html | 41 +--
content/cn/users/service-contract/index.html | 104 ++++----
content/cn/users/service-definition/index.html | 32 +--
content/cn/users/service-heartbeat/index.html | 8 +-
.../users/service-interface-constraints/index.html | 28 +-
content/cn/users/setup-environment/index.html | 129 +++++----
content/cn/users/use-service-contract/index.html | 14 +-
content/cn/users/use-tls/index.html | 55 ++--
content/cn/year-archive/index.html | 1 +
.../{index.html => becomming-a-commiter.html} | 109 ++++----
content/developers/contributing.html | 12 +
content/developers/index.html | 12 +
content/developers/release-guide/index.html | 52 ++--
.../developers/release-validation-guide/index.html | 102 ++++---
.../developers/setup-committer-rights/index.html | 12 +
.../setup-develop-environment/index.html | 24 +-
content/developers/submit-codes/index.html | 76 ++++--
content/developers/team/index.html | 12 +
content/developers/use-jira/index.html | 14 +-
.../apache-servicecomb-incubating-day/index.html | 1 +
content/docs/autoscale-on-company/index.html | 85 +++---
content/docs/communication-btw-sc-ms/index.html | 1 +
content/docs/company-on-kubernetes/index.html | 114 ++++----
content/docs/distributed_saga_1/index.html | 1 +
content/docs/distributed_saga_2/index.html | 1 +
content/docs/distributed_saga_3/index.html | 1 +
content/docs/go-to-cloud/index.html | 1 +
.../docs/how-to-reform-a-legacy-system/index.html | 1 +
content/docs/howto-upgrade-topzipkin2/index.html | 31 ++-
content/docs/linuxcon-workshop-demo/index.html | 240 +++++++++--------
.../distributed-tracing/index.html | 39 +--
.../quick-start-advance/flow-control/index.html | 34 +--
content/docs/quick-start-advance/index.html | 1 +
.../quick-start-advance/load-balance/index.html | 6 +-
.../service-management/index.html | 38 +--
content/docs/quick-start-bmi/index.html | 102 +++----
.../docs/quick-start-dataconsistency/index.html | 293 +++++++++++----------
content/docs/quick-start/index.html | 27 +-
.../seckill-development-journey-part-I/index.html | 1 +
.../seckill-development-journey-part-II/index.html | 1 +
.../index.html | 11 +-
content/docs/service-center-ui/index.html | 1 +
.../service-registry-refactor-proposal/index.html | 1 +
.../index.html | 43 +--
content/docs/tracing-with-servicecomb/index.html | 38 +--
content/faqs/faqs-huawei-cloud/index.html | 29 +-
content/faqs/index.html | 16 +-
content/feed.xml | 283 +++++++++++---------
content/index.html | 1 +
content/release/index.html | 11 +-
content/release/java-chassis-downloads/index.html | 11 +-
.../release/java-chassis-release-notes/index.html | 6 +-
content/release/saga-binary/index.html | 11 +-
content/release/saga-downloads/index.html | 11 +-
content/release/saga-release-notes/index.html | 6 +-
content/release/sc-binary/index.html | 11 +-
.../release/service-center-downloads/index.html | 11 +-
.../service-center-release-notes/index.html | 6 +-
content/sitemap.xml | 196 +++++++-------
content/sitemap/index.html | 1 +
content/slides/index.html | 1 +
content/users/application-boot-process/index.html | 3 +-
content/users/communicate-protocol/index.html | 86 +++---
content/users/customized-tracing/index.html | 23 +-
content/users/develop-with-jax-rs/index.html | 28 +-
.../users/develop-with-rest-template/index.html | 8 +-
content/users/develop-with-rpc/index.html | 33 ++-
.../develop-with-spring-boot-starter/index.html | 32 ++-
content/users/develop-with-springmvc/index.html | 32 ++-
.../users/develop-with-transparent-rpc/index.html | 38 +--
content/users/distributed-tracing/index.html | 36 +--
content/users/dynamic-config/index.html | 39 +--
content/users/edge-in-1.0.0-m1/index.html | 26 +-
content/users/edging-service/nginx/index.html | 58 ++--
content/users/edging-service/zuul/index.html | 72 ++---
content/users/faq/index.html | 16 +-
content/users/healthcheck/index.html | 20 +-
content/users/huawei-cloud-faq/index.html | 29 +-
content/users/index.html | 1 +
content/users/invoke-control/index.html | 16 +-
content/users/local-develop-test/index.html | 34 +--
.../index.html | 59 +++--
content/users/metrics-in-1.0.0-m1/index.html | 68 +++--
.../index.html | 54 ++--
content/users/run-mode/index.html | 16 +-
content/users/service-configurations/index.html | 41 +--
content/users/service-contract/index.html | 104 ++++----
content/users/service-definition/index.html | 26 +-
content/users/service-heartbeat/index.html | 8 +-
.../users/service-interface-constraints/index.html | 28 +-
content/users/setup-environment/index.html | 129 +++++----
content/users/use-service-contract/index.html | 14 +-
content/users/use-tls/index.html | 55 ++--
content/year-archive/index.html | 1 +
185 files changed, 4068 insertions(+), 3023 deletions(-)
diff --git a/content/404.html b/content/404.html
index b7a35ea..02e7664 100644
--- a/content/404.html
+++ b/content/404.html
@@ -350,6 +350,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _pages/404.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_pages/404.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/404.html b/content/about/language.html
similarity index 74%
copy from content/404.html
copy to content/about/language.html
index b7a35ea..3975cd0 100644
--- a/content/404.html
+++ b/content/about/language.html
@@ -19,35 +19,35 @@
-<title>Page Not Found - Apache ServiceComb (incubating)</title>
+<title>多语言支持 - Apache ServiceComb (incubating)</title>
-<meta name="description" content="Page not found. Your pixels are in another canvas.">
+<meta name="description" content="多语言支持">
<meta name="author" content="">
-<meta property="og:locale" content="en">
+<meta property="og:locale" content="en_US">
<meta property="og:site_name" content="Apache ServiceComb (incubating)">
-<meta property="og:title" content="Page Not Found">
+<meta property="og:title" content="多语言支持">
- <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/404.html">
- <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/404.html">
+ <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/about/language">
+ <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/about/language">
- <meta property="og:description" content="Page not found. Your pixels are in another canvas.">
+ <meta property="og:description" content="多语言支持">
<meta name="twitter:site" content="@ServiceComb">
- <meta name="twitter:title" content="Page Not Found">
- <meta name="twitter:description" content="Page not found. Your pixels are in another canvas.">
+ <meta name="twitter:title" content="多语言支持">
+ <meta name="twitter:description" content="多语言支持">
<meta name="twitter:url" content="">
@@ -160,67 +160,13 @@
<ul class="visible-links">
-
- <li class="masthead__menu-item">
-
-
-
- <a href="/docs/quick-start/">Quick Start</a>
-
- </li>
-
-
- <li class="masthead__menu-item">
-
-
-
- <a href="/users/">Users</a>
-
- </li>
-
-
- <li class="masthead__menu-item">
-
-
-
- <a href="/developers/">Developers</a>
-
- </li>
-
-
- <li class="masthead__menu-item">
-
-
-
- <a href="/year-archive/">Blogs</a>
-
- </li>
-
-
- <li class="masthead__menu-item">
-
-
-
- <a href="/faqs/">FAQ</a>
-
- </li>
-
-
- <li class="masthead__menu-item">
-
-
-
- <a href="/release/">Downloads</a>
-
- </li>
-
</ul>
<button><div class="navicon"></div></button>
<ul class="hidden-links hidden"></ul>
<div class="nav-lang">
- <a href=/cn/404.html>中文</a>
+ <a href=/cn/about/language>中文</a>
</div>
</nav>
@@ -265,16 +211,16 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
- <meta itemprop="headline" content="Page Not Found">
- <meta itemprop="description" content="Page not found. Your pixels are in another canvas.">
-
+ <meta itemprop="headline" content="多语言支持">
+ <meta itemprop="description" content="多语言支持">
+ <meta itemprop="dateModified" content="June 07, 2017">
<div class="page__inner-wrap">
<header>
- <h1 class="page__title" itemprop="headline">Page Not Found
+ <h1 class="page__title" itemprop="headline">多语言支持
</h1>
</header>
@@ -282,16 +228,7 @@
<section class="page__content" itemprop="text">
- <p>Sorry, but the page you were trying to view does not exist — perhaps you can try searching for it below.</p>
-
-<script type="text/javascript">
- var GOOG_FIXURL_LANG = 'en';
- var GOOG_FIXURL_SITE = ''
-</script>
-
-<script type="text/javascript" src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
-</script>
-
+
</section>
@@ -340,16 +277,17 @@
<p class="header">Resources</p>
<li><a href="/docs/quick-start/">Quick Start</a></li>
<li><a href="/users/user-guide/">User Guide</a></li>
- <li><a href="/slides/">Slides</a></li>
- <li><a href="/users/faq/">Common Questions</a></li>
+ <li><a href="/slides/">Workshop Slides</a></li>
+ <li><a href="/users/faq/">Frequently Asked Questions</a></li>
</ul>
</div>
<div class="col">
<ul>
<p class="header">Contribute</p>
- <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _pages/404.md">Report a Doc Issue</a></li>
- <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_pages/404.md">Edit This Page on Github</a></li>
+ <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _pages/languages.md">Report a Doc Issue</a></li>
+ <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_pages/languages.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/assets/css/main.css b/content/assets/css/main.css
index 676011e..072bcdd 100644
--- a/content/assets/css/main.css
+++ b/content/assets/css/main.css
@@ -5,4 +5,4 @@
*/@font-face{font-family:CustomSerifFont;font-weight:400;src:local("PingFangSC"),local("Microsoft Yahei"),local("WenQuanYi Micro Hei"),local("Noto Sans Mono CJK SC"),local(Helvetica),local(Arial)}@font-face{font-family:CustomSerifFont;font-weight:400;unicode-range:U+00-024F;src:local("Roboto"),local(Helvetica),local(Arial)}/*!
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url("../vendor/font-awesome/fontawesome-webfont.eot?v=4.7.0");src:url("../vendor/font-awesome/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"),url("../vendor/font-awesome/fontawesome-webfont.woff2?v=4.7.0") format("woff2"),url("../vendor/font-awesome/fontawesome-webfont.woff?v=4.7.0") format("woff"),url("../vendor/font-awesome/fontawesome-webfont.ttf?v=4.7.0") format("truetype"),url("../vendor/font-awesome/fontawesome-webfon [...]
+ */@font-face{font-family:'FontAwesome';src:url("../vendor/font-awesome/fontawesome-webfont.eot?v=4.7.0");src:url("../vendor/font-awesome/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"),url("../vendor/font-awesome/fontawesome-webfont.woff2?v=4.7.0") format("woff2"),url("../vendor/font-awesome/fontawesome-webfont.woff?v=4.7.0") format("woff"),url("../vendor/font-awesome/fontawesome-webfont.ttf?v=4.7.0") format("truetype"),url("../vendor/font-awesome/fontawesome-webfon [...]
diff --git a/content/assets/css/style.css b/content/assets/css/style.css
deleted file mode 100644
index d14b60b..0000000
--- a/content/assets/css/style.css
+++ /dev/null
@@ -1 +0,0 @@
-/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}summary{display:list-item}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent}a:active,a:hov [...]
diff --git a/content/cn/404.html b/content/cn/404.html
index ee2ee71..c2bbe31 100644
--- a/content/cn/404.html
+++ b/content/cn/404.html
@@ -351,6 +351,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _pages/cn/404.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_pages/cn/404.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/index.html b/content/cn/developers/becomming-a-commiter.html
similarity index 78%
copy from content/cn/developers/index.html
copy to content/cn/developers/becomming-a-commiter.html
index 7222f6c..8e61cce 100644
--- a/content/cn/developers/index.html
+++ b/content/cn/developers/becomming-a-commiter.html
@@ -19,12 +19,12 @@
-<title>开发者指南 - Apache ServiceComb (incubating)</title>
+<title>Becomming a Committer - Apache ServiceComb (incubating)</title>
-<meta name="description" content="开发者指南">
+<meta name="description" content="Becoming a committer of Apache ServiceComb">
@@ -33,21 +33,21 @@
<meta property="og:locale" content="cn">
<meta property="og:site_name" content="Apache ServiceComb (incubating)">
-<meta property="og:title" content="开发者指南">
+<meta property="og:title" content="Becomming a Committer">
- <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/cn/developers/">
- <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/cn/developers/">
+ <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/cn/developers/becomming-a-commiter">
+ <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/cn/developers/becomming-a-commiter">
- <meta property="og:description" content="开发者指南">
+ <meta property="og:description" content="Becoming a committer of Apache ServiceComb">
<meta name="twitter:site" content="@ServiceComb">
- <meta name="twitter:title" content="开发者指南">
- <meta name="twitter:description" content="开发者指南">
+ <meta name="twitter:title" content="Becomming a Committer">
+ <meta name="twitter:description" content="Becoming a committer of Apache ServiceComb">
<meta name="twitter:url" content="">
@@ -221,7 +221,7 @@
- <a href=/developers/>English</a>
+ <a href=/developers/becomming-a-commiter>English</a>
</div>
</nav>
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -387,16 +398,16 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
- <meta itemprop="headline" content="开发者指南">
- <meta itemprop="description" content="开发者指南">
+ <meta itemprop="headline" content="Becomming a Committer">
+ <meta itemprop="description" content="Becoming a committer of Apache ServiceComb">
- <meta itemprop="dateModified" content="June 24, 2017">
+ <meta itemprop="dateModified" content="June 19, 2018">
<div class="page__inner-wrap">
<header>
- <h1 class="page__title" itemprop="headline">开发者指南
+ <h1 class="page__title" itemprop="headline">Becomming a Committer
</h1>
</header>
@@ -404,55 +415,32 @@
<section class="page__content" itemprop="text">
- <aside class="sidebar__right">
-<nav class="toc">
- <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> 在本页上</h4></header> -->
-
- </nav>
-</aside>
-
-<p><strong>ServiceComb</strong> 项目托管在<a href="https://github.com/apache?q=incubator-servicecomb">Github</a>上，其各子项目如下表所示：</p>
-
-<table>
- <thead>
- <tr>
- <th>项目名</th>
- <th>项目简介</th>
- <th>编程语言</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><a href="https://github.com/apache/incubator-servicecomb-java-chassis">Java Chassis</a></td>
- <td>Java微服务框架（SDK）</td>
- <td>Java</td>
- </tr>
- <tr>
- <td><a href="https://github.com/apache/incubator-servicecomb-service-center">Service Center</a></td>
- <td>服务中心（服务注册及发现）</td>
- <td>Go</td>
- </tr>
- <tr>
- <td><a href="https://github.com/apache/incubator-servicecomb-saga">Saga</a></td>
- <td>微服务数据最终一致性实现</td>
- <td>Java</td>
- </tr>
- <tr>
- <td><a href="https://github.com/apache/incubator-servicecomb-website">Website</a></td>
- <td>ServiceComb网站</td>
- <td>Markdown</td>
- </tr>
- </tbody>
-</table>
-
-<p>参与 ServiceComb 项目并为其作出贡献的方法有很多：代码实现、测试编写、流程工具改进、文档完善等。您可以选择上述任何一个或多个感兴趣的项目进行贡献。具体贡献事宜可参考以下指南：</p>
+ <p>ServiceComb follows the Apache way to build the community. Anyone can become a committer once they have contributed sufficiently to the project and earned the trust.</p>
+
+<h2 id="contribute-and-earn-the-trust">Contribute and Earn The Trust</h2>
<ul>
- <li><a href="/cn/developers/setup-develop-environment/">开发环境准备</a>：主要介绍git，JDK，Maven以及IDE的安装及配置。</li>
- <li><a href="/cn/developers/submit-codes/">代码提交指南</a>：主要介绍功能特性需求及现有bug的获取途径，提交代码前的测试事宜，如何提交PR以及如何解决冲突等。</li>
+ <li><a href="/release">Download the releases</a></li>
+ <li><a href="mailto:dev@servicecomb.apache.org">Join the mailing list</a></li>
+ <li><a href="https://issues.apache.org/jira/projects/SCB/">Report bugs and/or feature requests</a></li>
</ul>
-<p>同时，也欢迎您订阅<a href="mailto:dev-subscribe@servicecomb.incubator.apache.org">ServiceComb邮件列表</a>了解 ServiceComb 项目的开发动态以及进行话题讨论。订阅的方法可参阅<a href="/cn/developers/subscribe-mail-list/">邮件列表订阅指南</a>。</p>
+<p>See the <a href="/developers/contributing">contributing</a> guide on how to become a contributor.</p>
+
+<p>ServiceComb is a meritocracy the same as Apache. Once you have shown sufficient sustained commitment to the project and earned the trust, the PMC may invite you to be a committer.</p>
+
+<p>There are multiple actions other than coding to build the trust in the ServiceComb community, code review, design discussion, user support, community outreach, documentation, project management etc.</p>
+
+<h2 id="new-committer-process">New Committer Process</h2>
+
+<p>The ServiceComb community follows the Apache Community’s <a href="http://community.apache.org/newcommitter.html">process</a> on accepting a new committer.</p>
+
+<ul>
+ <li>Start the vote in @private.</li>
+ <li>If the vote passes, send an offer to become a committer with @private CC’ed.</li>
+ <li>Add the committer to the <a href="/developers/team">team page</a></li>
+ <li><a href="/developers/setup-committer-rights/">Setup committer rights</a></li>
+</ul>
</section>
@@ -508,9 +496,10 @@
<div class="col">
<ul>
<p class="header">贡献</p>
- <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/developer-guide.md">报告本网页问题</a></li>
- <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/developer-guide.md">在Github上编辑此页</a></li>
+ <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/becomming-a-committer.md">报告本网页问题</a></li>
+ <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/becomming-a-committer.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/contributing.html b/content/cn/developers/contributing.html
index 4df6295..40d287b 100644
--- a/content/cn/developers/contributing.html
+++ b/content/cn/developers/contributing.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -544,6 +555,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/contributing.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/contributing.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/index.html b/content/cn/developers/index.html
index 7222f6c..4395a11 100644
--- a/content/cn/developers/index.html
+++ b/content/cn/developers/index.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -511,6 +522,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/developer-guide.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/developer-guide.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/release-guide/index.html b/content/cn/developers/release-guide/index.html
index 3c42438..f49d05b 100644
--- a/content/cn/developers/release-guide/index.html
+++ b/content/cn/developers/release-guide/index.html
@@ -296,6 +296,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -436,7 +447,7 @@
<p>在使用Maven把发行包发布到仓库之前，我们应当在<code class="highlighter-rouge">~/.m2/settings.xml</code>文件中配置制品为组群可写的，否则其它开发人员将无法提交相同制品的新SNAPSHOT版本。本项目参考了Maven项目的设定<a href="http://maven.apache.org/developers/committer-settings.html">指南</a>。请特别注意<a href="http://maven.apache.org/guides/mini/guide-encryption.html">加密密码</a>。</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><settings>
+<div class="highlighter-rouge"><pre class="highlight"><code><settings>
...
<servers>
<!-- Per http://maven.apache.org/developers/committer-settings.html -->
@@ -483,7 +494,8 @@
</profiles>
...
</settings>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="发行service-center">发行Service-Center</h2>
@@ -491,10 +503,11 @@
<ol>
<li>克隆service-center代码。
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git@github.com:apache/incubator-servicecomb-service-center.git
+ <div class="highlighter-rouge"><pre class="highlight"><code>git@github.com:apache/incubator-servicecomb-service-center.git
cd incubator-servicecomb-service-center
gvt restore
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>在master分支上打上准备发布版本的标签。</p>
@@ -588,12 +601,14 @@ gvt restore
<ol>
<li>克隆java-chassis代码。
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone git@github.com:apache/incubator-servicecomb-java-chassis.git
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>git clone git@github.com:apache/incubator-servicecomb-java-chassis.git
+</code></pre>
+ </div>
</li>
<li>使用以下perl命令，替换所有pom.xml文件中的版本号并提交改动至本地。
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
+</code></pre>
+ </div>
</li>
<li>
<p>在master分支上打上准备发布版本的标签。</p>
@@ -611,8 +626,9 @@ gvt restore
<p>更新设置内Apache帐户用户名和密码。</p>
</li>
<li>运行以下命令。
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
+</code></pre>
+ </div>
</li>
<li>
<p>上述命令执行成功，所有的jar包都成功上传至临时仓库后，运行Company Workshop作基本的功能验证。</p>
@@ -695,12 +711,14 @@ gvt restore
<ol>
<li>克隆Saga代码。
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git@github.com:apache/incubator-servicecomb-saga.git
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>git@github.com:apache/incubator-servicecomb-saga.git
+</code></pre>
+ </div>
</li>
<li>使用以下perl命令，替换所有pom.xml文件中的版本号并提交改动至本地。
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
+</code></pre>
+ </div>
</li>
<li>
<p>在master分支上打上准备发布版本的标签。</p>
@@ -718,8 +736,9 @@ gvt restore
<p>更新设置内Apache帐户用户名和密码。</p>
</li>
<li>运行以下命令。
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
+</code></pre>
+ </div>
</li>
<li>
<p>上述命令执行成功，所有的jar包都成功上传至临时仓库后，运行门槛测试以验证基本功能。</p>
@@ -876,6 +895,7 @@ gvt restore
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/release_guide.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/release_guide.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/release-validation-guide/index.html b/content/cn/developers/release-validation-guide/index.html
index 3fe0f44..a78dc35 100644
--- a/content/cn/developers/release-validation-guide/index.html
+++ b/content/cn/developers/release-validation-guide/index.html
@@ -296,6 +296,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -446,52 +457,60 @@
<h3 id="验证源代码包hash和签名正确">验证源代码包Hash和签名正确</h3>
<p>请在Vote邮件中找到<strong>Release Candidate</strong>的URL，例如：</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Release Candidate : https://dist.apache.org/repos/dist/dev/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m2/rc-01/
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>Release Candidate : https://dist.apache.org/repos/dist/dev/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m2/rc-01/
+</code></pre>
+</div>
<p>在浏览器中打开，下载<code class="highlighter-rouge">src.zip</code>结尾的源代码压缩包，以及同名的<code class="highlighter-rouge">src.zip.asc</code>签名文件和<code class="highlighter-rouge">src.zip.sha512</code>哈希文件，保持三个文件在同一目录下。</p>
<p>请在Vote邮件中找到<strong>Key</strong>的URL：</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Keys to verify the Release Candidate : https://dist.apache.org/repos/dist/dev/incubator/servicecomb/KEYS
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>Keys to verify the Release Candidate : https://dist.apache.org/repos/dist/dev/incubator/servicecomb/KEYS
+</code></pre>
+</div>
<p>在浏览器中打开，保存内容为KEYS文件并导入：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg <span class="nt">--import</span> KEYS
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>gpg --import KEYS
+</code></pre>
+</div>
<p>提示<code class="highlighter-rouge">Mohammad Asif Siddiqui (ServiceComb Code Signing Key) <asifdxtreme@apache.org></code>成功导入或未变化（已导入过）</p>
<p>验证签名：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg <span class="nt">--verify</span> xxx-src.zip.asc xxx-src.zip
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>gpg --verify xxx-src.zip.asc xxx-src.zip
+</code></pre>
+</div>
<p>提示<code class="highlighter-rouge">Good signature from "Mohammad Asif Siddiqui (ServiceComb Code Signing Key) <asifdxtreme@apache.org>"</code>代表签名正确。</p>
<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
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>sha512sum -c xxx-src.zip.sha512
+</code></pre>
+</div>
<p>提示<code class="highlighter-rouge">OK</code>代表Hash正确。</p>
<h3 id="验证源代码功能正确">验证源代码功能正确</h3>
<p>解压源代码：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>unzip xxx-src.zip
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>unzip xxx-src.zip
+</code></pre>
+</div>
<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>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean install -Pdocker -Pit
+</code></pre>
+</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>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean install -Pdocker -Pit -Pdocker-machine
+</code></pre>
+ </div>
</blockquote>
<p>等待所有的测试通过，依据配置环境不同，约耗时10~30分钟。</p>
@@ -499,8 +518,9 @@
<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/
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>rm -rf /root/.m2/repository/org/apache/servicecomb/
+</code></pre>
+</div>
<blockquote>
<p>提示：如果不是root用户，请修改对应的路径</p>
@@ -508,12 +528,13 @@
<p>请在Vote邮件中找到<strong>Staging Repository</strong>的URL：</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Staging Repository : https://repository.apache.org/content/repositories/orgapacheservicecomb-xxxx/
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>Staging Repository : https://repository.apache.org/content/repositories/orgapacheservicecomb-xxxx/
+</code></pre>
+</div>
<p>之后在maven的<code class="highlighter-rouge">settings.xml</code>中添加Staging Repository地址配置：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><settings></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><settings></span>
<span class="nt"><profiles></span>
<span class="nt"><profile></span>
<span class="nt"><repositories></span>
@@ -540,49 +561,57 @@
<span class="nt"></profile></span>
<span class="nt"></profiles></span>
<span class="nt"></settings></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<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>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean install -Pdocker -Pstaging
+</code></pre>
+</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>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean install -Pdocker -Pstaging -Pdocker-machine
+</code></pre>
+ </div>
</blockquote>
<p><strong>测试过程中可以观察到Java Chassis的依赖将从我们之前指定的Apache Staging Repository下载：</strong></p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Downloading: https://repository.apache.org/content/repositories/orgapacheservicecomb-xxxx/xxxx.pom
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>Downloading: https://repository.apache.org/content/repositories/orgapacheservicecomb-xxxx/xxxx.pom
+</code></pre>
+</div>
<p>等待所有的测试通过，依据配置环境不同，约耗时5~15分钟。</p>
<h3 id="验证spring-cloud集成功能正确">验证Spring Cloud集成功能正确</h3>
<p>从https://github.com/ServiceComb/ServiceComb-Company-WorkShop Clone最新Company示例项目代码，切换到<code class="highlighter-rouge">1.x</code>分支：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
git checkout 1.x
-</code></pre></div></div>
+</code></pre>
+</div>
<p>修改项目根目录中的<code class="highlighter-rouge">pom.xml</code>，更改其中的<code class="highlighter-rouge"><java-chassis.version></code>配置为当前发版版本，例如1.0.0-m2：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><properties></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><properties></span>
<span class="nt"><java-chassis.version></span>1.0.0-m2<span class="nt"></java-chassis.version></span>
<span class="nt"></properties></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>在项目根目录下执行：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean verify <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean verify -Pdocker -Pstaging
+</code></pre>
+</div>
<blockquote>
<p>提示：如果如果验证环境操作系统是Windows：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean verify <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span> <span class="nt">-Pdocker-machine</span>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean verify -Pdocker -Pstaging -Pdocker-machine
+</code></pre>
+ </div>
</blockquote>
<p>等待所有的测试通过，依据配置环境不同，约耗时5~10分钟。</p>
@@ -671,6 +700,7 @@ git checkout 1.x
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/release_validation_guide.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/release_validation_guide.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/setup-committer-rights/index.html b/content/cn/developers/setup-committer-rights/index.html
index e3d2e46..57e0ace 100644
--- a/content/cn/developers/setup-committer-rights/index.html
+++ b/content/cn/developers/setup-committer-rights/index.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -526,6 +537,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/setup-committer-rights.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/setup-committer-rights.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/setup-develop-environment/index.html b/content/cn/developers/setup-develop-environment/index.html
index e8865e5..11355fc 100644
--- a/content/cn/developers/setup-develop-environment/index.html
+++ b/content/cn/developers/setup-develop-environment/index.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -437,17 +448,19 @@
<li>
<p>配置Git。主要配置Git的个人信息和设置免密码提交代码。个人信息可通过以下指令进行配置：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git config <span class="nt">--global</span> user.name <your-user-name>
-git config <span class="nt">--global</span> user.email <your-email-address>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git config --global user.name <your-user-name>
+git config --global user.email <your-email-address>
+</code></pre>
+ </div>
<p>其中，请将<your-user-name>和<your-email-address>替换为您在Github上注册用到的用户名和邮箱信息。设置免密码提交代码可参考<a href="https://stackoverflow.com/a/8588786" target="_blank">Git免密码提交代码教程</a>。</p>
</li>
<li>
<p>获取项目代码。以 <a href="https://github.com/apache/incubator-servicecomb-java-chassis">ServiceComb-Java-Chassis</a> 项目为例，可直接执行以下指令获取代码：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/apache/incubator-servicecomb-java-chassis.git
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/apache/incubator-servicecomb-java-chassis.git
+</code></pre>
+ </div>
</li>
</ol>
@@ -554,6 +567,7 @@ git config <span class="nt">--global</span> user.email <your-email-address>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/setup-develop-environment.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/setup-develop-environment.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/submit-codes/index.html b/content/cn/developers/submit-codes/index.html
index a539c8f..d13eae1 100644
--- a/content/cn/developers/submit-codes/index.html
+++ b/content/cn/developers/submit-codes/index.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -390,7 +401,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">
@@ -451,8 +462,9 @@
<li>
<p>将代码克隆到本地：</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/<your_github_name>/incubator-servicecomb-website.git
-</code></pre></div> </div>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/<your_github_name>/incubator-servicecomb-website.git
+</code></pre>
+ </div>
<p>注意：请将 <your_github_name> 替换为您的github名字。</p>
</li>
@@ -464,25 +476,28 @@
<li>
<p>将 apache/incubator-servicecomb-website 添加为本地仓库的远程分支 upstream：</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd </span>incubator-servicecomb-website
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="nb">cd </span>incubator-servicecomb-website
git remote add upstream https://github.com/apache/incubator-servicecomb-website.git
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>检查远程仓库设置：</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git remote <span class="nt">-v</span>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git remote -v
origin https://github.com/<your_github_name>/incubator-servicecomb-website.git <span class="o">(</span>fetch<span class="o">)</span>
origin https://github.com/<your_github_name>/incubator-servicecomb-website.git <span class="o">(</span>push<span class="o">)</span>
upstream https://github.com/apache/incubator-servicecomb-website.git <span class="o">(</span>fetch<span class="o">)</span>
upstream https://github.com/apache/incubator-servicecomb-website.git <span class="o">(</span>push<span class="o">)</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>新建分支以便在分支上做修改：</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout <span class="nt">-b</span> <your_branch_name>
-</code></pre></div> </div>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git checkout -b <your_branch_name>
+</code></pre>
+ </div>
</li>
</ul>
@@ -494,9 +509,10 @@ upstream https://github.com/apache/incubator-servicecomb-website.git <span clas
<li>
<p>提交代码到远程分支：</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git commit <span class="nt">-a</span> <span class="nt">-m</span> <span class="s2">"<you_commit_message>"</span>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git commit -a -m <span class="s2">"<you_commit_message>"</span>
git push origin <your_branch_name>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ul>
@@ -518,27 +534,33 @@ fig-2 Create pull request</p>
<p> 提交PR时的代码冲突一般是由于多人编辑同一个文件引起的，解决冲突主要通过以下步骤即可：</p>
<ol>
<li>切换至主分支
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout master
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git checkout master
+</code></pre>
+ </div>
</li>
<li>同步远端主分支至本地
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git pull upstream master
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git pull upstream master
+</code></pre>
+ </div>
</li>
<li>切换回刚才的分支（假设分支名为fix）
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout fix
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git checkout fix
+</code></pre>
+ </div>
</li>
<li>进行rebase
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git rebase <span class="nt">-i</span> master
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git rebase -i master
+</code></pre>
+ </div>
<p>此时会弹出修改记录的文件，一般直接保存即可。然后会提示哪些文件出现了冲突，此时可打开冲突文件对冲突部分进行修改，将提示的所有冲突文件的冲突都解决后，执行</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git add <span class="nb">.</span>
-git rebase <span class="nt">--continue</span>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git add .
+git rebase --continue
+</code></pre>
+ </div>
<p>依此往复，直至屏幕出现类似 <em>rebase successful</em> 字样即可，此时您可以进行往提交PR的分支进行更新：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git push <span class="nt">-f</span> origin fix
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git push -f origin fix
+</code></pre>
+ </div>
</li>
</ol>
@@ -599,6 +621,7 @@ git rebase <span class="nt">--continue</span>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/submit-codes.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/submit-codes.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/subscribe-mail-list/index.html b/content/cn/developers/subscribe-mail-list/index.html
index 4b5f59f..874b233 100644
--- a/content/cn/developers/subscribe-mail-list/index.html
+++ b/content/cn/developers/subscribe-mail-list/index.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -390,7 +401,7 @@
<meta itemprop="headline" content="如何订阅Apache ServiceComb (incubating) 的邮件列表">
<meta itemprop="description" content="如何订阅Apache ServiceComb (incubating) 的邮件列表">
- <meta itemprop="dateModified" content="September 10, 2017">
+ <meta itemprop="dateModified" content="September 08, 2017">
<div class="page__inner-wrap">
@@ -524,6 +535,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/subscribe-mail-list.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/subscribe-mail-list.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/team/index.html b/content/cn/developers/team/index.html
index c6e3079..f3c8ece 100644
--- a/content/cn/developers/team/index.html
+++ b/content/cn/developers/team/index.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -684,6 +695,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/team.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/team.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/use-gitter/index.html b/content/cn/developers/use-gitter/index.html
index 7878eae..1d8d346 100644
--- a/content/cn/developers/use-gitter/index.html
+++ b/content/cn/developers/use-gitter/index.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -390,7 +401,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">
@@ -526,6 +537,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/use-gitter.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/use-gitter.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/developers/use-jira/index.html b/content/cn/developers/use-jira/index.html
index 11028a1..f3487c5 100644
--- a/content/cn/developers/use-jira/index.html
+++ b/content/cn/developers/use-jira/index.html
@@ -294,6 +294,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">成为Committer</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/cn/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">开发环境准备</span></a>
@@ -390,7 +401,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">
@@ -505,6 +516,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/cn/use-jira.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/cn/use-jira.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/apache-servicecomb-incubating-day/index.html b/content/cn/docs/apache-servicecomb-incubating-day/index.html
index de86650..1379b29 100644
--- a/content/cn/docs/apache-servicecomb-incubating-day/index.html
+++ b/content/cn/docs/apache-servicecomb-incubating-day/index.html
@@ -775,6 +775,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-06-14-apache-servicecomb-incubating-day.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-06-14-apache-servicecomb-incubating-day.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/autoscale-on-company/index.html b/content/cn/docs/autoscale-on-company/index.html
index 87d250b..725ddf0 100644
--- a/content/cn/docs/autoscale-on-company/index.html
+++ b/content/cn/docs/autoscale-on-company/index.html
@@ -383,74 +383,82 @@
<p> 具体读者踩了坑后更新的heapster的安装脚本作者放在：<a href="https://github.com/zenlinTechnofreak/LinuxCon-Beijing-WorkShop/tree/autoscal/kubernetes/heapster/deploy">heapster</a>，可直接获取下载获取，需要调整一个参数，后直接运行kube.sh脚本进行安装。</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>vi LinuxCon-Beijing-WorkShop/kubernetes/heapster/deploy/kube-config/influxdb/heapster.yaml
-</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">template</span><span class="pi">:</span>
- <span class="na">metadata</span><span class="pi">:</span>
- <span class="na">labels</span><span class="pi">:</span>
- <span class="na">task</span><span class="pi">:</span> <span class="s">monitoring</span>
- <span class="na">k8s-app</span><span class="pi">:</span> <span class="s">heapster</span>
- <span class="na">spec</span><span class="pi">:</span>
- <span class="na">serviceAccountName</span><span class="pi">:</span> <span class="s">heapster</span>
- <span class="na">containers</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s">heapster</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s">gcr.io/google_containers/heapster-amd64:v1.4.1</span>
- <span class="na">imagePullPolicy</span><span class="pi">:</span> <span class="s">IfNotPresent</span>
- <span class="na">command</span><span class="pi">:</span>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>vi LinuxCon-Beijing-WorkShop/kubernetes/heapster/deploy/kube-config/influxdb/heapster.yaml
+</code></pre>
+</div>
+
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">spec</span><span class="pi">:</span>
+ <span class="s">replicas</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="s">template</span><span class="pi">:</span>
+ <span class="s">metadata</span><span class="pi">:</span>
+ <span class="s">labels</span><span class="pi">:</span>
+ <span class="s">task</span><span class="pi">:</span> <span class="s">monitoring</span>
+ <span class="s">k8s-app</span><span class="pi">:</span> <span class="s">heapster</span>
+ <span class="s">spec</span><span class="pi">:</span>
+ <span class="s">serviceAccountName</span><span class="pi">:</span> <span class="s">heapster</span>
+ <span class="s">containers</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s">heapster</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s">gcr.io/google_containers/heapster-amd64:v1.4.1</span>
+ <span class="s">imagePullPolicy</span><span class="pi">:</span> <span class="s">IfNotPresent</span>
+ <span class="s">command</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s">/heapster</span>
<span class="c1">#集群内安装直接使用kubernetes</span>
<span class="pi">-</span> <span class="s">--source=kubernetes</span>
<span class="c1">#集群外安装请直接将下面的服务地址替换为k8s api server地址</span>
<span class="c1"># - --source=kubernetes:http://10.229.43.65:6443?inClusterConfig=false</span>
<span class="pi">-</span> <span class="s">--sink=influxdb:http://monitoring-influxdb:8086</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h5 id="启动company">启动Company：</h5>
<p> 下载Comany支持弹性伸缩的代码：</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
<span class="nb">cd </span>LinuxCon-Beijing-WorkShop/kubernetes/
bash start-autoscale.sh
-</code></pre></div></div>
+</code></pre>
+</div>
<p> 在Company的deployment.yaml中， 增加了如下限定资源的字段，这将限制每个pod被限制在200mill-core(1000毫core == 1 core)的cpu使用率以内。</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">resources</span><span class="pi">:</span>
- <span class="na">limits</span><span class="pi">:</span>
- <span class="na">cpu</span><span class="pi">:</span> <span class="s">200m</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">resources</span><span class="pi">:</span>
+ <span class="s">limits</span><span class="pi">:</span>
+ <span class="s">cpu</span><span class="pi">:</span> <span class="s">200m</span>
+</code></pre>
+</div>
<p> 在 start-autoscale.sh 中，对每个deployment创建HPA(pod水平弹性伸缩器)资源，限定每个pod的副本数弹性伸缩时控制在1到10之间，并限定每个pod的cpu占用率小于50%，结合前面限定了200mcore，故，每个pod的的平均cpu占用率会被HPA通过弹性伸缩能力控制在100mcore以内。</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># Create Horizontal Pod Autoscaler</span>
-kubectl autoscale deployment zipkin <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-bulletin-board <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-worker <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-doorman <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-manager <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-beekeeper <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="c"># Create Horizontal Pod Autoscaler</span>
+kubectl autoscale deployment zipkin --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-bulletin-board --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-worker --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-doorman --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-manager --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-beekeeper --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+</code></pre>
+</div>
<p> 当运行start-autoscale.sh之后，具备弹性伸缩器的company已经被创建，可通过下面指令进行HPA的查询：</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code> kubectl get hpa
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code> kubectl get hpa
+</code></pre>
+</div>
<h5 id="启动压测">启动压测：</h5>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">export</span> <span class="nv">$HOST</span><span class="o">=</span><heapster-ip>:<heapster-port>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="nb">export</span> <span class="nv">$HOST</span><span class="o">=</span><heapster-ip>:<heapster-port>
bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
-</code></pre></div></div>
+</code></pre>
+</div>
<p> 该脚本不断循环执行 1s内向Company请求计算 fibonacci 数值200次，对Company造成请求压力：</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">FIBONA_NUM</span><span class="o">=</span><span class="sb">`</span>curl <span class="nt">-s</span> <span class="nt">-H</span> <span class="s2">"Authorization: </span><span class="nv">$Authorization</span><span class="s2">"</span> <span class="nt">-XGET</span> <span class="s2">"http://</span><span class="nv">$HOST</span><span class="s2">/worker/fibonacci/term?n=6"</span><span [...]
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="nv">FIBONA_NUM</span><span class="o">=</span><span class="sb">`</span>curl -s -H <span class="s2">"Authorization: </span><span class="nv">$Authorization</span><span class="s2">"</span> -XGET <span class="s2">"http://</span><span class="nv">$HOST</span><span class="s2">/worker/fibonacci/term?n=6"</span><span class="sb">`</span>
+</code></pre>
+</div>
<h2 id="测试过程与结果">测试过程与结果</h2>
@@ -784,6 +792,7 @@ bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-08-24-autoscale-on-company.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-08-24-autoscale-on-company.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/build-java-chassis-microservices-using-gradle/index.html b/content/cn/docs/build-java-chassis-microservices-using-gradle/index.html
index e4ad6c0..46c3d64 100644
--- a/content/cn/docs/build-java-chassis-microservices-using-gradle/index.html
+++ b/content/cn/docs/build-java-chassis-microservices-using-gradle/index.html
@@ -377,7 +377,7 @@
<p>在maven中，Java Chassis的依赖管理通过以下方式即可引入：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
<span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
@@ -388,7 +388,8 @@
<span class="nt"></dependency></span>
<span class="nt"></dependencies></span>
<span class="nt"></dependencyManagement></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>在gradle中，则需要以下三步完成，具体可参考 ：<a href="https://github.com/apache/incubator-servicecomb-java-chassis/pull/640/files#diff-8d0fdb4970d74d053b6585c3d5ae4cc2R36">Java Chassis的PR-640</a>。</p>
@@ -396,7 +397,7 @@
<li>
<p>声明使用maven仓库及依赖管理插件的依赖</p>
- <div class="language-gradle highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">buildscript</span> <span class="o">{</span>
+ <div class="language-gradle highlighter-rouge"><pre class="highlight"><code><span class="k">buildscript</span> <span class="o">{</span>
<span class="k">repositories</span> <span class="o">{</span>
<span class="n">mavenLocal</span><span class="o">()</span>
<span class="n">mavenCentral</span><span class="o">()</span>
@@ -405,23 +406,26 @@
<span class="n">classpath</span><span class="o">(</span><span class="s1">'io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE'</span><span class="o">)</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>启用依赖管理插件</p>
- <div class="language-gradle highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">apply</span> <span class="nl">plugin:</span> <span class="s1">'io.spring.dependency-management'</span>
-</code></pre></div> </div>
+ <div class="language-gradle highlighter-rouge"><pre class="highlight"><code><span class="n">apply</span> <span class="nl">plugin:</span> <span class="s1">'io.spring.dependency-management'</span>
+</code></pre>
+ </div>
</li>
<li>
<p>声明Java Chassis的统一依赖管理</p>
- <div class="language-gradle highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">dependencyManagement</span> <span class="o">{</span>
+ <div class="language-gradle highlighter-rouge"><pre class="highlight"><code><span class="n">dependencyManagement</span> <span class="o">{</span>
<span class="n">imports</span> <span class="o">{</span>
<span class="n">mavenBom</span> <span class="s1">'org.apache.servicecomb:java-chassis-dependencies:1.0.0-m1'</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ol>
@@ -437,7 +441,7 @@
<li>
<p>声明使用maven仓库及Spring Boot插件的依赖</p>
- <div class="language-gradle highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">buildscript</span> <span class="o">{</span>
+ <div class="language-gradle highlighter-rouge"><pre class="highlight"><code><span class="k">buildscript</span> <span class="o">{</span>
<span class="k">dependencies</span> <span class="o">{</span>
<span class="n">classpath</span><span class="o">(</span><span class="s2">"org.springframework.boot:spring-boot-gradle-plugin:1.4.5.RELEASE"</span><span class="o">)</span>
<span class="o">}</span>
@@ -446,13 +450,15 @@
<span class="n">mavenCentral</span><span class="o">()</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>启用Spring Boot插件</p>
- <div class="language-gradle highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">apply</span> <span class="nl">plugin:</span> <span class="s1">'org.springframework.boot'</span>
-</code></pre></div> </div>
+ <div class="language-gradle highlighter-rouge"><pre class="highlight"><code><span class="n">apply</span> <span class="nl">plugin:</span> <span class="s1">'org.springframework.boot'</span>
+</code></pre>
+ </div>
</li>
</ol>
</li>
@@ -461,10 +467,11 @@
<p>非Spring Boot应用只需要在<code class="highlighter-rouge">build.gradle</code>文件中使用<code class="highlighter-rouge">application</code>插件并指明应用入口方法即可：</p>
- <div class="language-gradle highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">apply</span> <span class="nl">plugin:</span> <span class="s1">'application'</span>
+ <div class="language-gradle highlighter-rouge"><pre class="highlight"><code><span class="n">apply</span> <span class="nl">plugin:</span> <span class="s1">'application'</span>
<span class="n">mainClassName</span> <span class="o">=</span> <span class="s1">'org.packageName.XXXMain'</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ol>
@@ -756,6 +763,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-04-13-build-java-chassis-microservices-using-gradle.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-04-13-build-java-chassis-microservices-using-gradle.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/communication-btw-sc-ms/index.html b/content/cn/docs/communication-btw-sc-ms/index.html
index b69ef3b..d5c258e 100644
--- a/content/cn/docs/communication-btw-sc-ms/index.html
+++ b/content/cn/docs/communication-btw-sc-ms/index.html
@@ -702,6 +702,7 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-08-09-communication-btw-sc-ms.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-08-09-communication-btw-sc-ms.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/company-on-kubernetes/index.html b/content/cn/docs/company-on-kubernetes/index.html
index 3a38211..c86a6f0 100644
--- a/content/cn/docs/company-on-kubernetes/index.html
+++ b/content/cn/docs/company-on-kubernetes/index.html
@@ -381,18 +381,19 @@
<p> <a href="https://github.com/ServiceComb/ServiceComb-Company-WorkShop/blob/master/kubernetes/README.md">Run Company on Kubernetes Cluster</a> 提供了详细的使用方法，读者只需通过以下3条指令，就可将company在kubernetes集群上部署起来，</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
<span class="nb">cd </span>ServiceComb-Company-WorkShop/kubernetes/
bash start.sh
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="yaml文件解读">Yaml文件解读</h2>
<p> 以作者的实际环境为例：</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@zenlin:~/src/LinuxCon-Beijing-WorkShop/kubernetes# kubectl get pod <span class="nt">-owide</span>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">root@zenlin:~/src/LinuxCon-Beijing-WorkShop/kubernetes# </span>kubectl get pod -owide
NAME READY STATUS RESTARTS AGE IP NODE
company-beekeeper-3737555734-48sxf 1/1 Running 0 17s 10.244.2.49 zenlinnode2
company-bulletin-board-4113647782-th91w 1/1 Running 0 17s 10.244.1.53 zenlinnode1
@@ -400,38 +401,41 @@ company-doorman-3391375245-g0p8c 1/1 Running 0 17s
company-manager-454733969-0c1g8 1/1 Running 0 16s 10.244.2.50 zenlinnode2
company-worker-1085546725-x7zl4 1/1 Running 0 17s 10.244.1.54 zenlinnode1
zipkin-508217170-0khr3 1/1 Running 0 17s 10.244.2.48 zenlinnode2
-</code></pre></div></div>
+</code></pre>
+</div>
<p> 可以看到，一共启动了6个pod，分别为，公司经理（company-manager）、门卫（company-doorman）、公告栏（company-bulletin-board）、技工（company-worker）、养蜂人（company-beekeeper）、调用链跟踪（zipkin），K8S集群分别为他们分配对应的集群IP。</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@zenlin:~/src/LinuxCon-Beijing-WorkShop/kubernetes# kubectl get svc <span class="nt">-owide</span>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">root@zenlin:~/src/LinuxCon-Beijing-WorkShop/kubernetes# </span>kubectl get svc -owide
NAME CLUSTER-IP EXTERNAL-IP PORT<span class="o">(</span>S<span class="o">)</span> AGE SELECTOR
company-bulletin-board 10.99.70.46 <none> 30100/TCP 12m io.kompose.service<span class="o">=</span>company-bulletin-board
company-manager 10.100.61.227 <nodes> 8083:30301/TCP 12m io.kompose.service<span class="o">=</span>company-manager
zipkin 10.104.92.198 <none> 9411/TCP 12m io.kompose.service<span class="o">=</span>zipkin
-</code></pre></div></div>
+</code></pre>
+</div>
<p> 仅启动了3个service，调用链跟踪（zipkin）、公告栏（company-bulletin-board）以及经理（company-manager），这是因为，调用链跟踪和公告栏需要在集群内被其他服务通过域名来调用，而经理需要作为对外作为网关，统一暴露服务端口。</p>
<p> 查看company-bulletin-board-service.yaml文件，</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">apiVersion</span><span class="pi">:</span> <span class="s">v1</span>
- <span class="na">kind</span><span class="pi">:</span> <span class="s">Service</span>
- <span class="na">metadata</span><span class="pi">:</span>
- <span class="na">creationTimestamp</span><span class="pi">:</span> <span class="no">null</span>
- <span class="na">labels</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">apiVersion</span><span class="pi">:</span> <span class="s">v1</span>
+ <span class="s">kind</span><span class="pi">:</span> <span class="s">Service</span>
+ <span class="s">metadata</span><span class="pi">:</span>
+ <span class="s">creationTimestamp</span><span class="pi">:</span> <span class="s">null</span>
+ <span class="s">labels</span><span class="pi">:</span>
<span class="err"> </span><span class="s">io.kompose.service</span><span class="pi">:</span> <span class="s">company-bulletin-board</span>
<span class="s">name</span><span class="pi">:</span> <span class="s">company-bulletin-board</span>
<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">ports</span><span class="pi">:</span>
+<span class="err"> </span><span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">30100"</span>
+ <span class="s">port</span><span class="pi">:</span> <span class="s">30100</span>
+ <span class="s">targetPort</span><span class="pi">:</span> <span class="s">30100</span>
<span class="s">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>
-</code></pre></div></div>
+ <span class="s">status</span><span class="pi">:</span>
+ <span class="s">loadBalancer</span><span class="pi">:</span> <span class="pi">{}</span>
+</code></pre>
+</div>
<p> 该文件定义了公告栏对应的service，给service定义了name、port和targetPort，这样通过kubectl expose创建的service会在集群内具备DNS能力，在其他服务刚启动还未注册到公告栏（服务注册发现中心）时，就是使用该能力来访问到公告栏并注册服务的。</p>
@@ -439,37 +443,38 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<p> 查看company-worker-deployment.yaml 文件，</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">apiVersion</span><span class="pi">:</span> <span class="s">extensions/v1beta1</span>
-<span class="na">kind</span><span class="pi">:</span> <span class="s">Deployment</span>
-<span class="na">metadata</span><span class="pi">:</span>
- <span class="na">creationTimestamp</span><span class="pi">:</span> <span class="no">null</span>
- <span class="na">labels</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">apiVersion</span><span class="pi">:</span> <span class="s">extensions/v1beta1</span>
+<span class="s">kind</span><span class="pi">:</span> <span class="s">Deployment</span>
+<span class="s">metadata</span><span class="pi">:</span>
+ <span class="s">creationTimestamp</span><span class="pi">:</span> <span class="s">null</span>
+ <span class="s">labels</span><span class="pi">:</span>
<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">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>
-<span class="err"> </span><span class="na">creationTimestamp</span><span class="pi">:</span> <span class="no">null</span>
+<span class="s">spec</span><span class="pi">:</span>
+ <span class="s">replicas</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="s">strategy</span><span class="pi">:</span> <span class="pi">{}</span>
+ <span class="s">template</span><span class="pi">:</span>
+<span class="err"> </span><span class="s">metadata</span><span class="pi">:</span>
+<span class="err"> </span><span class="s">creationTimestamp</span><span class="pi">:</span> <span class="s">null</span>
<span class="err"> </span><span class="s">labels</span><span class="pi">:</span>
<span class="err"> </span><span class="s">io.kompose.service</span><span class="pi">:</span> <span class="s">company-worker</span>
-<span class="na">spec</span><span class="pi">:</span>
- <span class="na">containers</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">env</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s">ARTIFACT_ID</span>
- <span class="na">value</span><span class="pi">:</span> <span class="s">worker</span>
- <span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s">JAVA_OPTS</span>
- <span class="na">value</span><span class="pi">:</span> <span class="s">-Dcse.service.registry.address=http://company-bulletin-board:30100 -Dservicecomb.tracing.collector.adress=http://zipkin:9411</span>
- <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="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>
-</code></pre></div></div>
+<span class="s">spec</span><span class="pi">:</span>
+ <span class="s">containers</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">env</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s">ARTIFACT_ID</span>
+ <span class="s">value</span><span class="pi">:</span> <span class="s">worker</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s">JAVA_OPTS</span>
+ <span class="s">value</span><span class="pi">:</span> <span class="s">-Dcse.service.registry.address=http://company-bulletin-board:30100 -Dservicecomb.tracing.collector.adress=http://zipkin:9411</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s">servicecomb/worker:0.0.1-SNAPSHOT</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">company-worker</span>
+ <span class="s">ports</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">containerPort</span><span class="pi">:</span> <span class="s">7070</span>
+ <span class="pi">-</span> <span class="s">containerPort</span><span class="pi">:</span> <span class="s">8080</span>
+ <span class="s">resources</span><span class="pi">:</span> <span class="pi">{}</span>
+ <span class="s">restartPolicy</span><span class="pi">:</span> <span class="s">Always</span>
+<span class="s">status</span><span class="pi">:</span> <span class="pi">{}</span>
+</code></pre>
+</div>
<p> 该yaml文件定义了副本数为1（replicas: 1）的pod，可以通过修改该副本数控制所需启动的pod的副本数量（当然也可以使用K8S的弹性伸缩能力去实现按需动态水平伸缩，弹性伸缩部分将在后面的博文中提供）。前面我们提到过company-bulletin-board具备了DNS的能力，故现在可以通过该Deployment中的env传递cse.service.registry.address的值给pod内的服务使用，如： -Dcse.service.registry.address=http://company-bulletin-board:30100，<a href="https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md">kube-dns</a>将会自动解析该servicename。</p>
@@ -477,21 +482,23 @@ zipkin 10.104.92.198 <none> 9411/TCP 12
<p> 其他的deployment.yaml以及service.yaml都跟以上大同小异，唯一例外的是company-manager服务，我们可以看到在company-manager-service.yaml中看到定义了nodePort，这将使能company-manager对集群外部提供公网IP和服务端口，如下：</p>
-<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>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">spec</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">8083"</span>
+<span class="err"> </span><span class="s">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="s">type</span><span class="pi">:</span> <span class="s">NodePort</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p> 可以通过以下方法获得公网IP和服务端口：</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>kubectl get svc company-manager <span class="nt">-o</span> yaml | <span class="nb">grep </span>ExternalIP <span class="nt">-C</span> 1
-kubectl get svc company-manager <span class="nt">-o</span> yaml | <span class="nb">grep </span>nodePort <span class="nt">-C</span> 1
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code>kubectl get svc company-manager -o yaml | grep ExternalIP -C 1
+kubectl get svc company-manager -o yaml | grep nodePort -C 1
+</code></pre>
+</div>
<p> 接下来你就可以使用公网IP和服务端口访问已经部署好的company了，在<a href="https://github.com/ServiceComb/ServiceComb-Company-WorkShop/blob/master/kubernetes/README.md">github.com/ServiceComb/ServiceComb-Company-WorkShop/kubernetes</a>上详细提供了通过在集群内访问和集群外访问的方法。</p>
@@ -795,6 +802,7 @@ kubectl get svc company-manager <span class="nt">-o</span> yaml | <span class="n
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-08-21-company-on-kubernetes.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-08-21-company-on-kubernetes.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/config_center_integration/index.html b/content/cn/docs/config_center_integration/index.html
index 3b4e0ea..e788b75 100644
--- a/content/cn/docs/config_center_integration/index.html
+++ b/content/cn/docs/config_center_integration/index.html
@@ -371,7 +371,7 @@
<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>
+<div class="language-java highlighter-rouge"><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>
<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>
@@ -379,7 +379,8 @@
<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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>类似使用环境变量或者<code class="highlighter-rouge">properties</code>和<code class="highlighter-rouge">xml</code>等文件方式传入配置进而控制应用表现的方法广泛应用于开发过程中，这样做可以将外部配置与业务代码解耦，若有变动只需修改配置参数而不需要重新编译构建项目。但是这种将配置和代码放在一起的方式可能会泄露隐私信息（比如密码），因为代码可能会公开，出于安全的考虑，配置和代码分离管理的方式开始广泛使用，常见的方法比如将配置放在CI服务器上通过打包脚本打入应用包中，或者直接放到运行应用的服务器的特定目录下，或者存储到数据库中。这种方式在传统的单体应用中简单有效，但也带来一些新的挑战：</p>
@@ -526,9 +527,10 @@
<p>Apollo服务可以通过docker或二进制启动，方法参考官网文档[3]，推荐使用docker启动。</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/lijasonvip/apollo-image-for-servicecomb.git
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/lijasonvip/apollo-image-for-servicecomb.git
<span class="nb">cd </span>apollo-image-for-servicecomb <span class="o">&&</span> docker-compose up
-</code></pre></div></div>
+</code></pre>
+</div>
<p>出现<code class="highlighter-rouge">apollo-quick-start | Portal started. You can visit http://localhost:8070 now!</code>后表示Apollo已经启动成功，浏览器访问<code class="highlighter-rouge">http://localhost:8070</code>即可访问<code class="highlighter-rouge">portal</code>服务，默认登录账号为<code class="highlighter-rouge">apollo/admin</code>。</p>
@@ -552,26 +554,28 @@
<p>在Chassis应用的pom文件中引入依赖<code class="highlighter-rouge">config-apollo</code>：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>config-apollo<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h5 id="添加配置">添加配置</h5>
<p>在Chassis应用的配置文件<code class="highlighter-rouge">microservice.yaml</code>中增加以下配置：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">apollo</span><span class="pi">:</span>
- <span class="na">config</span><span class="pi">:</span>
- <span class="na">serverUri</span><span class="pi">:</span> <span class="s">http://127.0.0.1:8070</span><span class="err"> </span><span class="s">#Apollo portal服务地址</span>
- <span class="na">serviceName</span><span class="pi">:</span> <span class="s">SampleApp</span><span class="err"> </span><span class="s">#创建应用时的AppID</span>
- <span class="na">env</span><span class="pi">:</span> <span class="s">DEV</span><span class="err"> </span><span class="s">#env默认是DEV</span>
- <span class="na">clusters</span><span class="pi">:</span> <span class="s">default</span><span class="err"> </span><span class="s">#cluster默认default</span>
- <span class="na">namespace</span><span class="pi">:</span> <span class="s">application</span><span class="err"> </span><span class="s">#namespace默认application</span>
- <span class="na">token</span><span class="pi">:</span> <span class="s">de3c5b2e6d8535b96</span><span class="err"> </span><span class="s">#第一步中生成的TOKEN</span>
- <span class="na">refreshInterval</span><span class="pi">:</span> <span class="s">10</span><span class="err"> </span><span class="s">#自动拉取配置的时间间隔</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">apollo</span><span class="pi">:</span>
+ <span class="s">config</span><span class="pi">:</span>
+ <span class="s">serverUri</span><span class="pi">:</span> <span class="s">http://127.0.0.1:8070</span><span class="err"> </span><span class="s">#Apollo portal服务地址</span>
+ <span class="s">serviceName</span><span class="pi">:</span> <span class="s">SampleApp</span><span class="err"> </span><span class="s">#创建应用时的AppID</span>
+ <span class="s">env</span><span class="pi">:</span> <span class="s">DEV</span><span class="err"> </span><span class="s">#env默认是DEV</span>
+ <span class="s">clusters</span><span class="pi">:</span> <span class="s">default</span><span class="err"> </span><span class="s">#cluster默认default</span>
+ <span class="s">namespace</span><span class="pi">:</span> <span class="s">application</span><span class="err"> </span><span class="s">#namespace默认application</span>
+ <span class="s">token</span><span class="pi">:</span> <span class="s">de3c5b2e6d8535b96</span><span class="err"> </span><span class="s">#第一步中生成的TOKEN</span>
+ <span class="s">refreshInterval</span><span class="pi">:</span> <span class="s">10</span><span class="err"> </span><span class="s">#自动拉取配置的时间间隔</span>
+</code></pre>
+</div>
<p>至此，通过简单的4步应用已经成功的对接到了Apollo配置中心，启动应用后可以在Apollo页面通过对配置项的新增、更新、回滚等操作进行服务治理啦！Demo参考[4]。</p>
@@ -594,14 +598,15 @@
<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>
+ <div class="language-java highlighter-rouge"><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="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="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p><code class="highlighter-rouge">ConfigRefresh</code>线程的<code class="highlighter-rouge">run</code>中会从Apollo配置中心获取最新配置项并和之前的配置项对比分析出新增、修改和删除的配置参数，然后去执行对应的更新操作。对配置项的修改更新都是基于Archaius的<code class="highlighter-rouge">WatchedUpdateListener</code> 进而实现应用内参数的动态更新。</p>
</li>
@@ -921,6 +926,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-04-04-config-center-integration.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-04-04-config-center-integration.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/distributed-transactions-saga-implementation/index.html b/content/cn/docs/distributed-transactions-saga-implementation/index.html
index d032b04..b148076 100644
--- a/content/cn/docs/distributed-transactions-saga-implementation/index.html
+++ b/content/cn/docs/distributed-transactions-saga-implementation/index.html
@@ -869,6 +869,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-04-26-distributed-transactions-saga.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-04-26-distributed-transactions-saga.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/distributed_saga_1/index.html b/content/cn/docs/distributed_saga_1/index.html
index 6dd17bf..94018e1 100644
--- a/content/cn/docs/distributed_saga_1/index.html
+++ b/content/cn/docs/distributed_saga_1/index.html
@@ -787,6 +787,7 @@ Caitie McCaffrey也在她的<a href="https://www.youtube.com/watch?v=xDuwrtwYHu8
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-09-13-saga-background.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-09-13-saga-background.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/distributed_saga_2/index.html b/content/cn/docs/distributed_saga_2/index.html
index 008fce5..1d23597 100644
--- a/content/cn/docs/distributed_saga_2/index.html
+++ b/content/cn/docs/distributed_saga_2/index.html
@@ -763,6 +763,7 @@ Caitie McCaffrey在她的演讲<a href="https://www.youtube.com/watch?v=1H6tounp
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-09-16-saga-design.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-09-16-saga-design.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/distributed_saga_3/index.html b/content/cn/docs/distributed_saga_3/index.html
index 5ce3616..092afb6 100644
--- a/content/cn/docs/distributed_saga_3/index.html
+++ b/content/cn/docs/distributed_saga_3/index.html
@@ -785,6 +785,7 @@ n个处于不确定状态的服务向其他n-1个服务咨询将产生<strong>O(
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-09-18-saga-and-others.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-09-18-saga-and-others.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/easy-build-microservice-system-part-I/index.html b/content/cn/docs/easy-build-microservice-system-part-I/index.html
index 3618e3a..32dd02e 100644
--- a/content/cn/docs/easy-build-microservice-system-part-I/index.html
+++ b/content/cn/docs/easy-build-microservice-system-part-I/index.html
@@ -378,8 +378,9 @@
<h3 id="牛刀小试">牛刀小试</h3>
<p>打开命令行，输入下面的命令：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn org.apache.maven.plugins:maven-archetype-plugin:2.4:generate <span class="nt">-DarchetypeGroupId</span><span class="o">=</span>org.apache.servicecomb.archetypes <span class="nt">-DarchetypeArtifactId</span><span class="o">=</span>business-service-jaxrs-archetype <span class="nt">-DarchetypeVersion</span><span class="o">=</span>1.0.0-m2-SNAPSHOT <span class="nt">-DarchetypeRepository</span [...]
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn org.apache.maven.plugins:maven-archetype-plugin:2.4:generate -DarchetypeGroupId<span class="o">=</span>org.apache.servicecomb.archetypes -DarchetypeArtifactId<span class="o">=</span>business-service-jaxrs-archetype -DarchetypeVersion<span class="o">=</span>1.0.0-m2-SNAPSHOT -DarchetypeRepository<span class="o">=</span>https://repository.apache.org/content/groups/snapshots-group
+</code></pre>
+</div>
<blockquote>
<p>提示：由于Java Chassis Archetypes还处于SNAPSHOT阶段，Repository托管在Apache Snapshots库中，仅用于测试，所以下载速度会稍慢。</p>
@@ -391,13 +392,14 @@
<p>运行它也很简单，使用IDE打开项目，DEBUG -> Application.java，或在命令行：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c">#编译打包</span>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="c">#编译打包</span>
mvn package
<span class="c">#切换到输出目录</span>
<span class="nb">cd </span>target
<span class="c">#启动可执行jar包</span>
-java <span class="nt">-jar</span> xxxx.jar
-</code></pre></div></div>
+java -jar xxxx.jar
+</code></pre>
+</div>
<p>稍等微服务启动就绪，打开浏览器输入<code class="highlighter-rouge">http://localhost:8080/hello</code>验证一下：</p>
@@ -816,6 +818,7 @@ java <span class="nt">-jar</span> xxxx.jar
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-05-17-easy-build-microservice-system-part-I.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-05-17-easy-build-microservice-system-part-I.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/easy-build-microservice-system-part-II/index.html b/content/cn/docs/easy-build-microservice-system-part-II/index.html
index 210c5b1..05f939f 100644
--- a/content/cn/docs/easy-build-microservice-system-part-II/index.html
+++ b/content/cn/docs/easy-build-microservice-system-part-II/index.html
@@ -402,22 +402,24 @@
<li>Header： 声明Token的类型也就是JWT，以及加密算法，例如：</li>
</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">
+<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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>
+</span></code></pre>
+</div>
<ol>
<li>Playload：存放有效信息，既包含标准签发者、用户、签发时间、过期时间，唯一标识等信息；也可以存放用户自定义的声明信息，例如权限控制相关的内容，例如：</li>
</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">
+<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"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>
+</span></code></pre>
+</div>
<ol>
<li>Signature：签名信息，包含Header和Playload的原始信息（Base64编码过）以及签名过后的信息。</li>
@@ -456,7 +458,7 @@
<h4 id="第二步使用mysql持久化用户信息">第二步：使用MySQL持久化用户信息</h4>
<p>用户微服务需要持久化用户信息，我们使用MySQL数据库，ORM使用Spring Data JPA：</p>
<h5 id="引入依赖">引入依赖</h5>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>mysql<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>mysql-connector-java<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
@@ -464,9 +466,10 @@
<span class="nt"><groupId></span>org.springframework.boot<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-data-jpa<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h5 id="定义存储user信息的userentity实体">定义存储User信息的UserEntity实体</h5>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Entity</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="nd">@Entity</span>
<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>
@@ -498,28 +501,31 @@
<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="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>在CodeFist模式下，Spring Data JPA会在数据库中自动创建T_User表与此实体映射。</p>
<h5 id="实现userentity实体的repository">实现UserEntity实体的Repository</h5>
<p>我们继承JPA的PagingAndSortingRepository来实现ORM操作</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Repository</span>
+<div class="language-java highlighter-rouge"><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="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h5 id="配置数据库连接">配置数据库连接</h5>
<p>在项目的<code class="highlighter-rouge">resources</code>目录下新增<code class="highlighter-rouge">application.properties</code>文件，写入数据库连接信息：</p>
-<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">spring.datasource.url</span><span class="p">=</span><span class="s">jdbc:mysql://localhost:3306/user_db?useSSL=false</span>
+<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="py">spring.datasource.url</span><span class="p">=</span><span class="s">jdbc:mysql://localhost:3306/user_db?useSSL=false</span>
<span class="py">spring.datasource.username</span><span class="p">=</span><span class="s">root</span>
<span class="py">spring.datasource.password</span><span class="p">=</span><span class="s">pwd</span>
-<span class="py">spring.jpa.hibernate.ddl-auto</span><span class="p">=</span><span class="s">update</span>
+<span class="err">spring.jpa.hibernate.ddl-</span><span class="py">auto</span><span class="p">=</span><span class="s">update</span>
<span class="py">spring.jpa.properties.hibernate.dialect</span><span class="p">=</span><span class="s">org.hibernate.dialect.MySQL5Dialect</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<blockquote>
<p>提示：关于Spring Data JPA的更多资料请参见<a href="https://projects.spring.io/spring-data-jpa/">这篇文档</a>，为了能够简化依赖的引入我们实际上使用的是Spring Boot JPA Starter，详细的例子请参见<a href="https://spring.io/guides/gs/accessing-data-jpa/">这篇文档</a>。</p>
@@ -528,19 +534,20 @@
<h4 id="第三步实现jwt认证">第三步：实现JWT认证</h4>
<h5 id="定义jwt接口">定义JWT接口</h5>
-<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>
+<div class="language-java highlighter-rouge"><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="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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>generate用于生成Token，validate用于验证Token是否正确。</p>
<h5 id="实现tokenstore">实现TokenStore</h5>
<p>我们使用<a href="https://github.com/jwtk/jjwt">jjwt</a>提供的JWT实现，创建JwtTokenStore类，继承TokenStore接口，并重写方法：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Component</span>
+<div class="language-java highlighter-rouge"><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>
@@ -577,21 +584,23 @@
<span class="k">return</span> <span class="kc">false</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h4 id="第四步实现用户服务">第四步：实现用户服务</h4>
<h5 id="定义userservice接口">定义UserService接口</h5>
-<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>
+<div class="language-java highlighter-rouge"><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="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<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>
+<div class="language-java highlighter-rouge"><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>
@@ -607,12 +616,13 @@
<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="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h5 id="实现并发布userservice">实现并发布UserService</h5>
<p>创建UserServiceImpl，继承<code class="highlighter-rouge">UserService</code>接口：</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">"user"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><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>
@@ -669,7 +679,8 @@
<span class="k">return</span> <span class="n">headers</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>登录成功后，会从TokenStore生成Token，并将其写入Key为<code class="highlighter-rouge">AUTHORIZATION</code>的Header。</p>
@@ -991,6 +1002,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-05-23-easy-build-microservice-system-part-II.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-05-23-easy-build-microservice-system-part-II.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/go-to-cloud/index.html b/content/cn/docs/go-to-cloud/index.html
index 65ad7a8..93abc47 100644
--- a/content/cn/docs/go-to-cloud/index.html
+++ b/content/cn/docs/go-to-cloud/index.html
@@ -844,6 +844,7 @@ watching microservice 4 successfully，服务注册成功<br />
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-06-24-go-to-cloud.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-06-24-go-to-cloud.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/how-to-grow-up-to-be-an-apache-committer/index.html b/content/cn/docs/how-to-grow-up-to-be-an-apache-committer/index.html
index 2cf69cd..8081638 100644
--- a/content/cn/docs/how-to-grow-up-to-be-an-apache-committer/index.html
+++ b/content/cn/docs/how-to-grow-up-to-be-an-apache-committer/index.html
@@ -702,6 +702,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-06-06-how-to-grow-up-to-be-an-apache-committer.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-06-06-how-to-grow-up-to-be-an-apache-committer.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/how-to-reform-a-legacy-system/index.html b/content/cn/docs/how-to-reform-a-legacy-system/index.html
index 5668c8e..2403fdd 100644
--- a/content/cn/docs/how-to-reform-a-legacy-system/index.html
+++ b/content/cn/docs/how-to-reform-a-legacy-system/index.html
@@ -1040,6 +1040,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-10-23-how-to-reform-a-legacy-system.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-10-23-how-to-reform-a-legacy-system.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/jira_beginner_guide/index.html b/content/cn/docs/jira_beginner_guide/index.html
index 183c172..0c6a973 100644
--- a/content/cn/docs/jira_beginner_guide/index.html
+++ b/content/cn/docs/jira_beginner_guide/index.html
@@ -697,6 +697,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-11-16-jira-beginner-guide.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-11-16-jira-beginner-guide.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/join_the_community/index.html b/content/cn/docs/join_the_community/index.html
index aca3772..d025845 100644
--- a/content/cn/docs/join_the_community/index.html
+++ b/content/cn/docs/join_the_community/index.html
@@ -763,6 +763,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-04-04-join_the_community.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-04-04-join_the_community.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/linuxcon-workshop-demo/index.html b/content/cn/docs/linuxcon-workshop-demo/index.html
index 4b28443..e5b98e7 100644
--- a/content/cn/docs/linuxcon-workshop-demo/index.html
+++ b/content/cn/docs/linuxcon-workshop-demo/index.html
@@ -478,11 +478,12 @@
<p>技工的主要工作时提供黄金分割数列计算服务，当用户需要知道第n个黄金分割数时，技工以最快的速度计算出数值并返回给用户。
我们可以把这个工作简化为如下数学方程:</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>value = fibo(n)
-</code></pre></div></div>
+<div class="highlighter-rouge"><pre class="highlight"><code>value = fibo(n)
+</code></pre>
+</div>
<p>在暂时不考虑性能的情况下，我们可以迅速实现黄金分割数列的计算。</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">interface</span> <span class="nc">FibonacciService</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">interface</span> <span class="nc">FibonacciService</span> <span class="o">{</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>
@@ -499,28 +500,31 @@
<span class="k">return</span> <span class="nf">term</span><span class="o">(</span><span class="n">n</span> <span class="o">-</span> <span class="mi">1</span><span class="o">)</span> <span class="o">+</span> <span class="n">term</span><span class="o">(</span><span class="n">n</span> <span class="o">-</span> <span class="mi">2</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="技工服务端点">技工服务端点</h3>
<p>黄金分割数量运算已经实现，现在我们需要将服务提供给用户，首先我们定义端点接口：</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">FibonacciEndpoint</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">FibonacciEndpoint</span> <span class="o">{</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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>引入 <code class="highlighter-rouge">ServiceComb</code> 依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-provider<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>接下来我们同时暴露黄金分割运算服务的<strong>Restful</strong>和<strong>RPC</strong>端点：</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">"fibonacciRestEndpoint"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><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>
@@ -539,9 +543,10 @@
<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>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</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>
+<div class="language-java highlighter-rouge"><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">private</span> <span class="kd">final</span> <span class="n">FibonacciService</span> <span class="n">fibonacciService</span><span class="o">;</span>
@@ -556,31 +561,33 @@
<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>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>这里用 <code class="highlighter-rouge">@RestSchema</code> 和 <code class="highlighter-rouge">@RpcSchema</code> 注释两个端点后，<code class="highlighter-rouge">ServiceComb</code> 会自动生成对应的服务端点契约，根据如下
<code class="highlighter-rouge">microsevice.yaml</code> 配置端点端口，并将契约和服务一起注册到<a href="https://github.com/apache/incubator-servicecomb-service-center">Service Center</a>：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1"># all interconnected microservices must belong to an application wth the same ID</span>
-<span class="na">APPLICATION_ID</span><span class="pi">:</span> <span class="s">company</span>
-<span class="na">service_description</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># all interconnected microservices must belong to an application wth the same ID</span>
+<span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">company</span>
+<span class="s">service_description</span><span class="pi">:</span>
<span class="c1"># name of the declaring microservice</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">worker</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">worker</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
<span class="c1"># service center address</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</span>
- <span class="na">highway</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7070</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>
-</code></pre></div></div>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</span>
+ <span class="s">highway</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7070</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
+</code></pre>
+</div>
<p>最后，提供技工服务应用启动入口，并加上 <code class="highlighter-rouge">@EnableServiceComb</code> 注释启用 <code class="highlighter-rouge">ServiceComb</code> ：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
+<div class="language-java highlighter-rouge"><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">WorkerApplication</span> <span class="o">{</span>
@@ -588,7 +595,8 @@
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="告示栏-bulletin-board">告示栏 (Bulletin Board)</h2>
<p><strong>告示栏</strong>提供为<strong>门卫</strong>、<strong>技工</strong>和<strong>养蜂人</strong>注册联系方式的设施，同时<strong>经理</strong>和<strong>养蜂人</strong>可通过此设施查询注册方的联系方式，以方便匹配能力的提供和消费。</p>
@@ -608,14 +616,15 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<h3 id="蜜蜂繁殖规律研究服务">蜜蜂繁殖规律研究服务</h3>
<p>首先我们定义黄金数列运算接口：</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">FibonacciCalculator</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">FibonacciCalculator</span> <span class="o">{</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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>接下来定义并实现蜜蜂繁殖规律研究服务:</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">interface</span> <span class="nc">BeekeeperService</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">interface</span> <span class="nc">BeekeeperService</span> <span class="o">{</span>
<span class="kt">long</span> <span class="nf">ancestorsOfDroneAt</span><span class="o">(</span><span class="kt">int</span> <span class="n">generation</span><span class="o">);</span>
<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>
@@ -645,14 +654,15 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="k">return</span> <span class="n">fibonacciCalculator</span><span class="o">.</span><span class="na">term</span><span class="o">(</span><span class="n">generation</span> <span class="o">+</span> <span class="mi">2</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>这里我们用到之前定义的 <code class="highlighter-rouge">FibonacciCalculator</code> 接口，并希望通过这个接口远程调用<strong>技工</strong>服务端点。<code class="highlighter-rouge">@RpcReference</code>
注释能帮助我们自动从<a href="https://github.com/apache/incubator-servicecomb-service-center">Service Center</a>中获取
<code class="highlighter-rouge">microserviceName = "worker", schemaId = "fibonacciRpcEndpoint"</code> ， 即服务名为 <code class="highlighter-rouge">worker</code> 已经schema ID为
<code class="highlighter-rouge">fibonacciRpcEndpoint</code>的端点：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Configuration</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="nd">@Configuration</span>
<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>
@@ -663,7 +673,8 @@ 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">BeekeeperServiceImpl</span><span class="o">(</span><span class="n">fibonacciCalculator</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>我们在<strong>技工</strong>一节已定义好对应的服务名和schema ID端点，通过上面的配置，<code class="highlighter-rouge">ServiceComb</code> 会自动将远程<strong>技工</strong>服务
实例和 <code class="highlighter-rouge">FibonacciCalculator</code> 绑定在一起。</p>
@@ -671,7 +682,7 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<h3 id="养蜂人服务端点">养蜂人服务端点</h3>
<p>与上一节<strong>技工</strong>服务相似，我们在这里也需要提供养蜂人服务端点，让用户可以进行调用：</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">"beekeeperRestEndpoint"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><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">"beekeeperRestEndpoint"</span><span class="o">)</span>
<span class="nd">@RequestMapping</span><span class="o">(</span><span class="s">"/rest"</span><span class="o">)</span>
<span class="nd">@Controller</span>
<span class="kd">public</span> <span class="kd">class</span> <span class="nc">BeekeeperController</span> <span class="o">{</span>
@@ -720,37 +731,39 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="k">return</span> <span class="n">ancestors</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>因为<strong>养蜂人</strong>需要消费<strong>技工</strong>提供的服务，所以其 <code class="highlighter-rouge">microservice.yaml</code> 配置稍有不同：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1"># all interconnected microservices must belong to an application wth the same ID</span>
-<span class="na">APPLICATION_ID</span><span class="pi">:</span> <span class="s">company</span>
-<span class="na">service_description</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># all interconnected microservices must belong to an application wth the same ID</span>
+<span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">company</span>
+<span class="s">service_description</span><span class="pi">:</span>
<span class="c1"># name of the declaring microservice</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">beekeeper</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</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:8090</span>
- <span class="na">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Consumer</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">bizkeeper-consumer,loadbalance</span>
- <span class="na">references</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">beekeeper</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8090</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Consumer</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">bizkeeper-consumer,loadbalance</span>
+ <span class="s">references</span><span class="pi">:</span>
<span class="c1"># this one below must refer to the microservice name it communicates with</span>
- <span class="na">worker</span><span class="pi">:</span>
- <span class="na">version-rule</span><span class="pi">:</span> <span class="s">0.0.1</span>
-</code></pre></div></div>
+ <span class="s">worker</span><span class="pi">:</span>
+ <span class="s">version-rule</span><span class="pi">:</span> <span class="s">0.0.1</span>
+</code></pre>
+</div>
<p>这里我们需要定义 <code class="highlighter-rouge">servicecomb.references.worker.version-rule</code> ，让配置名称中指向<strong>技工</strong>服务名 <code class="highlighter-rouge">worker</code> ，并匹配其版本号。</p>
<p>最后定义养蜂人服务应用入口：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
+<div class="language-java highlighter-rouge"><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">BeekeeperApplication</span> <span class="o">{</span>
@@ -758,7 +771,8 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="门卫-doorman">门卫 (Doorman)</h2>
<p><strong>门卫</strong>为公司提供安全保障，屏蔽非合法用户，防止其骗取免费服务，甚至伤害<strong>技工</strong>和<strong>养蜂人</strong>。</p>
@@ -770,18 +784,19 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<p>认证服务的接口如下，<code class="highlighter-rouge">authenticate</code> 方法根据用户名和密码查询确认用户存在，并返回对应JWT token。用户登录后的每次
请求都需要带上返回的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>
+<div class="language-java highlighter-rouge"><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="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>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="门卫认证服务端点">门卫认证服务端点</h3>
<p>与前两节的Rest服务端点相似，我们加上 <code class="highlighter-rouge">@RestSchema</code> 注释，以便 <code class="highlighter-rouge">ServiceComb</code> 自动配置端点、生成契约并注册服务。</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">"authenticationRestEndpoint"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><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">"authenticationRestEndpoint"</span><span class="o">)</span>
<span class="nd">@Controller</span>
<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>
@@ -842,11 +857,12 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<span class="sc">'}'</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>同样，我们需要提供服务应用启动入口以及 <code class="highlighter-rouge">microservice.yaml</code>：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
+<div class="language-java highlighter-rouge"><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">DoormanApplication</span> <span class="o">{</span>
@@ -854,21 +870,23 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1"># all interconnected microservices must belong to an application wth the same ID</span>
-<span class="na">APPLICATION_ID</span><span class="pi">:</span> <span class="s">company</span>
-<span class="na">service_description</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># all interconnected microservices must belong to an application wth the same ID</span>
+<span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">company</span>
+<span class="s">service_description</span><span class="pi">:</span>
<span class="c1"># name of the declaring microservice</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">doorman</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</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:9090</span>
-</code></pre></div></div>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">doorman</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:9090</span>
+</code></pre>
+</div>
<h2 id="经理-manager">经理 (Manager)</h2>
<p>为了管理所有人员和设施，<strong>经理</strong>作为用户唯一接口人，主要功能有：</p>
@@ -890,11 +908,12 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<p>首先我们引入依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-discovery<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="用户认证服务">用户认证服务</h3>
<p>当用户发送非登录请求时，我们首先需要验证用户合法，在如下服务中，我们通过<strong>告示栏</strong>获取<strong>门卫</strong>联系方式，
@@ -903,12 +922,13 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<p><code class="highlighter-rouge">ServiceComb</code> 提供了相应 <code class="highlighter-rouge">RestTemplate</code> 实现查询<a href="https://github.com/apache/incubator-servicecomb-service-center">Service Center</a>
中的服务注册信息，只需在地址中以如下格式包含被调用的服务名</p>
-<div class="language-html highlighter-rouge"><div class="highlight"><pre class="highlight"><code>cse://doorman/path/to/rest/endpoint
-</code></pre></div></div>
+<div class="language-html highlighter-rouge"><pre class="highlight"><code>cse://doorman/path/to/rest/endpoint
+</code></pre>
+</div>
<p><code class="highlighter-rouge">ServiceComb</code> 将自动查询对应服务并发送请求到地址中的服务端点。</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Service</span>
+<div class="language-java highlighter-rouge"><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>
@@ -959,13 +979,14 @@ 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="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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="请求过滤">请求过滤</h3>
<p>接下来我们提供 <code class="highlighter-rouge">ZuulFilter</code> 实现过滤用户请求，调用 <code class="highlighter-rouge">authenticationService.validate(token)</code> 认证用户token。
若用户合法则路由用户请求到对应服务，否则返回 <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>
+<div class="language-java highlighter-rouge"><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">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>
@@ -1043,11 +1064,12 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>最后提供服务应用入口：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
<span class="nd">@EnableCircuitBreaker</span>
<span class="nd">@EnableZuulProxy</span>
<span class="nd">@EnableDiscoveryClient</span>
@@ -1058,37 +1080,40 @@ Credit: <a href="http://www.dave-cushman.net"">Dave Cushman’s website</a>
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<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">zuul</span><span class="pi">:</span>
- <span class="na">routes</span><span class="pi">:</span>
- <span class="na">doorman</span><span class="pi">:</span>
- <span class="na">serviceId</span><span class="pi">:</span> <span class="s">doorman</span>
- <span class="na">sensitiveHeaders</span><span class="pi">:</span>
- <span class="na">worker</span><span class="pi">:</span>
- <span class="na">serviceId</span><span class="pi">:</span> <span class="s">worker</span>
- <span class="na">beekeeper</span><span class="pi">:</span>
- <span class="na">serviceId</span><span class="pi">:</span> <span class="s">beekeeper</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">zuul</span><span class="pi">:</span>
+ <span class="s">routes</span><span class="pi">:</span>
+ <span class="s">doorman</span><span class="pi">:</span>
+ <span class="s">serviceId</span><span class="pi">:</span> <span class="s">doorman</span>
+ <span class="s">sensitiveHeaders</span><span class="pi">:</span>
+ <span class="s">worker</span><span class="pi">:</span>
+ <span class="s">serviceId</span><span class="pi">:</span> <span class="s">worker</span>
+ <span class="s">beekeeper</span><span class="pi">:</span>
+ <span class="s">serviceId</span><span class="pi">:</span> <span class="s">beekeeper</span>
<span class="c1"># disable netflix eurkea since it's not used for service discovery</span>
-<span class="na">ribbon</span><span class="pi">:</span>
- <span class="na">eureka</span><span class="pi">:</span>
- <span class="na">enabled</span><span class="pi">:</span> <span class="no">false</span>
-</code></pre></div></div>
+<span class="s">ribbon</span><span class="pi">:</span>
+ <span class="s">eureka</span><span class="pi">:</span>
+ <span class="s">enabled</span><span class="pi">:</span> <span class="s">false</span>
+</code></pre>
+</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">company</span>
-<span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">manager</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">company</span>
+<span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">manager</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</span>
+</code></pre>
+</div>
<h2 id="项目归档-project-archive">项目归档 (Project Archive)</h2>
<p><strong>经理</strong>在每次用户请求后将项目进行归档，如果将来有内容相同的请求到达，<strong>经理</strong>可以就近获取结果，不必再购买
@@ -1410,6 +1435,7 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-06-15-linuxcon-workshop-demo.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-06-15-linuxcon-workshop-demo.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/maven_dependency_management/index.html b/content/cn/docs/maven_dependency_management/index.html
index 7ef1b46..3b75f15 100644
--- a/content/cn/docs/maven_dependency_management/index.html
+++ b/content/cn/docs/maven_dependency_management/index.html
@@ -394,7 +394,7 @@
<li>项目X的pom:</li>
</ul>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>groupA<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>artifactA<span class="nt"></artifactId></span>
<span class="nt"><version></span>0.1.0<span class="nt"></version></span>
@@ -404,29 +404,32 @@
<span class="nt"><artifactId></span>artifactB<span class="nt"></artifactId></span>
<span class="nt"><version></span>0.1.0<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<ul>
<li>项目A的pom:</li>
</ul>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>groupC<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>artifactC<span class="nt"></artifactId></span>
<span class="nt"><version></span>0.1.0<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<ul>
<li>项目B的pom:</li>
</ul>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>groupC<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>artifactC<span class="nt"></artifactId></span>
<span class="nt"><version></span>0.2.0<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>项目X在最终发布的时候，会出现如下几种情况：</p>
@@ -443,7 +446,7 @@
管理，其他的子模块都不配置三方件的版本号，从而每个子模块依赖的三方件版本都是同一个版本，即使他们依赖的模块间接依赖了不同的三方件版本。<br />
这种机制给使用者也带来了一定的好处，使用者可以采用dependencyManagement来定义自己的三方组件依赖关系，定义的时候，通过import方式继承。比如使用ServiceComb的微服务，可以采用如下方式管理依赖关系：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependencyManagement></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependencyManagement></span>
<span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
@@ -454,7 +457,8 @@
<span class="nt"></dependency></span>
<span class="nt"></dependencies></span>
<span class="nt"></dependencyManagement></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="一个复杂的例子">一个复杂的例子</h2>
<p>这个例子是在业务代码中使用Spring Boot、Spring Cloud、ServiceComb开源组件和ServiceComb商用组件的复杂场景。业务使用Spring Boot开发，并且启用了ServiceComb功能。可以通过下面的配置管理依赖关系。通过调整3个组件的顺序，决定优先使用哪些三方件。常见的业务场景有：</p>
@@ -464,7 +468,7 @@
<li>Spring Cloud发现了bug，但是修复该bug的版本同时升级了Spring Boot，业务当前有其他原因不能使用Spring Boot的新版本，这个时候，可以将Spring Boot的依赖放到前面，保证了不会由于升级Spring Cloud，而引入Spring Boot新的版本。</li>
</ul>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
<span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.springframework.boot<span class="nt"></groupId></span>
@@ -489,7 +493,8 @@
<span class="nt"></dependency></span>
<span class="nt"></dependencies></span>
<span class="nt"></dependencyManagement></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="总结">总结</h2>
<p>上面列举了依赖关系管理的最佳实践。在配套不同组件进行业务代码开发时，如果碰到ClassNotFoundException、NoSuchMethodException等异常，可以通过IDE（比如eclipse）或者mvn dependency:tree命令来分析是否由于依赖关系错误，引入了某些三方件较老的版本，然后都可以利用dependencyManagement机制来强制约束三方件的版本号。正如最开始指出的，任何的三方件升级都可能存在风险，并且有些时候会出现无法解决，需要修改依赖组件代码的情况。一个好的实践是进行持续的集成，并增加适当的测试用例，尽早发现问题和解决依赖关系管理引入的接口不兼容问题。我们建议开发者能够结合上面的例子，适当调整下各个组件的顺序，观察一个项目实际使用的三方件版本的变化，深刻理解dependencyManagement的作用原理，这样能够帮助快速解决开发过程中碰到的ClassNotFoundExcep
tion、NoSuchMethodException等问题。</p>
@@ -783,6 +788,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-09-14-maven-dependency-management.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-09-14-maven-dependency-management.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/open-design/index.html b/content/cn/docs/open-design/index.html
index fc9285b..a252b59 100644
--- a/content/cn/docs/open-design/index.html
+++ b/content/cn/docs/open-design/index.html
@@ -430,7 +430,7 @@
<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>
+<div class="language-java highlighter-rouge"><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="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>
@@ -442,13 +442,14 @@
<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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p><strong>JAX-RS 方式的 Provider</strong></p>
<p><em>代码片段来自于 <a href="https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/jaxrs-sample">Apache ServiceComb JAX-RS 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">"jaxrsHello"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><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>
@@ -467,13 +468,14 @@
<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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p><strong>Spring MVC 方式的 Provider</strong></p>
<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>
+<div class="language-java highlighter-rouge"><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>
@@ -489,14 +491,16 @@
<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>
-</code></pre></div></div>
+</code></pre>
+</div>
<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>
+<div class="language-java highlighter-rouge"><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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p><em>以上代码片段全部出自 <a href="https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/">Apache ServiceComb Samples</a>，有兴趣者可阅读了解或贡献更多的智慧。</em></p>
@@ -520,22 +524,24 @@
<p>对于 Java 开发者，下面的代码片段是日常所打交道的：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">User</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">User</span><span class="pi">:</span>
<span class="s">type:object</span>
<span class="s">properties</span><span class="pi">:</span>
-<span class="na">age</span><span class="pi">:</span>
+<span class="s">age</span><span class="pi">:</span>
<span class="s">type:integer</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>如果开发人员有丰富的跨语言开发经验，可以看出 Swagger 在解决跨语言编程方面API定义冲突的努力， 如 Swagger 通过 format 来定义数据类型的存储格式，以解决不同的语言在数据类型表示上的差异：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">User</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">User</span><span class="pi">:</span>
<span class="s">type:object</span>
<span class="s">properties</span><span class="pi">:</span>
-<span class="na">age</span><span class="pi">:</span>
+<span class="s">age</span><span class="pi">:</span>
<span class="s">type:integer</span>
<span class="s">format:int32</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p><a href="http://servicecomb.incubator.apache.org/cn/">开源微服务框架 Apache SerivceComb</a> 既遵循常规开发规范也特别关注开发效率。开发者可以先写接口定义后写代码， 也可直接通过自己熟悉的方式编写写代码， 两种方式都会生成 <a href="http://servicecomb.incubator.apache.org/cn/users/service-contract/">服务契约</a>（Open API 描述文件），并且将内容注册到<a href="https://github.com/apache/incubator-servicecomb-service-center">服务中心</a>。使用者可以从服务中心下载相关的服务契约进行开发。 Apache ServiceComb 的各种治理结构也是基于契约的，可以让开发者独立于业务实现对系统进行统一的管控治理。</p>
@@ -571,12 +577,13 @@
<p>在 Apache ServiceComb 框架中，<a href="http://servicecomb.incubator.apache.org/cn/users/communicate-protocol/">切换协议</a>非常简单，不需要修改一行业务代码。多个协议共存也是允许的。</p>
-<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>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">ServiceComb</span><span class="pi">:</span>
+ <span class="s">rest</span><span class="pi">:</span>
<span class="s">address:0.0.0.0:8084</span>
- <span class="na">highway</span><span class="pi">:</span>
+ <span class="s">highway</span><span class="pi">:</span>
<span class="s">address:0.0.0.0:8094</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="扩展性">扩展性</h2>
@@ -976,6 +983,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-04-25-open-design.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-04-25-open-design.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
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 2c99a8d..c3787eb 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
@@ -392,9 +392,10 @@
<p> 脚本文件已经托管至秒杀项目中，可直接获取：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/ServiceComb/seckill
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/ServiceComb/seckill
<span class="nb">cd </span>seckill/performance-test/script
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="性能测试环境">性能测试环境</h2>
<p> 我们调来了两台云服务器进行性能测试，角色和配置如下：</p>
@@ -426,19 +427,20 @@
<p> 为了能够便于配置和启动示例系统，我们采用《秒杀开发历程（三）》中的一键启动模式拉起所有的服务，因此Docker升级为当前最新版17.06.2-ce，能够支持配置Container使用CPU和内存的大小限制，以Admin微服务为例：
</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">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>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">admin-service</span><span class="pi">:</span>
+ <span class="s">mem_limit</span><span class="pi">:</span> <span class="s">4096m</span>
+ <span class="s">cpu_count</span><span class="pi">:</span> <span class="s">4</span>
+ <span class="s">cpu_percent</span><span class="pi">:</span> <span class="s">50</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">seckill-admin-service:0.2.0-SNAPSHOT"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">admin-service</span>
+ <span class="s">links</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">mysql-write-db:write_db.servicecomb.io"</span>
- <span class="na">environment</span><span class="pi">:</span>
+ <span class="s">environment</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s">JAVA_OPTS=-Dspring.profiles.active=prd -Dendpoints.shutdown.enabled=true</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">8081:8081"</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="加压机配置">加压机配置</h3>
<p> 加压机与秒杀服务器处于同一网络环境中，配置如下：
@@ -454,14 +456,16 @@
现在，我们切换到性能测试脚本目录下，执行下面的命令启动测试：
</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>jmeter <span class="nt">-n</span> <span class="nt">-t</span> seckill.jmx <span class="nt">-l</span> log.jtl
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>jmeter -n -t seckill.jmx -l log.jtl
+</code></pre>
+</div>
<h2 id="测试结果">测试结果</h2>
<p> 测试完毕后通过下面的命令分析测试结果日志数据，请将<report folder="">替换为你的本地目录：</report></p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>jmeter <span class="nt">-g</span> log.jtl <span class="nt">-o</span> <report folder>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>jmeter -g log.jtl -o <report folder>
+</code></pre>
+</div>
<p> 我们需要先验证测试结果的正确性，查看数据统计图：</p>
@@ -789,6 +793,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-09-15-performance-test-on-seckill-with-jmeter.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-09-15-performance-test-on-seckill-with-jmeter.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/quick-start-advance/distributed-tracing/index.html b/content/cn/docs/quick-start-advance/distributed-tracing/index.html
index b90818a..9147b5e 100644
--- a/content/cn/docs/quick-start-advance/distributed-tracing/index.html
+++ b/content/cn/docs/quick-start-advance/distributed-tracing/index.html
@@ -388,30 +388,33 @@
<li>
<p>在 <em>体质指数计算器</em> 的 <code class="highlighter-rouge">pom.xml</code> 文件中添加依赖项：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>handler-tracing-zipkin<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>在 <em>体质指数计算器</em> 的 <code class="highlighter-rouge">microservice.yaml</code> 文件中添加分布式追踪的处理链：</p>
- <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">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">tracing-provider</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">tracing-provider</span>
+</code></pre>
+ </div>
</li>
<li>
<p>在 <em>体质指数界面</em> 的 <code class="highlighter-rouge">pom.xml</code> 文件中添加依赖项：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-cloud-zuul-zipkin<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ol>
@@ -421,20 +424,23 @@
<li>
<p>使用 Docker 运行 <em>Zipkin</em> 分布式追踪服务：</p>
- <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> 9411:9411 openzipkin/zipkin
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>docker run -d -p 9411:9411 openzipkin/zipkin
+</code></pre>
+ </div>
</li>
<li>
<p>重启 <em>体质指数计算器</em> 微服务：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn spring-boot:run <span class="nt">-Drun</span>.jvmArguments<span class="o">=</span><span class="s2">"-Dcse.handler.chain.Provider.default=tracing-provider"</span>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn spring-boot:run -Drun.jvmArguments<span class="o">=</span><span class="s2">"-Dcse.handler.chain.Provider.default=tracing-provider"</span>
+</code></pre>
+ </div>
</li>
<li>
<p>重启 <em>体质指数界面</em> 微服务：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn spring-boot:run <span class="nt">-Drun</span>.jvmArguments<span class="o">=</span><span class="s2">"-Dservicecomb.tracing.enabled=true"</span>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn spring-boot:run -Drun.jvmArguments<span class="o">=</span><span class="s2">"-Dservicecomb.tracing.enabled=true"</span>
+</code></pre>
+ </div>
</li>
</ol>
@@ -525,6 +531,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _docs/cn/distributed-tracing.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_docs/cn/distributed-tracing.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
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 a3c5c6e..0e92caa 100644
--- a/content/cn/docs/quick-start-advance/flow-control/index.html
+++ b/content/cn/docs/quick-start-advance/flow-control/index.html
@@ -388,33 +388,36 @@
<li>
<p>在 <em>体质指数计算器</em> 的 <code class="highlighter-rouge">pom.xml</code> 文件中添加依赖项：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>handler-flowcontrol-qps<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>在 <em>体质指数计算器</em> 的 <code class="highlighter-rouge">microservice.yaml</code> 文件中指明使用流量控制的处理链及指定流控策略：</p>
- <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">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">qps-flowcontrol-provider</span>
- <span class="na">flowcontrol</span><span class="pi">:</span>
- <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>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">qps-flowcontrol-provider</span>
+ <span class="s">flowcontrol</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">qps</span><span class="pi">:</span>
+ <span class="s">limit</span><span class="pi">:</span>
+ <span class="s">gateway</span><span class="pi">:</span> <span class="s">1</span>
+</code></pre>
+ </div>
</li>
</ol>
<p>体质指数应用中已配置好了上述配置项，您只需关闭之前运行的 <strong>体质指数计算器</strong>，然后再用以下指令重新运行即可：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn spring-boot:run <span class="nt">-Drun</span>.jvmArguments<span class="o">=</span><span class="s2">"-Dcse.handler.chain.Provider.default=qps-flowcontrol-provider -Dcse.flowcontrol.Provider.qps.limit.gateway=1"</span>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn spring-boot:run -Drun.jvmArguments<span class="o">=</span><span class="s2">"-Dcse.handler.chain.Provider.default=qps-flowcontrol-provider -Dcse.flowcontrol.Provider.qps.limit.gateway=1"</span>
+</code></pre>
+</div>
<h2 id="验证">验证</h2>
@@ -490,6 +493,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _docs/cn/flow-control.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_docs/cn/flow-control.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/quick-start-advance/index.html b/content/cn/docs/quick-start-advance/index.html
index 261d1e5..0099c44 100644
--- a/content/cn/docs/quick-start-advance/index.html
+++ b/content/cn/docs/quick-start-advance/index.html
@@ -448,6 +448,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _docs/cn/quick-start-advance.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_docs/cn/quick-start-advance.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/quick-start-advance/load-balance/index.html b/content/cn/docs/quick-start-advance/load-balance/index.html
index 3c1f967..db2eeff 100644
--- a/content/cn/docs/quick-start-advance/load-balance/index.html
+++ b/content/cn/docs/quick-start-advance/load-balance/index.html
@@ -390,8 +390,9 @@
<p>对 <em>体质指数计算器</em> 微服务进行水平扩展，使其运行实例数为2，即新增一个运行实例：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn spring-boot:run <span class="nt">-Drun</span>.jvmArguments<span class="o">=</span><span class="s2">"-Dcse.rest.address=0.0.0.0:7778"</span>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn spring-boot:run -Drun.jvmArguments<span class="o">=</span><span class="s2">"-Dcse.rest.address=0.0.0.0:7778"</span>
+</code></pre>
+</div>
<p>为了便于区分不同的运行实例，在体质指数计算器的实现中新增了返回实例ID和运行时间的接口，详情可查看<a href="https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/bmi/calculator">体质指数计算器的完整实现代码</a>。而为了避免端口冲突，新的实例在另一个端口上运行。</p>
@@ -467,6 +468,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _docs/cn/load-balance.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_docs/cn/load-balance.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
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 ee9e52c..d1a37fb 100644
--- a/content/cn/docs/quick-start-advance/service-management/index.html
+++ b/content/cn/docs/quick-start-advance/service-management/index.html
@@ -388,35 +388,38 @@
<li>
<p>在 <em>体质指数计算器</em> 的 <code class="highlighter-rouge">pom.xml</code> 文件中添加依赖项：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>handler-bizkeeper<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>在 <em>体质指数计算器</em> 的 <code class="highlighter-rouge">microservice.yaml</code> 文件中指明使用服务治理的处理链及指定熔断和容错策略：</p>
- <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">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span>
- <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">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>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span>
+ <span class="s">circuitBreaker</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">calculator</span><span class="pi">:</span>
+ <span class="s">requestVolumeThreshold</span><span class="pi">:</span> <span class="s">3</span>
+ <span class="s">fallbackpolicy</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">policy</span><span class="pi">:</span> <span class="s">returnnull</span>
+</code></pre>
+ </div>
</li>
</ol>
<p>体质指数应用中已配置好了上述配置项，您只需重新运行 <strong>体质指数计算器</strong>：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn spring-boot:run <span class="nt">-Drun</span>.jvmArguments<span class="o">=</span><span class="s2">"-Dcse.handler.chain.Provider.default=bizkeeper-provider -Dcse.circuitBreaker.Provider.calculator.requestVolumeThreshold=3 -Dcse.fallbackpolicy.Provider.policy=returnnull"</span>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn spring-boot:run -Drun.jvmArguments<span class="o">=</span><span class="s2">"-Dcse.handler.chain.Provider.default=bizkeeper-provider -Dcse.circuitBreaker.Provider.calculator.requestVolumeThreshold=3 -Dcse.fallbackpolicy.Provider.policy=returnnull"</span>
+</code></pre>
+</div>
<h2 id="验证">验证</h2>
@@ -502,6 +505,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _docs/cn/service-management.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_docs/cn/service-management.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/quick-start-bmi/index.html b/content/cn/docs/quick-start-bmi/index.html
index 3628581..a5a507b 100644
--- a/content/cn/docs/quick-start-bmi/index.html
+++ b/content/cn/docs/quick-start-bmi/index.html
@@ -395,7 +395,7 @@
</ul>
<p>在开始前，需要先在服务的父工程中添加以下依赖项：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="o"><</span><span class="n">dependencyManagement</span><span class="o">></span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="o"><</span><span class="n">dependencyManagement</span><span class="o">></span>
<span class="o"><</span><span class="n">dependencies</span><span class="o">></span>
<span class="o"><</span><span class="n">dependency</span><span class="o">></span>
<span class="o"><</span><span class="n">groupId</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">groupId</span><span class="o">></span>
@@ -413,7 +413,8 @@
<span class="o"><</span><span class="n">artifactId</span><span class="o">></span><span class="n">hibernate</span><span class="o">-</span><span class="n">validator</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>
<span class="o"></</span><span class="n">dependencies</span><span class="o">></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p><strong>注意</strong>: <code class="highlighter-rouge">java-chassis-dependencies</code> 这个依赖是以pom的形式导入来统一项目中的依赖项的版本管理。</p>
<p>下面将对这两个微服务的实现进行介绍，其代码已托管于<a href="https://github.com/apache/incubator-servicecomb-java-chassis/tree/master/samples/bmi">github</a>上。</p>
@@ -434,7 +435,7 @@
<h4 id="具体运算实现">具体运算实现</h4>
<p>本模块负责计算体质指数，根据公式 \(体质指数=\frac{体重}{身高^2}\) 进行实现，代码如下：</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">CalculatorService</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">CalculatorService</span> <span class="o">{</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>
@@ -449,22 +450,25 @@
<span class="k">return</span> <span class="n">weight</span> <span class="o">/</span> <span class="o">(</span><span class="n">heightInMeter</span> <span class="o">*</span> <span class="n">heightInMeter</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h4 id="服务端点定义">服务端点定义</h4>
<p>服务端点用于生成服务契约，使得服务间能无缝进行通信。首先定义端点接口：</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">CalculatorEndpoint</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">CalculatorEndpoint</span> <span class="o">{</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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>引入 <strong>ServiceComb</strong> 依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-provider<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<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>
+<div class="language-java highlighter-rouge"><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>
@@ -481,34 +485,37 @@
<span class="k">return</span> <span class="n">calculatorService</span><span class="o">.</span><span class="na">calculate</span><span class="o">(</span><span class="n">height</span><span class="o">,</span> <span class="n">weight</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p class="notice--info">ServiceComb从0.3.0版本之后提供了对SpringMvc中简化注解(即<code class="highlighter-rouge">GetMapping</code>等)的支持。</p>
<p>这里用<code class="highlighter-rouge">@RestSchema</code>注释端点后， <strong>ServiceComb</strong> 微服务框架会自动生成对应的服务端点契约，并根据
如下的 <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>
-<span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">calculator</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</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:7777</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">bmi</span>
+<span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">calculator</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7777</span>
+</code></pre>
+</div>
<h4 id="服务启动入口">服务启动入口</h4>
<p>服务启动入口中只需添加 <code class="highlighter-rouge">@EnableServiceComb</code> 的注解即可启用 <em>ServiceComb</em> 微服务框架，代码如下：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
+<div class="language-java highlighter-rouge"><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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="体质指数界面实现">体质指数界面实现</h3>
<p>本模块负责提供用户界面及网关服务。其实现主要分为三部分：</p>
@@ -531,7 +538,7 @@
<p>网关服务主要用到了业界有名的<a href="https://github.com/Netflix/zuul/wiki">Netflix Zuul</a>来实现。</p>
<p>引入依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-discovery<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
@@ -543,38 +550,41 @@
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-cloud-zuul<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p class="notice--info">ServiceComb从0.4.0-SNAPSHOT版本之后新增了<code class="highlighter-rouge">spring-cloud-zuul</code>模块使能提供对zuul的兼容。</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">zuul</span><span class="pi">:</span>
- <span class="na">routes</span><span class="pi">:</span>
- <span class="na">calculator</span><span class="pi">:</span> <span class="s">/calculator/**</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">zuul</span><span class="pi">:</span>
+ <span class="s">routes</span><span class="pi">:</span>
+ <span class="s">calculator</span><span class="pi">:</span> <span class="s">/calculator/**</span>
<span class="c1"># disable netflix eurkea since it's not used for service discovery</span>
-<span class="na">ribbon</span><span class="pi">:</span>
- <span class="na">eureka</span><span class="pi">:</span>
- <span class="na">enabled</span><span class="pi">:</span> <span class="no">false</span>
+<span class="s">ribbon</span><span class="pi">:</span>
+ <span class="s">eureka</span><span class="pi">:</span>
+ <span class="s">enabled</span><span class="pi">:</span> <span class="s">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>
-</code></pre></div></div>
+<span class="s">server</span><span class="pi">:</span>
+ <span class="s">port</span><span class="pi">:</span> <span class="s">8889</span>
+</code></pre>
+</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>
-<span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">gateway</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">bmi</span>
+<span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">gateway</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span>
+</code></pre>
+</div>
<p>此处将服务注册中心和Zuul相结合使能服务发现。</p>
<h4 id="服务启动入口-1">服务启动入口</h4>
<p>服务启动入口也只需要声明启用 <code class="highlighter-rouge">ServiceComb</code> 和 <code class="highlighter-rouge">Zuul</code> 即可。</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
<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>
@@ -582,7 +592,8 @@
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>至此，<strong>体质指数</strong>应用已开发完毕，您可以通过<a href="/cn/docs/quick-start/#运行微服务应用">快速入门指南</a>中的步骤对其进行验证。</p>
@@ -649,6 +660,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _docs/cn/quick-start-bmi.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_docs/cn/quick-start-bmi.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/quick-start-dataconsistency/index.html b/content/cn/docs/quick-start-dataconsistency/index.html
index b2cae52..1a72cc3 100644
--- a/content/cn/docs/quick-start-dataconsistency/index.html
+++ b/content/cn/docs/quick-start-dataconsistency/index.html
@@ -409,110 +409,114 @@
<p>配置服务
在各服务的 <em>microservice.yaml</em> 文件，设置该服务注册的服务中心</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">saga</span>
- <span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">flight-booking-service</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
- <span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</span> <span class="c1">#此处选择使用ServiceComb的Service Center</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">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Consumer</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">loadbalance</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">saga</span>
+ <span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">flight-booking-service</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+ <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://sc.servicecomb.io:30100</span> <span class="c1">#此处选择使用ServiceComb的Service Center</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Consumer</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">loadbalance</span>
+</code></pre>
+ </div>
<p>在 <em>saga-demo/docker-compose.yaml</em> 设置部署脚本</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">version</span><span class="pi">:</span> <span class="s1">'</span><span class="s">2.1'</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">version</span><span class="pi">:</span> <span class="s1">'</span><span class="s">2.1'</span>
- <span class="na">services</span><span class="pi">:</span>
- <span class="na">service-center</span><span class="pi">:</span> <span class="c1">#此处选择使用ServiceComb的Service Center容器镜像</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">servicecomb/service-center"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">service-center</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">services</span><span class="pi">:</span>
+ <span class="s">service-center</span><span class="pi">:</span> <span class="c1">#此处选择使用ServiceComb的Service Center容器镜像</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">servicecomb/service-center"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">service-center</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">30100:30100"</span>
- <span class="na">mysql</span><span class="pi">:</span> <span class="c1">#此处选择使用5.7版本的mysql镜像</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">mysql/mysql-server:5.7"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">mysql</span>
- <span class="na">environment</span><span class="pi">:</span>
+ <span class="s">mysql</span><span class="pi">:</span> <span class="c1">#此处选择使用5.7版本的mysql镜像</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">mysql/mysql-server:5.7"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">mysql</span>
+ <span class="s">environment</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s">MYSQL_ROOT_PASSWORD=password</span>
<span class="pi">-</span> <span class="s">MYSQL_DATABASE=saga</span>
<span class="pi">-</span> <span class="s">MYSQL_USER=saga</span>
<span class="pi">-</span> <span class="s">MYSQL_PASSWORD=password</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">3306:3306"</span>
- <span class="na">healthcheck</span><span class="pi">:</span>
- <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">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>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">car</span>
- <span class="na">links</span><span class="pi">:</span>
+ <span class="s">healthcheck</span><span class="pi">:</span>
+ <span class="s">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;</sp [...]
+ <span class="s">interval</span><span class="pi">:</span> <span class="s">30s</span>
+ <span class="s">timeout</span><span class="pi">:</span> <span class="s">10s</span>
+ <span class="s">retries</span><span class="pi">:</span> <span class="s">5</span>
+
+ <span class="s">car-rental-service</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">car-rental-service:0.0.2-SNAPSHOT"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">car</span>
+ <span class="s">links</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">service-center:sc.servicecomb.io"</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">8080:8080"</span>
- <span class="na">flight-booking-service</span><span class="pi">:</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">flight-booking-service:0.0.2-SNAPSHOT"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">flight</span>
- <span class="na">links</span><span class="pi">:</span>
+ <span class="s">flight-booking-service</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">flight-booking-service:0.0.2-SNAPSHOT"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">flight</span>
+ <span class="s">links</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">service-center:sc.servicecomb.io"</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">8081:8080"</span>
- <span class="na">hotel-reservation-service</span><span class="pi">:</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">hotel-reservation-service:0.0.2-SNAPSHOT"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">hotel</span>
- <span class="na">links</span><span class="pi">:</span>
+ <span class="s">hotel-reservation-service</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">hotel-reservation-service:0.0.2-SNAPSHOT"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">hotel</span>
+ <span class="s">links</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">service-center:sc.servicecomb.io"</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">8082:8080"</span>
- <span class="na">payment-service</span><span class="pi">:</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">payment-service:0.0.2-SNAPSHOT"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">payment</span>
- <span class="na">links</span><span class="pi">:</span>
+ <span class="s">payment-service</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">payment-service:0.0.2-SNAPSHOT"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">payment</span>
+ <span class="s">links</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">service-center:sc.servicecomb.io"</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">8080"</span>
- <span class="na">saga</span><span class="pi">:</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">saga-spring:0.0.2-SNAPSHOT"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">saga</span>
- <span class="na">links</span><span class="pi">:</span>
+ <span class="s">saga</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">saga-spring:0.0.2-SNAPSHOT"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">saga</span>
+ <span class="s">links</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">mysql:mysql.servicecomb.io"</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">service-center:sc.servicecomb.io"</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">car-rental-service:car.servicecomb.io"</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">flight-booking-service:flight.servicecomb.io"</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">hotel-reservation-service:hotel.servicecomb.io"</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">payment-service:payment.servicecomb.io"</span>
- <span class="na">environment</span><span class="pi">:</span>
+ <span class="s">environment</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s">JAVA_OPTS=-Dspring.profiles.active=prd,servicecomb -Dcse.service.registry.address=http://sc.servicecomb.io:30100</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">8083:8080"</span>
- <span class="na">depends_on</span><span class="pi">:</span>
- <span class="na">mysql</span><span class="pi">:</span>
- <span class="na">condition</span><span class="pi">:</span> <span class="s">service_healthy</span>
-</code></pre></div> </div>
+ <span class="s">depends_on</span><span class="pi">:</span>
+ <span class="s">mysql</span><span class="pi">:</span>
+ <span class="s">condition</span><span class="pi">:</span> <span class="s">service_healthy</span>
+</code></pre>
+ </div>
</li>
<li>
<p>在Saga项目的根目录执行编译，制作Saga、机票预订、租车、酒店预订和支付服务镜像</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> mvn package <span class="nt">-DskipTests</span> <span class="nt">-Pdocker</span> <span class="nt">-Pdemo</span>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> mvn package -DskipTests -Pdocker -Pdemo
+</code></pre>
+ </div>
</li>
<li>
<p>在Saga项目的saga-demo目录通过docker-compose一键启动Saga、机票预订、租车、酒店预订和支付服务</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> docker-compose up
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> docker-compose up
+</code></pre>
+ </div>
</li>
</ol>
@@ -522,129 +526,133 @@
<li>
<p>参照 <a href="https://github.com/apache/incubator-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">
+ <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"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="nt">"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="nt">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"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="nt">"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="nt">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"transaction"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"compensation"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"params"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"form"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="p">}</span><span class="w">
-</span></code></pre></div> </div>
+</span></code></pre>
+ </div>
</li>
<li>
<p>发送请求到Saga</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> curl <span class="nt">-XPOST</span> <span class="nt">-H</span> <span class="s2">"Content-Type: text/plain"</span> <span class="nt">-d</span> @./request.json http://<localhost.ip:8083>/requests
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> curl -XPOST -H <span class="s2">"Content-Type: text/plain"</span> -d @./request.json http://<localhost.ip:8083>/requests
+</code></pre>
+ </div>
<p>获取处理结果成功(如果失败，返回相应的错误信息)</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> success
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> success
+</code></pre>
+ </div>
</li>
<li>
<p>查看Saga的事务</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> curl <span class="nt">-XGET</span> http://<localhost.ip:8083>/events
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> curl -XGET http://<localhost.ip:8083>/events
+</code></pre>
+ </div>
<p>查询结果</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="o">{</span>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> <span class="o">{</span>
<span class="s2">"bcd27f0d-6b82-49b3-8067-b16eba970e55"</span>: <span class="o">[</span>
<span class="o">{</span>
<span class="s2">"id"</span>: 1,
@@ -718,12 +726,13 @@
<span class="o">}</span>
<span class="o">]</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>demo中模拟了支付服务帐户余额不足场景，发送请求超过一次将触发补偿操作。再次发送请求，可以在Saga日志中找到补偿事件</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="o">{</span>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> <span class="o">{</span>
<span class="s2">"bcd27f0d-6b82-49b3-8067-b16eba970e55"</span>: <span class="o">[</span>
...
<span class="o">]</span>,
@@ -821,7 +830,8 @@
<span class="o">}</span>
<span class="o">]</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ol>
@@ -896,6 +906,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _docs/cn/quick-start-dataconsistency.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_docs/cn/quick-start-dataconsistency.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/quick-start/index.html b/content/cn/docs/quick-start/index.html
index adfbdc1..9a18587 100644
--- a/content/cn/docs/quick-start/index.html
+++ b/content/cn/docs/quick-start/index.html
@@ -392,18 +392,20 @@
<li>
<p>安装 ServiceComb Java Chassis(SDK)，执行以下指令：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> git clone https://github.com/apache/incubator-servicecomb-java-chassis.git
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> git clone https://github.com/apache/incubator-servicecomb-java-chassis.git
<span class="nb">cd </span>incubator-servicecomb-java-chassis
- mvn clean install <span class="nt">-DskipTests</span>
-</code></pre></div> </div>
+ mvn clean install -DskipTests
+</code></pre>
+ </div>
</li>
</ul>
<h2 id="运行-service-center">运行 Service Center</h2>
<p>在 <strong>ServiceComb</strong> 微服务框架中，<strong>Service Center</strong> 提供服务注册及服务发现功能，可直接使用 Docker 运行。</p>
-<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>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>docker pull servicecomb/service-center
+docker run -d -p 30100:30100 servicecomb/service-center:latest
+</code></pre>
+</div>
<p><em>您可以通过阅读<a href="/cn/users/setup-environment/#运行service-center">环境配置</a>获取在本地以二进制方式运行Service Center的方法。</em></p>
<h2 id="创建第一个微服务">创建第一个微服务</h2>
@@ -429,16 +431,18 @@ 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
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd </span>samples/bmi
+</code></pre>
+ </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>
<li>
<p>启动 <strong>体质指数计算器</strong> 和 <strong>体质指数界面</strong> 微服务，分别执行以下指令：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd </span>calculator<span class="p">;</span> mvn spring-boot:run
-<span class="nb">cd </span>webapp<span class="p">;</span> mvn spring-boot:run
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd </span>calculator; mvn spring-boot:run
+<span class="nb">cd </span>webapp; mvn spring-boot:run
+</code></pre>
+ </div>
</li>
<li>
<p>验证服务。微服务启动完毕后，即可通过 <a>http://localhost:8889</a> 访问 <strong>体质指数</strong> 应用，届时将能看到如下界面，并可输入您的身高和体重信息验证服务是否正常运行。</p>
@@ -510,6 +514,7 @@ docker run <span class="nt">-d</span> <span class="nt">-p</span> 30100:30100 ser
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _docs/cn/quick-start.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_docs/cn/quick-start.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/saga_pack_design/index.html b/content/cn/docs/saga_pack_design/index.html
index 0965635..f73d6ef 100644
--- a/content/cn/docs/saga_pack_design/index.html
+++ b/content/cn/docs/saga_pack_design/index.html
@@ -448,16 +448,18 @@
<p>alpha启动前需要先运行数据库PostgreSQL：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>docker run <span class="nt">-d</span> <span class="nt">-e</span> <span class="s2">"POSTGRES_DB=saga"</span> <span class="nt">-e</span> <span class="s2">"POSTGRES_USER=saga"</span> <span class="nt">-e</span> <span class="s2">"POSTGRES_PASSWORD=password"</span> <span class="nt">-p</span> 5432:5432 postgres
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>docker run -d -e <span class="s2">"POSTGRES_DB=saga"</span> -e <span class="s2">"POSTGRES_USER=saga"</span> -e <span class="s2">"POSTGRES_PASSWORD=password"</span> -p 5432:5432 postgres
+</code></pre>
+</div>
<p>在确保数据库正常启动后，即可运行alpha：</p>
-<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> 8090:8090 <span class="se">\</span>
- <span class="nt">-e</span> <span class="s2">"JAVA_OPTS=-Dspring.profiles.active=prd"</span> <span class="se">\</span>
- <span class="nt">-e</span> <span class="s2">"spring.datasource.url=jdbc:postgresql://{docker.host.address}:5432/saga?useSSL=false"</span> <span class="se">\</span>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>docker run -d -p 8090:8090 <span class="se">\</span>
+ -e <span class="s2">"JAVA_OPTS=-Dspring.profiles.active=prd"</span> <span class="se">\</span>
+ -e <span class="s2">"spring.datasource.url=jdbc:postgresql://{docker.host.address}:5432/saga?useSSL=false"</span> <span class="se">\</span>
alpha-server:0.1.0
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="omega的使用">omega的使用</h3>
@@ -465,7 +467,7 @@
<ol>
<li>引入依赖
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb.saga<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>omega-spring-starter<span class="nt"></artifactId></span>
<span class="nt"><version></span>0.1.0<span class="nt"></version></span>
@@ -475,27 +477,30 @@
<span class="nt"><artifactId></span>omega-transport-resttemplate<span class="nt"></artifactId></span>
<span class="nt"><version></span>0.1.0<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>添加Saga的注解及相应的补偿方法
2.1 在应用入口添加 <code class="highlighter-rouge">@EnableOmega</code> 的注解来初始化omega的配置并与alpha建立连接。
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@SpringBootApplication</span>
+ <div class="language-java highlighter-rouge"><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="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </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>
+ <div class="language-java highlighter-rouge"><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="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>
+</code></pre>
+ </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>
+ <div class="language-java highlighter-rouge"><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="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>
@@ -503,17 +508,19 @@
<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="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>
+</code></pre>
+ </div>
<p>2.4 对转入服务重复第2.3步即可。</p>
<p>2.5 在每个服务的application.yaml中添加配置项，指明服务信息和alpha的地址信息：</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">spring</span><span class="pi">:</span>
- <span class="na">application</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="pi">{</span><span class="nv">application.name</span><span class="pi">}</span>
- <span class="na">alpha</span><span class="pi">:</span>
- <span class="na">cluster</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="pi">{</span><span class="nv">alpha.cluster.addresses</span><span class="pi">}</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">spring</span><span class="pi">:</span>
+ <span class="s">application</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="pi">{</span><span class="nv">application.name</span><span class="pi">}</span>
+ <span class="s">alpha</span><span class="pi">:</span>
+ <span class="s">cluster</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="pi">{</span><span class="nv">alpha.cluster.addresses</span><span class="pi">}</span>
+</code></pre>
+ </div>
</li>
</ol>
@@ -819,6 +826,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-04-04-saga-pack-design.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-04-04-saga-pack-design.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/saga_with_cucumber/index.html b/content/cn/docs/saga_with_cucumber/index.html
index 455884a..e6ac145 100644
--- a/content/cn/docs/saga_with_cucumber/index.html
+++ b/content/cn/docs/saga_with_cucumber/index.html
@@ -397,7 +397,7 @@
<li>
<p>创建feature文件<code class="highlighter-rouge">pack_success_scenario.feature</code>，定义Feature，并在feature中定义step</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Feature: Alpha records transaction events
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>Feature: Alpha records transaction events
Scenario: Everything is normal
Given Car Service is up and running
@@ -423,7 +423,8 @@
And Hotel Service contains the following booking orders
| name | amount | confirmed | cancelled |
| Sean | 1 | <span class="nb">true</span> | <span class="nb">false</span> |
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p><code class="highlighter-rouge">Given</code> 定义了测试用例<code class="highlighter-rouge">Everything is normal</code>所需的4个条件分别是4个服务运行正常，<code class="highlighter-rouge">When</code>定义了触发用户<code class="highlighter-rouge">Sean</code>发起预定2辆车和1间房子的被测事件。<code class="highlighter-rouge">Then</code>中则指定了验证结果是<code class="highlighter-rouge">Alpha</code>记录的各子事务及子事务发生顺序，<code class="highlighter-rouge">Car</code>服务和<code class="highlighter-rouge">Hotel</code>服务则记录预定结果。</p>
</li>
@@ -432,14 +433,15 @@
<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>
+ <div class="language-java highlighter-rouge"><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>
<span class="o">});</span>
-</code></pre></div> </div>
+</code></pre>
+ </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"><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> <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">"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>
@@ -449,11 +451,12 @@
<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>
-</code></pre></div> </div>
+</code></pre>
+ </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>
+ <div class="language-java highlighter-rouge"><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>
<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>
@@ -468,7 +471,8 @@
<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="o">});</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>上面代码对应feature中<code class="highlighter-rouge">Then</code>结果从三方面验证预定事件是否符合预期：<code class="highlighter-rouge">Alpha</code>服务中记录的事件顺序、<code class="highlighter-rouge">Car</code>服务的预定结果和 <code class="highlighter-rouge">Hotel</code>服务中的预定结果。<code class="highlighter-rouge">DataTable</code>解析了feature中定义的事件结果和顺序，<code class="highlighter-rouge">dataMatches</code>将此结果与各服务中查询到的结果进行比较验证是不是符合预期。</p>
</li>
@@ -484,7 +488,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>
+ <div class="language-java highlighter-rouge"><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="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>
@@ -492,7 +496,8 @@
<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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>在此异常测试中我们预订事件中预订3间房，由于订房间失败，整个行程事务没有成功，对已经成功执行的订车子事务进行补偿保证原子性。</p>
@@ -502,7 +507,7 @@
<p>与成功的行程规划测试中不同的只有触发的预定事件和最终的结果，前提条件都是4个服务启动并运行，所以feature只要修改<code class="highlighter-rouge">When</code>和<code class="highlighter-rouge">Then</code>内容即可（Features和Scenarios名也要对应修改）</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="s">When User Sean requests to book 5 cars and 3 rooms</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">When User Sean requests to book 5 cars and 3 rooms</span>
<span class="s">Then Alpha records the following events</span>
<span class="s">| serviceName | type |</span>
@@ -516,11 +521,12 @@
<span class="s">Then Car Service contains the following booking orders</span>
<span class="s">| name | amount | confirmed | cancelled |</span>
- <span class="s">| Sean | 5 | </span><span class="no">false</span><span class="s"> | </span><span class="no">true</span><span class="s"> |</span>
+ <span class="s">| Sean | 5 | false | true |</span>
<span class="s">Then Hotel Service contains the following booking orders</span>
<span class="s">| name | amount | confirmed | cancelled |</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>step_definition和Command与之前一样，不需要任何修改，触发预定超过3个房间的操作后，<code class="highlighter-rouge">Alpha</code>会记录Hotel服务的<code class="highlighter-rouge">TxAbortedEvent</code>和Car服务的<code class="highlighter-rouge">TxCompensatedEvent</code>时间，此外Car服务的预定记录中会有取消为<code class="highlighter-rouge">true</code>的记录。</p>
@@ -543,14 +549,15 @@
<p>根据byteman语法创建规则，包括规则名，目标类，目标方法，注入位置，注入内容等，下面是一个在<code class="highlighter-rouge">main</code>函数入口注入打印语句的规则文件例子</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="s">RULE trace main entry</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">RULE trace main entry</span>
<span class="s">CLASS AppMain</span>
<span class="s">METHOD main</span>
<span class="s">AT ENTRY</span>
-<span class="s">IF </span><span class="no">true</span>
+<span class="s">IF true</span>
<span class="s">DO traceln("entering main")</span>
<span class="s">ENDRULE</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>在安装了byteman环境的机器上用javaagent参数指定加载规则文件运行AppMain即可在main函数入口处打印出<code class="highlighter-rouge">entering main</code>。例子<a href="https://github.com/adinn/byteman-tutorial1">源码请参考[5]</a></p>
</li>
@@ -559,9 +566,10 @@
<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"><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>
<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>
+</code></pre>
+ </div>
<p><code class="highlighter-rouge">org.jboss.byteman.agent.submit.Submit</code>提供的加载规则的方法有通过文件加载<code class="highlighter-rouge">addRulesFromFiles</code>和<code class="highlighter-rouge">addRulesFromResources</code></p>
@@ -577,7 +585,7 @@
<li>
<p>创建byteman规则文件：<code class="highlighter-rouge">booking_timeout.btm</code></p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="s">RULE set the saga timeout to 5s</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">RULE set the saga timeout to 5s</span>
<span class="s">INTERFACE org.apache.servicecomb.saga.omega.context.annotations.SagaStart</span>
<span class="s">METHOD timeout</span>
<span class="s">AT EXIT</span>
@@ -593,14 +601,15 @@
<span class="s">DO debug("delay 10s until the booking timeout"),</span>
<span class="s">Thread.sleep(10000)</span>
<span class="s">ENDRULE</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>这里定义了两个规则，第一个规则<code class="highlighter-rouge">set the saga timeout to 5s</code>在注解<code class="highlighter-rouge">@SagaStart</code>的<code class="highlighter-rouge">timeout</code>方法中返回5表示设置超时时间值为5秒。第二个规则<code class="highlighter-rouge">sleep when postBooking until timeout happens</code>在类<code class="highlighter-rouge">BookingController</code>的<code class="highlighter-rouge">postBooking</code>方法中注入<code class="highlighter-rouge">Thread.sleep(10000)</code>，让<code class="highlighter- [...]
</li>
<li>
<p>创建feature文件：<code class="highlighter-rouge">pack_timeout_scenario.feature</code></p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err"> </span><span class="s">Given Install the byteman script booking_timeout.btm to Booking Service</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="err"> </span><span class="s">Given Install the byteman script booking_timeout.btm to Booking Service</span>
<span class="s">When User Sean requests to book 1 cars and 1 rooms</span>
@@ -618,32 +627,35 @@
<span class="s">Then Car Service contains the following booking orders</span>
<span class="s">| name | amount | confirmed | cancelled |</span>
- <span class="s">| Sean | 1 | </span><span class="no">false</span><span class="s"> | </span><span class="no">true</span><span class="s"> |</span>
+ <span class="s">| Sean | 1 | false | true |</span>
<span class="s">Then Hotel Service contains the following booking orders</span>
<span class="s">| name | amount | confirmed | cancelled |</span>
- <span class="s">| Sean | 1 | </span><span class="no">false</span><span class="s"> | </span><span class="no">true</span><span class="s"> |</span>
-</code></pre></div> </div>
+ <span class="s">| Sean | 1 | false | true |</span>
+</code></pre>
+ </div>
<p>在行程预定的例子中仍然以4个服务启动并运行为前提，然后加载上面创建的byteman规则文件和目标服务：<code class="highlighter-rouge">Booking</code>。然后触发预定一辆车和一间房的操作。</p>
</li>
<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"><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">-></span> <span class="o"> [...]
<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="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="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>
+</code></pre>
+ </div>
<p>在Cucumber解析文件中用正则方法获取目标规则和服务名，<code class="highlighter-rouge">getBytemanSubmit</code>根据服务名<code class="highlighter-rouge">service</code>参数来获取目标服务的地址和byteman监听端口，并将本地规则注入到目标服务中，注入原理是<code class="highlighter-rouge">Booking</code>启动时是带着byteman参数启动的：</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">-Dorg</span>.jboss.byteman.debug<span class="o">=</span><span class="nb">true</span> <span class="nt">-Dorg</span>.jboss.byteman.verbose<span class="o">=</span>tru
-<span class="nt">-javaagent</span>:/maven/saga/byteman.jar<span class="o">=</span>port:9091,address:0.0.0.0,listener:true
-</code></pre></div> </div>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>-Dorg.jboss.byteman.debug<span class="o">=</span><span class="nb">true</span> -Dorg.jboss.byteman.verbose<span class="o">=</span>tru
+-javaagent:/maven/saga/byteman.jar<span class="o">=</span>port:9091,address:0.0.0.0,listener:true
+</code></pre>
+ </div>
<p>执行<code class="highlighter-rouge">bm.addRulesFromFiles(rules);</code>时就可以把本地规则通过Socket发送到<code class="highlighter-rouge">Booking</code>服务，并由Byteman完成字节替换。</p>
</li>
@@ -656,7 +668,7 @@
<p>代码中使用Cucumber和Byteman要先通过pom引入相关依赖</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>io.cucumber<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>cucumber-java8<span class="nt"></artifactId></span>
<span class="nt"><version></span>${cucumber.version}<span class="nt"></version></span>
@@ -673,7 +685,8 @@
<span class="nt"><artifactId></span>byteman-submit<span class="nt"></artifactId></span>
<span class="nt"><version></span>${byteman.version}<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>本地运行调试需要在启动的时候使用javaagent启动byteman，建议通过修改docker-compose.yaml文件，指定可执行jar的启动参数，并修改stepdef解析文件中各个服务地址，个服务启动运行后在IDEA中运行相应的feature文件即可进行调试测试。运行调试版代码可参考<a href="https://github.com/lijasonvip/incubator-servicecomb-saga/tree/debug-cucumber-byteman">个人分支代码[6]</a></p>
@@ -987,6 +1000,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2018-04-28-saga_with_cucumber.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2018-04-28-saga_with_cucumber.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/seckill-development-journey-part-I/index.html b/content/cn/docs/seckill-development-journey-part-I/index.html
index 6ede578..8263641 100644
--- a/content/cn/docs/seckill-development-journey-part-I/index.html
+++ b/content/cn/docs/seckill-development-journey-part-I/index.html
@@ -727,6 +727,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-08-26-seckill-develop-course-part-I.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-08-26-seckill-develop-course-part-I.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/seckill-development-journey-part-II/index.html b/content/cn/docs/seckill-development-journey-part-II/index.html
index 9e0f2bf..d164d28 100644
--- a/content/cn/docs/seckill-development-journey-part-II/index.html
+++ b/content/cn/docs/seckill-development-journey-part-II/index.html
@@ -716,6 +716,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-08-30-seckill-develop-course-part-II.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-08-30-seckill-develop-course-part-II.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
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 92d560f..83044fa 100644
--- a/content/cn/docs/seckill-development-journey-part-III/index.html
+++ b/content/cn/docs/seckill-development-journey-part-III/index.html
@@ -403,10 +403,11 @@
<h3 id="command微服务message-publisher组件">Command微服务Message Publisher组件</h3>
<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>
+<div class="language-java highlighter-rouge"><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="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="event微服务的实现">Event微服务的实现</h3>
<p> Event微服务订阅Message Broker获取Event Message，然后根据不同的Event类型，转化为对ReadDB中的值对象操作或Coupon值对象操作：</p>
@@ -418,10 +419,11 @@
<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>
+<div class="language-java highlighter-rouge"><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="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="query微服务的重构">Query微服务的重构</h3>
<p> 经过了读写分离的改造，现在所有活跃的Promotion都保存在ActivePromotion值对象表中，而客户成功秒杀的Coupon都保存在Coupon值对象表中，因此直接查询即可，不再需要Replay Event。</p>
@@ -728,6 +730,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-09-07-seckill-develop-course-part-III.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-09-07-seckill-develop-course-part-III.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
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 c3c37a3..623972f 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
@@ -395,9 +395,10 @@
<p> 测试方案文件笔者已托管于github上，可直接获取：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop
<span class="nb">cd </span>ServiceComb-Company-WorkShop/stress-tests
-</code></pre></div></div>
+</code></pre>
+</div>
<p class="figure-caption"><img src="/assets/images/company_test_plan.png" alt="图1 测试计划" /><br />
图1 测试计划</p>
@@ -405,12 +406,14 @@
<p> 在我们测试计划的开始，我们设置了一些在所有线程组都能共享的全局配置。其中，<em>CSV Data Set Config</em>组件从本地csv文件中加载测试服务器的信息。<em>HTTP Request Defaults</em>组件则为每个请求预设了默认的请求服务器信息，如IP和端口。<em>User Defined Variables</em>组件定义了全局共享的变量。<em>HTTP Header Manager</em>组件自动为每个请求添加HTTP的请求头部。</p>
<p> 接着就是<em>setUp</em>线程组了。其作用主要是处理用户认证。由于Cookie在网络应用中得到较广泛的应用，因此JMeter中内置的认证方式是通过<em>HTTP Cookie Manager</em>组件来完成的。然而，我们的Company示例采用的是基于Token的认证方式而不是基于Cookie的认证方式。因此，这给我们在JMeter中处理认证添加了一点难度。<em>Remove header pre processor</em>组件使用了以下的脚本来去掉登录时请求中带有默认的请求头部，即登录请求时并不需要带有鉴权的请求头部。</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>import org.apache.jmeter.protocol.http.control.Header<span class="p">;</span>
-sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="o">(</span><span class="s2">"Authorization"</span><span class="o">)</span><span class="p">;</span>
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code>import org.apache.jmeter.protocol.http.control.Header;
+sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="o">(</span><span class="s2">"Authorization"</span><span class="o">)</span>;
+</code></pre>
+</div>
<p> 然后我们通过<em>Set up Login</em>组件发起一次登录请求来获取用户登录鉴权信息。之后再通过正则表达式提取组件<em>authorization_extractor</em>来提取响应头部中的<em>Authorization</em>对应的值。由于变量无法在不同的线程组中共享和传递，这时候<em>BeanShell PostProcessor</em>组件就派上用场了，它主要工作就是将当前线程组中的目标变量转换为全局属性。</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">${</span><span class="nv">__setProperty</span><span class="p">(Authorization,</span><span class="k">${</span><span class="nv">Authorization</span><span class="k">}</span><span class="p">,)</span><span class="k">}</span>
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="k">${</span><span class="nv">__setProperty</span><span class="p">(Authorization,</span><span class="k">${</span><span class="nv">Authorization</span><span class="k">}</span><span class="p">,)</span><span class="k">}</span>
+</code></pre>
+</div>
<p> 在测试计划的最后部分就是我们要在Company示例上进行的压力测试。测试所选取的三个接口都是通过经理服务路由至其他两个服务的，即技工服务和养蜂人服务。在我们测试开始之前，我们通过打开<em>StressTest</em>的开关来禁用经理服务提供的缓存能力，从而使得技工服务和养蜂人服务能够处理到用户请求的计算任务。此外，我们通过将请求参数设置为1来简化技工服务和养蜂人服务的计算任务。</p>
<h2 id="启动测试">启动测试</h2>
@@ -428,8 +431,9 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
<li>
<p>运行测试，启动200个并发线程发起请求压力，并设置测试时常为600秒。</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> jmeter <span class="nt">-n</span> <span class="nt">-t</span> workshop.jmx <span class="nt">-j</span> workshop.log <span class="nt">-l</span> workshop.jtl <span class="nt">-Jthreads</span><span class="o">=</span>200 <span class="nt">-Jduration</span><span class="o">=</span>600
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> jmeter -n -t workshop.jmx -j workshop.log -l workshop.jtl -Jthreads<span class="o">=</span>200 -Jduration<span class="o">=</span>600
+</code></pre>
+ </div>
</li>
</ul>
@@ -453,7 +457,7 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
<p> 由于经理服务的日志是直接输出到stdout上的，且JMeter的测试端以单机模式运行时可能并不能同时模拟出足够的并发量。依此对在同一并发度（200）下不同log的设置（log4j1 stdout, log4j2 stdout，log4j2 异步，无日志输出）进行测试。其中，异步log在<em>log4j2.xml</em>文件中的设置如下所示：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp"><?xml version="1.0" encoding="UTF-8" ?></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="cp"><?xml version="1.0" encoding="UTF-8" ?></span>
<span class="nt"><Configuration</span> <span class="na">status=</span><span class="s">"INFO"</span><span class="nt">></span>
<span class="nt"><Appenders></span>
<span class="nt"><RandomAccessFile</span> <span class="na">name=</span><span class="s">"RandomAccessFile"</span> <span class="na">fileName=</span><span class="s">"manager.log"</span> <span class="na">immediateFlush=</span><span class="s">"false"</span> <span class="na">append=</span><span class="s">"false"</span><span class="nt">></span>
@@ -466,29 +470,33 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
<span class="nt"></asyncRoot></span>
<span class="nt"></Loggers></span>
<span class="nt"></Configuration></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>此外，还需要添加如下<em>disruptor</em>的依赖项使异步的设置生效：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>com.lmax<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>disruptor<span class="nt"></artifactId></span>
<span class="nt"><version></span>3.3.6<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>没有日志输出的设置仅仅是将上述<em>log4j2.xml</em>文件中的日志输出级别从<em>info</em>改为<em>off</em>即可。此外，我们还使用JMeter分布式的模式进行了相关的测试。JMeter中使用分布式的模式来运行主要分两步：</p>
<ol>
<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>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>jmeter-server -Djava.rmi.server.hostname<span class="o">=</span><span class="k">$(</span>ifconfig eth0 | grep <span class="s2">"inet addr"</span> | awk <span class="s1">'{print $2}'</span> | cut -d <span class="s2">":"</span> -f2<span class="k">)</span>
+</code></pre>
+ </div>
</li>
<li>
<p>在测试主节点上运行<em>jmeter</em>，指令如下：</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>jmeter <span class="nt">-n</span> <span class="nt">-R</span> host1,host2 <span class="nt">-t</span> workshop.jmx <span class="nt">-j</span> workshop.log <span class="nt">-l</span> workshop.jtl <span class="nt">-Gmin</span><span class="o">=</span>1 <span class="nt">-Gmax</span><span class="o">=</span>2 <span class="nt">-Gthreads</span><span class="o">=</span>200 <span class="nt">-Gduration [...]
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>jmeter -n -R host1,host2 -t workshop.jmx -j workshop.log -l workshop.jtl -Gmin<span class="o">=</span>1 -Gmax<span class="o">=</span>2 -Gthreads<span class="o">=</span>200 -Gduration<span class="o">=</span>600
+</code></pre>
+ </div>
<p class="notice--warning"><em>注意事项</em>：JMeter属性在分布式模式下并不能生效，需要将其声明为全局的属性。因此，此处我们用的是<em>-G</em>的选项而不是之前的<em>-J</em>的选项。</p>
</li>
@@ -820,6 +828,7 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-08-25-stress-test-on-company-with-jmeter-in-k8s.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-08-25-stress-test-on-company-with-jmeter-in-k8s.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/docs/tracing-with-servicecomb/index.html b/content/cn/docs/tracing-with-servicecomb/index.html
index 4e40c40..6a94057 100644
--- a/content/cn/docs/tracing-with-servicecomb/index.html
+++ b/content/cn/docs/tracing-with-servicecomb/index.html
@@ -399,35 +399,38 @@
<h3 id="添加依赖">添加依赖</h3>
<p>基于 ServiceComb Java Chassis 的微服务只需要添加如下依赖到 pom.xml。</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>handler-tracing-zipkin<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>如果微服务是基于 Spring Cloud + Zuul 的 API 网关，例如 workshop demo 中的 manager service ，我们还需要加入如下的额外依赖。</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-cloud-zuul-zipkin<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="配置追踪处理和数据收集">配置追踪处理和数据收集</h3>
<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">servicecomb</span><span class="pi">:</span>
- <span class="na">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Consumer</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">tracing-consumer</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">tracing-provider</span>
-
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">tracing</span><span class="pi">:</span>
- <span class="na">collector</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://zipkin.servicecomb.io:9411</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Consumer</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">tracing-consumer</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">tracing-provider</span>
+
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">tracing</span><span class="pi">:</span>
+ <span class="s">collector</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://zipkin.servicecomb.io:9411</span>
+</code></pre>
+</div>
<p>就这样，在加了两个配置项，没改动一行代码的情况下，我们启动了基于 Zipkin 和 Java chassis 的分布式调用链追踪的功能。</p>
@@ -776,6 +779,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/cn/2017-07-17-tracing-with-servicecomb.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/cn/2017-07-17-tracing-with-servicecomb.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/faqs/faqs-huawei-cloud/index.html b/content/cn/faqs/faqs-huawei-cloud/index.html
index dc99519..56b2727 100644
--- a/content/cn/faqs/faqs-huawei-cloud/index.html
+++ b/content/cn/faqs/faqs-huawei-cloud/index.html
@@ -291,7 +291,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">
@@ -320,22 +320,24 @@
<li>
<p><strong>Q: 华为公有云运行时报错：WARN com.huawei.paas.monitor.DataFactory: Upload monitor data error. 使用的配置为：</strong></p>
- <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">monitor</span><span class="pi">:</span>
- <span class="na">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">monitor</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span>
+</code></pre>
+ </div>
<p>A: 这个是配置文件的错误，handler应该是在cse的下一级而不是monitor的下一级，正确的配置是：</p>
- <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">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: 微服务引擎CSE和ServiceComb有什么关系？</strong></p>
@@ -401,6 +403,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _faqs/cn/huawei-cloud-faq.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_faqs/cn/huawei-cloud-faq.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/faqs/index.html b/content/cn/faqs/index.html
index 2814c02..a6e678e 100644
--- a/content/cn/faqs/index.html
+++ b/content/cn/faqs/index.html
@@ -291,7 +291,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">
@@ -338,9 +338,10 @@
<li>
<p><strong>Q: 网关依赖的jar和其他微服务的一样吗？</strong></p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-provider<span class="nt"></artifactId></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>A: 网关除了要依赖<code class="highlighter-rouge">spring-boot-starter-provider</code>之外还要依赖<code class="highlighter-rouge">spring-boot-starter-discovery</code>，可以参考<a href="https://github.com/ServiceComb/LinuxCon-Beijing-WorkShop">LinuxCon-Beijing-Workshop</a>中manager的实现。</p>
</li>
@@ -373,15 +374,16 @@
<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"><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 class="s">""</span><sp [...]
<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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<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>
+ <div class="language-java highlighter-rouge"><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>
<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>
@@ -398,7 +400,8 @@
<span class="k">return</span> <span class="s">"not expected"</span><span class="o">;</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: 如何定制自己微服务的日志配置?</strong></p>
@@ -434,11 +437,12 @@
<p>如果，此时consumer想固定使用某个transport访问producer，可以在consumer进程的microservice.yaml中配置，指定transport的名称:</p>
- <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">references</span><span class="pi">:</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">references</span><span class="pi">:</span>
<span class="s"><service_name></span><span class="pi">:</span>
- <span class="na">transport</span><span class="pi">:</span> <span class="s">highway</span>
-</code></pre></div> </div>
+ <span class="s">transport</span><span class="pi">:</span> <span class="s">highway</span>
+</code></pre>
+ </div>
</li>
<li>当一个微服务producer只开放了highway的endpoint
<ul>
@@ -463,59 +467,63 @@
<p>定义如下接口，将参数放到body传递</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="s">/testInherate</span><span class="pi">:</span>
- <span class="na">post</span><span class="pi">:</span>
- <span class="na">operationId</span><span class="pi">:</span> <span class="s2">"</span><span class="s">testInherate"</span>
- <span class="na">parameters</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">in</span><span class="pi">:</span> <span class="s2">"</span><span class="s">body"</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">xxxxx"</span>
- <span class="na">required</span><span class="pi">:</span> <span class="no">false</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s">string</span>
- <span class="na">responses</span><span class="pi">:</span>
- <span class="na">200</span><span class="pi">:</span>
- <span class="na">description</span><span class="pi">:</span> <span class="s2">"</span><span class="s">response</span><span class="nv"> </span><span class="s">of</span><span class="nv"> </span><span class="s">200"</span>
- <span class="na">schema</span><span class="pi">:</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">/testInherate</span><span class="pi">:</span>
+ <span class="s">post</span><span class="pi">:</span>
+ <span class="s">operationId</span><span class="pi">:</span> <span class="s2">"</span><span class="s">testInherate"</span>
+ <span class="s">parameters</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">in</span><span class="pi">:</span> <span class="s2">"</span><span class="s">body"</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">xxxxx"</span>
+ <span class="s">required</span><span class="pi">:</span> <span class="s">false</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s">string</span>
+ <span class="s">responses</span><span class="pi">:</span>
+ <span class="s">200</span><span class="pi">:</span>
+ <span class="s">description</span><span class="pi">:</span> <span class="s2">"</span><span class="s">response</span><span class="nv"> </span><span class="s">of</span><span class="nv"> </span><span class="s">200"</span>
+ <span class="s">schema</span><span class="pi">:</span>
<span class="s">$ref</span><span class="pi">:</span> <span class="s2">"</span><span class="s">#/definitions/ResponseImpl"</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>采用上面方式定义接口。在服务注册以后，从服务中心查询下来的接口type: string 丢失，变成了：</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="s">/testInherate</span><span class="pi">:</span>
- <span class="na">post</span><span class="pi">:</span>
- <span class="na">operationId</span><span class="pi">:</span> <span class="s2">"</span><span class="s">testInherate"</span>
- <span class="na">parameters</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">in</span><span class="pi">:</span> <span class="s2">"</span><span class="s">body"</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">xxxxx"</span>
- <span class="na">required</span><span class="pi">:</span> <span class="no">false</span>
- <span class="na">responses</span><span class="pi">:</span>
- <span class="na">200</span><span class="pi">:</span>
- <span class="na">description</span><span class="pi">:</span> <span class="s2">"</span><span class="s">response</span><span class="nv"> </span><span class="s">of</span><span class="nv"> </span><span class="s">200"</span>
- <span class="na">schema</span><span class="pi">:</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">/testInherate</span><span class="pi">:</span>
+ <span class="s">post</span><span class="pi">:</span>
+ <span class="s">operationId</span><span class="pi">:</span> <span class="s2">"</span><span class="s">testInherate"</span>
+ <span class="s">parameters</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">in</span><span class="pi">:</span> <span class="s2">"</span><span class="s">body"</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">xxxxx"</span>
+ <span class="s">required</span><span class="pi">:</span> <span class="s">false</span>
+ <span class="s">responses</span><span class="pi">:</span>
+ <span class="s">200</span><span class="pi">:</span>
+ <span class="s">description</span><span class="pi">:</span> <span class="s2">"</span><span class="s">response</span><span class="nv"> </span><span class="s">of</span><span class="nv"> </span><span class="s">200"</span>
+ <span class="s">schema</span><span class="pi">:</span>
<span class="s">$ref</span><span class="pi">:</span> <span class="s2">"</span><span class="s">#/definitions/ResponseImpl"</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>如果客户端没有放置swagger，还会报告如下异常：</p>
- <div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code> Caused by: java.lang.ClassFormatError: Method "testInherate" in class ? has illegal signature "
-</code></pre></div> </div>
+ <div class="language-text highlighter-rouge"><pre class="highlight"><code> Caused by: java.lang.ClassFormatError: Method "testInherate" in class ? has illegal signature "
+</code></pre>
+ </div>
<p>A：定义body参数的类型的时候，需要使用schema，不能直接使用type。</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="s">/testInherate</span><span class="pi">:</span>
- <span class="na">post</span><span class="pi">:</span>
- <span class="na">operationId</span><span class="pi">:</span> <span class="s2">"</span><span class="s">testInherate"</span>
- <span class="na">parameters</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">in</span><span class="pi">:</span> <span class="s2">"</span><span class="s">body"</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">request"</span>
- <span class="na">required</span><span class="pi">:</span> <span class="no">false</span>
- <span class="na">schema</span><span class="pi">:</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s">string</span>
- <span class="na">responses</span><span class="pi">:</span>
- <span class="na">200</span><span class="pi">:</span>
- <span class="na">description</span><span class="pi">:</span> <span class="s2">"</span><span class="s">response</span><span class="nv"> </span><span class="s">of</span><span class="nv"> </span><span class="s">200"</span>
- <span class="na">schema</span><span class="pi">:</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">/testInherate</span><span class="pi">:</span>
+ <span class="s">post</span><span class="pi">:</span>
+ <span class="s">operationId</span><span class="pi">:</span> <span class="s2">"</span><span class="s">testInherate"</span>
+ <span class="s">parameters</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">in</span><span class="pi">:</span> <span class="s2">"</span><span class="s">body"</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">request"</span>
+ <span class="s">required</span><span class="pi">:</span> <span class="s">false</span>
+ <span class="s">schema</span><span class="pi">:</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s">string</span>
+ <span class="s">responses</span><span class="pi">:</span>
+ <span class="s">200</span><span class="pi">:</span>
+ <span class="s">description</span><span class="pi">:</span> <span class="s2">"</span><span class="s">response</span><span class="nv"> </span><span class="s">of</span><span class="nv"> </span><span class="s">200"</span>
+ <span class="s">schema</span><span class="pi">:</span>
<span class="s">$ref</span><span class="pi">:</span> <span class="s2">"</span><span class="s">#/definitions/ResponseImpl"</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: ServiceComb微服务框架服务调用是否使用长连接?</strong></p>
@@ -537,9 +545,10 @@
<p>A: 发布服务接口的时候需要将war包部署的上下文（context）放在baseurl最前面，这样才能保证注册到服务中心的路径是完整的路径（包含了上下文）。实例：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@path</span><span class="o">(/{</span><span class="n">context</span><span class="o">}/</span><span class="n">xxx</span><span class="o">)</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="nd">@path</span><span class="o">(/{</span><span class="n">context</span><span class="o">}/</span><span class="n">xxx</span><span class="o">)</span>
<span class="kd">class</span> <span class="nc">ServiceA</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: ServiceComb微服务框架如何实现数据多个微服务间透传</strong></p>
@@ -547,28 +556,30 @@
<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"><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>
<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 [...]
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>透传数据获取：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@Override</span>
+ <div class="language-java highlighter-rouge"><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="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>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: ServiceComb微服务框架服务如何自定义返回状态码?</strong></p>
<p>A:</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@Override</span>
+ <div class="language-java highlighter-rouge"><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>
@@ -576,27 +587,30 @@
<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="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>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: ServiceComb body Model部分暴露</strong></p>
<p>A: 一个接口对应的body对象中，可能有一些属性是内部的，不想开放出去，生成schema的时候不要带出去，使用：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@ApiModelProperty</span><span class="o">(</span><span class="n">hidden</span> <span class="o">=</span> <span class="kc">true</span><span class="o">)</span>
-</code></pre></div> </div>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="nd">@ApiModelProperty</span><span class="o">(</span><span class="n">hidden</span> <span class="o">=</span> <span class="kc">true</span><span class="o">)</span>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: ServiceComb框架获取远端consumer的地址</strong></p>
<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"><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="o">(</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="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>实际场景是拿最外层的地址，所以应该是LB传入到edgeservice，edgeService再放到context外下传递。</p>
</li>
@@ -619,7 +633,7 @@
<li>在代码里面不要使用Log4jUtils.init()；</li>
<li>去掉log4j的配置文件（不删掉也没关系，因为不会使用）；</li>
<li>exclude掉CSE框架引入的log4j，例如：
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>provider-springmvc<span class="nt"></artifactId></span>
<span class="nt"><exclusions></span>
@@ -629,12 +643,13 @@
<span class="nt"></exclusion></span>
<span class="nt"></exclusions></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>引入log4j2的依赖</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.logging.log4j<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>log4j-slf4j-impl<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
@@ -646,14 +661,15 @@
<span class="nt"><groupId></span>org.apache.logging.log4j<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>log4j-core<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>如果没有版本依赖管理，还需要填写上版本号。</p>
</li>
<li>
<p>加入log4j2的配置文件log4j2.xml，关于这个请查看官方说明，例如：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
<span class="c"><!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL --></span>
<span class="c"><!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出--></span>
<span class="c"><!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数--></span>
@@ -714,7 +730,8 @@
<span class="nt"></root></span>
<span class="nt"></loggers></span>
<span class="nt"></configuration></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>启动服务进行验证</li>
</ol>
@@ -724,10 +741,11 @@
<p>A: 在微服务描述文件（microservice.yaml）中添加如下配置：</p>
- <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>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">request</span><span class="pi">:</span>
+ <span class="s">timeout</span><span class="pi">:</span> <span class="s">30000</span>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: URL 地址就可以唯一定位，为什么要加上一个schema？</strong></p>
@@ -825,20 +843,21 @@
<p>A: 如果是使用rest transport，因为是Json序列化，可以使用@JsonIgnore注解标记需要忽略的属性；highway transport目前尚不支持。注意修改后需要更新微服务的version，例如:</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">OutputForTest</span><span class="o">{</span>
+ <div class="language-java highlighter-rouge"><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="o">...</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: 如何在用户自定义的handler中获取header中某个字段的值</strong></p>
<p>A: 在用户自定义的handler使用@ApiImplicitParams注解声明，使用invocation.getArgs()获取header的值。例如:</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">MyHandler</span> <span class="kd">implements</span> <span class="n">Handler</span> <span class="o">{</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyHandler</span> <span class="kd">implements</span> <span class="n">Handler</span> <span class="o">{</span>
<span class="nd">@ApiImplicitParams</span><span class="o">({</span><span class="nd">@ApiImplicitParam</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"tester"</span><span class="o">,</span> <span class="n">dataType</span> <span class="o">=</span> <span class="s">"string"</span><span class="o">,</span> <span class="n">paramType</span> <span class="o">=</span> <span class="s">"header"</span><span class="o">)})</span>
<span class="nd">@Override</span>
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">handle</span><span class="o">(</span><span class="n">Invocation</span> <span class="n">invocation</span><span class="o">,</span> <span class="n">AsyncResponse</span> <span class="n">asyncResp</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
@@ -846,7 +865,8 @@
<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">args</span><span class="o">);</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>Q: 微服务运行时抛出异常：<code class="highlighter-rouge"> java.lang.Error:not support def type:calss io.swagger.models.properties BaseIntegerProperty</code>？</strong></p>
@@ -912,6 +932,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _faqs/cn/faq.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_faqs/cn/faq.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/index.html b/content/cn/index.html
index 47c453b..ce260af 100644
--- a/content/cn/index.html
+++ b/content/cn/index.html
@@ -435,6 +435,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _pages/cn/home.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_pages/cn/home.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/index.html b/content/cn/release/index.html
index 5b6a6c6..5cf2ef5 100644
--- a/content/cn/release/index.html
+++ b/content/cn/release/index.html
@@ -390,7 +390,7 @@
<p>It is essential that you verify the integrity of the downloaded files using the PGP or SHA signatures.
The PGP signatures can be verified using GPG or PGP.
Please download the <a href="https://www.apache.org/dist/incubator/servicecomb/KEYS" target="_blank">KEYS</a> as well as the asc signature files for relevant distribution. It is recommended to get these files from the main distribution <a href="https://www.apache.org/dist/incubator/servicecomb/" target="_blank">directory</a> and not from the mirrors.</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> gpg -i KEYS
+<div class="highlighter-rouge"><pre class="highlight"><code> gpg -i KEYS
or
@@ -400,11 +400,12 @@
pgp -ka KEYS
-</code></pre></div></div>
+</code></pre>
+</div>
<p>To verify the binaries/sources you can download the relevant asc files for it from main distribution directory and follow the below guide.</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating********.asc apache-servicecomb-incubating*********
+<div class="highlighter-rouge"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating********.asc apache-servicecomb-incubating*********
or
@@ -415,7 +416,8 @@ or
pgp apache-servicecomb-incubating********.asc
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Alternatively you can download the SHA signatures from main distribution <a href="https://www.apache.org/dist/incubator/servicecomb/" target="_blank">repo</a> and verify the downloads using sha512sum.</p>
@@ -476,6 +478,7 @@ pgp apache-servicecomb-incubating********.asc
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/release.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/release.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/java-chassis-downloads/index.html b/content/cn/release/java-chassis-downloads/index.html
index c55d44f..15fa947 100644
--- a/content/cn/release/java-chassis-downloads/index.html
+++ b/content/cn/release/java-chassis-downloads/index.html
@@ -381,7 +381,7 @@
<p><strong>发布包验证</strong></p>
<p>使用PGP或SHA签名验证下载文件的完整性是很有必要的。PGP签名可以使用GPG或PGP进行验证，请下载 <a href="https://www.apache.org/dist/incubator/servicecomb/KEYS">KEYS</a>以及相关发行的asc签名文件。建议从主发行<a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/" target="_blank">目录</a> 中获取这些文件，而不是从镜像中获取这些文件。</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> gpg -i KEYS
+<div class="highlighter-rouge"><pre class="highlight"><code> gpg -i KEYS
or
@@ -391,11 +391,12 @@
pgp -ka KEYS
-</code></pre></div></div>
+</code></pre>
+</div>
<p>要验证二进制文件或源代码，您可以从主发行目录下载相关的asc文件并按照以下指南进行操作。</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-java-chassis-********.asc apache-servicecomb-incubating-java-chassis-*********
+<div class="highlighter-rouge"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-java-chassis-********.asc apache-servicecomb-incubating-java-chassis-*********
or
@@ -406,7 +407,8 @@ or
pgp apache-servicecomb-incubating-java-chassis-********.asc
-</code></pre></div></div>
+</code></pre>
+</div>
<p>另外，您也可以从主发行<a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/" target="_blank">仓库</a>下载SHA签名并使用sha512sum验证。</p>
@@ -467,6 +469,7 @@ pgp apache-servicecomb-incubating-java-chassis-********.asc
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/java_chassis_downloads.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/java_chassis_downloads.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/java-chassis-release-notes/index.html b/content/cn/release/java-chassis-release-notes/index.html
index fb52d95..6bdee08 100644
--- a/content/cn/release/java-chassis-release-notes/index.html
+++ b/content/cn/release/java-chassis-release-notes/index.html
@@ -367,8 +367,9 @@
<section class="page__content" itemprop="text">
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> Release Notes - Apache ServiceComb - Version Java-Chassis-1.0.0-m1
-</code></pre></div></div>
+ <div class="highlighter-rouge"><pre class="highlight"><code> Release Notes - Apache ServiceComb - Version Java-Chassis-1.0.0-m1
+</code></pre>
+</div>
<h3 id="major-improvements">Major improvements:</h3>
@@ -465,6 +466,7 @@ and provider now supports CompletableFuture.</li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/java_chassis_releaseNotes.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/java_chassis_releaseNotes.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/saga-binary/index.html b/content/cn/release/saga-binary/index.html
index 1e1e266..e58956d 100644
--- a/content/cn/release/saga-binary/index.html
+++ b/content/cn/release/saga-binary/index.html
@@ -383,7 +383,7 @@
<p>It is essential that you verify the integrity of the downloaded files using the PGP or SHA signatures.
The PGP signatures can be verified using GPG or PGP.
Please download the <a href="https://www.apache.org/dist/incubator/servicecomb/KEYS" target="_blank">KEYS</a> as well as the asc signature files for relevant distribution. It is recommended to get these files from the main distribution <a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/" target="_blank">directory</a> and not from the mirrors.</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> gpg -i KEYS
+<div class="highlighter-rouge"><pre class="highlight"><code> gpg -i KEYS
or
@@ -393,11 +393,12 @@
pgp -ka KEYS
-</code></pre></div></div>
+</code></pre>
+</div>
<p>To verify the binaries/sources you can download the relevant asc files for it from main distribution directory and follow the below guide.</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-saga********.asc apache-servicecomb-incubating-saga-*********
+<div class="highlighter-rouge"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-saga********.asc apache-servicecomb-incubating-saga-*********
or
@@ -408,7 +409,8 @@ or
pgp apache-servicecomb-incubating-saga-********.asc
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Alternatively you can download the SHA signatures from main distribution <a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/" target="_blank">repo</a> and verify the downloads using sha512sum.</p>
@@ -469,6 +471,7 @@ pgp apache-servicecomb-incubating-saga-********.asc
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/saga_binaries.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/saga_binaries.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/saga-downloads/index.html b/content/cn/release/saga-downloads/index.html
index fbed5cf..8ca952b 100644
--- a/content/cn/release/saga-downloads/index.html
+++ b/content/cn/release/saga-downloads/index.html
@@ -384,7 +384,7 @@
<p>建议从主发行<a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/">目录</a>中获取这些文件，而不是从镜像中获取这些文件。</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> gpg -i KEYS
+<div class="highlighter-rouge"><pre class="highlight"><code> gpg -i KEYS
or
@@ -394,11 +394,12 @@
pgp -ka KEYS
-</code></pre></div></div>
+</code></pre>
+</div>
<p>要验证二进制文件或源代码，您可以从主发行目录下载相关的asc文件并按照以下指南进行操作。</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-saga********.asc apache-servicecomb-incubating-saga-*********
+<div class="highlighter-rouge"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-saga********.asc apache-servicecomb-incubating-saga-*********
or
@@ -409,7 +410,8 @@ or
pgp apache-servicecomb-incubating-saga-********.asc
-</code></pre></div></div>
+</code></pre>
+</div>
<p>另外，您也可以从主发行<a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/" target="_blank">仓库</a>下载SHA签名并使用sha512sum验证。</p>
@@ -470,6 +472,7 @@ pgp apache-servicecomb-incubating-saga-********.asc
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/saga_downloads.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/saga_downloads.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/saga-release-notes/index.html b/content/cn/release/saga-release-notes/index.html
index ab6a96b..71b9a85 100644
--- a/content/cn/release/saga-release-notes/index.html
+++ b/content/cn/release/saga-release-notes/index.html
@@ -367,8 +367,9 @@
<section class="page__content" itemprop="text">
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> Release Notes - Apache ServiceComb - Version saga-0.1.0
-</code></pre></div></div>
+ <div class="highlighter-rouge"><pre class="highlight"><code> Release Notes - Apache ServiceComb - Version saga-0.1.0
+</code></pre>
+</div>
<h2> Sub-task
</h2>
@@ -566,6 +567,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/saga_releaseNotes.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/saga_releaseNotes.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/service-center-binary/index.html b/content/cn/release/service-center-binary/index.html
index 8d5719c..ee946d0 100644
--- a/content/cn/release/service-center-binary/index.html
+++ b/content/cn/release/service-center-binary/index.html
@@ -384,7 +384,7 @@
<p>It is essential that you verify the integrity of the downloaded files using the PGP or SHA signatures.
The PGP signatures can be verified using GPG or PGP.
Please download the <a href="https://www.apache.org/dist/incubator/servicecomb/KEYS" target="_blank">KEYS</a> as well as the asc signature files for relevant distribution. It is recommended to get these files from the main distribution <a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/" target="_blank">directory</a> and not from the mirrors.</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> gpg -i KEYS
+<div class="highlighter-rouge"><pre class="highlight"><code> gpg -i KEYS
or
@@ -394,11 +394,12 @@
pgp -ka KEYS
-</code></pre></div></div>
+</code></pre>
+</div>
<p>To verify the binaries/sources you can download the relevant asc files for it from main distribution directory and follow the below guide.</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-service-center-********.asc apache-servicecomb-incubating-service-center-*********
+<div class="highlighter-rouge"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-service-center-********.asc apache-servicecomb-incubating-service-center-*********
or
@@ -409,7 +410,8 @@ or
pgp apache-servicecomb-incubating-service-center-********.asc
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Alternatively you can download the SHA signatures from main distribution <a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/" target="_blank">repo</a> and verify the downloads using sha512sum.</p>
@@ -470,6 +472,7 @@ pgp apache-servicecomb-incubating-service-center-********.asc
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/service_center_binaries.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/service_center_binaries.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/service-center-downloads/index.html b/content/cn/release/service-center-downloads/index.html
index 1b4142d..d95d2c6 100644
--- a/content/cn/release/service-center-downloads/index.html
+++ b/content/cn/release/service-center-downloads/index.html
@@ -383,7 +383,7 @@
<p>使用PGP或SHA签名验证下载文件的完整性是很有必要的。PGP签名可以使用GPG或PGP进行验证，请下载 <a href="https://www.apache.org/dist/incubator/servicecomb/KEYS">KEYS</a>以及相关发行的asc签名文件。
建议从主发行<a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/" target="_blank">目录</a> 中获取这些文件，而不是从镜像中获取这些文件。.</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> gpg -i KEYS
+<div class="highlighter-rouge"><pre class="highlight"><code> gpg -i KEYS
or
@@ -393,11 +393,12 @@
pgp -ka KEYS
-</code></pre></div></div>
+</code></pre>
+</div>
<p>要验证二进制文件或源代码，您可以从主发行目录下载相关的asc文件并按照以下指南进行操作。</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-service-center-********.asc apache-servicecomb-incubating-service-center-*********
+<div class="highlighter-rouge"><pre class="highlight"><code>gpg --verify apache-servicecomb-incubating-service-center-********.asc apache-servicecomb-incubating-service-center-*********
or
@@ -408,7 +409,8 @@ or
pgp apache-servicecomb-incubating-service-center-********.asc
-</code></pre></div></div>
+</code></pre>
+</div>
<p>另外，您也可以从主发行<a href="https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/" target="_blank">仓库</a>下载SHA签名并使用sha512sum验证。</p>
@@ -469,6 +471,7 @@ pgp apache-servicecomb-incubating-service-center-********.asc
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/service_center_downloads.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/service_center_downloads.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/release/service-center-release-notes/index.html b/content/cn/release/service-center-release-notes/index.html
index e064eff..7666976 100644
--- a/content/cn/release/service-center-release-notes/index.html
+++ b/content/cn/release/service-center-release-notes/index.html
@@ -367,8 +367,9 @@
<section class="page__content" itemprop="text">
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> Release Notes - Apache ServiceComb - Version Service-Center-1.0.0-m1
-</code></pre></div></div>
+ <div class="highlighter-rouge"><pre class="highlight"><code> Release Notes - Apache ServiceComb - Version Service-Center-1.0.0-m1
+</code></pre>
+</div>
<h4 id="api-changes-">API Changes :</h4>
<ul>
@@ -465,6 +466,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _release/cn/service_center_releaseNotes.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_release/cn/service_center_releaseNotes.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/slides/index.html b/content/cn/slides/index.html
index 116fdae..d239ddc 100644
--- a/content/cn/slides/index.html
+++ b/content/cn/slides/index.html
@@ -423,6 +423,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _pages/cn/about-slides.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_pages/cn/about-slides.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/application-boot-process/index.html b/content/cn/users/application-boot-process/index.html
index 493b313..18c0cd9 100644
--- a/content/cn/users/application-boot-process/index.html
+++ b/content/cn/users/application-boot-process/index.html
@@ -632,7 +632,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">
@@ -728,6 +728,7 @@ ServiceComb的配置项分为三个层次：配置中心、环境变量、本地
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/application-boot-process.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/application-boot-process.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/communicate-protocol/index.html b/content/cn/users/communicate-protocol/index.html
index 7943013..ba49790 100644
--- a/content/cn/users/communicate-protocol/index.html
+++ b/content/cn/users/communicate-protocol/index.html
@@ -632,7 +632,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">
@@ -725,11 +725,12 @@
<p>在microservice.yaml中添加executors配置，为schemaId:operation配置单独的业务线程池：</p>
-<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">executors</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">executors</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
<span class="pi">[</span><span class="nv">schemaId</span><span class="pi">]</span><span class="s">.[operation]</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="rest-over-servlet">REST over Servlet</h2>
<h3 id="配置说明">配置说明</h3>
@@ -742,7 +743,7 @@
<p>web.xml文件配置在项目的src/main/webapp/WEB_INF目录，配置内容如下：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><web-app</span> <span class="na">xmlns=</span><span class="s">"http://java.sun.com/xml/ns/javaee"</span> <span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span> <span class="na">xsi:schemaLocation=</span><span class="s">"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"</span> <span class=" [...]
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><web-app</span> <span class="na">xmlns=</span><span class="s">"http://java.sun.com/xml/ns/javaee"</span> <span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span> <span class="na">xsi:schemaLocation=</span><span class="s">"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"</span> <span class="na">version=</span><spa [...]
<span class="nt"><context-param></span>
<span class="nt"><param-name></span>contextConfigLocation<span class="nt"></param-name></span>
<span class="nt"><param-value></span>classpath*:META-INF/spring/*.bean.xml classpath*:app-config.xml<span class="nt"></param-value></span>
@@ -761,12 +762,13 @@
<span class="nt"><url-pattern></span>/rest/*<span class="nt"></url-pattern></span>
<span class="nt"></servlet-mapping></span>
<span class="nt"></web-app></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>在web.xml文件中仅配置listener，在microservice.yaml文件中配置urlPattern</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><web-app</span> <span class="na">xmlns=</span><span class="s">"http://java.sun.com/xml/ns/javaee"</span> <span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span> <span class="na">xsi:schemaLocation=</span><span class="s">"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"</span> <span class=" [...]
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><web-app</span> <span class="na">xmlns=</span><span class="s">"http://java.sun.com/xml/ns/javaee"</span> <span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span> <span class="na">xsi:schemaLocation=</span><span class="s">"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"</span> <span class="na">version=</span><spa [...]
<span class="nt"><context-param></span>
<span class="nt"><param-name></span>contextConfigLocation<span class="nt"></param-name></span>
<span class="nt"><param-value></span>classpath*:META-INF/spring/*.bean.xml classpath*:app-config.xml<span class="nt"></param-value></span>
@@ -775,22 +777,25 @@
<span class="nt"><listener-class></span>org.apache.servicecomb.transport.rest.servlet.RestServletContextListener<span class="nt"></listener-class></span>
<span class="nt"></listener></span>
<span class="nt"></web-app></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>在microservice.yaml文件中需要增加一行配置来指定urlPattern：</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="s">servicecomb.rest.servlet.urlPattern</span><span class="pi">:</span> <span class="s">/rest/*</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">servicecomb.rest.servlet.urlPattern</span><span class="pi">:</span> <span class="s">/rest/*</span>
+</code></pre>
+ </div>
</li>
</ul>
<p>以上两种方式是等效的，两种方式都需要在maven pom文件中添加如下依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>transport-rest-servlet<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>REST over Servlet在microservice.yaml文件中的配置项见下表：</p>
@@ -855,18 +860,19 @@
<p>microservice.yaml文件中的配置示例如下：</p>
-<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>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
+ <span class="s">timeout</span><span class="pi">:</span> <span class="s">3000</span>
+</code></pre>
+</div>
<h2 id="rest-over-vertx">REST over Vertx</h2>
<h3 id="配置说明-1">配置说明</h3>
<p>REST over Vertx通信通道对应使用standalone部署运行模式，可直接通过main函数拉起。main函数中需要初始化日志和加载服务配置，代码如下：</p>
-<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>
+<div class="language-java highlighter-rouge"><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>
@@ -875,15 +881,17 @@
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>使用REST over Vertx网络通道需要在maven pom文件中添加如下依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>transport-rest-vertx<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>REST over Vertx通道在microservice.yaml文件中有以下配置项：</p>
@@ -964,15 +972,16 @@
<p>microservice.yaml文件中的配置示例：</p>
-<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">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>
- <span class="na">version-rule</span><span class="pi">:</span> <span class="s">0.0.1</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
+ <span class="s">thread-count</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="s">references</span><span class="pi">:</span>
+ <span class="s">hello</span><span class="pi">:</span>
+ <span class="s">transport</span><span class="pi">:</span> <span class="s">rest</span>
+ <span class="s">version-rule</span><span class="pi">:</span> <span class="s">0.0.1</span>
+</code></pre>
+</div>
<h2 id="highway-rpc协议">Highway RPC协议</h2>
<h3 id="概念阐述-2">概念阐述</h3>
@@ -983,11 +992,12 @@
<p>使用Highway网络通道需要在maven pom文件中添加如下依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>transport-highway<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Highway通道在microservice.yaml文件中的配置项如下表所示：</p>
@@ -1068,10 +1078,11 @@
<p>microservice.yaml文件中的配置示例：</p>
-<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">highway</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7070</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">highway</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7070</span>
+</code></pre>
+</div>
</section>
@@ -1130,6 +1141,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/communicate-protocol.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/communicate-protocol.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/customized-tracing/index.html b/content/cn/users/customized-tracing/index.html
index 62f9e5b..84a166f 100644
--- a/content/cn/users/customized-tracing/index.html
+++ b/content/cn/users/customized-tracing/index.html
@@ -632,7 +632,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">
@@ -693,30 +693,32 @@
<p>基于 ServiceComb Java Chassis 的微服务只需要添加如下依赖到 pom.xml：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>tracing-zipkin<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="启用自定义打点功能">启用自定义打点功能</h3>
<p>在应用入口或Spring配置类上添加<code class="highlighter-rouge">@EnableZipkinTracing</code>注释：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@SpringBootApplication</span>
+<div class="language-java highlighter-rouge"><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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="定制打点">定制打点</h3>
<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>
+<div class="language-java highlighter-rouge"><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>
@@ -730,7 +732,8 @@
<span class="k">return</span> <span class="s">"crawled"</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>就这样，通过使用<code class="highlighter-rouge">@Span</code>注释，我们启动了基于 Zipkin 的自定义打点功能。</p>
@@ -766,13 +769,14 @@
<p>如果需要定制上报的数据内容，可以传入自定义的参数：</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="kd">class</span> <span class="nc">CustomSpanTask</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><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="k">return</span> <span class="s">"invoke the method"</span><span class="o">;</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
</section>
@@ -831,6 +835,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/customized-tracing.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/customized-tracing.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/deploy-mode/index.html b/content/cn/users/deploy-mode/index.html
index 1c243f7..4ba8838 100644
--- a/content/cn/users/deploy-mode/index.html
+++ b/content/cn/users/deploy-mode/index.html
@@ -683,7 +683,7 @@
<h3 id="如何打包微服务">如何打包微服务</h3>
<p>在微服务项目的<code class="highlighter-rouge">pom.xml</code>中添加以下依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><build></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><build></span>
<span class="nt"><plugins></span>
<span class="nt"><plugin></span>
<span class="nt"><groupId></span>org.apache.maven.plugins<span class="nt"></groupId></span>
@@ -721,17 +721,20 @@
<span class="nt"></plugin></span>
<span class="nt"></plugins></span>
<span class="nt"></build></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>之后运行：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn package
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn package
+</code></pre>
+</div>
<p>在<code class="highlighter-rouge">target</code>目录下拷贝生成的微服务jar包和<code class="highlighter-rouge">lib</code>（依赖jar）至任何目录，运行即可：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>java <span class="nt">-jar</span> <span class="k">${</span><span class="nv">project</span><span class="p">.artifactId</span><span class="k">}</span>-<span class="k">${</span><span class="nv">project</span><span class="p">.version</span><span class="k">}</span>.jar
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>java -jar <span class="k">${</span><span class="nv">project</span><span class="p">.artifactId</span><span class="k">}</span>-<span class="k">${</span><span class="nv">project</span><span class="p">.version</span><span class="k">}</span>.jar
+</code></pre>
+</div>
<blockquote>
<p>提示：</p>
@@ -749,7 +752,7 @@
<h3 id="如何直接打包微服务为docker镜像">如何直接打包微服务为Docker镜像</h3>
<p>我们使用io.fabric8的<a href="https://github.com/fabric8io/docker-maven-plugin">maven插件</a>从打包，镜像在微服务项目的<code class="highlighter-rouge">pom.xml</code>中添加以下依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><build></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><build></span>
<span class="nt"><pluginManagement></span>
<span class="nt"><plugins></span>
<span class="nt"><plugin></span>
@@ -841,11 +844,12 @@
<span class="nt"></build></span>
<span class="nt"></profile></span>
<span class="nt"></profiles></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>在项目源代码<code class="highlighter-rouge">src\main</code>下，创建一个<code class="highlighter-rouge">docker</code>目录，之后在此目录中创建一个<code class="highlighter-rouge">assembly.xml</code>文件，填入下面的内容：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
<span class="nt"><assembly></span>
<span class="nt"><id></span>installer<span class="nt"></id></span>
<span class="nt"><fileSets></span>
@@ -864,7 +868,8 @@
<span class="nt"></file></span>
<span class="nt"></files></span>
<span class="nt"></assembly></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>完成之后的项目效果：</p>
@@ -872,8 +877,9 @@
<p>运行：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn package <span class="nt">-Pdocker</span>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn package -Pdocker
+</code></pre>
+</div>
<p>等待打包完成，会有提示镜像生成成功并注册到本地镜像库的提示。</p>
@@ -884,57 +890,60 @@
<li>为了保留普通打包方式，docker打包方式配置为maven profile，即``-Pdocker`；</li>
<li>如果是使用windows系统，请安装docker machine，并且确保docker machine vm启动中；</li>
<li>打包的镜像会默认安装在本地镜像库中，如果需要上传外部镜像库例如中央库，可以使用下面的命令：
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn <span class="nt">-Ddocker</span>.registry<span class="o">=</span>registry.hub.docker.com/<span class="k">${</span><span class="nv">username</span><span class="k">}</span> <span class="nt">-Ddocker</span>.username<span class="o">=</span><span class="k">${</span><span class="nv">username</span><span class="k">}</span> <span class="nt">-Ddocker</span>.password<span class="o">=</span><s [...]
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn -Ddocker.registry<span class="o">=</span>registry.hub.docker.com/<span class="k">${</span><span class="nv">username</span><span class="k">}</span> -Ddocker.username<span class="o">=</span><span class="k">${</span><span class="nv">username</span><span class="k">}</span> -Ddocker.password<span class="o">=</span><span class="k">${</span><span class="nv">password</span><span class="k">}</span> docker:push
+</code></pre>
+ </div>
</li>
</ol>
</blockquote>
<h3 id="使用docker-compose编排并拉起所有的微服务">使用Docker Compose编排并拉起所有的微服务</h3>
<p>将所有的微服务打包为镜像后，就可以使用Docker Compose组织它们，我们给一个例子：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">version</span><span class="pi">:</span> <span class="s1">'</span><span class="s">2.0'</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">version</span><span class="pi">:</span> <span class="s1">'</span><span class="s">2.0'</span>
-<span class="na">services</span><span class="pi">:</span>
- <span class="na">service-center</span><span class="pi">:</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">servicecomb/service-center"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">service-center</span>
- <span class="na">ports</span><span class="pi">:</span>
+<span class="s">services</span><span class="pi">:</span>
+ <span class="s">service-center</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">servicecomb/service-center"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">service-center</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">30100:30100"</span>
- <span class="na">mysql-write-db</span><span class="pi">:</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">mysql:latest"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">write_db_server</span>
- <span class="na">environment</span><span class="pi">:</span>
+ <span class="s">mysql-write-db</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">mysql:latest"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">write_db_server</span>
+ <span class="s">environment</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s">MYSQL_ROOT_PASSWORD=password</span>
<span class="pi">-</span> <span class="s">MYSQL_DATABASE=seckill</span>
<span class="pi">-</span> <span class="s">MYSQL_USER=seckill</span>
<span class="pi">-</span> <span class="s">MYSQL_PASSWORD=password</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">3306"</span>
- <span class="na">activemq</span><span class="pi">:</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">webcenter/activemq:latest"</span>
- <span class="na">hostname</span><span class="pi">:</span> <span class="s">queue-server</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">activemq</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">webcenter/activemq:latest"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">queue-server</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">61616"</span>
- <span class="na">admin-service</span><span class="pi">:</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>
+ <span class="s">admin-service</span><span class="pi">:</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s2">"</span><span class="s">seckill-admin-service:0.2.0-SNAPSHOT"</span>
+ <span class="s">hostname</span><span class="pi">:</span> <span class="s">admin-service</span>
+ <span class="s">links</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">mysql-write-db:write_db.servicecomb.io"</span>
- <span class="na">environment</span><span class="pi">:</span>
+ <span class="s">environment</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s">JAVA_OPTS=-Dspring.profiles.active=prd,cse -Dendpoints.shutdown.enabled=true</span>
- <span class="na">ports</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s2">"</span><span class="s">8081:8081"</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>为了能够使containers互联互通，使用<code class="highlighter-rouge">links</code>指定链接关系，<code class="highlighter-rouge">ports</code>用于映射到Docker Host的端口，关于Docker Compose Yaml配置的更多信息，可以参见<a href="https://docs.docker.com/compose/">这篇文档</a>。</p>
<p>编写好docker-compose.yml后，切换到此文件目录，执行：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>docker-compose up
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>docker-compose up
+</code></pre>
+</div>
<p>即可将所有的微服务都拉起来。</p>
@@ -1109,6 +1118,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/deploy-mode.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/deploy-mode.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/develop-with-jax-rs/index.html b/content/cn/users/develop-with-jax-rs/index.html
index b9464ca..2c5ff0a 100644
--- a/content/cn/users/develop-with-jax-rs/index.html
+++ b/content/cn/users/develop-with-jax-rs/index.html
@@ -632,7 +632,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">
@@ -669,7 +669,7 @@
<p>在Maven的pom.xml中添加所需的依赖：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
<span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
@@ -699,14 +699,15 @@
<span class="nt"><artifactId></span>slf4j-log4j12<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
<span class="nt"></dependencies></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 2</strong> 实现服务。</p>
<p>使用JAX-RS注解开发业务代码，Hello的服务实现如下：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">javax.ws.rs.POST</span><span class="o">;</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">javax.ws.rs.POST</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">javax.ws.rs.Path</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">javax.ws.rs.Produces</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">javax.ws.rs.core.MediaType</span><span class="o">;</span>
@@ -727,7 +728,8 @@
<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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p><strong>注意：请一定在服务的实现类（本文档例子为JaxrsHelloImpl）上标记@Path，否则接口发布的Path和Method将会不正确！</strong></p>
@@ -738,17 +740,18 @@
<p>在服务的实现类上打上注解<code class="highlighter-rouge">@RestSchema</code>，指定schemaId，表示该实现作为当前微服务的一个schema发布，代码如下：</p>
- <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>
+ <div class="language-java highlighter-rouge"><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="c1">// other code omitted</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>然后在resources/META-INF/spring目录下创建jaxrsHello.bean.xml文件，配置spring进行服务扫描的base-package，文件内容如下：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
<span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">" http://www.springframework.org/schema/beans "</span> <span class="na">xmlns:xsi=</span><span class="s">" http://www.w3.org/2001/XMLSchema-instance "</span>
<span class="na">xmlns:p=</span><span class="s">" http://www.springframework.org/schema/p "</span> <span class="na">xmlns:util=</span><span class="s">" http://www.springframework.org/schema/util "</span>
<span class="na">xmlns:cse=</span><span class="s">" http://www.huawei.com/schema/paas/cse/rpc "</span>
@@ -757,7 +760,8 @@
<span class="nt"><context:component-scan</span> <span class="na">base-package=</span><span class="s">"org.apache.servicecomb.samples.jaxrs.provider"</span><span class="nt">/></span>
<span class="nt"></beans></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 4</strong> 添加服务定义。</p>
@@ -767,7 +771,7 @@
<li>
<p><strong>步骤 5</strong> 添加Main启动类</p>
- <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>
+ <div class="language-java highlighter-rouge"><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">Application</span> <span class="o">{</span>
@@ -777,7 +781,8 @@
<span class="n">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>
+</code></pre>
+ </div>
</li>
</ul>
@@ -912,6 +917,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/develop-with-jax-rs.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/develop-with-jax-rs.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/develop-with-rest-template/index.html b/content/cn/users/develop-with-rest-template/index.html
index b9bb884..9b28a85 100644
--- a/content/cn/users/develop-with-rest-template/index.html
+++ b/content/cn/users/develop-with-rest-template/index.html
@@ -632,7 +632,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">
@@ -670,7 +670,7 @@
<p> Rest Template实例通过调用<code class="highlighter-rouge">RestTemplateBuilder.create()</code>方法获取，再使用该实例通过自定义的URL进行服务调用，代码如下：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.springframework.stereotype.Component</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.springframework.stereotype.Component</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.web.client.RestTemplate</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.apache.servicecomb.foundation.common.utils.BeanUtils</span><span class="o">;</span>
@@ -699,7 +699,8 @@
<span class="n">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>
+</code></pre>
+</div>
<blockquote>
<p>说明：</p>
@@ -766,6 +767,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/develop-with-rest-template.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/develop-with-rest-template.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/develop-with-rpc/index.html b/content/cn/users/develop-with-rpc/index.html
index 1d7eb0f..ca9b4de 100644
--- a/content/cn/users/develop-with-rpc/index.html
+++ b/content/cn/users/develop-with-rpc/index.html
@@ -632,7 +632,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">
@@ -668,7 +668,7 @@
<p>只需要声明一个服务接口类型的成员，并且使用<code class="highlighter-rouge">@RpcReference</code>标注该成员，声明依赖的微服务及schemaId，即可进行服务调用，示例代码如下：</p>
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.springframework.stereotype.Component</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.springframework.stereotype.Component</span><span class="o">;</span>
<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>
@@ -694,7 +694,8 @@
<span class="n">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>
+</code></pre>
+</div>
<p>在以上代码中，服务消费者已经取得了服务提供者的服务接口<code class="highlighter-rouge">Hello</code>，并在代码中声明一个<code class="highlighter-rouge">Hello</code>类型的成员。通过在<code class="highlighter-rouge">hello</code>上使用<code class="highlighter-rouge">@RPCReference</code>注解指明微服务名称和schemaId，ServiceComb框架可以在程序启动时从服务中心获取到对应的服务提供者实例信息，并且生成一个代理注入到hello中，用户可以像调用本地类一样调用远程服务。</p>
@@ -703,31 +704,36 @@
<h4 id="方式1通过cserpc-reference定义">方式1：通过cse:rpc-reference定义</h4>
<p>在你的bean.xml中添加cse:rpc-reference的配置项：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><cse:rpc-reference</span> <span class="na">id=</span><span class="s">"hello"</span> <span class="na">microservice-name=</span><span class="s">"codefirst"</span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><cse:rpc-reference</span> <span class="na">id=</span><span class="s">"hello"</span> <span class="na">microservice-name=</span><span class="s">"codefirst"</span>
<span class="na">schema-id=</span><span class="s">"codeFirstHello"</span> <span class="na">interface=</span><span class="s">"org.apache.servicecomb.samples.common.schema.Hello"</span><span class="nt">></cse:rpc-reference></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<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>
-</code></pre></div></div>
+<div class="language-java highlighter-rouge"><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>
+</code></pre>
+</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>
+<div class="language-java highlighter-rouge"><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>
-</code></pre></div></div>
+</code></pre>
+</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"><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>
<span class="k">return</span> <span class="n">hello</span><span class="o">;</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</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>
-</code></pre></div></div>
+<div class="language-java highlighter-rouge"><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>
+</code></pre>
+</div>
<blockquote>
<p>说明：
@@ -791,6 +797,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/develop-with-rpc.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/develop-with-rpc.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/develop-with-spring-boot-starter/index.html b/content/cn/users/develop-with-spring-boot-starter/index.html
index 6b5262d..2810b0a 100644
--- a/content/cn/users/develop-with-spring-boot-starter/index.html
+++ b/content/cn/users/develop-with-spring-boot-starter/index.html
@@ -632,7 +632,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">
@@ -676,7 +676,7 @@
<p>在Maven的pom.xml中添加所需的依赖：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
<span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
@@ -702,14 +702,15 @@
<span class="nt"><artifactId></span>hibernate-validator<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
<span class="nt"></dependencies></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 2</strong> 实现服务。</p>
<p>使用Spring MVC注解开发业务代码，Hello的服务实现如下：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">javax.ws.rs.core.MediaType</span><span class="o">;</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">javax.ws.rs.core.MediaType</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestBody</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestMapping</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestMethod</span><span class="o">;</span>
@@ -728,7 +729,8 @@
<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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p><strong>注意：请一定在服务的实现类（本文档例子为SpringmvcHelloImpl）上标记@RequestMapping，否则接口发布的Path和Method将会不正确！</strong></p>
@@ -739,27 +741,29 @@
<p>在服务的实现类上打上注解@RestSchema，指定schemaId，表示该实现作为当前微服务的一个schema发布，代码如下：</p>
- <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>
+ <div class="language-java highlighter-rouge"><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">"springmvcHello"</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="c1">// other code omitted</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>然后在<code class="highlighter-rouge">resources/META-INF/spring</code>目录下创建<code class="highlighter-rouge">springmvcHello.bean.xml</code>文件，命名规则为<code class="highlighter-rouge">\*.bean.xml</code>，配置spring进行服务扫描的base-package，文件内容如下：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
<span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">"http://www.springframework.org/schema/beans"</span>
<span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
<span class="na">xmlns:context=</span><span class="s">"http://www.springframework.org/schema/context"</span>
- <span class="na">xsi:schemaLocation=</span><span class="s">"http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"</span><span class="nt">></span>
+ <span class="na">xsi:schemaLocation=</span><span class="s">"http://www.springframework.org/schema/beans</span> <span class="err">classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd</span>
+ <span class="err">http://www.springframework.org/schema/context</span> <span class="err">http://www.springframework.org/schema/context/spring-context-3.0.xsd"</span><span class="nt">></span>
<span class="nt"><context:component-scan</span> <span class="na">base-package=</span><span class="s">"org.apache.servicecomb.samples.springmvc.provider"</span><span class="nt">/></span>
<span class="nt"></beans></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ul>
@@ -777,7 +781,7 @@ Spring Boot已经包含了默认的Bean扫描策略，如果能够保证Spring B
<li>
<p><strong>步骤 5</strong> 添加Main启动类</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">org.apache.servicecomb.springboot.starter.provider.EnableServiceComb</span><span class="o">;</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">org.apache.servicecomb.springboot.starter.provider.EnableServiceComb</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.boot.SpringApplication</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.boot.autoconfigure.SpringBootApplication</span><span class="o">;</span>
@@ -789,7 +793,8 @@ Spring Boot已经包含了默认的Bean扫描策略，如果能够保证Spring B
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ul>
@@ -916,6 +921,7 @@ Spring Boot已经包含了默认的Bean扫描策略，如果能够保证Spring B
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/develop-with-springboot-starter.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/develop-with-springboot-starter.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/develop-with-springmvc/index.html b/content/cn/users/develop-with-springmvc/index.html
index 0e0f333..8e24e7e 100644
--- a/content/cn/users/develop-with-springmvc/index.html
+++ b/content/cn/users/develop-with-springmvc/index.html
@@ -632,7 +632,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">
@@ -669,7 +669,7 @@
<p>在Maven的pom.xml中添加所需的依赖：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
<span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
@@ -699,14 +699,15 @@
<span class="nt"><artifactId></span>slf4j-log4j12<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
<span class="nt"></dependencies></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 2</strong> 实现服务。</p>
<p>使用Spring MVC注解开发业务代码，Hello的服务实现如下：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">javax.ws.rs.core.MediaType</span><span class="o">;</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="kn">import</span> <span class="nn">javax.ws.rs.core.MediaType</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestBody</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestMapping</span><span class="o">;</span>
<span class="kn">import</span> <span class="nn">org.springframework.web.bind.annotation.RequestMethod</span><span class="o">;</span>
@@ -725,7 +726,8 @@
<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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p><strong>注意：请一定在服务的实现类（本文档例子为SpringmvcHelloImpl）上标记@RequestMapping，否则接口发布的Path和Method将会不正确！</strong></p>
@@ -736,27 +738,29 @@
<p>在服务的实现类上打上注解@RestSchema，指定schemaId，表示该实现作为当前微服务的一个schema发布，代码如下：</p>
- <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>
+ <div class="language-java highlighter-rouge"><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">"springmvcHello"</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="c1">// other code omitted</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>然后在<code class="highlighter-rouge">resources/META-INF/spring</code>目录下创建<code class="highlighter-rouge">springmvcHello.bean.xml</code>文件，命名规则为<code class="highlighter-rouge">\*.bean.xml</code>，配置spring进行服务扫描的base-package，文件内容如下：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
<span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">"http://www.springframework.org/schema/beans"</span>
<span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
<span class="na">xmlns:context=</span><span class="s">"http://www.springframework.org/schema/context"</span>
- <span class="na">xsi:schemaLocation=</span><span class="s">"http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"</span><span class="nt">></span>
+ <span class="na">xsi:schemaLocation=</span><span class="s">"http://www.springframework.org/schema/beans</span> <span class="err">classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd</span>
+ <span class="err">http://www.springframework.org/schema/context</span> <span class="err">http://www.springframework.org/schema/context/spring-context-3.0.xsd"</span><span class="nt">></span>
<span class="nt"><context:component-scan</span> <span class="na">base-package=</span><span class="s">"org.apache.servicecomb.samples.springmvc.provider"</span><span class="nt">/></span>
<span class="nt"></beans></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 4</strong> 添加服务定义。</p>
@@ -766,7 +770,7 @@
<li>
<p><strong>步骤 5</strong> 添加Main启动类</p>
- <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>
+ <div class="language-java highlighter-rouge"><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">Application</span> <span class="o">{</span>
@@ -776,7 +780,8 @@
<span class="n">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>
+</code></pre>
+ </div>
</li>
</ul>
@@ -903,6 +908,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/develop-with-springmvc.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/develop-with-springmvc.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/develop-with-transparent-rpc/index.html b/content/cn/users/develop-with-transparent-rpc/index.html
index 20520af..d7c17a4 100644
--- a/content/cn/users/develop-with-transparent-rpc/index.html
+++ b/content/cn/users/develop-with-transparent-rpc/index.html
@@ -632,7 +632,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">
@@ -668,7 +668,7 @@
<p>在Maven的pom.xml中添加所需的依赖：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
<span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
@@ -698,25 +698,27 @@
<span class="nt"><artifactId></span>slf4j-log4j12<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
<span class="nt"></dependencies></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 2</strong> 定义服务接口：</p>
<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>
+ <div class="language-java highlighter-rouge"><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="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 3</strong> 实现服务：</p>
<p>Hello的服务实现如下：</p>
- <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>
+ <div class="language-java highlighter-rouge"><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>
@@ -730,7 +732,8 @@
<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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 4</strong> 发布服务</p>
@@ -744,7 +747,7 @@
<p>使用Spring xml配置方式：
在resources/META-INF/spring目录下创建pojoHello.bean.xml文件，在文件中声明schema，文件内容如下：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
<span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">" http://www.springframework.org/schema/beans "</span> <span class="na">xmlns:xsi=</span><span class="s">" http://www.w3.org/2001/XMLSchema-instance "</span>
<span class="na">xmlns:p=</span><span class="s">" http://www.springframework.org/schema/p "</span> <span class="na">xmlns:util=</span><span class="s">" http://www.springframework.org/schema/util "</span>
<span class="na">xmlns:cse=</span><span class="s">" http://www.huawei.com/schema/paas/cse/rpc "</span>
@@ -753,14 +756,15 @@
<span class="nt"><cse:rpc-schema</span> <span class="na">schema-id=</span><span class="s">"pojoHello"</span> <span class="na">implementation=</span><span class="s">"org.apache.servicecomb.samples.pojo.provider.PojoHelloImpl"</span><span class="nt">/></span>
<span class="nt"></beans></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>使用注解配置方式：</p>
<p>在接口Hello的实现类上使用@RpcSchema注解定义schema，代码如下：</p>
- <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>
+ <div class="language-java highlighter-rouge"><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="nd">@Override</span>
@@ -773,11 +777,12 @@
<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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>在resources/META-INF/spring目录下的pojoHello.bean.xml文件中，配置Spring进行服务扫描的base-package，文件内容如下：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
<span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">" http://www.springframework.org/schema/beans "</span> <span class="na">xmlns:xsi=</span><span class="s">" http://www.w3.org/2001/XMLSchema-instance "</span>
<span class="na">xmlns:p=</span><span class="s">" http://www.springframework.org/schema/p "</span> <span class="na">xmlns:util=</span><span class="s">" http://www.springframework.org/schema/util "</span>
<span class="na">xmlns:cse=</span><span class="s">" http://www.huawei.com/schema/paas/cse/rpc "</span>
@@ -786,7 +791,8 @@
<span class="nt"><context:component-scan</span> <span class="na">base-package=</span><span class="s">"org.apache.servicecomb.samples.pojo.provider"</span><span class="nt">/></span>
<span class="nt"></beans></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ol>
@@ -808,7 +814,7 @@
<li>
<p><strong>步骤 6</strong> 添加Main启动类</p>
- <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>
+ <div class="language-java highlighter-rouge"><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">Application</span> <span class="o">{</span>
@@ -818,7 +824,8 @@
<span class="n">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>
+</code></pre>
+ </div>
</li>
</ul>
@@ -879,6 +886,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/develop-with-transparent-rpc.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/develop-with-transparent-rpc.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/distributed-tracing/index.html b/content/cn/users/distributed-tracing/index.html
index f69a8e0..c90ec71 100644
--- a/content/cn/users/distributed-tracing/index.html
+++ b/content/cn/users/distributed-tracing/index.html
@@ -632,7 +632,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">
@@ -686,35 +686,38 @@
<p>基于 ServiceComb Java Chassis 的微服务只需要添加如下依赖到 pom.xml：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>handler-tracing-zipkin<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>如果微服务是基于 Spring Cloud + Zuul 的 API 网关，例如 workshop demo 中的 manager service ，我们还需要加入如下的额外依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-cloud-zuul-zipkin<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="配置追踪处理和数据收集">配置追踪处理和数据收集</h3>
<p>在microservice.yaml文件中设置追踪处理器和数据收集服务地址</p>
-<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">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Consumer</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">tracing-consumer</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">tracing-provider</span>
- <span class="na">tracing</span><span class="pi">:</span>
- <span class="na">collector</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://zipkin.servicecomb.io:9411</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Consumer</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">tracing-consumer</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">tracing-provider</span>
+ <span class="s">tracing</span><span class="pi">:</span>
+ <span class="s">collector</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://zipkin.servicecomb.io:9411</span>
+</code></pre>
+</div>
<p>就这样，在加了两个配置项，没改动一行代码的情况下，我们启动了基于 Zipkin 和 Java chassis 的分布式调用链追踪的功能。</p>
@@ -777,6 +780,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/distributed-tracing.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/distributed-tracing.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/dynamic-config/index.html b/content/cn/users/dynamic-config/index.html
index c44d2e3..66564e8 100644
--- a/content/cn/users/dynamic-config/index.html
+++ b/content/cn/users/dynamic-config/index.html
@@ -632,7 +632,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">
@@ -674,9 +674,10 @@
<p>通过镜像方式启动Apollo配置中心请参考<a href="https://github.com/ctripcorp/apollo/wiki/Apollo-Quick-Start-Docker%E9%83%A8%E7%BD%B2">官方文档</a>，或者执行下面两个指令即可：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code> git clone https://github.com/lijasonvip/apollo-image-for-servicecomb.git
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code> git clone https://github.com/lijasonvip/apollo-image-for-servicecomb.git
<span class="nb">cd </span>apollo-image-for-servicecomb <span class="o">&&</span> docker-compose up
-</code></pre></div></div>
+</code></pre>
+</div>
<p>等待出现 <code class="highlighter-rouge">Portal started. You can visit http://localhost:8070 now!</code> 后表示系统启动完成（启动时间基于机器性能可能需要1-3分钟），可以在浏览器中访问<code class="highlighter-rouge">http://localhost:8070</code>进入配置中心页面。 <code class="highlighter-rouge">docker-compose</code>安装请参考<a href="https://docs.docker.com/compose/install/">文档</a>。</p>
<h3 id="通过apollo界面配置应用获取token">通过Apollo界面配置应用获取TOKEN</h3>
@@ -718,23 +719,25 @@
<h3 id="在应用中添加依赖">在应用中添加依赖</h3>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>config-apollo<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="添加配置项">添加配置项</h3>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">apollo</span><span class="pi">:</span>
- <span class="na">config</span><span class="pi">:</span>
- <span class="na">serverUri</span><span class="pi">:</span> <span class="s">http://127.0.0.1:8070</span>
- <span class="na">serviceName</span><span class="pi">:</span> <span class="s">SampleApp</span>
- <span class="na">env</span><span class="pi">:</span> <span class="s">DEV</span>
- <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>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">apollo</span><span class="pi">:</span>
+ <span class="s">config</span><span class="pi">:</span>
+ <span class="s">serverUri</span><span class="pi">:</span> <span class="s">http://127.0.0.1:8070</span>
+ <span class="s">serviceName</span><span class="pi">:</span> <span class="s">SampleApp</span>
+ <span class="s">env</span><span class="pi">:</span> <span class="s">DEV</span>
+ <span class="s">clusters</span><span class="pi">:</span> <span class="s">default</span>
+ <span class="s">namespace</span><span class="pi">:</span> <span class="s">application</span>
+ <span class="s">token</span><span class="pi">:</span> <span class="s">testtoken</span>
+ <span class="s">refreshInterval</span><span class="pi">:</span> <span class="s">10</span>
+</code></pre>
+</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>
@@ -744,7 +747,7 @@
<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>
+<div class="language-java highlighter-rouge"><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>
@@ -756,7 +759,8 @@
<span class="o">}</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p> Apollo配置中心修改配置项并发布后，经过一个刷新周期后就会打印出最新的<code class="highlighter-rouge">timeout</code>值。</p>
@@ -817,6 +821,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/dynamic-config.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/dynamic-config.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/edge-in-1.0.0-m1/index.html b/content/cn/users/edge-in-1.0.0-m1/index.html
index fa0f36b..5cbcad5 100644
--- a/content/cn/users/edge-in-1.0.0-m1/index.html
+++ b/content/cn/users/edge-in-1.0.0-m1/index.html
@@ -699,12 +699,13 @@
<h2 id="开发edge-service">开发Edge Service</h2>
<h3 id="引入依赖">引入依赖</h3>
<p>只需要引入edge-core依赖即可：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>edge-core<span class="nt"></artifactId></span>
<span class="nt"><version></span>1.0.0-m1<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="开发dispatcher">开发Dispatcher</h3>
<p>要实现Edge Service转发功能，需要开发Dispatcher并继承接口org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher或org.apache.servicecomb.transport.rest.vertx.AbstractVertxHttpDispatcher，重写其中的三个方法：</p>
@@ -713,7 +714,7 @@
<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>
+<div class="language-java highlighter-rouge"><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>
<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>
@@ -724,7 +725,8 @@
<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>
-</code></pre></div></div>
+</code></pre>
+</div>
<ol>
<li>/([^\/]+)/([^\/]+)/(.*) : 这条策略我们希望匹配带版本的微服务请求，例如/user-service/v0/validate；</li>
@@ -733,20 +735,23 @@
<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>
-</code></pre></div></div>
+<div class="language-java highlighter-rouge"><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>
+</code></pre>
+</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"><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>
<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>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="加载dispatcher">加载Dispatcher</h3>
<p>Edge Service使用SPI机制加载用户自定义的VertxHttpDispatcher，我们在resources文件夹下创建META-INF/services文件夹，之后添加org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher文件，在文件中，添加写好的Dispatcher即可：</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>{your-package-path}.XXXDispatcher
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>{your-package-path}.XXXDispatcher
+</code></pre>
+</div>
<h3 id="扩展handler可选">扩展Handler（可选）</h3>
<p>由于Edge Service需要承载统一认证、集中监控等功能，我们推荐扩展Handler的方式实现，在demo-edge中的edge-service中有AuthHandler的示例。</p>
@@ -818,6 +823,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/edge-in-1.0.0-m1.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/edge-in-1.0.0-m1.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/edging-service/nginx/index.html b/content/cn/users/edging-service/nginx/index.html
index e1c61a6..5df18d8 100644
--- a/content/cn/users/edging-service/nginx/index.html
+++ b/content/cn/users/edging-service/nginx/index.html
@@ -632,7 +632,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">
@@ -694,14 +694,16 @@
<li>
<p>检查服务中心健康状态</p>
- <div class="language-http highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err"> GET 127.0.0.1:9980/health
-</span></code></pre></div> </div>
+ <div class="language-http highlighter-rouge"><pre class="highlight"><code><span class="err"> GET 127.0.0.1:9980/health
+</span></code></pre>
+ </div>
</li>
<li>
<p>获取所有微服务信息</p>
- <div class="language-http highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err"> GET 127.0.0.1:9980/registry/v3/microservices
-</span></code></pre></div> </div>
+ <div class="language-http highlighter-rouge"><pre class="highlight"><code><span class="err"> GET 127.0.0.1:9980/registry/v3/microservices
+</span></code></pre>
+ </div>
</li>
<li>
<p>获取指定id的微服务信息</p>
@@ -713,14 +715,16 @@
<li>
<p>首先根据微服务信息获取serviceId</p>
- <div class="language-http highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">GET 127.0.0.1:9980/registry/v3/existence?type=microservice&appId={appId}&serviceName={serviceName}&version={version}
-</span></code></pre></div> </div>
+ <div class="language-http highlighter-rouge"><pre class="highlight"><code><span class="err">GET 127.0.0.1:9980/registry/v3/existence?type=microservice&appId={appId}&serviceName={serviceName}&version={version}
+</span></code></pre>
+ </div>
</li>
<li>
<p>根据上述接口返回的serviceId获取微服务完整信息</p>
- <div class="language-http highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err">GET 127.0.0.1:9980/registry/v3/microservices/{serviceId}
-</span></code></pre></div> </div>
+ <div class="language-http highlighter-rouge"><pre class="highlight"><code><span class="err">GET 127.0.0.1:9980/registry/v3/microservices/{serviceId}
+</span></code></pre>
+ </div>
</li>
</ol>
</blockquote>
@@ -729,15 +733,17 @@
<li>
<p>获取指定微服务的所有实例信息</p>
- <div class="language-http highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err"> GET 127.0.0.1:9980/registry/v3/microservices/{serviceId}/instances
-</span></code></pre></div> </div>
+ <div class="language-http highlighter-rouge"><pre class="highlight"><code><span class="err"> GET 127.0.0.1:9980/registry/v3/microservices/{serviceId}/instances
+</span></code></pre>
+ </div>
<p>需要在header中添加：”X-ConsumerId:{serviceId}”。</p>
</li>
<li>
<p>查找微服务实例信息</p>
- <div class="language-http highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="err"> GET 127.0.0.1:9980/registry/v3/instances?appId={appId}&serviceName={serviceName}&version={version}
-</span></code></pre></div> </div>
+ <div class="language-http highlighter-rouge"><pre class="highlight"><code><span class="err"> GET 127.0.0.1:9980/registry/v3/instances?appId={appId}&serviceName={serviceName}&version={version}
+</span></code></pre>
+ </div>
<p>需要在header中添加”X-ConsumerId:{serviceId}”。</p>
</li>
</ul>
@@ -750,24 +756,29 @@
<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>
-</code></pre></div> </div>
+ <div class="language-java highlighter-rouge"><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>
+</code></pre>
+ </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>
-</code></pre></div> </div>
+ <div class="language-java highlighter-rouge"><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>
+</code></pre>
+ </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>
-</code></pre></div> </div>
+ <div class="language-java highlighter-rouge"><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>
+</code></pre>
+ </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>
-</code></pre></div> </div>
+ <div class="language-java highlighter-rouge"><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>
+</code></pre>
+ </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 [...]
-</code></pre></div> </div>
+ <div class="language-java highlighter-rouge"><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</span> <span class="n">serv [...]
+</code></pre>
+ </div>
</li>
</ul>
@@ -830,6 +841,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/nginx.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/nginx.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/edging-service/zuul/index.html b/content/cn/users/edging-service/zuul/index.html
index e2d9b01..444d923 100644
--- a/content/cn/users/edging-service/zuul/index.html
+++ b/content/cn/users/edging-service/zuul/index.html
@@ -632,7 +632,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">
@@ -705,7 +705,7 @@
<li>
<p><strong>步骤 1</strong>在pom文件中添加依赖：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.springframework.cloud<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-cloud-starter-zuul<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
@@ -720,12 +720,13 @@
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-discovery<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 2</strong>在SpringBoot主类添加注解：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@SpringBootApplication</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="nd">@SpringBootApplication</span>
<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>
@@ -733,34 +734,37 @@
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<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">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>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">server</span><span class="pi">:</span>
+ <span class="s">port</span><span class="pi">:</span> <span class="s">8754</span> <span class="c1">#api gateway服务端口</span>
+ <span class="s">zuul</span><span class="pi">:</span>
+ <span class="s">routes</span><span class="pi">:</span> <span class="c1">#路由策略</span>
+ <span class="s">discoveryServer</span><span class="pi">:</span> <span class="s">/myServer/**</span> <span class="c1">#路由规则</span>
+</code></pre>
+ </div>
<p>上述的配置项可以根据实际开发环境进行配置。关于zuul.routers的路由策略的详细定义规则，请参考官方文献：<a href="https://springcloud.cc/spring-cloud-dalston.html#_router_and_filter_zuul">路由器和过滤器：Zuul</a>，可更细粒度地对路由进行控制。</p>
</li>
<li>
<p><strong>步骤 4</strong>在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">discoverytest</span> <span class="c1">#服务ID</span>
- <span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">discoveryGateway</span> <span class="c1">#服务名称</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.2</span> <span class="c1">#服务版本号</span>
- <span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span> <span class="c1">#服务注册中心地址</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:8082</span> <span class="c1">#微服务端口，可不写</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">discoverytest</span> <span class="c1">#服务ID</span>
+ <span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">discoveryGateway</span> <span class="c1">#服务名称</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.2</span> <span class="c1">#服务版本号</span>
+ <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span> <span class="c1">#服务注册中心地址</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8082</span> <span class="c1">#微服务端口，可不写</span>
+</code></pre>
+ </div>
</li>
</ul>
@@ -787,17 +791,18 @@
<p>示例如下：</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">discoverytest</span> <span class="c1">#与zuul proxy一致</span>
- <span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">discoveryServer</span> <span class="c1">#服务名称，与zuul.routers对应</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.2</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span> <span class="c1">#服务注册中心地址</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>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">discoverytest</span> <span class="c1">#与zuul proxy一致</span>
+ <span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">discoveryServer</span> <span class="c1">#服务名称，与zuul.routers对应</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.2</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span> <span class="c1">#服务注册中心地址</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
+</code></pre>
+</div>
<p>API Gateway的访问入口为：<a href="http://127.0.0.1:8754">http://127.0.0.1:8754</a>，所有在zuul.routers中定义的服务都可通过这个访问入口进行代理访问，访问规则如下：</p>
@@ -866,6 +871,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/zuul.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/zuul.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/healthcheck/index.html b/content/cn/users/healthcheck/index.html
index 1dc7ad0..bd83de0 100644
--- a/content/cn/users/healthcheck/index.html
+++ b/content/cn/users/healthcheck/index.html
@@ -695,7 +695,7 @@
</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"><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>
<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="k">return</span> <span class="s">"mysql"</span><span class="o">;</span>
@@ -722,20 +722,23 @@
<span class="o">}</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>然后使用SPI的方式加载它，具体为在<code class="highlighter-rouge">resource/META-INF/services</code>下创建<code class="highlighter-rouge">org.apache.servicecomb.foundation.metrics.health.HealthChecker</code>文件，然后写入实现的HealthCheck类名即可，例如：</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>org.apache.servicecomb.samples.metrics.extendhealthcheck.MySqlHealthChecker
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>org.apache.servicecomb.samples.metrics.extendhealthcheck.MySqlHealthChecker
+</code></pre>
+</div>
<h3 id="验证实现的healthcheck">验证实现的HealthCheck</h3>
<p>启动微服务后，HealthCheck默认以Rest方式发布，发布地址与<code class="highlighter-rouge">servicecomb.rest.address</code>一致，如果在<code class="highlighter-rouge">microservice.yaml</code>中设置的配置为：</p>
-<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>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
+</code></pre>
+</div>
<p>那么就可以通过访问http://localhost:8080/health 获取检查结果，以及访问http://localhost:8080/health/detail 获取所有的检查项结果明细。</p>
@@ -807,6 +810,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/healthcheck.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/healthcheck.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/index.html b/content/cn/users/index.html
index eae52cc..7ad6e63 100644
--- a/content/cn/users/index.html
+++ b/content/cn/users/index.html
@@ -797,6 +797,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/servicecomb-introduction.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/servicecomb-introduction.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/invoke-control/index.html b/content/cn/users/invoke-control/index.html
index 4aa2ca0..e8f34fd 100644
--- a/content/cn/users/invoke-control/index.html
+++ b/content/cn/users/invoke-control/index.html
@@ -632,7 +632,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">
@@ -750,12 +750,13 @@
<p>限流策略配置在microservice.yaml文件中，相关配置项见下表。要开启服务消费者端的限流策略，还需要在处理链中配置消费端限流handler，配置示例如下：</p>
-<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">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Consumer</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">qps-flowcontrol-consumer</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Consumer</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">qps-flowcontrol-consumer</span>
+</code></pre>
+</div>
<p>QPS流控配置项说明</p>
@@ -847,6 +848,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/invoke-control.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/invoke-control.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/local-develop-test/index.html b/content/cn/users/local-develop-test/index.html
index aa17e5d..c1bb9ca 100644
--- a/content/cn/users/local-develop-test/index.html
+++ b/content/cn/users/local-develop-test/index.html
@@ -632,7 +632,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">
@@ -684,11 +684,12 @@
<li>
<p><strong>步骤 2</strong> 启动本地轻量服务中心后，在服务提供/消费者的microservice.yaml文件中配置ServerCenter的地址和端口，示例代码：</p>
- <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">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span> <span class="c1">#服务中心地址及端口</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span> <span class="c1">#服务中心地址及端口</span>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 3</strong> 开发服务提供/消费者，启动微服务进行本地测试。</p>
@@ -701,27 +702,29 @@
<li>
<p><strong>步骤 1</strong>新建本地服务中心定义文件registry.yaml，内容如下：</p>
- <div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">springmvctest</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">id</span><span class="pi">:</span> <span class="s2">"</span><span class="s">001"</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s2">"</span><span class="s">1.0"</span>
- <span class="na">appid</span><span class="pi">:</span> <span class="s">myapp</span> <span class="c1">#调试的服务id</span>
- <span class="na">instances</span><span class="pi">:</span>
- <span class="na">endpoints</span><span class="pi">:</span>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">springmvctest</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">id</span><span class="pi">:</span> <span class="s2">"</span><span class="s">001"</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s2">"</span><span class="s">1.0"</span>
+ <span class="s">appid</span><span class="pi">:</span> <span class="s">myapp</span> <span class="c1">#调试的服务id</span>
+ <span class="s">instances</span><span class="pi">:</span>
+ <span class="s">endpoints</span><span class="pi">:</span>
<span class="s">rest://127.0.0.1:8080</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p>注意：mock机制需要自己准备契约，并且当前只支持在本地进行服务消费端(consumer)侧的调试，不支持服务提供者(provider)</p>
</li>
<li>
<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>
+ <div class="language-java highlighter-rouge"><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="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="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ul>
@@ -788,6 +791,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/local-develop-test.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/local-develop-test.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/manage_springcloud_application_using_sc_and_gs/index.html b/content/cn/users/manage_springcloud_application_using_sc_and_gs/index.html
index b2d4ccf..97f45ad 100644
--- a/content/cn/users/manage_springcloud_application_using_sc_and_gs/index.html
+++ b/content/cn/users/manage_springcloud_application_using_sc_and_gs/index.html
@@ -632,7 +632,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">
@@ -703,7 +703,7 @@
<li>
<p><strong>步骤 1</strong> 在pom中添加依赖管理dependencyManagement：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependencyManagement></span>
<span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
@@ -714,12 +714,13 @@
<span class="nt"></dependency></span>
<span class="nt"></dependencies></span>
<span class="nt"></dependencyManagement></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 2</strong> 在pom中添加依赖：</p>
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="c"><!--让服务运行于微服务sdk容器中--></span>
<span class="nt"><group></span>org.apache.servicecomb<span class="nt"></group></span>
<span class="nt"><artifactId></span>spring-boot-starter-provider<span class="nt"></artifactId></span>
@@ -741,45 +742,48 @@
<span class="nt"><groupId></span>org.springframework.boot<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-actuator<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 3</strong> 配置处理链和协议：</p>
<p>在resources目录下新建microservice.yaml文件，对服务进行定义，详细定义规则请参考<a href="/cn/users/service-definition/">服务定义章节</a>，示例如下：</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">discoverytest</span>
- <span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">discoveryServer</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.2</span>
- <span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span> <span class="c1">#服务注册中心地址</span>
- <span class="err"> </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="c1">#服务发布的端口</span>
- <span class="na">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span> <span class="c1">#调用的处理链</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">discoverytest</span>
+ <span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">discoveryServer</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.2</span>
+ <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span> <span class="c1">#服务注册中心地址</span>
+ <span class="err"> </span><span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span> <span class="c1">#服务发布的端口</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span> <span class="c1">#调用的处理链</span>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤4</strong> 若要使用ServiceComb的服务中心：</p>
<p>在pom中添加依赖：</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>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="o"><</span><span class="n">dependency</span><span class="o">></span>
<span class="o"><!--</span><span class="err">使用服务中心</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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 5</strong> 在启动类添加注解@EnableServiceComb：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@EnableDiscoveryClient</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="nd">@EnableDiscoveryClient</span>
<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>
@@ -787,12 +791,13 @@
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 6</strong> 定义服务契约，具体请参考<a href="/cn/users/service-contract/">服务契约</a>，示例如下：</p>
- <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="c1">// ControllerImpl.class:</span>
+ <div class="language-java highlighter-rouge"><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="kd">public</span> <span class="kd">class</span> <span class="nc">ControllerImpl</span> <span class="o">{</span>
@@ -802,7 +807,8 @@
<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>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤 7</strong> 启动xxxServer，该服务便可注册到ServiceComb的Service Center。</p>
@@ -866,6 +872,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/manage_springcloud_application_using_sc_and_gs.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/manage_springcloud_application_using_sc_and_gs.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/metrics-in-0.5.0/index.html b/content/cn/users/metrics-in-0.5.0/index.html
index 3e78874..98b3731 100644
--- a/content/cn/users/metrics-in-0.5.0/index.html
+++ b/content/cn/users/metrics-in-0.5.0/index.html
@@ -632,7 +632,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">
@@ -678,9 +678,10 @@
<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"><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>
<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>
+</code></pre>
+</div>
<p><strong>为不影响调试，log的输出级别为trace</strong></p>
<p>以下是我们的定向Logger名以及输出的Metrics含义：</p>
@@ -758,41 +759,43 @@ Logger名指的是LoggerFactory.getLogger后的第一个参数：</p>
<h2 id="如何配置">如何配置</h2>
<p>请在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">demo</span>
-<span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">demoService</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">demo</span>
+<span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">demoService</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">metrics</span><span class="pi">:</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">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="s">polltime</span><span class="pi">:</span> <span class="s">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">file</span><span class="pi">:</span>
+ <span class="s">round_places</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="s">file</span><span class="pi">:</span>
<span class="c1">#是否启用文件输出</span>
- <span class="na">enabled</span><span class="pi">:</span> <span class="no">true</span>
+ <span class="s">enabled</span><span class="pi">:</span> <span class="s">true</span>
<span class="c1">#会体现为输出内容中的plugin_id</span>
- <span class="na">name_prefix</span><span class="pi">:</span> <span class="s">bmi.calculator</span>
-</code></pre></div></div>
+ <span class="s">name_prefix</span><span class="pi">:</span> <span class="s">bmi.calculator</span>
+</code></pre>
+</div>
<h2 id="注意事项">注意事项</h2>
<p><strong>需要在provider治理链中添加bizkeeper-provider，否则TPS和Latency无数据</strong></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">demo</span>
-<span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">demoService</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">demo</span>
+<span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">demoService</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">bizkeeper-provider</span>
+</code></pre>
+</div>
<h2 id="配置示例">配置示例</h2>
<p>以设置averageServiceExecutionTime为例，如果是Log4j，配置如下：</p>
-<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c">#指定Logger名为averageServiceExecutionTime
+<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="c">#指定Logger名为averageServiceExecutionTime
</span><span class="py">log4j.category.averageServiceExecutionTime</span><span class="p">=</span><span class="s">TRACE, averageServiceExecutionTimeLogger</span>
<span class="c">#定向日志，不扩散到别的Logger中
</span><span class="py">log4j.additivity.averageServiceExecutionTime</span><span class="p">=</span><span class="s">false</span>
@@ -804,10 +807,11 @@ Logger名指的是LoggerFactory.getLogger后的第一个参数：</p>
<span class="py">log4j.appender.averageServiceExecutionTimeLogger.layout</span><span class="p">=</span><span class="s">org.apache.log4j.PatternLayout</span>
<span class="py">log4j.appender.averageServiceExecutionTimeLogger.layout.ConversionPattern</span><span class="p">=</span><span class="s">%m%n</span>
<span class="py">log4j.appender.averageServiceExecutionTimeLogger.append</span><span class="p">=</span><span class="s">true</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>如果是Log4j2，配置如下：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"><!--Log4j2配置支持全局配置--></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="c"><!--Log4j2配置支持全局配置--></span>
<span class="nt"><Properties></span>
<span class="nt"><Property</span> <span class="na">name=</span><span class="s">"maxFileSize"</span><span class="nt">></span>10MB<span class="nt"></Property></span>
<span class="nt"><Property</span> <span class="na">name=</span><span class="s">"maxFileCount"</span><span class="nt">></span>10<span class="nt"></Property></span>
@@ -829,7 +833,8 @@ Logger名指的是LoggerFactory.getLogger后的第一个参数：</p>
<span class="nt"><AppenderRef</span> <span class="na">ref=</span><span class="s">"averageServiceExecutionTime"</span><span class="nt">/></span>
<span class="nt"></Logger></span>
<span class="nt"></Loggers></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>剩余Metric（参见原理章节中的表格）按照上面的例子重复替换即可。</p>
@@ -895,6 +900,7 @@ Logger名指的是LoggerFactory.getLogger后的第一个参数：</p>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/metrics-in-0.5.0.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/metrics-in-0.5.0.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/metrics-in-1.0.0-m1/index.html b/content/cn/users/metrics-in-1.0.0-m1/index.html
index 89e1d55..0587a61 100644
--- a/content/cn/users/metrics-in-1.0.0-m1/index.html
+++ b/content/cn/users/metrics-in-1.0.0-m1/index.html
@@ -897,33 +897,35 @@ name包括：</p>
<h3 id="全局配置">全局配置</h3>
<p>请在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">demo</span>
-<span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">demoService</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">demo</span>
+<span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">demoService</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">metrics</span><span class="pi">:</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">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>
-</code></pre></div></div>
+ <span class="s">window_time</span><span class="pi">:</span> <span class="s">5000</span>
+</code></pre>
+</div>
<p><strong>为了降低Metrics理解和使用难度，我们暂时不支持多周期</strong></p>
<h3 id="依赖配置">依赖配置</h3>
<p>只需要添加metrics-core依赖即可：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>metrics-core<span class="nt"></artifactId></span>
<span class="nt"><version></span>1.0.0-m1<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="如何获取数据">如何获取数据</h2>
<p>配置好Metrics后，你可以通过如下两种方式获取Metrics数据：</p>
<h3 id="通过发布接口获取">通过发布接口获取</h3>
<p>当微服务启动后，metrics-core会自动以Springmvc的方式发布服务：</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">"metricsEndpoint"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><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">"metricsEndpoint"</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">"/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>
@@ -935,28 +937,31 @@ name包括：</p>
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>因此，如果你在microservice.yaml中配置了rest provider，例如：</p>
-<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">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</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>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">http://127.0.0.1:30100</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
+</code></pre>
+</div>
<p>你就可以通过http://localhost:8080/metrics 直接获取到数据，打开浏览器输入此URL就可以看到返回结果。</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>
+<div class="language-java highlighter-rouge"><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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p><strong>提示：Servo已经被Netflix标记为DEPRECATED，我们将在1.0.0-m2中使用Netflix spectator替换，获取数据的接口会有调整</strong></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>
+<div class="language-java highlighter-rouge"><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="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>
@@ -979,7 +984,8 @@ name包括：</p>
<span class="c1">//从层次结构中通过Tag匹配获取Metric的值</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">getFirstMatchMetricValue</span><span class="o">(</span><span class="s">"K3"</span><span class="o">,</span><span class="s">"30"</span><span class="o">);</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p><em>demo/perf/PerfMetricsFilePublisher.java提供了MetricsLoader更详细的使用示例</em></p>
<h2 id="如何扩展">如何扩展</h2>
@@ -1013,7 +1019,7 @@ name包括：</p>
</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">OrderController</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><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>
@@ -1048,24 +1054,26 @@ name包括：</p>
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>注意事项：</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"><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>
<span class="c1">//metrics的keySet()将包含：</span>
<span class="c1">// 订单数量(商品名=levis jeans,型号=512)</span>
<span class="c1">// 生成订单(统计项=事务每秒)</span>
<span class="c1">// 生成订单(统计项=平均生成时间,单位=MILLISECONDS)</span>
<span class="c1">// 生成订单(统计项=最大生成时间,单位=MILLISECONDS)</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<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 [...]
+<div class="language-java highlighter-rouge"><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">"levis jeans"</span><span c [...]
<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 [...]
<span class="n">counter1</span><span class="o">.</span><span class="na">increment</span><span class="o">();</span>
@@ -1074,7 +1082,8 @@ name包括：</p>
<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</ [...]
-</code></pre></div></div>
+</code></pre>
+</div>
<p><strong>获取Monitor的方法性能较低，请在初始化阶段一次获取所需的Monitor，然后将它们缓存起来，请参照前面OrderController的做法。</strong></p>
@@ -1144,6 +1153,7 @@ name包括：</p>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/metrics-in-1.0.0-m1.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/metrics-in-1.0.0-m1.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html b/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
index 537e1cd..52c74fa 100644
--- a/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
+++ b/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
@@ -675,7 +675,7 @@
<p>由于Java Chassis由Java语言开发，我们使用<a href="https://github.com/prometheus/client_java">prometheus java client</a>中的Simple Client作为对接SDK，版本为0.1.0。<br />
Prometheus推荐Pull模式拉取Metrics数据，被监控微服务作为Producer发布数据provider接口，我们采用Simple HTTP Server发布微服务采集到的Metrics数据。<br />
作为一个集成（可选）模块，代码在metrics-integration/metrics-prometheus中，你可以看到它依赖：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>io.prometheus<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>simpleclient<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
@@ -688,60 +688,64 @@ Prometheus推荐Pull模式拉取Metrics数据，被监控微服务作为Producer
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>metrics-core<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>因此一旦集成Prometheus引入了metrics-prometheus依赖后，不再需要添加metrics-core的依赖。</p>
<h2 id="如何配置">如何配置</h2>
<p>开启对接prometheus非常简单：</p>
<h3 id="全局配置">全局配置</h3>
<p>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">demo</span>
-<span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">demoService</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">metrics</span><span class="pi">:</span>
- <span class="na">prometheus</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">demo</span>
+<span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">demoService</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">metrics</span><span class="pi">:</span>
+ <span class="s">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>
-</code></pre></div></div>
+ <span class="s">port</span><span class="pi">:</span> <span class="s">9696</span>
+</code></pre>
+</div>
<p><em>如果不做配置，默认端口为9696</em></p>
<h3 id="依赖配置">依赖配置</h3>
<p>只需要添加metrics-prometheus依赖即可：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>metrics-prometheus<span class="nt"></artifactId></span>
<span class="nt"><version></span>1.0.0-m1<span class="nt"></version></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="配置prometheus的prometheusyml">配置Prometheus的prometheus.yml</h3>
<p>你需要在prometheus.yml中配置数据采集job，例如</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">scrape_configs</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">scrape_configs</span><span class="pi">:</span>
<span class="c1"># The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.</span>
- <span class="pi">-</span> <span class="na">job_name</span><span class="pi">:</span> <span class="s1">'</span><span class="s">prometheus'</span>
+ <span class="pi">-</span> <span class="s">job_name</span><span class="pi">:</span> <span class="s1">'</span><span class="s">prometheus'</span>
<span class="c1"># metrics_path defaults to '/metrics'</span>
<span class="c1"># scheme defaults to 'http'.</span>
- <span class="na">static_configs</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">targets</span><span class="pi">:</span> <span class="pi">[</span><span class="s1">'</span><span class="s">localhost:9090'</span><span class="pi">]</span>
+ <span class="s">static_configs</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">targets</span><span class="pi">:</span> <span class="pi">[</span><span class="s1">'</span><span class="s">localhost:9090'</span><span class="pi">]</span>
- <span class="pi">-</span> <span class="na">job_name</span><span class="pi">:</span> <span class="s1">'</span><span class="s">servicecomb'</span>
+ <span class="pi">-</span> <span class="s">job_name</span><span class="pi">:</span> <span class="s1">'</span><span class="s">servicecomb'</span>
<span class="c1"># metrics_path defaults to '/metrics'</span>
<span class="c1"># scheme defaults to 'http'.</span>
- <span class="na">static_configs</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">targets</span><span class="pi">:</span> <span class="pi">[</span><span class="s1">'</span><span class="s">localhost:9696'</span><span class="pi">]</span>
-</code></pre></div></div>
+ <span class="s">static_configs</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">targets</span><span class="pi">:</span> <span class="pi">[</span><span class="s1">'</span><span class="s">localhost:9696'</span><span class="pi">]</span>
+</code></pre>
+</div>
<p>其中job_name: ‘servicecomb’即自定义的job配置，目标是本地微服务localhost:9696，关于prometheus.yml的配置更多信息可以参考<a href="https://prometheus.io/docs/prometheus/latest/configuration/configuration/">这篇文章</a>。</p>
<h3 id="验证输出">验证输出</h3>
<p>Prometheus Simple HTTP Server使用/metrics作为默认URL，metrics-prometheus会使用9696作为默认端口，微服务启动后你可以使用http://localhost:9696/metrics 访问它。</p>
<p>使用Prometheus Simple HTTP Server接口发布的数据是Prometheus采集的标准格式：</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code># HELP ServiceComb Metrics ServiceComb Metrics
+<div class="language-text highlighter-rouge"><pre class="highlight"><code># HELP ServiceComb Metrics ServiceComb Metrics
# TYPE ServiceComb Metrics untyped
jvm{name="cpuRunningThreads",statistic="gauge",} 45.0
jvm{name="heapMax",statistic="gauge",} 3.786407936E9
@@ -760,7 +764,8 @@ servicecomb_invocation_calculator_calculatorRestEndpoint_calculate{role="produce
jvm{name="nonHeapUsed",statistic="gauge",} 5.9361032E7
servicecomb_invocation_calculator_calculatorRestEndpoint_calculate{role="producer",stage="queue",statistic="latency",status="200",unit="MILLISECONDS",} 0.0
servicecomb_invocation_calculator_calculatorRestEndpoint_calculate{role="producer",stage="queue",statistic="max",status="200",unit="MILLISECONDS",} 0.0
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="配置grafana可选">配置Grafana（可选）</h3>
<p>如何在Grafana中添加Prometheus作为数据源请参考<a href="https://prometheus.io/docs/visualization/grafana/">这篇文章</a>。</p>
@@ -830,6 +835,7 @@ servicecomb_invocation_calculator_calculatorRestEndpoint_calculate{role="produce
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html b/content/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
index ca6c2cb..89e70fa 100644
--- a/content/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
+++ b/content/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
@@ -695,26 +695,27 @@
<h2 id="全局配置">全局配置</h2>
<p>与0.5.0类似，需要在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">demo</span>
-<span class="na">service_description</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">demoService</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">demo</span>
+<span class="s">service_description</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">demoService</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span>
-<span class="na">servicecomb</span><span class="pi">:</span>
- <span class="na">metrics</span><span class="pi">:</span>
+<span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">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="s">window_time</span><span class="pi">:</span> <span class="s">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">file</span><span class="pi">:</span>
+ <span class="s">round_places</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="s">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="s">root_path</span><span class="pi">:</span> <span class="s">./log/metric/</span>
+ <span class="s">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="s">max_file_count</span><span class="pi">:</span> <span class="s">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>
+ <span class="s">max_file_size</span> <span class="pi">:</span> <span class="s">10MB</span>
+</code></pre>
+</div>
<p>与0.5.0版本配置的比较：</p>
<ol>
<li>旧版本使用servicecomb.metrics.polltime(单位秒)配置文件输出间隔，1.0.0-m1版本中旧版本功能仍然存在；</li>
@@ -726,11 +727,12 @@
<h2 id="依赖和代码使用">依赖和代码使用</h2>
<ol>
<li>首先需要引入metrics-write-file模块，这个模块包含了获取Metrics数据并转化为指定格式后写文件的逻辑：
- <div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt"><dependency></span>
+ <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb.samples<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>metrics-write-file<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
<p><em>也可以参考其中的实现修改代码或复制代码到项目中。</em></p>
</li>
<li>metrics-write-file模块不包含动态生成写文件RollingFileAppender的代码，根据项目实际使用的日志实现，如果是log4j，拷贝metrics-write-file-log4j-springboot模块中的Log4JMetricsFileWriter，如果是log4j2，拷贝metrics-write-file-log4j2-springboot模块中的Log4J2MetricsFileWriter。 <br />
@@ -739,7 +741,7 @@
<h2 id="使用spring-boot-starter开发注意事项">使用Spring Boot Starter开发注意事项</h2>
<p>Java Chassis集成了Spring Boot Starter，如果使用Spring Boot Starter启动微服务同时又使用Log4j作为日志实现，则需要处理依赖问题，请参考samples/metrics-write-file-sample/metrics-write-file-log4j-springboot项目：</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="c"><!--need exclusion log4j-over-slf4j--></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="c"><!--need exclusion log4j-over-slf4j--></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.springframework.boot<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter<span class="nt"></artifactId></span>
@@ -756,7 +758,8 @@
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-boot-starter-provider<span class="nt"></artifactId></span>
<span class="nt"></dependency></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Spring Boot Starter中包含了log4j-over-slf4j，这个Log Bridge并没有完全实现log4j的所有接口，包括RollingFileAppender，所以我们需要排除它让slf4j直接调用log4j而不是这个Log Bridge，请确定这种排除对你的系统不会有影响，关于log4j-over-slf4j的更多信息可以参考<a href="https://www.slf4j.org/legacy.html#log4j-over-slf4j">这篇文章</a>。</p>
<h2 id="运行示例">运行示例</h2>
@@ -838,6 +841,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/metrics-write-file-extension-and-sample-in-1.0.0-m1.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/metrics-write-file-extension-and-sample-in-1.0.0-m1.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/run-mode/index.html b/content/cn/users/run-mode/index.html
index 8c74415..4d313bf 100644
--- a/content/cn/users/run-mode/index.html
+++ b/content/cn/users/run-mode/index.html
@@ -673,7 +673,7 @@
<li>
<p><strong>步骤1</strong> 编写Main函数，初始化日志和加载服务配置，内容如下：</p>
- <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>
+ <div class="language-java highlighter-rouge"><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>
@@ -682,7 +682,8 @@
<span class="c1">// other codes omitted</span>
<span class="o">}</span>
<span class="o">}</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p><strong>步骤2</strong> 运行MainServer即可启动该微服务进程，向外暴露服务。</p>
@@ -700,7 +701,7 @@
<li><strong>步骤1 新建servlet工程，修改web.xml文件如下：</strong></li>
</ul>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><web-app></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><web-app></span>
<span class="nt"><context-param></span>
<span class="nt"><param-name></span>contextConfigLocation<span class="nt"></param-name></span>
<span class="nt"><param-value></span>
@@ -723,13 +724,14 @@
<span class="nt"><url-pattern></span>/rest/*<span class="nt"></url-pattern></span>
<span class="nt"></servlet-mapping></span>
<span class="nt"></web-app></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<ul>
<li><strong>步骤2 修改pom文件</strong></li>
</ul>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><dependencies></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.servicecomb<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>transport-rest-servlet<span class="nt"></artifactId></span>
@@ -738,7 +740,8 @@
<span class="nt"><build></span>
<span class="nt"><finalName></span>test<span class="nt"></finalName></span>
<span class="nt"></build></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p><strong>注意事项:</strong></p>
<ol>
@@ -804,6 +807,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/deployment.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/deployment.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/service-configurations/index.html b/content/cn/users/service-configurations/index.html
index 498c5ca..dc357e4 100644
--- a/content/cn/users/service-configurations/index.html
+++ b/content/cn/users/service-configurations/index.html
@@ -632,7 +632,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">
@@ -796,23 +796,25 @@
<p> 配置处理链：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">servicecomb</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
<span class="c1"># other configurations omitted</span>
- <span class="na">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Consumer</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">loadbalance</span>
+ <span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Consumer</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">loadbalance</span>
<span class="c1"># other configurations omitted</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p> 增加路由策略：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="s">servicecomb：</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb：</span>
<span class="s"># other configurations omitted</span>
<span class="s">loadbalance</span><span class="pi">:</span>
- <span class="na">NFLoadBalancerRuleClassName</span><span class="pi">:</span> <span class="s">com.netflix.loadbalancer.RoundRobinRule</span>
+ <span class="s">NFLoadBalancerRuleClassName</span><span class="pi">:</span> <span class="s">com.netflix.loadbalancer.RoundRobinRule</span>
<span class="c1"># other configurations omitted</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="自定义路由策略">自定义路由策略</h2>
@@ -850,12 +852,13 @@
<ul>
<li>microservice.yaml配置示例如下：
- <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">handler</span><span class="pi">:</span>
- <span class="na">chain</span><span class="pi">:</span>
- <span class="na">Provider</span><span class="pi">:</span>
- <span class="na">default</span><span class="pi">:</span> <span class="s">qps-flowcontrol-provider</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+<span class="s">handler</span><span class="pi">:</span>
+ <span class="s">chain</span><span class="pi">:</span>
+ <span class="s">Provider</span><span class="pi">:</span>
+ <span class="s">default</span><span class="pi">:</span> <span class="s">qps-flowcontrol-provider</span>
+</code></pre>
+ </div>
</li>
<li>添加handler-flowcontrol-qps的pom依赖：
```yaml</li>
@@ -865,7 +868,7 @@
<artifactId>handler-flowcontrol-qps</artifactId>
<version>1.0.0-m1</version>
</dependency>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
+<div class="highlighter-rouge"><pre class="highlight"><code>
**表2 QPS流控配置项说明**
| 配置项 | 默认值 | 取值范围 | 是否必选 | 含义 | 注意 |
@@ -933,7 +936,8 @@ servicecomb:
fallback:
enabled: true
policy: throwexception
-</code></pre></div></div>
+</code></pre>
+</div>
<blockquote>
<p><strong>说明：</strong>
@@ -997,6 +1001,7 @@ servicecomb:
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/service-configurations.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/service-configurations.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/service-contract/index.html b/content/cn/users/service-contract/index.html
index b4916bf..ea0acd8 100644
--- a/content/cn/users/service-contract/index.html
+++ b/content/cn/users/service-contract/index.html
@@ -632,7 +632,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">
@@ -696,61 +696,62 @@
<h3 id="示例代码">示例代码</h3>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">swagger</span><span class="pi">:</span> <span class="s1">'</span><span class="s">2.0'</span>
-<span class="na">info</span><span class="pi">:</span>
- <span class="na">title</span><span class="pi">:</span> <span class="s">hello</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">1.0.0</span>
- <span class="na">x-java-interface</span><span class="pi">:</span> <span class="s">org.apache.servicecomb.samples.common.schema.Hello</span>
-<span class="na">basePath</span><span class="pi">:</span> <span class="s">/springmvchello</span>
-<span class="na">produces</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">swagger</span><span class="pi">:</span> <span class="s1">'</span><span class="s">2.0'</span>
+<span class="s">info</span><span class="pi">:</span>
+ <span class="s">title</span><span class="pi">:</span> <span class="s">hello</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">1.0.0</span>
+ <span class="s">x-java-interface</span><span class="pi">:</span> <span class="s">org.apache.servicecomb.samples.common.schema.Hello</span>
+<span class="s">basePath</span><span class="pi">:</span> <span class="s">/springmvchello</span>
+<span class="s">produces</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s">application/json</span>
-<span class="na">paths</span><span class="pi">:</span>
+<span class="s">paths</span><span class="pi">:</span>
<span class="s">/sayhi</span><span class="pi">:</span>
- <span class="na">post</span><span class="pi">:</span>
- <span class="na">operationId</span><span class="pi">:</span> <span class="s">sayHi</span>
- <span class="na">parameters</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s">name</span>
- <span class="na">in</span><span class="pi">:</span> <span class="s">query</span>
- <span class="na">required</span><span class="pi">:</span> <span class="no">true</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s">string</span>
- <span class="na">responses</span><span class="pi">:</span>
- <span class="na">200</span><span class="pi">:</span>
- <span class="na">description</span><span class="pi">:</span> <span class="s">正确返回</span>
- <span class="na">schema</span><span class="pi">:</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s">string</span>
- <span class="na">default</span><span class="pi">:</span>
- <span class="na">description</span><span class="pi">:</span> <span class="s">默认返回</span>
- <span class="na">schema</span><span class="pi">:</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s">string</span>
+ <span class="s">post</span><span class="pi">:</span>
+ <span class="s">operationId</span><span class="pi">:</span> <span class="s">sayHi</span>
+ <span class="s">parameters</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s">name</span>
+ <span class="s">in</span><span class="pi">:</span> <span class="s">query</span>
+ <span class="s">required</span><span class="pi">:</span> <span class="s">true</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s">string</span>
+ <span class="s">responses</span><span class="pi">:</span>
+ <span class="s">200</span><span class="pi">:</span>
+ <span class="s">description</span><span class="pi">:</span> <span class="s">正确返回</span>
+ <span class="s">schema</span><span class="pi">:</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s">string</span>
+ <span class="s">default</span><span class="pi">:</span>
+ <span class="s">description</span><span class="pi">:</span> <span class="s">默认返回</span>
+ <span class="s">schema</span><span class="pi">:</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s">string</span>
<span class="s">/sayhello</span><span class="pi">:</span>
- <span class="na">post</span><span class="pi">:</span>
- <span class="na">operationId</span><span class="pi">:</span> <span class="s">sayHello</span>
- <span class="na">parameters</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s">person</span>
- <span class="na">in</span><span class="pi">:</span> <span class="s">body</span>
- <span class="na">required</span><span class="pi">:</span> <span class="no">true</span>
- <span class="na">schema</span><span class="pi">:</span>
+ <span class="s">post</span><span class="pi">:</span>
+ <span class="s">operationId</span><span class="pi">:</span> <span class="s">sayHello</span>
+ <span class="s">parameters</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s">person</span>
+ <span class="s">in</span><span class="pi">:</span> <span class="s">body</span>
+ <span class="s">required</span><span class="pi">:</span> <span class="s">true</span>
+ <span class="s">schema</span><span class="pi">:</span>
<span class="s">$ref</span><span class="pi">:</span> <span class="s2">"</span><span class="s">#/definitions/Person"</span>
- <span class="na">responses</span><span class="pi">:</span>
- <span class="na">200</span><span class="pi">:</span>
- <span class="na">description</span><span class="pi">:</span> <span class="s">正确返回</span>
- <span class="na">schema</span><span class="pi">:</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s">string</span>
- <span class="na">default</span><span class="pi">:</span>
- <span class="na">description</span><span class="pi">:</span> <span class="s">默认返回</span>
- <span class="na">schema</span><span class="pi">:</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s">string</span>
-<span class="na">definitions</span><span class="pi">:</span>
- <span class="na">Person</span><span class="pi">:</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s2">"</span><span class="s">object"</span>
- <span class="na">properties</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span>
- <span class="na">type</span><span class="pi">:</span> <span class="s2">"</span><span class="s">string"</span>
- <span class="na">description</span><span class="pi">:</span> <span class="s2">"</span><span class="s">person</span><span class="nv"> </span><span class="s">name"</span>
- <span class="na">xml</span><span class="pi">:</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">Person"</span>
-</code></pre></div></div>
+ <span class="s">responses</span><span class="pi">:</span>
+ <span class="s">200</span><span class="pi">:</span>
+ <span class="s">description</span><span class="pi">:</span> <span class="s">正确返回</span>
+ <span class="s">schema</span><span class="pi">:</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s">string</span>
+ <span class="s">default</span><span class="pi">:</span>
+ <span class="s">description</span><span class="pi">:</span> <span class="s">默认返回</span>
+ <span class="s">schema</span><span class="pi">:</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s">string</span>
+<span class="s">definitions</span><span class="pi">:</span>
+ <span class="s">Person</span><span class="pi">:</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s2">"</span><span class="s">object"</span>
+ <span class="s">properties</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span>
+ <span class="s">type</span><span class="pi">:</span> <span class="s2">"</span><span class="s">string"</span>
+ <span class="s">description</span><span class="pi">:</span> <span class="s2">"</span><span class="s">person</span><span class="nv"> </span><span class="s">name"</span>
+ <span class="s">xml</span><span class="pi">:</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">Person"</span>
+</code></pre>
+</div>
<blockquote>
<p><strong>注意</strong>：</p>
@@ -832,6 +833,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/define-service-contract.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/define-service-contract.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/service-definition/index.html b/content/cn/users/service-definition/index.html
index 68ffd76..fa64b5b 100644
--- a/content/cn/users/service-definition/index.html
+++ b/content/cn/users/service-definition/index.html
@@ -632,7 +632,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">
@@ -752,20 +752,21 @@
<h2 id="示例代码">示例代码</h2>
-<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">helloTest</span> <span class="c1">#应用名</span>
-<span class="na">service_description</span><span class="pi">:</span> <span class="c1">#服务描述</span>
- <span class="na">name</span><span class="pi">:</span> <span class="s">helloServer</span> <span class="c1">#微服务名称</span>
- <span class="na">version</span><span class="pi">:</span> <span class="s">0.0.1</span> <span class="c1">#服务版本号</span>
- <span class="na">properties</span><span class="pi">:</span> <span class="c1">#元数据</span>
- <span class="na">allowCrossApp</span><span class="pi">:</span> <span class="no">false</span>
- <span class="na">key1</span><span class="pi">:</span> <span class="s">value1</span>
- <span class="na">key2</span><span class="pi">:</span> <span class="s">value2</span>
- <span class="na">propertyExtentedClass</span><span class="pi">:</span> <span class="s">org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub</span>
-<span class="na">instance_description</span><span class="pi">:</span> <span class="c1">#实例描述</span>
- <span class="na">properties</span><span class="pi">:</span> <span class="c1">#元数据</span>
- <span class="na">key3</span><span class="pi">:</span> <span class="s">value3</span>
- <span class="na">propertyExtentedClass</span><span class="pi">:</span> <span class="s">org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">helloTest</span> <span class="c1">#应用名</span>
+<span class="s">service_description</span><span class="pi">:</span> <span class="c1">#服务描述</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">helloServer</span> <span class="c1">#微服务名称</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">0.0.1</span> <span class="c1">#服务版本号</span>
+ <span class="s">properties</span><span class="pi">:</span> <span class="c1">#元数据</span>
+ <span class="s">allowCrossApp</span><span class="pi">:</span> <span class="s">false</span>
+ <span class="s">key1</span><span class="pi">:</span> <span class="s">value1</span>
+ <span class="s">key2</span><span class="pi">:</span> <span class="s">value2</span>
+ <span class="s">propertyExtentedClass</span><span class="pi">:</span> <span class="s">org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub</span>
+<span class="s">instance_description</span><span class="pi">:</span> <span class="c1">#实例描述</span>
+ <span class="s">properties</span><span class="pi">:</span> <span class="c1">#元数据</span>
+ <span class="s">key3</span><span class="pi">:</span> <span class="s">value3</span>
+ <span class="s">propertyExtentedClass</span><span class="pi">:</span> <span class="s">org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub</span>
+</code></pre>
+</div>
</section>
@@ -824,6 +825,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/service-definition.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/service-definition.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/service-heartbeat/index.html b/content/cn/users/service-heartbeat/index.html
index 81ff7af..c96c1ca 100644
--- a/content/cn/users/service-heartbeat/index.html
+++ b/content/cn/users/service-heartbeat/index.html
@@ -632,7 +632,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">
@@ -672,7 +672,7 @@
<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"><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>
<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>
@@ -680,7 +680,8 @@
<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="o">}</span>
<span class="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
</section>
@@ -739,6 +740,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/service-heartbeat.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/service-heartbeat.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/service-interface-constraints/index.html b/content/cn/users/service-interface-constraints/index.html
index f46ea20..6658941 100644
--- a/content/cn/users/service-interface-constraints/index.html
+++ b/content/cn/users/service-interface-constraints/index.html
@@ -632,7 +632,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">
@@ -661,19 +661,21 @@
<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>
+<div class="language-java highlighter-rouge"><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>
-</code></pre></div></div>
+</code></pre>
+</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>
+<div class="language-java highlighter-rouge"><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>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>通常，我们会将简单的数据类型，比如String, int等在RequestParam或者PathVariable传递，而把复杂的数据类型使用JSON编码以后在RequestBody传递，以减少HTTP协议限制可能给开发者带来的各种问题。</p>
@@ -683,20 +685,23 @@
<ul>
<li>比较抽象的数据结构: java.lang.Object, net.sf.json.JsonObject等</li>
<li>接口或者抽象类
- <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">IPerson</span> <span class="o">{...}</span>
+ <div class="language-java highlighter-rouge"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">interface</span> <span class="nc">IPerson</span> <span class="o">{...}</span>
<span class="kd">public</span> <span class="kd">abstract</span> <span class="kd">class</span> <span class="nc">AbstractPerson</span> <span class="o">{...}</span>
-</code></pre></div> </div>
+</code></pre>
+ </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>
-</code></pre></div> </div>
+ <div class="language-java highlighter-rouge"><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>
+</code></pre>
+ </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>
-</code></pre></div> </div>
+ <div class="language-java highlighter-rouge"><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>
+</code></pre>
+ </div>
</li>
</ul>
@@ -779,6 +784,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/service-interface-constraints.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/service-interface-constraints.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/setup-environment/index.html b/content/cn/users/setup-environment/index.html
index 32fa54a..dd5a28e 100644
--- a/content/cn/users/setup-environment/index.html
+++ b/content/cn/users/setup-environment/index.html
@@ -702,13 +702,15 @@
<div id="linux" class="tab-pane fade">
<ol>
<li>下载服务注册中心可执行文件压缩包并解压缩
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
-<span class="nb">tar </span>xvf apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
+tar xvf apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
+</code></pre>
+ </div>
</li>
<li>运行服务注册中心
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>bash apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>bash apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh
+</code></pre>
+ </div>
</li>
</ol>
@@ -724,9 +726,10 @@
</li>
</ol>
-<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>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>docker pull servicecomb/service-center
+docker run -d -p 30100:30100 servicecomb/service-center:latest
+</code></pre>
+</div>
<p class="notice--warning"><strong>注意事项：</strong> 服务注册中心运行后绑定的IP为：<em>http://127.0.0.1:30100</em>。<br />
如使用Docker Toolbox，可通过 <code class="highlighter-rouge">docker-machine ip</code> 获取服务绑定IP地址。</p>
@@ -764,95 +767,106 @@ docker run <span class="nt">-d</span> <span class="nt">-p</span> 30100:30100 ser
<h5 id="第一步">第一步</h5>
<p>在所有的VM上从<a href="https://github.com/apache/incubator-servicecomb-service-center/releases">ServiceComb官网</a>下载最新版本的Service Center并解压：</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">tar</span> <span class="nt">-xvf</span> service-center-X.X.X-linux-amd64.tar.gz
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>tar -xvf service-center-X.X.X-linux-amd64.tar.gz
+</code></pre>
+</div>
<p>提示：请不要按stand-alone提示的方式执行start-service-center.sh，因为这样会启动内置的etcd。</p>
<h5 id="第二步">第二步</h5>
<p>编辑ServcieComb的配置文件，修改ip/port以及etcd地址：</p>
<h6 id="vm1">VM1</h6>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>vi conf/app.conf
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>vi conf/app.conf
+</code></pre>
+</div>
<p>修改下面的配置 :</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>httpaddr = 10.12.0.1
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>httpaddr = 10.12.0.1
manager_cluster = "10.12.0.4:2379"
-</code></pre></div></div>
+</code></pre>
+</div>
<p>然后启动Service Center :</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>./service-center
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>./service-center
+</code></pre>
+</div>
<h6 id="vm2">VM2</h6>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>vi conf/app.conf
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>vi conf/app.conf
+</code></pre>
+</div>
<p>修改下面的配置 :</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>httpaddr = 10.12.0.2
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>httpaddr = 10.12.0.2
manager_cluster = "10.12.0.4:2379"
-</code></pre></div></div>
+</code></pre>
+</div>
<p>然后启动Service Center :</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>./service-center
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>./service-center
+</code></pre>
+</div>
<p>提示：在<code class="highlighter-rouge">manger_cluster</code>配置中你可以填写多个在etcd群集中的etcd实例地址：</p>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>manager_cluster= "10.12.0.4:2379,10.12.0.X:2379,10.12.0.X:2379"
-</code></pre></div></div>
+<div class="highlighter-rouge"><pre class="highlight"><code>manager_cluster= "10.12.0.4:2379,10.12.0.X:2379,10.12.0.X:2379"
+</code></pre>
+</div>
<h5 id="第三步">第三步</h5>
<p>验证你部署完毕的Service Center实例 :</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>curl http://10.12.0.1:30101/v4/default/registry/health
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>curl http://10.12.0.1:30101/v4/default/registry/health
+</code></pre>
+</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">
+<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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="nt">"healthCheck"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nt">"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="nt">"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="nt">"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="nt">"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="nt">"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">
-</span></code></pre></div></div>
+</span></code></pre>
+</div>
<p>我们可以看到Service Center能够自动发现所有正在集群中运行的实例，<a href="https://github.com/apache/incubator-servicecomb-java-chassis">Java-Chassis SDK</a>将使用这个特性至少找到一个Service Center实例。</p>
<p>在你的microservice.yaml中你可以填写一个或多个Service Center实例，如果<a href="https://github.com/apache/incubator-servicecomb-java-chassis">Java-Chassis SDK</a>发现配置的第一个地址（实例）失败，它将会自动使用下一个地址（实例）：</p>
-<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">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s2">"</span><span class="s">http://10.12.0.1:30100,http://10.12.0.2:30100"</span>
- <span class="na">autodiscovery</span><span class="pi">:</span> <span class="no">true</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s2">"</span><span class="s">http://10.12.0.1:30100,http://10.12.0.2:30100"</span>
+ <span class="s">autodiscovery</span><span class="pi">:</span> <span class="s">true</span>
+</code></pre>
+</div>
<p>上面的例子里包含了我们已经配置好的两个Service Center实例。</p>
@@ -912,6 +926,7 @@ manager_cluster = "10.12.0.4:2379"
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/setup-environment.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/setup-environment.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/use-service-contract/index.html b/content/cn/users/use-service-contract/index.html
index 4b7efe6..73b3732 100644
--- a/content/cn/users/use-service-contract/index.html
+++ b/content/cn/users/use-service-contract/index.html
@@ -632,7 +632,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">
@@ -676,12 +676,13 @@
<p>服务消费者需要在microservice.yaml文件中配置依赖的provider，示例配置如下：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">servicecomb</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
<span class="c1"># other configurations omitted</span>
- <span class="na">references</span><span class="pi">:</span>
- <span class="na">springmvc</span><span class="pi">:</span>
- <span class="na">version-rule</span><span class="pi">:</span> <span class="s">0.0.1</span>
-</code></pre></div></div>
+ <span class="s">references</span><span class="pi">:</span>
+ <span class="s">springmvc</span><span class="pi">:</span>
+ <span class="s">version-rule</span><span class="pi">:</span> <span class="s">0.0.1</span>
+</code></pre>
+</div>
<blockquote>
<p>version-rule是版本匹配规则，有四种格式：</p>
@@ -772,6 +773,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/use-service-contract.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/use-service-contract.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/users/use-tls/index.html b/content/cn/users/use-tls/index.html
index 992f377..54eeef8 100644
--- a/content/cn/users/use-tls/index.html
+++ b/content/cn/users/use-tls/index.html
@@ -632,7 +632,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">
@@ -659,22 +659,24 @@
<p>服务中心TLS通信配置
微服务与服务中心的连接可以通过将http改为https启用TLS通信，配置示例如下：</p>
- <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">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">https://127.0.0.1:30100</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">https://127.0.0.1:30100</span>
+</code></pre>
+ </div>
</li>
<li>
<p>服务提供者启用TLS通信
服务提供者在配置服务监听地址时，可以通过在地址后面追加<code class="highlighter-rouge">?sslEnabled=true</code>开启TLS通信，示例如下：</p>
- <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?sslEnabled=true</span>
- <span class="na">highway</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7070?sslEnabled=true</span>
-</code></pre></div> </div>
+ <div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080?sslEnabled=true</span>
+ <span class="s">highway</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7070?sslEnabled=true</span>
+</code></pre>
+ </div>
</li>
</ul>
@@ -682,8 +684,9 @@
<p>证书配置项写在microservice.yaml文件中，支持统一制定证书，也可以添加tag进行更细粒度的配置，有tag的配置会覆盖全局配置，配置格式如下：</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="s">ssl.[tag].[property]</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">ssl.[tag].[property]</span>
+</code></pre>
+</div>
<p>证书配置项见下表证书配置项说明表。</p>
@@ -993,19 +996,19 @@
<h2 id="示例代码">示例代码</h2>
<p>microservice.yaml文件中启用TLS通信的配置示例如下：</p>
-<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">service</span><span class="pi">:</span>
- <span class="na">registry</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">https://127.0.0.1:30100</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?sslEnabled=true</span>
- <span class="na">highway</span><span class="pi">:</span>
- <span class="na">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7070?sslEnabled=true</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">servicecomb</span><span class="pi">:</span>
+ <span class="s">service</span><span class="pi">:</span>
+ <span class="s">registry</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">https://127.0.0.1:30100</span>
+ <span class="s">rest</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080?sslEnabled=true</span>
+ <span class="s">highway</span><span class="pi">:</span>
+ <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:7070?sslEnabled=true</span>
<span class="c1">#########SSL options</span>
<span class="s">ssl.protocols</span><span class="pi">:</span> <span class="s">TLSv1.2</span>
-<span class="s">ssl.authPeer</span><span class="pi">:</span> <span class="no">true</span>
-<span class="s">ssl.checkCN.host</span><span class="pi">:</span> <span class="no">true</span>
+<span class="s">ssl.authPeer</span><span class="pi">:</span> <span class="s">true</span>
+<span class="s">ssl.checkCN.host</span><span class="pi">:</span> <span class="s">true</span>
<span class="c1">#########certificates config</span>
<span class="s">ssl.trustStore</span><span class="pi">:</span> <span class="s">trust.jks</span>
@@ -1016,7 +1019,8 @@
<span class="s">ssl.keyStoreValue</span><span class="pi">:</span> <span class="s">Changeme_123</span>
<span class="s">ssl.crl</span><span class="pi">:</span> <span class="s">revoke.crl</span>
<span class="s">ssl.sslCustomClass</span><span class="pi">:</span> <span class="s">org.apache.servicecomb.demo.DemoSSLCustom</span>
-</code></pre></div></div>
+</code></pre>
+</div>
</section>
@@ -1075,6 +1079,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/use-tls.md">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/use-tls.md">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/cn/year-archive/index.html b/content/cn/year-archive/index.html
index 9966620..2b14c0c 100644
--- a/content/cn/year-archive/index.html
+++ b/content/cn/year-archive/index.html
@@ -3323,6 +3323,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _pages/cn/year-archive.html">报告本网页问题</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_pages/cn/year-archive.html">在Github上编辑此页</a></li>
<li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+ <li><a href="http://www.apache.org/security">安全</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/index.html b/content/developers/becomming-a-commiter.html
similarity index 78%
copy from content/developers/index.html
copy to content/developers/becomming-a-commiter.html
index 586dfb9..39ded75 100644
--- a/content/developers/index.html
+++ b/content/developers/becomming-a-commiter.html
@@ -19,12 +19,12 @@
-<title>Developer Guide - Apache ServiceComb (incubating)</title>
+<title>Becomming a Committer - Apache ServiceComb (incubating)</title>
-<meta name="description" content="Developer Guide">
+<meta name="description" content="Becoming a committer of Apache ServiceComb">
@@ -33,21 +33,21 @@
<meta property="og:locale" content="en">
<meta property="og:site_name" content="Apache ServiceComb (incubating)">
-<meta property="og:title" content="Developer Guide">
+<meta property="og:title" content="Becomming a Committer">
- <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/developers/">
- <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/developers/">
+ <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/developers/becomming-a-commiter">
+ <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/developers/becomming-a-commiter">
- <meta property="og:description" content="Developer Guide">
+ <meta property="og:description" content="Becoming a committer of Apache ServiceComb">
<meta name="twitter:site" content="@ServiceComb">
- <meta name="twitter:title" content="Developer Guide">
- <meta name="twitter:description" content="Developer Guide">
+ <meta name="twitter:title" content="Becomming a Committer">
+ <meta name="twitter:description" content="Becoming a committer of Apache ServiceComb">
<meta name="twitter:url" content="">
@@ -220,7 +220,7 @@
<div class="nav-lang">
- <a href=/cn/developers/>中文</a>
+ <a href=/cn/developers/becomming-a-commiter>中文</a>
</div>
</nav>
@@ -293,6 +293,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -364,16 +375,16 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
- <meta itemprop="headline" content="Developer Guide">
- <meta itemprop="description" content="Developer Guide">
+ <meta itemprop="headline" content="Becomming a Committer">
+ <meta itemprop="description" content="Becoming a committer of Apache ServiceComb">
- <meta itemprop="dateModified" content="June 24, 2017">
+ <meta itemprop="dateModified" content="June 19, 2018">
<div class="page__inner-wrap">
<header>
- <h1 class="page__title" itemprop="headline">Developer Guide
+ <h1 class="page__title" itemprop="headline">Becomming a Committer
</h1>
</header>
@@ -381,55 +392,32 @@
<section class="page__content" itemprop="text">
- <aside class="sidebar__right">
-<nav class="toc">
- <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> On This Page</h4></header> -->
-
- </nav>
-</aside>
-
-<p><strong>ServiceComb</strong> is hosted on <a href="https://github.com/apache?q=incubator-servicecomb">Github</a>, it has the following sub-projects:</p>
-
-<table>
- <thead>
- <tr>
- <th>Project Name</th>
- <th>Project Introduction</th>
- <th>Programming Language</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><a href="https://github.com/apache/incubator-servicecomb-java-chassis">Java Chassis</a></td>
- <td>Java Microservice Framework（SDK）</td>
- <td>Java</td>
- </tr>
- <tr>
- <td><a href="https://github.com/apache/incubator-servicecomb-service-center">Service Center</a></td>
- <td>Service registration and discovery</td>
- <td>Go</td>
- </tr>
- <tr>
- <td><a href="https://github.com/apache/incubator-servicecomb-saga">Saga</a></td>
- <td>Data Eventually Consistency Solution for Microservice</td>
- <td>Java</td>
- </tr>
- <tr>
- <td><a href="https://github.com/apache/incubator-servicecomb-website">Website</a></td>
- <td>ServiceComb Website</td>
- <td>Markdown</td>
- </tr>
- </tbody>
-</table>
-
-<p>There are many ways to get involved in ServiceComb and contribute to it, e.g. submit codes, submit tests, tools improvements, document improvements. You can contribute to one or more interested projects. You can refer to the following guide about how to contribute to this community.</p>
+ <p>ServiceComb follows the Apache way to build the community. Anyone can become a committer once they have contributed sufficiently to the project and earned the trust.</p>
+
+<h2 id="contribute-and-earn-the-trust">Contribute and Earn The Trust</h2>
<ul>
- <li><a href="/developers/setup-develop-environment/">Setup Develop Environment</a>. Introduce how to install and setup git, JDK, Maven and IDE(IntelliJ).</li>
- <li><a href="/developers/submit-codes/">Code Submit Guide</a>. Introduce how to get involved with development of ServiceComb and how to submit codes.</li>
+ <li><a href="/release">Download the releases</a></li>
+ <li><a href="mailto:dev@servicecomb.apache.org">Join the mailing list</a></li>
+ <li><a href="https://issues.apache.org/jira/projects/SCB/">Report bugs and/or feature requests</a></li>
</ul>
-<p>In the meanwhile, welcome to subscribe the <a href="mailto:dev-subscribe@servicecomb.incubator.apache.org">ServiceComb mailing list</a> to keep track of the development status of ServiceComb community and discuss with us.</p>
+<p>See the <a href="/developers/contributing">contributing</a> guide on how to become a contributor.</p>
+
+<p>ServiceComb is a meritocracy the same as Apache. Once you have shown sufficient sustained commitment to the project and earned the trust, the PMC may invite you to be a committer.</p>
+
+<p>There are multiple actions other than coding to build the trust in the ServiceComb community, code review, design discussion, user support, community outreach, documentation, project management etc.</p>
+
+<h2 id="new-committer-process">New Committer Process</h2>
+
+<p>The ServiceComb community follows the Apache Community’s <a href="http://community.apache.org/newcommitter.html">process</a> on accepting a new committer.</p>
+
+<ul>
+ <li>Start the vote in @private.</li>
+ <li>If the vote passes, send an offer to become a committer with @private CC’ed.</li>
+ <li>Add the committer to the <a href="/developers/team">team page</a></li>
+ <li><a href="/developers/setup-committer-rights/">Setup committer rights</a></li>
+</ul>
</section>
@@ -485,9 +473,10 @@
<div class="col">
<ul>
<p class="header">Contribute</p>
- <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/developer-guide.md">Report a Doc Issue</a></li>
- <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/developer-guide.md">Edit This Page on Github</a></li>
+ <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/becomming-a-committer.md">Report a Doc Issue</a></li>
+ <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/becomming-a-committer.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/contributing.html b/content/developers/contributing.html
index 18613ba..d3df560 100644
--- a/content/developers/contributing.html
+++ b/content/developers/contributing.html
@@ -293,6 +293,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -523,6 +534,7 @@ Then we can add your issue to git and then we’ll know when its really fixed an
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/contributing.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/contributing.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/index.html b/content/developers/index.html
index 586dfb9..002f5b7 100644
--- a/content/developers/index.html
+++ b/content/developers/index.html
@@ -293,6 +293,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -488,6 +499,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/developer-guide.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/developer-guide.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/release-guide/index.html b/content/developers/release-guide/index.html
index 557eb9d..a6deeca 100644
--- a/content/developers/release-guide/index.html
+++ b/content/developers/release-guide/index.html
@@ -295,6 +295,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -413,7 +424,7 @@
<p>As ServiceComb Java Chassis and Saga are using maven for the release, you should do some maven 2 setup before releasing these two projects.
Before you deploy anything to the maven repository using Maven 2, you should configure your ~/.m2/settings.xml file so that the file permissions of the deployed artifacts are group writable. If you do not do this, other developers will not able to overwrite your SNAPSHOT releases with newer versions. The settings follow the <a href="http://maven.apache.org/developers/committer-settings.html">guidelines</a> used by the Maven project. Please pay particular attention to the <a href="http:// [...]
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><settings>
+<div class="highlighter-rouge"><pre class="highlight"><code><settings>
...
<servers>
<!-- Per http://maven.apache.org/developers/committer-settings.html -->
@@ -460,7 +471,8 @@ Before you deploy anything to the maven repository using Maven 2, you should con
</profiles>
...
</settings>
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="major-steps-for-doing-service-center-release">Major Steps for doing Service-Center Release</h2>
@@ -468,10 +480,11 @@ Before you deploy anything to the maven repository using Maven 2, you should con
<ol>
<li>Clone the service-center code.
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git@github.com:apache/incubator-servicecomb-service-center.git
+ <div class="highlighter-rouge"><pre class="highlight"><code>git@github.com:apache/incubator-servicecomb-service-center.git
cd incubator-servicecomb-service-center
gvt restore
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>Create a Tag from the master branch based on the version number which needs to be released.</p>
@@ -568,12 +581,14 @@ gvt restore
<ol>
<li>Clone the java-chassis code.
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone git@github.com:apache/incubator-servicecomb-java-chassis.git
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>git clone git@github.com:apache/incubator-servicecomb-java-chassis.git
+</code></pre>
+ </div>
</li>
<li>Cut the release using perl command to replace all the versions in pom.xml files
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
+</code></pre>
+ </div>
</li>
<li>
<p>Create a Tag from the master branch using the version number.</p>
@@ -591,8 +606,9 @@ gvt restore
<p>Update the apache account username and password in the settings file.</p>
</li>
<li>Run the maven deploy command.
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
+</code></pre>
+ </div>
</li>
<li>
<p>Once every thing is uploaded then use the staging repo to verify the build using Company workshop.</p>
@@ -676,15 +692,17 @@ gvt restore
<p><strong><em>Make and Verify the Release</em></strong></p>
<ol>
<li>Clone the saga code.
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git@github.com:apache/incubator-servicecomb-saga.git
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>git@github.com:apache/incubator-servicecomb-saga.git
+</code></pre>
+ </div>
</li>
<li>
<p>Cut the release using per command to replace all the versions in pom.xml files</p>
</li>
<li>Create a Tag from the master branch using the version number.
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
+</code></pre>
+ </div>
</li>
<li>
<p>Clear all the redundant servicecomb releases in repository.apache.org</p>
@@ -699,8 +717,9 @@ gvt restore
<p>Update the apache account username and password in the settings.xml file.</p>
</li>
<li>Run the maven deploy command.
- <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn deploy -DskipTests -Ppassphrase -Prelease
-</code></pre></div> </div>
+ <div class="highlighter-rouge"><pre class="highlight"><code>mvn deploy -DskipTests -Ppassphrase -Prelease
+</code></pre>
+ </div>
</li>
<li>
<p>Once every thing is uploaded then use the staging repo to verify the build using the acceptance test.</p>
@@ -861,6 +880,7 @@ gvt restore
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/release_guide.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/release_guide.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/release-validation-guide/index.html b/content/developers/release-validation-guide/index.html
index 3aaa419..080a15d 100644
--- a/content/developers/release-validation-guide/index.html
+++ b/content/developers/release-validation-guide/index.html
@@ -295,6 +295,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -423,52 +434,60 @@
<h3 id="verify-the-hash-and-the-signature">Verify the Hash and the Signature</h3>
<p>Please find the URL of <strong>Release Candidate</strong> in Vote mail, for example:</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Release Candidate : https://dist.apache.org/repos/dist/dev/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m2/rc-01/
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>Release Candidate : https://dist.apache.org/repos/dist/dev/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m2/rc-01/
+</code></pre>
+</div>
<p>Open this URL in browser, download the source code end with <code class="highlighter-rouge">src.zip</code>, signature file end with <code class="highlighter-rouge">src.zip.asc</code> and hash file end with <code class="highlighter-rouge">src.zip.sha512</code>, please keep these three files in same folder.</p>
<p>Please find URL of <strong>Key</strong> in Vote mail, for example:</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Keys to verify the Release Candidate : https://dist.apache.org/repos/dist/dev/incubator/servicecomb/KEYS
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>Keys to verify the Release Candidate : https://dist.apache.org/repos/dist/dev/incubator/servicecomb/KEYS
+</code></pre>
+</div>
<p>Open this URL in browser, copy contents into KEYS file, then import:</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg <span class="nt">--import</span> KEYS
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>gpg --import KEYS
+</code></pre>
+</div>
<p>Then <code class="highlighter-rouge">Mohammad Asif Siddiqui (ServiceComb Code Signing Key) <asifdxtreme@apache.org></code> will output if imported successfully.</p>
<p>Verify the Signature:</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>gpg <span class="nt">--verify</span> xxx-src.zip.asc xxx-src.zip
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>gpg --verify xxx-src.zip.asc xxx-src.zip
+</code></pre>
+</div>
<p>Then <code class="highlighter-rouge">Good signature from "Mohammad Asif Siddiqui (ServiceComb Code Signing Key) <asifdxtreme@apache.org>"</code> will output if verified successfully.</p>
<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
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>sha512sum -c xxx-src.zip.sha512
+</code></pre>
+</div>
<p>Then <code class="highlighter-rouge">OK</code> will output if verified successfully.</p>
<h3 id="verify-the-source-code">Verify the source code</h3>
<p>Unzip the source code:</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>unzip xxx-src.zip
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>unzip xxx-src.zip
+</code></pre>
+</div>
<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>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean install -Pdocker -Pit
+</code></pre>
+</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>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean install -Pdocker -Pit -Pdocker-machine
+</code></pre>
+ </div>
</blockquote>
<p>Wait all test case check passed, may use 10~30 minutes.</p>
@@ -476,8 +495,9 @@
<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/
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>rm -rf /root/.m2/repository/org/apache/servicecomb/
+</code></pre>
+</div>
<blockquote>
<p>Hint: If not the root, please change the path of .m2</p>
@@ -485,12 +505,13 @@
<p>Please find URL of <strong>Staging Repository</strong> in Vote mail, for example:</p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Staging Repository : https://repository.apache.org/content/repositories/orgapacheservicecomb-xxxx/
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>Staging Repository : https://repository.apache.org/content/repositories/orgapacheservicecomb-xxxx/
+</code></pre>
+</div>
<p>Then add this Staging Repository address into <code class="highlighter-rouge">settings.xml</code> of maven:</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><settings></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><settings></span>
<span class="nt"><profiles></span>
<span class="nt"><profile></span>
<span class="nt"><repositories></span>
@@ -517,49 +538,57 @@
<span class="nt"></profile></span>
<span class="nt"></profiles></span>
<span class="nt"></settings></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<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>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean install -Pdocker -Pstaging
+</code></pre>
+</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>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean install -Pdocker -Pstaging -Pdocker-machine
+</code></pre>
+ </div>
</blockquote>
<p><strong>When test cases are running, we can see the Java Chassis dependencies will download from Apache Staging Repository that had configured:</strong></p>
-<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Downloading: https://repository.apache.org/content/repositories/orgapacheservicecomb-xxxx/xxxx.pom
-</code></pre></div></div>
+<div class="language-text highlighter-rouge"><pre class="highlight"><code>Downloading: https://repository.apache.org/content/repositories/orgapacheservicecomb-xxxx/xxxx.pom
+</code></pre>
+</div>
<p>Wait all test case check passed, may use 5~15 minutes.</p>
<h3 id="verify-integration-with-spring-cloud">Verify integration with Spring Cloud</h3>
<p>Please clone the latest source code of Company demo project from https://github.com/ServiceComb/ServiceComb-Company-WorkShop , then checkout branch of 1.x :</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
git checkout 1.x
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Modify the configuration of <code class="highlighter-rouge"><java-chassis.version></code> in <code class="highlighter-rouge">pom.xml</code> under source code root folder to current releasing version, such as 1.0.0-m2 :</p>
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><properties></span>
+<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt"><properties></span>
<span class="nt"><java-chassis.version></span>1.0.0-m2<span class="nt"></java-chassis.version></span>
<span class="nt"></properties></span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Run test case under source code root:</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>mvn clean verify <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span>
-</code></pre></div></div>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean verify -Pdocker -Pstaging
+</code></pre>
+</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 verify <span class="nt">-Pdocker</span> <span class="nt">-Pstaging</span> <span class="nt">-Pdocker-machine</span>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mvn clean verify -Pdocker -Pstaging -Pdocker-machine
+</code></pre>
+ </div>
</blockquote>
<p>Wait all test case check passed, may use 5~10 minutes.</p>
@@ -648,6 +677,7 @@ git checkout 1.x
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/release_validation_guide.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/release_validation_guide.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/setup-committer-rights/index.html b/content/developers/setup-committer-rights/index.html
index 8635c2d..ffc5346 100644
--- a/content/developers/setup-committer-rights/index.html
+++ b/content/developers/setup-committer-rights/index.html
@@ -293,6 +293,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -503,6 +514,7 @@ You may visit <a href="https://github.com/apache/">Apache on Github</a> to see i
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/setup-committer-rights.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/setup-committer-rights.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/setup-develop-environment/index.html b/content/developers/setup-develop-environment/index.html
index cbefe0d..f275cb2 100644
--- a/content/developers/setup-develop-environment/index.html
+++ b/content/developers/setup-develop-environment/index.html
@@ -293,6 +293,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -401,17 +412,19 @@
<p>Configure Git. Configure personal information and setup git for push without username/password.
Configure personal information:</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git config <span class="nt">--global</span> user.name <your-user-name>
-git config <span class="nt">--global</span> user.email <your-email-address>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git config --global user.name <your-user-name>
+git config --global user.email <your-email-address>
+</code></pre>
+ </div>
<p>Substitute <your-user-name>和<your-email-address> with your name and email. Refer<a href="https://stackoverflow.com/a/8588786" target="_blank">Git push without username and password</a>to setup pushing without username/password.</p>
</li>
<li>
<p>Get the source code. For example, to get <a href="https://github.com/apache/incubator-servicecomb-java-chassis.git">ServiceComb-Java-Chassis</a>, execute the following command:</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/apache/incubator-servicecomb-java-chassis.git
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/apache/incubator-servicecomb-java-chassis.git
+</code></pre>
+ </div>
</li>
</ol>
@@ -527,6 +540,7 @@ git config <span class="nt">--global</span> user.email <your-email-address>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/setup-develop-environment.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/setup-develop-environment.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/submit-codes/index.html b/content/developers/submit-codes/index.html
index f1a29a7..1cdef20 100644
--- a/content/developers/submit-codes/index.html
+++ b/content/developers/submit-codes/index.html
@@ -293,6 +293,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -367,7 +378,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">
@@ -411,8 +422,9 @@
</ul>
<h2 id="run-tests">Run tests</h2>
-<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Before submitting code, make sure that you have properly tested the functionality and verified the implementation according to the auto test section in README.
-</code></pre></div></div>
+<div class="highlighter-rouge"><pre class="highlight"><code>Before submitting code, make sure that you have properly tested the functionality and verified the implementation according to the auto test section in README.
+</code></pre>
+</div>
<h2 id="how-to-submit-a-pr">How to submit a PR</h2>
<p> It’s quite convenient to submit a <a href="https://help.github.com/articles/about-pull-requests/">Pull Request(PR)</a> on <a href="https://github.com/search?q=org%3Aapache+servicecomb">Github</a>. Take the <a href="https://github.com/apache/incubator-servicecomb-website">apache/incubator-servicecomb-website</a> as an example:</p>
@@ -429,8 +441,9 @@
<li>
<p>Clone the source code to local machine:</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/<your_github_name>/incubator-servicecomb-website.git
-</code></pre></div> </div>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/<your_github_name>/incubator-servicecomb-website.git
+</code></pre>
+ </div>
<p>Note: substitute <your_github_name> with your github username.</p>
@@ -439,25 +452,28 @@
<li>
<p>Add apache/incubator-servicecomb-website as upstream remote:</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">cd </span>incubator-servicecomb-website
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="nb">cd </span>incubator-servicecomb-website
git remote add upstream https://github.com/apache/incubator-servicecomb-website.git
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>Check the local repository’s remotes</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git remote <span class="nt">-v</span>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git remote -v
origin https://github.com/<your_github_name>/incubator-servicecomb-website.git <span class="o">(</span>fetch<span class="o">)</span>
origin https://github.com/<your_github_name>/incubator-servicecomb-website.git <span class="o">(</span>push<span class="o">)</span>
upstream https://github.com/apache/incubator-servicecomb-website.git <span class="o">(</span>fetch<span class="o">)</span>
upstream https://github.com/apache/incubator-servicecomb-website.git <span class="o">(</span>push<span class="o">)</span>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
<li>
<p>Create a new branch to start working</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout <span class="nt">-b</span> <your_branch_name>
-</code></pre></div> </div>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git checkout -b <your_branch_name>
+</code></pre>
+ </div>
<p>Note: replace <your_branch_name> with an actual branch name at your choice, like feature-foo/bugfix-bar
Now you can start coding.</p>
@@ -465,9 +481,10 @@ Now you can start coding.</p>
<li>
<p>Push the changes to a remote repository</p>
- <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git commit <span class="nt">-a</span> <span class="nt">-m</span> <span class="s2">"<you_commit_message>"</span>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git commit -a -m <span class="s2">"<you_commit_message>"</span>
git push origin <your_branch_name>
-</code></pre></div> </div>
+</code></pre>
+ </div>
</li>
</ul>
@@ -489,28 +506,34 @@ fig-2 Create pull request</p>
<ol>
<li>Switch to the master branch
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout master
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git checkout master
+</code></pre>
+ </div>
</li>
<li>Pull the upstream’s master branch
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git pull upstream master
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git pull upstream master
+</code></pre>
+ </div>
</li>
<li>Switch back to the branch we are working on(e.g. fix)
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout fix
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git checkout fix
+</code></pre>
+ </div>
</li>
<li>Rebase the working branch onto the master branch
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git rebase <span class="nt">-i</span> master
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git rebase -i master
+</code></pre>
+ </div>
<p>A list of commits will be listed on your text editor. Normally we can just save and exit.
Git will now apply the commits one by one onto the master branch until it encounters a conflict. When this happens, the rebase process is paused. We need to resolve the conflicts, then execute</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git add <span class="nb">.</span>
-git rebase <span class="nt">--continue</span>
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git add .
+git rebase --continue
+</code></pre>
+ </div>
<p>Repeat this process until all commits are successfully applied. And finally run</p>
- <div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git push <span class="nt">-f</span> origin fix
-</code></pre></div> </div>
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git push -f origin fix
+</code></pre>
+ </div>
<p>to push the resolved branch to remote origin</p>
</li>
</ol>
@@ -572,6 +595,7 @@ git rebase <span class="nt">--continue</span>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/submit-codes.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/submit-codes.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/team/index.html b/content/developers/team/index.html
index 3abac97..3b14525 100644
--- a/content/developers/team/index.html
+++ b/content/developers/team/index.html
@@ -293,6 +293,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -661,6 +672,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/team.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/team.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/developers/use-jira/index.html b/content/developers/use-jira/index.html
index e518676..45066e4 100644
--- a/content/developers/use-jira/index.html
+++ b/content/developers/use-jira/index.html
@@ -293,6 +293,17 @@
+ <a href="/developers/becomming-a-commiter"><span class="nav__sub-title nav__sub-title-with-url">Becoming A Committer of Apache ServiceComb</span></a>
+
+
+
+ </li>
+
+ <li>
+
+
+
+
<a href="/developers/setup-develop-environment/"><span class="nav__sub-title nav__sub-title-with-url">Develop Environment Setup</span></a>
@@ -367,7 +378,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">
@@ -482,6 +493,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _developers/use-jira.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_developers/use-jira.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/apache-servicecomb-incubating-day/index.html b/content/docs/apache-servicecomb-incubating-day/index.html
index 1483bd1..47fb7fb 100644
--- a/content/docs/apache-servicecomb-incubating-day/index.html
+++ b/content/docs/apache-servicecomb-incubating-day/index.html
@@ -800,6 +800,7 @@ The microservice open source project - Apache ServiceComb (incubating) will host
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2018-06-14-apache-servicecomb-incubating-day.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2018-06-14-apache-servicecomb-incubating-day.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/autoscale-on-company/index.html b/content/docs/autoscale-on-company/index.html
index 51b4df0..d81f434 100644
--- a/content/docs/autoscale-on-company/index.html
+++ b/content/docs/autoscale-on-company/index.html
@@ -380,74 +380,82 @@
<p>Get one-click installing scripts in the <a href="https://github.com/zenlinTechnofreak/LinuxCon-Beijing-WorkShop/tree/autoscal/kubernetes/heapster/deploy">author’s repo</a>，update value of api-server as following and run kube.sh to start,</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>vi LinuxCon-Beijing-WorkShop/kubernetes/heapster/deploy/kube-config/influxdb/heapster.yaml
-</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">template</span><span class="pi">:</span>
- <span class="na">metadata</span><span class="pi">:</span>
- <span class="na">labels</span><span class="pi">:</span>
- <span class="na">task</span><span class="pi">:</span> <span class="s">monitoring</span>
- <span class="na">k8s-app</span><span class="pi">:</span> <span class="s">heapster</span>
- <span class="na">spec</span><span class="pi">:</span>
- <span class="na">serviceAccountName</span><span class="pi">:</span> <span class="s">heapster</span>
- <span class="na">containers</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s">heapster</span>
- <span class="na">image</span><span class="pi">:</span> <span class="s">gcr.io/google_containers/heapster-amd64:v1.4.1</span>
- <span class="na">imagePullPolicy</span><span class="pi">:</span> <span class="s">IfNotPresent</span>
- <span class="na">command</span><span class="pi">:</span>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>vi LinuxCon-Beijing-WorkShop/kubernetes/heapster/deploy/kube-config/influxdb/heapster.yaml
+</code></pre>
+</div>
+
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">spec</span><span class="pi">:</span>
+ <span class="s">replicas</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="s">template</span><span class="pi">:</span>
+ <span class="s">metadata</span><span class="pi">:</span>
+ <span class="s">labels</span><span class="pi">:</span>
+ <span class="s">task</span><span class="pi">:</span> <span class="s">monitoring</span>
+ <span class="s">k8s-app</span><span class="pi">:</span> <span class="s">heapster</span>
+ <span class="s">spec</span><span class="pi">:</span>
+ <span class="s">serviceAccountName</span><span class="pi">:</span> <span class="s">heapster</span>
+ <span class="s">containers</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s">heapster</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s">gcr.io/google_containers/heapster-amd64:v1.4.1</span>
+ <span class="s">imagePullPolicy</span><span class="pi">:</span> <span class="s">IfNotPresent</span>
+ <span class="s">command</span><span class="pi">:</span>
<span class="pi">-</span> <span class="s">/heapster</span>
<span class="c1">#use 'kubernetes' directly if installed inside the cluster</span>
<span class="pi">-</span> <span class="s">--source=kubernetes</span>
<span class="c1">#use the practical api-server address if installed outside the cluster</span>
<span class="c1"># - --source=kubernetes:http://10.229.43.65:6443?inClusterConfig=false</span>
<span class="pi">-</span> <span class="s">--sink=influxdb:http://monitoring-influxdb:8086</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="start-company-demo">Start Company Demo</h3>
<p>Download Company source code, restricted resources, creating auto-scaller,</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
<span class="nb">cd </span>LinuxCon-Beijing-WorkShop/kubernetes/
bash start-autoscale.sh
-</code></pre></div></div>
+</code></pre>
+</div>
<p>In Company’s deployment script, filed of resources is added to limit 200 milli-cores to each pod(1000 milli-cores equal to 1 core),</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">resources</span><span class="pi">:</span>
- <span class="na">limits</span><span class="pi">:</span>
- <span class="na">cpu</span><span class="pi">:</span> <span class="s">200m</span>
-</code></pre></div></div>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">resources</span><span class="pi">:</span>
+ <span class="s">limits</span><span class="pi">:</span>
+ <span class="s">cpu</span><span class="pi">:</span> <span class="s">200m</span>
+</code></pre>
+</div>
<p>In script start-autoscale.sh, each command create a Horizontal Pod Autoscaler that maintains between 1 and 10 replicas of the Pods controlled by its deployment created. HPA will increase and decrease the number of replicas (via the deployment) to maintain an average CPU utilization across all Pods of 50%(this means average CPU usage of 100 milli-cores),</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># Create Horizontal Pod Autoscaler</span>
-kubectl autoscale deployment zipkin <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-bulletin-board <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-worker <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-doorman <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-manager <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-kubectl autoscale deployment company-beekeeper <span class="nt">--cpu-percent</span><span class="o">=</span>50 <span class="nt">--min</span><span class="o">=</span>1 <span class="nt">--max</span><span class="o">=</span>10
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="c"># Create Horizontal Pod Autoscaler</span>
+kubectl autoscale deployment zipkin --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-bulletin-board --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-worker --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-doorman --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-manager --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+kubectl autoscale deployment company-beekeeper --cpu-percent<span class="o">=</span>50 --min<span class="o">=</span>1 --max<span class="o">=</span>10
+</code></pre>
+</div>
<p>HPA can be created after running start-autoscale.sh, get HPA status by the following command,</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code> kubectl get hpa
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code> kubectl get hpa
+</code></pre>
+</div>
<h3 id="start-pressure-testing">Start Pressure Testing</h3>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nb">export</span> <span class="nv">$HOST</span><span class="o">=</span><heapster-ip>:<heapster-port>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="nb">export</span> <span class="nv">$HOST</span><span class="o">=</span><heapster-ip>:<heapster-port>
bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
-</code></pre></div></div>
+</code></pre>
+</div>
<p>The script enable a dead loop, request to Company to calculate fibonacci number 200 times in each second, causing pressure on Company,</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">FIBONA_NUM</span><span class="o">=</span><span class="sb">`</span>curl <span class="nt">-s</span> <span class="nt">-H</span> <span class="s2">"Authorization: </span><span class="nv">$Authorization</span><span class="s2">"</span> <span class="nt">-XGET</span> <span class="s2">"http://</span><span class="nv">$HOST</span><span class="s2">/worker/fibonacci/term?n=6"</span><span [...]
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="nv">FIBONA_NUM</span><span class="o">=</span><span class="sb">`</span>curl -s -H <span class="s2">"Authorization: </span><span class="nv">$Authorization</span><span class="s2">"</span> -XGET <span class="s2">"http://</span><span class="nv">$HOST</span><span class="s2">/worker/fibonacci/term?n=6"</span><span class="sb">`</span>
+</code></pre>
+</div>
<h2 id="testing-result">Testing Result</h2>
@@ -789,6 +797,7 @@ Fig 5 HPA Data of The End</p>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-08-24-autoscale-on-company.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-08-24-autoscale-on-company.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/communication-btw-sc-ms/index.html b/content/docs/communication-btw-sc-ms/index.html
index 19edf5a..1f1466c 100644
--- a/content/docs/communication-btw-sc-ms/index.html
+++ b/content/docs/communication-btw-sc-ms/index.html
@@ -699,6 +699,7 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-08-09-communication-btw-sc-ms.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-08-09-communication-btw-sc-ms.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/company-on-kubernetes/index.html b/content/docs/company-on-kubernetes/index.html
index a2225ed..b75f242 100644
--- a/content/docs/company-on-kubernetes/index.html
+++ b/content/docs/company-on-kubernetes/index.html
@@ -378,18 +378,19 @@
<p><a href="https://github.com/ServiceComb/ServiceComb-Company-WorkShop/blob/master/kubernetes/README.md">Run Company on Kubernetes Cluster</a> Provides a detailed user guide, company can be deployed in the kubernetes cluster easily thourgh the following three instructions,</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/ServiceComb/ServiceComb-Company-WorkShop.git
<span class="nb">cd </span>ServiceComb-Company-WorkShop/kubernetes/
bash start.sh
-</code></pre></div></div>
+</code></pre>
+</div>
<h2 id="yaml-file-interpretation">Yaml File Interpretation</h2>
<p>Take the author’s actual environment as an example:</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@zenlin:~/src/LinuxCon-Beijing-WorkShop/kubernetes# kubectl get pod <span class="nt">-owide</span>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">root@zenlin:~/src/LinuxCon-Beijing-WorkShop/kubernetes# </span>kubectl get pod -owide
NAME READY STATUS RESTARTS AGE IP NODE
company-beekeeper-3737555734-48sxf 1/1 Running 0 17s 10.244.2.49 zenlinnode2
company-bulletin-board-4113647782-th91w 1/1 Running 0 17s 10.244.1.53 zenlinnode1
@@ -397,93 +398,99 @@ company-doorman-3391375245-g0p8c 1/1 Running 0 17s
company-manager-454733969-0c1g8 1/1 Running 0 16s 10.244.2.50 zenlinnode2
company-worker-1085546725-x7zl4 1/1 Running 0 17s 10.244.1.54 zenlinnode1
zipkin-508217170-0khr3 1/1 Running 0 17s 10.244.2.48 zenlinnode2
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Total of six pods, company manager, company-doorman, company-bulletin-board, company-worker, company-beekeeper, and zipkin, K8S cluster assigns the corresponding cluster IP to them.</p>
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>root@zenlin:~/src/LinuxCon-Beijing-WorkShop/kubernetes# kubectl get svc <span class="nt">-owide</span>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">root@zenlin:~/src/LinuxCon-Beijing-WorkShop/kubernetes# </span>kubectl get svc -owide
NAME CLUSTER-IP EXTERNAL-IP PORT<span class="o">(</span>S<span class="o">)</span> AGE SELECTOR
company-bulletin-board 10.99.70.46 <none> 30100/TCP 12m io.kompose.service<span class="o">=</span>company-bulletin-board
company-manager 10.100.61.227 <nodes> 8083:30301/TCP 12m io.kompose.service<span class="o">=</span>company-manager
zipkin 10.104.92.198 <none> 9411/TCP 12m io.kompose.service<span class="o">=</span>zipkin
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Only three services are started, zipkin, bulletin-board, and company-manager, that is because the address of call chain and the bulletin-board need to be passed in the cluster to be called by other services, and the manager is the api gateway nedd to be visited outside the cluster.</p>
<p>Read company-bulletin-board-service.yaml,</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="na">apiVersion</span><span class="pi">:</span> <span class="s">v1</span>
- <span class="na">kind</span><span class="pi">:</span> <span class="s">Service</span>
- <span class="na">metadata</span><span class="pi">:</span>
- <span class="na">creationTimestamp</span><span class="pi">:</span> <span class="no">null</span>
- <span class="na">labels</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code> <span class="s">apiVersion</span><span class="pi">:</span> <span class="s">v1</span>
+ <span class="s">kind</span><span class="pi">:</span> <span class="s">Service</span>
+ <span class="s">metadata</span><span class="pi">:</span>
+ <span class="s">creationTimestamp</span><span class="pi">:</span> <span class="s">null</span>
+ <span class="s">labels</span><span class="pi">:</span>
<span class="err"> </span><span class="s">io.kompose.service</span><span class="pi">:</span> <span class="s">company-bulletin-board</span>
<span class="s">name</span><span class="pi">:</span> <span class="s">company-bulletin-board</span>
<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">ports</span><span class="pi">:</span>
+<span class="err"> </span><span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">30100"</span>
+ <span class="s">port</span><span class="pi">:</span> <span class="s">30100</span>
+ <span class="s">targetPort</span><span class="pi">:</span> <span class="s">30100</span>
<span class="s">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>
-</code></pre></div></div>
+ <span class="s">status</span><span class="pi">:</span>
+ <span class="s">loadBalancer</span><span class="pi">:</span> <span class="pi">{}</span>
+</code></pre>
+</div>
<p>The file defines the service of bulletin-board, and defines the name, port, and targetPort for the service, which is created by ‘kubectl expose’ to keep DNS capability in the cluster. Thus, other services can access the bulletin board and registry themselves.</p>
<p>To the label and selector, it is useful to the situation of one-service to multiple-pods，When a pod dies, it is automatically removed from the endpoints, and new pods matching the Service’s selector will automatically get added to the endpoints.</p>
<p>Read company-worker-deployment.yaml,</p>
-<div class="language-yaml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="na">apiVersion</span><span class="pi">:</span> <span class="s">extensions/v1beta1</span>
-<span class="na">kind</span><span class="pi">:</span> <span class="s">Deployment</span>
-<span class="na">metadata</span><span class="pi">:</span>
- <span class="na">creationTimestamp</span><span class="pi">:</span> <span class="no">null</span>
- <span class="na">labels</span><span class="pi">:</span>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">apiVersion</span><span class="pi">:</span> <span class="s">extensions/v1beta1</span>
+<span class="s">kind</span><span class="pi">:</span> <span class="s">Deployment</span>
+<span class="s">metadata</span><span class="pi">:</span>
+ <span class="s">creationTimestamp</span><span class="pi">:</span> <span class="s">null</span>
+ <span class="s">labels</span><span class="pi">:</span>
<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">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>
-<span class="err"> </span><span class="na">creationTimestamp</span><span class="pi">:</span> <span class="no">null</span>
+<span class="s">spec</span><span class="pi">:</span>
+ <span class="s">replicas</span><span class="pi">:</span> <span class="s">1</span>
+ <span class="s">strategy</span><span class="pi">:</span> <span class="pi">{}</span>
+ <span class="s">template</span><span class="pi">:</span>
+<span class="err"> </span><span class="s">metadata</span><span class="pi">:</span>
+<span class="err"> </span><span class="s">creationTimestamp</span><span class="pi">:</span> <span class="s">null</span>
<span class="err"> </span><span class="s">labels</span><span class="pi">:</span>
<span class="err"> </span><span class="s">io.kompose.service</span><span class="pi">:</span> <span class="s">company-worker</span>
-<span class="na">spec</span><span class="pi">:</span>
- <span class="na">containers</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">env</span><span class="pi">:</span>
- <span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s">ARTIFACT_ID</span>
- <span class="na">value</span><span class="pi">:</span> <span class="s">worker</span>
- <span class="pi">-</span> <span class="na">name</span><span class="pi">:</span> <span class="s">JAVA_OPTS</span>
- <span class="na">value</span><span class="pi">:</span> <span class="s">-Dcse.service.registry.address=http://company-bulletin-board:30100 -Dservicecomb.tracing.collector.adress=http://zipkin:9411</span>
- <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="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>
-</code></pre></div></div>
+<span class="s">spec</span><span class="pi">:</span>
+ <span class="s">containers</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">env</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s">ARTIFACT_ID</span>
+ <span class="s">value</span><span class="pi">:</span> <span class="s">worker</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s">JAVA_OPTS</span>
+ <span class="s">value</span><span class="pi">:</span> <span class="s">-Dcse.service.registry.address=http://company-bulletin-board:30100 -Dservicecomb.tracing.collector.adress=http://zipkin:9411</span>
+ <span class="s">image</span><span class="pi">:</span> <span class="s">servicecomb/worker:0.0.1-SNAPSHOT</span>
+ <span class="s">name</span><span class="pi">:</span> <span class="s">company-worker</span>
+ <span class="s">ports</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">containerPort</span><span class="pi">:</span> <span class="s">7070</span>
+ <span class="pi">-</span> <span class="s">containerPort</span><span class="pi">:</span> <span class="s">8080</span>
+ <span class="s">resources</span><span class="pi">:</span> <span class="pi">{}</span>
+ <span class="s">restartPolicy</span><span class="pi">:</span> <span class="s">Always</span>
+<span class="s">status</span><span class="pi">:</span> <span class="pi">{}</span>
+</code></pre>
+</div>
<p>The yaml defines a pod with one replica (replicas: 1), which can be modified to control the number of replicas of the pod(Anyway, the flexibility of the K8S scalability to achieve on-demand dynamic horizontal expansion to reach the purpose, material of K8S scalability will be provided later in the website). We mentioned that the company-bulletin-board is a DNS name, it is used as the value of servicecomb.service.registry.address and passed to the service within the pod, such as: -Dcse [...]
<p>Read <a href="https://kubernetes.io/docs/concepts/services-networking/connect-applications-service/">connect-applications-service</a> to understanding the communication of services in K8S cluster.</p>
<p>Other deployment.yaml and service.yaml are similar to the above except manager service, nodePort is defined in the company-manager-service.yaml to provide External-IP and Service-Port, as follows,</p>
-<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>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">spec</span><span class="pi">:</span>
+ <span class="s">ports</span><span class="pi">:</span>
+ <span class="pi">-</span> <span class="s">name</span><span class="pi">:</span> <span class="s2">"</span><span class="s">8083"</span>
+<span class="err"> </span><span class="s">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="s">type</span><span class="pi">:</span> <span class="s">NodePort</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<p>Get the External-IP and Service-Port by commands,</p>
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>kubectl get svc company-manager <span class="nt">-o</span> yaml | <span class="nb">grep </span>ExternalIP <span class="nt">-C</span> 1
-kubectl get svc company-manager <span class="nt">-o</span> yaml | <span class="nb">grep </span>nodePort <span class="nt">-C</span> 1
-</code></pre></div></div>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code>kubectl get svc company-manager -o yaml | grep ExternalIP -C 1
+kubectl get svc company-manager -o yaml | grep nodePort -C 1
+</code></pre>
+</div>
<p>Now, you can use the External-IP and nodePort to visit company, Read <a href="https://github.com/ServiceComb/ServiceComb-Company-WorkShop/blob/master/kubernetes/README.md">github.com/ServiceComb/ServiceComb-Company-WorkShop/kubernetes</a> to get details about how to visit it inside or outside the cluster.</p>
@@ -787,6 +794,7 @@ kubectl get svc company-manager <span class="nt">-o</span> yaml | <span class="n
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-08-21-company-on-kubernetes.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-08-21-company-on-kubernetes.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/distributed_saga_1/index.html b/content/docs/distributed_saga_1/index.html
index 165a9a1..0dda094 100644
--- a/content/docs/distributed_saga_1/index.html
+++ b/content/docs/distributed_saga_1/index.html
@@ -829,6 +829,7 @@ next blog post.</p>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-09-13-saga-background.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-09-13-saga-background.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/distributed_saga_2/index.html b/content/docs/distributed_saga_2/index.html
index 73a7e77..0802546 100644
--- a/content/docs/distributed_saga_2/index.html
+++ b/content/docs/distributed_saga_2/index.html
@@ -775,6 +775,7 @@ there are a few requirements on design of microservices to ensure saga consisten
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-09-16-saga-design.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-09-16-saga-design.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/distributed_saga_3/index.html b/content/docs/distributed_saga_3/index.html
index 81c202f..9a90ea8 100644
--- a/content/docs/distributed_saga_3/index.html
+++ b/content/docs/distributed_saga_3/index.html
@@ -808,6 +808,7 @@ and allows easier troubleshooting of any problem occurred in transactions.</p>
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-09-18-saga-and-others.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-09-18-saga-and-others.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/go-to-cloud/index.html b/content/docs/go-to-cloud/index.html
index a1f9c5a..500b6a0 100644
--- a/content/docs/go-to-cloud/index.html
+++ b/content/docs/go-to-cloud/index.html
@@ -843,6 +843,7 @@ watching microservice 4 successfully，服务注册成功<br />
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-06-24-go-to-cloud.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-06-24-go-to-cloud.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/how-to-reform-a-legacy-system/index.html b/content/docs/how-to-reform-a-legacy-system/index.html
index b19ca79..0d3ed2e 100644
--- a/content/docs/how-to-reform-a-legacy-system/index.html
+++ b/content/docs/how-to-reform-a-legacy-system/index.html
@@ -1037,6 +1037,7 @@
<li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-10-23-how-to-reform-a-legacy-system.md">Report a Doc Issue</a></li>
<li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-10-23-how-to-reform-a-legacy-system.md">Edit This Page on Github</a></li>
<li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
</ul>
</div>
<div class="col">
diff --git a/content/docs/howto-upgrade-topzipkin2/index.html b/content/docs/howto-upgrade-topzipkin2/index.html
index bbf0bd6..30cab32 100644
--- a/content/docs/howto-upgrade-topzipkin2/index.html
+++ b/content/docs/howto-upgrade-topzipkin2/index.html
@@ -416,7 +416,7 @@
<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
+<div class="language-diff highlighter-rouge"><pre class="highlight"><code>java-chassis-dependencies/pom.xml
<span class="gu">@@ -50,8 +50,8 @@
</span> <cxf.version>3.1.6</cxf.version>
<logback.version>1.1.7</logback.version>
@@ -458,13 +458,14 @@ handlers/handler-tracing-zipkin/pom.xml
</dependency>
<dependency>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="make-brave-to-use-zipkin2-instead-of-zipkin">Make brave to use zipkin2 instead of zipkin</h3>
<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
+<div class="language-diff highlighter-rouge"><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;
import brave.propagation.CurrentTraceContext;
@@ -498,37 +499,40 @@ handlers/handler-tracing-zipkin/pom.xml
</span><span class="gi">+ .spanReporter(reporter)
</span> .build();
}
-</code></pre></div></div>
+</code></pre>
+</div>
<p><strong>Note</strong>:</p>
<p>In the <a href="https://github.com/openzipkin/brave/releases/tag/4.7.1">brave release notes</a>, it’s stated that we need to use <code class="highlighter-rouge">create()</code> instead of <code class="highlighter-rouge">builder()</code></p>
-<div class="language-diff highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
+<div class="language-diff highlighter-rouge"><pre class="highlight"><code>
/** Configuration for how to buffer spans into messages for Zipkin */
<span class="gd">- @Bean Reporter<Span> reporter() {
- return AsyncReporter.builder(sender()).build();
</span><span class="gi">+ @Bean Reporter<Span> spanReporter() {
+ return AsyncReporter.create(sender()).build();
</span> }
-</code></pre></div></div>
+</code></pre>
+</div>
<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>
+<div class="language-java highlighter-rouge"><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>
<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="o">}</span>
-</code></pre></div></div>
+</code></pre>
+</div>
<h3 id="make-changes-according-to-the-changes-of-zipkinspan-and-zipkin2span">Make changes according to the changes of zipkin.Span and zipkin2.Span.</h3>
<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
+<div class="language-diff highlighter-rouge"><pre class="highlight"><code>tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
... 6435 lines suppressed ...
[incubator-servicecomb-website] 01/02: Merge branch 'master' into
asf-site
Posted by ni...@apache.org.
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/incubator-servicecomb-website.git
commit 7f27fdb087287c076f6f3a32e6b063f304ebd0f9
Merge: a38f90d 1dbd850
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Tue Jun 19 14:33:52 2018 +0800
Merge branch 'master' into asf-site
_data/navigation.yml | 4 ++++
_data/ui-text.yml | 2 ++
_developers/becomming-a-committer.md | 31 +++++++++++++++++++++++++++++++
_developers/cn/becomming-a-committer.md | 31 +++++++++++++++++++++++++++++++
_includes/footer.html | 1 +
5 files changed, 69 insertions(+)