You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by jb...@apache.org on 2017/12/12 07:05:22 UTC
[04/51] incubator-servicecomb-website git commit: updated statements
in quick start
updated statements in quick start
Signed-off-by: eric-lee-ltk <li...@huawei.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/commit/26bbf68b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/tree/26bbf68b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/diff/26bbf68b
Branch: refs/heads/asf-site
Commit: 26bbf68b6774fec12e7c1e81a52b94c8d92029e1
Parents: 35dcfff
Author: eric-lee-ltk <li...@huawei.com>
Authored: Mon Oct 23 12:54:07 2017 +0800
Committer: Willem Jiang <ji...@huawei.com>
Committed: Mon Oct 23 21:43:28 2017 -0500
----------------------------------------------------------------------
_docs/cn/distributed-tracing.md | 8 ++------
_docs/cn/flow-control.md | 2 +-
_docs/cn/load-balance.md | 15 +--------------
_docs/cn/quick-start-bmi.md | 15 ++++++++++++---
_docs/cn/service-management.md | 2 +-
_docs/distributed-tracing.md | 8 ++------
_docs/flow-control.md | 2 +-
_docs/load-balance.md | 16 +---------------
_docs/quick-start-bmi.md | 15 ++++++++++++---
_docs/service-management.md | 2 +-
10 files changed, 34 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/cn/distributed-tracing.md
----------------------------------------------------------------------
diff --git a/_docs/cn/distributed-tracing.md b/_docs/cn/distributed-tracing.md
index 4badbad..c9db557 100644
--- a/_docs/cn/distributed-tracing.md
+++ b/_docs/cn/distributed-tracing.md
@@ -40,10 +40,6 @@ last_modified_at: 2017-09-03T10:01:43-04:00
```xml
<dependency>
<groupId>io.servicecomb</groupId>
- <artifactId>handler-tracing-zipkin</artifactId>
- </dependency>
- <dependency>
- <groupId>io.servicecomb</groupId>
<artifactId>spring-cloud-zuul-zipkin</artifactId>
</dependency>
```
@@ -59,13 +55,13 @@ last_modified_at: 2017-09-03T10:01:43-04:00
2. 重启 *体质指数计算器* 微服务：
```bash
- mvn spring-boot:run -Ptracing -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=tracing-provider"
+ mvn spring-boot:run -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=tracing-provider"
```
3. 重启 *体质指数界面* 微服务：
```bash
- mvn spring-boot:run -Ptracing
+ mvn spring-boot:run -Drun.jvmArguments="-Dservicecomb.tracing.enabled=true"
```
## 验证
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/cn/flow-control.md
----------------------------------------------------------------------
diff --git a/_docs/cn/flow-control.md b/_docs/cn/flow-control.md
index f06756f..f44d7de 100644
--- a/_docs/cn/flow-control.md
+++ b/_docs/cn/flow-control.md
@@ -43,7 +43,7 @@ last_modified_at: 2017-09-03T10:01:43-04:00
体质指数应用中已配置好了上述配置项，您只需关闭之前运行的 **体质指数计算器**，然后再用以下指令重新运行即可：
```bash
-mvn spring-boot:run -Pflowcontrol -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=qps-flowcontrol-provider -Dcse.flowcontrol.Provider.qps.limit.gateway=1"
+mvn spring-boot:run -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=qps-flowcontrol-provider -Dcse.flowcontrol.Provider.qps.limit.gateway=1"
```
## 验证
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/cn/load-balance.md
----------------------------------------------------------------------
diff --git a/_docs/cn/load-balance.md b/_docs/cn/load-balance.md
index 4d8800a..465a82f 100644
--- a/_docs/cn/load-balance.md
+++ b/_docs/cn/load-balance.md
@@ -16,20 +16,7 @@ last_modified_at: 2017-09-03T10:01:43-04:00
## 开启
-1. 在 *体质指数界面* 的 `pom.xml` 文件中添加依赖项：
-
- ```xml
- <dependency>
- <groupId>io.servicecomb</groupId>
- <artifactId>handler-loadbalance</artifactId>
- </dependency>
- ```
-
-体质指数应用中已配置好了上述配置项，您只需通过以下指令重启体质指数界面微服务即可：
-
-```bash
-mvn spring-boot:run -Ploadbalance
-```
+默认情况下会使用内置的一个简单的负载均衡的实现，不需要额外的配置。
## 验证
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/cn/quick-start-bmi.md
----------------------------------------------------------------------
diff --git a/_docs/cn/quick-start-bmi.md b/_docs/cn/quick-start-bmi.md
index af13500..229dcac 100644
--- a/_docs/cn/quick-start-bmi.md
+++ b/_docs/cn/quick-start-bmi.md
@@ -39,6 +39,9 @@ public interface CalculatorService {
public class CalculatorServiceImpl implements CalculatorService {
@Override
public double calculate(double height, double weight) {
+ if (height <= 0 || weight <= 0) {
+ throw new IllegalArgumentException("Arguments must be above 0");
+ }
double heightInMeter = height / 100;
return weight / (heightInMeter * heightInMeter);
}
@@ -63,7 +66,6 @@ public interface CalculatorEndpoint {
```java
@RestSchema(schemaId = "calculatorRestEndpoint")
@RequestMapping("/")
-@Controller
public class CalculatorRestEndpoint implements CalculatorEndpoint {
private final CalculatorService calculatorService;
@@ -74,8 +76,7 @@ public class CalculatorRestEndpoint implements CalculatorEndpoint {
}
@Override
- @RequestMapping(value = "/bmi", method = RequestMethod.GET)
- @ResponseBody
+ @GetMapping("/bmi")
public double calculate(double height, double weight) {
return calculatorService.calculate(height, weight);
}
@@ -128,6 +129,14 @@ public class CalculatorApplication {
<groupId>io.servicecomb</groupId>
<artifactId>spring-boot-starter-discovery</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>spring-boot-starter-servicecomb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>spring-cloud-zuul</artifactId>
+ </dependency>
```
在 `application.yaml` 文件中配置路由规则及服务端口信息：
```yaml
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/cn/service-management.md
----------------------------------------------------------------------
diff --git a/_docs/cn/service-management.md b/_docs/cn/service-management.md
index c7223a5..2a198b1 100644
--- a/_docs/cn/service-management.md
+++ b/_docs/cn/service-management.md
@@ -45,7 +45,7 @@ last_modified_at: 2017-09-03T10:01:43-04:00
体质指数应用中已配置好了上述配置项，您只需重新运行 **体质指数计算器**：
```bash
-mvn spring-boot:run -Pbizkeeper -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=bizkeeper-provider -Dcse.circuitBreaker.Provider.calculator.requestVolumeThreshold=3 -Dcse.fallbackpolicy.Provider.policy=returnnull"
+mvn spring-boot:run -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=bizkeeper-provider -Dcse.circuitBreaker.Provider.calculator.requestVolumeThreshold=3 -Dcse.fallbackpolicy.Provider.policy=returnnull"
```
## 验证
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/distributed-tracing.md
----------------------------------------------------------------------
diff --git a/_docs/distributed-tracing.md b/_docs/distributed-tracing.md
index 1bae478..3efe333 100644
--- a/_docs/distributed-tracing.md
+++ b/_docs/distributed-tracing.md
@@ -40,10 +40,6 @@ Walk through [Develop microservice application in minutes](/docs/quick-start-bmi
```xml
<dependency>
<groupId>io.servicecomb</groupId>
- <artifactId>handler-tracing-zipkin</artifactId>
- </dependency>
- <dependency>
- <groupId>io.servicecomb</groupId>
<artifactId>spring-cloud-zuul-zipkin</artifactId>
</dependency>
```
@@ -59,13 +55,13 @@ The above configurations have already set up in the code. All you need to do is
2. Restart *BMI calculator service* with the following command:
```bash
- mvn spring-boot:run -Ptracing -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=tracing-provider"
+ mvn spring-boot:run -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=tracing-provider"
```
3. Restart *BMI web service* with the following command:
```bash
- mvn spring-boot:run -Ptracing
+ mvn spring-boot:run -Drun.jvmArguments="-Dservicecomb.tracing.enabled=true"
```
## Verification
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/flow-control.md
----------------------------------------------------------------------
diff --git a/_docs/flow-control.md b/_docs/flow-control.md
index 9749539..61f472c 100644
--- a/_docs/flow-control.md
+++ b/_docs/flow-control.md
@@ -43,7 +43,7 @@ Walk through [Develop microservice application in minutes](/docs/quick-start-bmi
The above configurations have already set up in the code. All you need to do is to stop all **BMI calculator services** and then start a new one with the following command:
```bash
-mvn spring-boot:run -Pflowcontrol -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=qps-flowcontrol-provider -Dcse.flowcontrol.Provider.qps.limit.gateway=1"
+mvn spring-boot:run -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=qps-flowcontrol-provider -Dcse.flowcontrol.Provider.qps.limit.gateway=1"
```
## Verification
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/load-balance.md
----------------------------------------------------------------------
diff --git a/_docs/load-balance.md b/_docs/load-balance.md
index 5c10361..57f282c 100644
--- a/_docs/load-balance.md
+++ b/_docs/load-balance.md
@@ -16,21 +16,7 @@ Walk through [Develop microservice application in minutes](/docs/quick-start-bmi
## Enable
-1. Add load balance dependency in `pom.xml` of *BMI web service*:
-
- ```xml
- <dependency>
- <groupId>io.servicecomb</groupId>
- <artifactId>handler-loadbalance</artifactId>
- </dependency>
- ```
-
-
-The above configurations have already set up in the code. All you need to do is restart the **BMI web services** with the following command:
-
-```bash
-mvn spring-boot:run -Ploadbalance
-```
+The simple embedded load balancer will be used by default. No extra configurations needed.
## Verification
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/quick-start-bmi.md
----------------------------------------------------------------------
diff --git a/_docs/quick-start-bmi.md b/_docs/quick-start-bmi.md
index e556171..ac356ee 100644
--- a/_docs/quick-start-bmi.md
+++ b/_docs/quick-start-bmi.md
@@ -40,6 +40,9 @@ public interface CalculatorService {
public class CalculatorServiceImpl implements CalculatorService {
@Override
public double calculate(double height, double weight) {
+ if (height <= 0 || weight <= 0) {
+ throw new IllegalArgumentException("Arguments must be above 0");
+ }
double heightInMeter = height / 100;
return weight / (heightInMeter * heightInMeter);
}
@@ -64,7 +67,6 @@ Expose calculator service's restful endpoint:
```java
@RestSchema(schemaId = "calculatorRestEndpoint")
@RequestMapping("/")
-@Controller
public class CalculatorRestEndpoint implements CalculatorEndpoint {
private final CalculatorService calculatorService;
@@ -75,8 +77,7 @@ public class CalculatorRestEndpoint implements CalculatorEndpoint {
}
@Override
- @RequestMapping(value = "/bmi", method = RequestMethod.GET)
- @ResponseBody
+ @GetMapping("/bmi")
public double calculate(double height, double weight) {
return calculatorService.calculate(height, weight);
}
@@ -128,6 +129,14 @@ Introduce ServiceComb dependency:
<groupId>io.servicecomb</groupId>
<artifactId>spring-boot-starter-discovery</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>spring-boot-starter-servicecomb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>spring-cloud-zuul</artifactId>
+ </dependency>
```
Configure routing rules and service endpoint in `application.yaml`.
```yaml
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/26bbf68b/_docs/service-management.md
----------------------------------------------------------------------
diff --git a/_docs/service-management.md b/_docs/service-management.md
index ea2340b..5a8930a 100644
--- a/_docs/service-management.md
+++ b/_docs/service-management.md
@@ -45,7 +45,7 @@ Walk through [Develop microservice application in minutes](/docs/quick-start-bmi
The above configurations have already set up in the code. All you need to do is to restart the *BMI calculator services* with the following command:
```bash
-mvn spring-boot:run -Pbizkeeper -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=bizkeeper-provider -Dcse.circuitBreaker.Provider.calculator.requestVolumeThreshold=3 -Dcse.fallbackpolicy.Provider.policy=returnnull"
+mvn spring-boot:run -Drun.jvmArguments="-Dcse.handler.chain.Provider.default=bizkeeper-provider -Dcse.circuitBreaker.Provider.calculator.requestVolumeThreshold=3 -Dcse.fallbackpolicy.Provider.policy=returnnull"
```
## Verification