[incubator-servicecomb-website] branch asf-site updated (17f45a3 -> fad336e)

2018-04-24 Thread ningjiang 
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 17f45a3  add subscribe mail-list guide (#70)
 add 395674b  add Q about @ApiOperation (#68)
 add d878253  Split General Development/Use ServiceComb in Spring Boot 
document (#67)
 add 9449db6  add service center m1 fix method (#69)
 add 676ae04  add subscribe mail-list guide (#70)
 new 925965e  Merge branch 'master' into asf-site
 new fad336e  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   |  14 +-
 _faqs/cn/faq.md|   4 +
 ...ngmvc.md => develop-with-springboot-starter.md} |  96 ++--
 ...age_springcloud_application_using_sc_and_gs.md} | 106 ++---
 _users/develop-with-jax-rs.md  |   4 +-
 ...ngmvc.md => develop-with-springboot-starter.md} |  92 ++--
 _users/develop-with-springmvc.md   |   4 +-
 _users/develop-with-transparent-rpc.md |   4 +-
 ...age_springcloud_application_using_sc_and_gs.md} | 100 +
 .../assets}/images/subscribe-mail-list-step1.png   | Bin
 .../assets}/images/subscribe-mail-list-step2.png   | Bin
 .../assets}/images/subscribe-mail-list-step3.png   | Bin
 .../assets}/images/subscribe-mail-list-step4.png   | Bin
 content/cn/developers/index.html   |  13 +-
 .../developers/setup-committer-rights/index.html   |  11 ++
 .../setup-develop-environment/index.html   |  11 ++
 content/cn/developers/submit-codes/index.html  |  11 ++
 .../index.html | 111 +++---
 content/cn/developers/use-jira/index.html  |  11 ++
 content/cn/faqs/index.html |   5 +
 .../cn/users/application-boot-process/index.html   |  24 ++-
 content/cn/users/communicate-protocol/index.html   |  24 ++-
 content/cn/users/customized-tracing/index.html |  24 ++-
 content/cn/users/develop-with-jax-rs/index.html|  24 ++-
 .../cn/users/develop-with-rest-template/index.html |  24 ++-
 content/cn/users/develop-with-rpc/index.html   |  24 ++-
 .../index.html | 147 ++
 content/cn/users/develop-with-springmvc/index.html |  24 ++-
 .../users/develop-with-transparent-rpc/index.html  |  24 ++-
 content/cn/users/distributed-tracing/index.html|  24 ++-
 content/cn/users/dynamic-config/index.html |  24 ++-
 content/cn/users/edge-in-1.0.0-m1/index.html   |  24 ++-
 content/cn/users/edging-service/nginx/index.html   |  24 ++-
 content/cn/users/edging-service/zuul/index.html|  24 ++-
 content/cn/users/index.html|  24 ++-
 content/cn/users/invoke-control/index.html |  24 ++-
 content/cn/users/local-develop-test/index.html |  24 ++-
 .../index.html | 166 +
 content/cn/users/metrics-in-0.5.0/index.html   |  24 ++-
 content/cn/users/metrics-in-1.0.0-m1/index.html|  24 ++-
 .../index.html |  24 ++-
 .../index.html |  24 ++-
 content/cn/users/run-mode/index.html   |  24 ++-
 content/cn/users/service-configurations/index.html |  24 ++-
 content/cn/users/service-contract/index.html   |  24 ++-
 content/cn/users/service-definition/index.html |  24 ++-
 content/cn/users/service-heartbeat/index.html  |  24 ++-
 .../users/service-interface-constraints/index.html |  24 ++-
 content/cn/users/setup-environment/index.html  |  27 +++-
 content/cn/users/use-service-contract/index.html   |  24 ++-
 content/cn/users/use-tls/index.html|  24 ++-
 content/feed.xml   |   2 +-
 content/sitemap.xml| 146 +-
 content/users/application-boot-process/index.html  |  26 ++--
 content/users/communicate-protocol/index.html  |  26 ++--
 content/users/customized-tracing/index.html|  26 ++--
 content/users/develop-with-jax-rs/index.html   |  44 +++---
 .../users/develop-with-rest-template/index.html|  26 ++--
 content/users/develop-with-rpc/index.html  |  26 ++--
 .../index.html | 151 +++
 content/users/develop-with-springmvc/index.html|  44 +++---
 .../users/develop-with-transparent-rpc/index.html  |  44 +++---
 content/users/distributed-tracing/index.html   |  26 ++--
 content/users/dynamic-config/index.html|  26 ++--
 content/users/edge-in-1.0.0-m1/index.html  |  26 ++--

[incubator-servicecomb-website] 01/02: Merge branch 'master' into asf-site

2018-04-24 Thread ningjiang 
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 925965e59211c44b1c33d8f3ebd00825f0cb4e7f
Merge: 17f45a3 676ae04
Author: Willem Jiang 
AuthorDate: Tue Apr 24 17:33:16 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |  14 +-
 _faqs/cn/faq.md|   4 +
 _users/cn/develop-with-springboot-starter.md   | 147 +
 ...age_springcloud_application_using_sc_and_gs.md} | 106 ++-
 _users/develop-with-jax-rs.md  |   4 +-
 ...ngmvc.md => develop-with-springboot-starter.md} |  92 ++---
 _users/develop-with-springmvc.md   |   4 +-
 _users/develop-with-transparent-rpc.md |   4 +-
 ...age_springcloud_application_using_sc_and_gs.md} | 100 ++
 9 files changed, 230 insertions(+), 245 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] branch master updated (d878253 -> 676ae04)

2018-04-24 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

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


from d878253  Split General Development/Use ServiceComb in Spring Boot 
document (#67)
 add 9449db6  add service center m1 fix method (#69)
 add 676ae04  add subscribe mail-list guide (#70)

No new revisions were added by this update.

Summary of changes:
 _data/navigation.yml|   2 +
 _developers/cn/developer-guide.md   |   2 +-
 _developers/cn/subscribe-mail-list.md   |  67 
 _users/cn/setup-environment.md  |   4 ++
 _users/setup-environment.md |   4 ++
 assets/images/subscribe-mail-list-step1.png | Bin 0 -> 8831 bytes
 assets/images/subscribe-mail-list-step2.png | Bin 0 -> 65335 bytes
 assets/images/subscribe-mail-list-step3.png | Bin 0 -> 48503 bytes
 assets/images/subscribe-mail-list-step4.png | Bin 0 -> 57022 bytes
 9 files changed, 78 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 _developers/cn/developer-guide.md
 create mode 100755 _developers/cn/subscribe-mail-list.md
 create mode 100755 assets/images/subscribe-mail-list-step1.png
 create mode 100755 assets/images/subscribe-mail-list-step2.png
 create mode 100755 assets/images/subscribe-mail-list-step3.png
 create mode 100755 assets/images/subscribe-mail-list-step4.png

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] branch master updated: Split General Development/Use ServiceComb in Spring Boot document (#67)

2018-04-24 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new d878253  Split General Development/Use ServiceComb in Spring Boot 
document (#67)
d878253 is described below

commit d878253f3a99613981d78c7b3d0f5bd8994ee647
Author: zhengyangyong 
AuthorDate: Tue Apr 24 17:30:01 2018 +0800

Split General Development/Use ServiceComb in Spring Boot document (#67)

* In the "General Development/Use ServiceComb in Spring Boot" document,it 
is include two topics:
1.Using the Service Center and Governance Center to Manage the Spring Cloud 
Application
2.How to develop Microservice with Spring Boot Starter

So I had split it into two document:
1.Open Service Capabilities/Using the Service Center and Governance Center 
to Manage the Spring Cloud Application (Spring zuul also here)
2.Develop Service Provider/Develop Microservice with Spring Boot Starter

Signed-off-by: zhengyangyong 

* fix style

Signed-off-by: zhengyangyong 
---
 _data/navigation.yml   |  14 +-
 _users/cn/develop-with-springboot-starter.md   | 147 +
 ...age_springcloud_application_using_sc_and_gs.md} | 106 ++-
 _users/develop-with-jax-rs.md  |   4 +-
 ...ngmvc.md => develop-with-springboot-starter.md} |  92 ++---
 _users/develop-with-springmvc.md   |   4 +-
 _users/develop-with-transparent-rpc.md |   4 +-
 ...age_springcloud_application_using_sc_and_gs.md} | 100 ++
 8 files changed, 226 insertions(+), 245 deletions(-)

diff --git a/_data/navigation.yml b/_data/navigation.yml
index 7ad9b42..e72eeaa 100755
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -54,6 +54,8 @@ t:
 url: /users/develop-with-jax-rs/
   - title: Develop Microservice with Transparent RPC
 url: /users/develop-with-transparent-rpc/
+  - title: Develop Microservice with Spring Boot Starter
+url: /users/develop-with-spring-boot-starter/
   - title: Service Interface Constraints
 url: /users/service-interface-constraints/
   - title: Service Configurations
@@ -80,8 +82,6 @@ t:
 children:
   - title: Develop and Test in Local Environment
 url: /users/local-develop-test/
-  - title: Use ServiceComb in Spring Boot
-url: /users/use-servicecomb-in-spring-boot/
   - title: Distributed Tracing
 url: /users/distributed-tracing/
   - title: Customized Tracing
@@ -90,7 +90,7 @@ t:
   - title: Dynamic Configurations
 url: /users/dynamic-config/
 
-  - title: Edging Service
+  - title: Open Service Capabilities
 children:
   - title: Confd and Nginx Edge Service
 url: /users/edging-service/nginx/
@@ -98,6 +98,8 @@ t:
 url: /users/edging-service/zuul/
   - title: ServiceComb Java Chassis Edge Service
 url: /users/edge-in-1.0.0-m1/
+  - title: Using the Service Center and Governance Center to Manage 
the Spring Cloud Application
+url: /users/manage_springcloud_application_using_sc_and_gs/
 
   - title: Monitor
 children:
@@ -211,6 +213,8 @@ t:
 url: /cn/users/develop-with-jax-rs/
   - title: 用透明RPC开发微服务
 url: /cn/users/develop-with-transparent-rpc/
+  - title: 用Spring Boot Starter开发微服务
+url: /cn/users/develop-with-spring-boot-starter/
   - title: 服务接口约束
 url: /cn/users/service-interface-constraints/
   - title: 服务配置
@@ -237,8 +241,6 @@ t:
 children:
   - title: 本地开发与测试
 url: /cn/users/local-develop-test/
-  - title: 在Spring Boot中使用ServiceComb
-url: /cn/users/use-servicecomb-in-spring-boot/
   - title: 分布式调用链追踪
 url: /cn/users/distributed-tracing/
   - title: 自定义调用链打点
@@ -255,6 +257,8 @@ t:
 url: /cn/users/edging-service/zuul/
   - title: 使用内置Edge模块实现边缘服务
 url: /cn/users/edge-in-1.0.0-m1/
+  - title: 使用Service Center和治理中心管理Spring Cloud应用
+url: /cn/users/manage_springcloud_application_using_sc_and_gs/
 
   - title: 监控
 children:
diff --git a/_users/cn/develop-with-springboot-starter.md 
b/_users/cn/develop-with-springboot-starter.md
new file mode 100644
index 000..b4d33e1
--- /dev/null
+++ b/_users/cn/develop-with-springboot-starter.md
@@ -0,0 +1,147 @@
+---
+title: "用Spring Boot Starter开发微服务"
+lang: cn
+ref: develop-with-spring-boot-starter
+permalink: /cn/users/develop-with-spring-boot-starter/
+excerpt: "用Spring Boot

[incubator-servicecomb-website] branch asf-site updated: add service center m1 fix method (#69)

2018-04-24 Thread ningjiang 
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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 8abac13  add service center m1 fix method (#69)
8abac13 is described below

commit 8abac13bdb58abe9f7c2aabe1737cb90a314bb3f
Author: zhengyangyong 
AuthorDate: Tue Apr 24 17:26:45 2018 +0800

add service center m1 fix method (#69)

Signed-off-by: zhengyangyong 
---
 _users/cn/setup-environment.md | 4 
 _users/setup-environment.md| 4 
 2 files changed, 8 insertions(+)

diff --git a/_users/cn/setup-environment.md b/_users/cn/setup-environment.md
index 749f5a5..08f04ef 100644
--- a/_users/cn/setup-environment.md
+++ b/_users/cn/setup-environment.md
@@ -46,6 +46,10 @@ last_modified_at: 2018-04-13T10:01:43-04:00
```bash
bash 
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh
```
+   
+
注意：前端（frontend）在Linux环境下默认会绑定ipv6地址，导致浏览器报错，修复办法为：先修改conf/app.conf中的httpaddr为外部可达网卡ip，之后修改app/appList/apiList.js中`ip
 : 'http://127.0.0.1'`为对应ip，最后重启ServiceCenter即可。
+{: .notice--warning}
+  
 

 
diff --git a/_users/setup-environment.md b/_users/setup-environment.md
index fdc8316..fe3779c 100644
--- a/_users/setup-environment.md
+++ b/_users/setup-environment.md
@@ -46,6 +46,10 @@ There are two ways to start a stand-alone service center 
service:
```bash
bash 
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh
```
+   
+   NOTE：Frontend will bind ipv6 address under Linux, so browser may report 
error, fix method：Modify httpaddr in conf/app.conf with a reachable ip, then 
modify `ip : 'http://127.0.0.1'` in app/appList/apiList.js with same ip, final 
restart ServiceCenter.
+   {: .notice--warning}
+   
 



-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] branch master updated: add Q about @ApiOperation (#68)

2018-04-24 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 395674b  add Q about @ApiOperation (#68)
395674b is described below

commit 395674b8f9a8d2b63b4499922b5b9c0b68ba2834
Author: zhengyangyong 
AuthorDate: Tue Apr 24 17:27:16 2018 +0800

add Q about @ApiOperation (#68)

Signed-off-by: zhengyangyong 
---
 _faqs/cn/faq.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/_faqs/cn/faq.md b/_faqs/cn/faq.md
index 13062f6..43533c4 100755
--- a/_faqs/cn/faq.md
+++ b/_faqs/cn/faq.md
@@ -25,6 +25,10 @@ redirect_from:
(2) 所用到的HTTP请求方法一样时，如GET，则方法名不能重载。这是由于生成契约时方法名会作为其Operation ID，所以要保证其唯一性。
(3) 方法和类必须是public的。
 
+* **Q: 契约生成会报错Caused by: java.lang.Error: OperationId must be unique，不支持函数重载？**
+
+   A: 我们是支持函数重载的， 加上`@ApiOperation`标签即可，demo-pojo中有示例。每个接口必须有唯一的operation id。
+
 * **Q: 
使用*spring-boot-starter-provider*这个依赖时，在*application.yml*文件中声明的`spring.main.web-application`属性并没有生效？**
 
A: 
使用*starter-provider*这个依赖时，如果用到了servlet这种方式时，需要在*application.properties*这个文件引入`spring.main.web-application=true`这样的属性或者在*application.yml*文件中声明，但是此时需要新建一个*application.properties*的文件，其内容可以为空。

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-service-center] branch master updated: SCB-508 Cache does not match the etcd store (#332)

2018-04-24 Thread littlecui 
This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
 new 24eb859  SCB-508 Cache does not match the etcd store (#332)
24eb859 is described below

commit 24eb859334ff32da88306c695778a303b572e39a
Author: little-cui 
AuthorDate: Tue Apr 24 15:57:23 2018 +0800

SCB-508 Cache does not match the etcd store (#332)

* reuse timer

* SCB-508 Cache does not match the etcd store

* SCB-508 Cache does not match the etcd store

* SCB-508 Cache does not match the etcd store

* SCB-513 Optimize Event handle

* SCB-508 Set Cacher ready after sync cache

* SCB-508 Add cache size metric

* SCB-508 Add cache size metric

* SCB-508 Use standard testing output

* SCB-508 Optimize store
---
 integration/health-metrics-grafana.json| 117 -
 pkg/async/async_task_test.go   |  42 +-
 pkg/chain/chain_test.go|   2 +
 pkg/plugin/loader_test.go  |  28 +-
 pkg/util/concurrent_map_test.go|  30 +-
 pkg/util/goroutines_test.go|  10 +-
 pkg/util/log_test.go   |   8 +-
 pkg/util/net_test.go   |  16 +-
 pkg/util/reflect.go|  85 +++-
 pkg/util/reflect_test.go   |  38 +-
 pkg/util/tree_test.go  |   2 +-
 pkg/util/uniqueue_test.go  |  26 +-
 pkg/util/util_test.go  |   7 -
 server/broker/store.go |   4 +-
 .../core/backend/store/{cacher.go => cache_kv.go}  | 250 --
 .../core/backend/store/cache_null.go   |  85 ++--
 server/core/backend/store/cacher.go| 549 +
 server/core/backend/store/cacher_test.go   |  84 
 server/core/backend/store/common.go| 133 +
 server/core/backend/store/defer.go | 140 +-
 .../backend/store/{defer.go => defer_instance.go}  |  59 ++-
 server/core/backend/store/defer_test.go|  61 ++-
 server/core/backend/store/event.go |  14 +-
 server/core/backend/store/indexer.go   |  41 +-
 server/core/backend/store/listwatch.go |  48 +-
 .../handler.go => core/backend/store/metric.go}|  41 +-
 server/core/backend/store/opt.go   |   7 +-
 server/core/backend/store/store.go | 123 +
 server/core/proto/services.go  |   2 +
 server/plugin/infra/registry/etcd/etcd_test.go |   3 +-
 .../infra/tracing/buildin/file_collector_test.go   |   4 +-
 server/plugin/infra/tracing/buildin/span_test.go   |   9 +-
 server/rest/handler.go |   2 +-
 server/rest/metric.go  |   2 +-
 server/rest/server.go  |   1 +
 pkg/util/util_test.go => server/rest/server_mux.go |  47 +-
 server/service/event/dependency_event_handler.go   |   4 +-
 server/service/event/instance_event_handler.go |   7 +-
 server/service/event/rule_event_handler.go |   7 +-
 server/service/event/service_event_handler.go  |   7 +-
 server/service/event/tag_event_handler.go  |   7 +-
 server/service/util/dependency_test.go | 157 ++
 server/service/util/domain_util_test.go|  34 +-
 server/service/util/heartbeat_util_test.go |   7 +-
 server/service/util/instance_util_test.go  |  40 +-
 server/service/util/rule_util_test.go  |  94 ++--
 server/service/util/tag_util_test.go   |  10 +-
 server/service/util/util_suite_test.go |  15 +-
 48 files changed, 966 insertions(+), 1543 deletions(-)

diff --git a/integration/health-metrics-grafana.json 
b/integration/health-metrics-grafana.json
index aff03ab..55e5c69 100644
--- a/integration/health-metrics-grafana.json
+++ b/integration/health-metrics-grafana.json
@@ -1,18 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the