You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/12/07 08:56:31 UTC
[servicecomb-samples] branch master updated: upgrade to 2.1.3 and
add AK/SK example (#62)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 0cc1995 upgrade to 2.1.3 and add AK/SK example (#62)
0cc1995 is described below
commit 0cc1995b2cb43c767196c3777cbb0d4fd7aea5bf
Author: bao liu <bi...@qq.com>
AuthorDate: Mon Dec 7 16:56:20 2020 +0800
upgrade to 2.1.3 and add AK/SK example (#62)
upgrade to 2.1.3 and add AK/SK example
---
java-chassis-samples/apm-agent/pom.xml | 4 +--
.../auth-sample/auth-consumer/pom.xml | 2 +-
.../auth-sample/auth-provider/pom.xml | 2 +-
java-chassis-samples/auth-sample/pom.xml | 2 +-
java-chassis-samples/bmi/calculator/pom.xml | 2 +-
java-chassis-samples/bmi/pom.xml | 2 +-
java-chassis-samples/bmi/webapp/pom.xml | 2 +-
.../codefirst-sample/codefirst-consumer/pom.xml | 2 +-
.../codefirst-sample/codefirst-provider/pom.xml | 2 +-
java-chassis-samples/codefirst-sample/pom.xml | 2 +-
java-chassis-samples/common-schema/pom.xml | 2 +-
java-chassis-samples/config-apollo-sample/pom.xml | 2 +-
.../custom-handler-consumer/pom.xml | 2 +-
.../custom-handler-provider/pom.xml | 2 +-
java-chassis-samples/custom-handler-sample/pom.xml | 2 +-
.../jaxrs-sample/jaxrs-consumer/pom.xml | 35 ++++------------------
.../src/main/resources/microservice.yaml | 20 ++++++++++++-
.../jaxrs-sample/jaxrs-provider/pom.xml | 31 ++++---------------
.../src/main/resources/microservice.yaml | 20 ++++++++++++-
java-chassis-samples/jaxrs-sample/pom.xml | 2 +-
.../local-registry-client/pom.xml | 2 +-
.../local-registry-server/pom.xml | 2 +-
.../local-service-registry/pom.xml | 2 +-
.../metrics-extend-healthcheck/pom.xml | 2 +-
.../metrics-write-file/pom.xml | 2 +-
.../metrics-write-file-sample/pom.xml | 2 +-
.../pojo-sample/pojo-consumer/pom.xml | 30 ++++---------------
.../src/main/resources/microservice.yaml | 21 ++++++++++++-
.../pojo-sample/pojo-provider/pom.xml | 30 ++++---------------
.../src/main/resources/microservice.yaml | 21 ++++++++++++-
java-chassis-samples/pojo-sample/pom.xml | 2 +-
java-chassis-samples/pom.xml | 2 +-
java-chassis-samples/springmvc-sample/pom.xml | 2 +-
.../springmvc-sample/springmvc-consumer/pom.xml | 30 ++-----------------
.../src/main/resources/microservice.yaml | 21 ++++++++++++-
.../springmvc-sample/springmvc-provider/pom.xml | 26 ++--------------
.../src/main/resources/microservice.yaml | 21 ++++++++++++-
java-chassis-samples/trust-sample/customer/pom.xml | 2 +-
java-chassis-samples/trust-sample/hacker/pom.xml | 2 +-
java-chassis-samples/trust-sample/pom.xml | 2 +-
java-chassis-samples/trust-sample/store/pom.xml | 2 +-
java-chassis-samples/use-log4j2-sample/pom.xml | 2 +-
42 files changed, 177 insertions(+), 191 deletions(-)
diff --git a/java-chassis-samples/apm-agent/pom.xml b/java-chassis-samples/apm-agent/pom.xml
index 225a8c8..e8171d3 100644
--- a/java-chassis-samples/apm-agent/pom.xml
+++ b/java-chassis-samples/apm-agent/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>apm-agent</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
<name>Java Chassis::Samples::apm-agent</name>
<properties>
diff --git a/java-chassis-samples/auth-sample/auth-consumer/pom.xml b/java-chassis-samples/auth-sample/auth-consumer/pom.xml
index b10cf4c..b5aaf0c 100644
--- a/java-chassis-samples/auth-sample/auth-consumer/pom.xml
+++ b/java-chassis-samples/auth-sample/auth-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>auth-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>auth-consumer</artifactId>
<name>Java Chassis::Samples::Auth::Consumer</name>
diff --git a/java-chassis-samples/auth-sample/auth-provider/pom.xml b/java-chassis-samples/auth-sample/auth-provider/pom.xml
index 55187e1..6869a41 100644
--- a/java-chassis-samples/auth-sample/auth-provider/pom.xml
+++ b/java-chassis-samples/auth-sample/auth-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>auth-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>auth-provider</artifactId>
<dependencies>
diff --git a/java-chassis-samples/auth-sample/pom.xml b/java-chassis-samples/auth-sample/pom.xml
index f42fda4..d8c6007 100644
--- a/java-chassis-samples/auth-sample/pom.xml
+++ b/java-chassis-samples/auth-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>auth-sample</artifactId>
<name>Java Chassis::Samples::Auth</name>
diff --git a/java-chassis-samples/bmi/calculator/pom.xml b/java-chassis-samples/bmi/calculator/pom.xml
index 0bfbca4..0019a30 100644
--- a/java-chassis-samples/bmi/calculator/pom.xml
+++ b/java-chassis-samples/bmi/calculator/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>bmi</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/bmi/pom.xml b/java-chassis-samples/bmi/pom.xml
index ef56e8e..beadb92 100644
--- a/java-chassis-samples/bmi/pom.xml
+++ b/java-chassis-samples/bmi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>bmi</artifactId>
diff --git a/java-chassis-samples/bmi/webapp/pom.xml b/java-chassis-samples/bmi/webapp/pom.xml
index 90305e0..b271967 100644
--- a/java-chassis-samples/bmi/webapp/pom.xml
+++ b/java-chassis-samples/bmi/webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>bmi</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml b/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
index 69b2d00..0a2152c 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
+++ b/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>codefirst-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>codefirst-consumer</artifactId>
<name>Java Chassis::Samples::CodeFirst::Consumer</name>
diff --git a/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml b/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
index c360524..9a22537 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
+++ b/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>codefirst-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>codefirst-provider</artifactId>
<name>Java Chassis::Samples::CodeFirst::Provider</name>
diff --git a/java-chassis-samples/codefirst-sample/pom.xml b/java-chassis-samples/codefirst-sample/pom.xml
index 8d78332..d453796 100644
--- a/java-chassis-samples/codefirst-sample/pom.xml
+++ b/java-chassis-samples/codefirst-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>codefirst-sample</artifactId>
<name>Java Chassis::Samples::CodeFirst</name>
diff --git a/java-chassis-samples/common-schema/pom.xml b/java-chassis-samples/common-schema/pom.xml
index 10a2a01..ffc57e2 100644
--- a/java-chassis-samples/common-schema/pom.xml
+++ b/java-chassis-samples/common-schema/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>common-schema</artifactId>
<name>Java Chassis::Samples::Common Schema</name>
diff --git a/java-chassis-samples/config-apollo-sample/pom.xml b/java-chassis-samples/config-apollo-sample/pom.xml
index b83e9de..91765d7 100644
--- a/java-chassis-samples/config-apollo-sample/pom.xml
+++ b/java-chassis-samples/config-apollo-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml b/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
index 99b6c6a..f663592 100644
--- a/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>custom-handler-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>custom-handler-consumer</artifactId>
<name>Java Chassis::Samples::Custom Handler::Consumer</name>
diff --git a/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml b/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
index 207c9ad..735efce 100644
--- a/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>custom-handler-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>custom-handler-provider</artifactId>
<name>Java Chassis::Samples::Custom Handler::Provider</name>
diff --git a/java-chassis-samples/custom-handler-sample/pom.xml b/java-chassis-samples/custom-handler-sample/pom.xml
index e789e62..d1654a5 100644
--- a/java-chassis-samples/custom-handler-sample/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>custom-handler-sample</artifactId>
<name>Java Chassis::Samples::Custom Handler</name>
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
index 0374087..9b99777 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
@@ -21,50 +21,27 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>jaxrs-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>jaxrs-consumer</artifactId>
<name>Java Chassis::Samples::JAXRS::Consumer</name>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-bizkeeper</artifactId>
+ <artifactId>solution-basic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-loadbalance</artifactId>
+ <artifactId>servicestage</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-vertx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-flowcontrol-qps</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-pojo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-springmvc</artifactId>
+ <groupId>org.apache.servicecomb.samples</groupId>
+ <artifactId>common-schema</artifactId>
</dependency>
+ <!--log4j2-->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.samples</groupId>
- <artifactId>common-schema</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
index b978f05..e5f9622 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
@@ -22,7 +22,17 @@ servicecomb:
version: 0.0.1
registry:
- address: http://127.0.0.1:30100
+ # Default using local service center
+ address: http://localhost:30100
+ # address: https://cse.cn-south-1.myhuaweicloud.com
+ instance:
+ watch: false
+ config:
+ client:
+ # Default using local config center
+ # serverUri: https://cse.cn-south-1.myhuaweicloud.com
+ serverUri: http://localhost:30113
+ refreshMode: 1
handler:
chain:
Consumer:
@@ -33,3 +43,11 @@ servicecomb:
references:
jaxrs:
version-rule: 0.0.1
+
+# Using Huawei Cloud Service Engine Professional Edition, AK/SK is required
+# credentials:
+# akskEnabled: true
+# accessKey: add your ak/sk from huaweicloud
+# secretKey: add your ak/sk from huaweicloud
+# akskCustomCipher: default
+# project: cn-south-1
\ No newline at end of file
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml b/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
index f640ab8..7106bd5 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
@@ -21,46 +21,27 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>jaxrs-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>jaxrs-provider</artifactId>
<name>Java Chassis::Samples::JAXRS::Provider</name>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-bizkeeper</artifactId>
+ <artifactId>solution-basic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-loadbalance</artifactId>
+ <artifactId>servicestage</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-flowcontrol-qps</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-vertx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-jaxrs</artifactId>
+ <groupId>org.apache.servicecomb.samples</groupId>
+ <artifactId>common-schema</artifactId>
</dependency>
+ <!--log4j2-->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.samples</groupId>
- <artifactId>common-schema</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml b/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
index d44325c..2897c5e 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
@@ -21,7 +21,25 @@ servicecomb:
name: jaxrs
version: 0.0.1
registry:
- address: http://127.0.0.1:30100
+ # Default using local service center
+ address: http://localhost:30100
+ # address: https://cse.cn-south-1.myhuaweicloud.com
+ instance:
+ watch: false
+ config:
+ client:
+ # Default using local config center
+ # serverUri: https://cse.cn-south-1.myhuaweicloud.com
+ serverUri: http://localhost:30113
+ refreshMode: 1
+
rest:
address: 0.0.0.0:8080
+# Using Huawei Cloud Service Engine Professional Edition, AK/SK is required
+# credentials:
+# akskEnabled: true
+# accessKey: add your ak/sk from huaweicloud
+# secretKey: add your ak/sk from huaweicloud
+# akskCustomCipher: default
+# project: cn-south-1
diff --git a/java-chassis-samples/jaxrs-sample/pom.xml b/java-chassis-samples/jaxrs-sample/pom.xml
index c4e8be5..0955661 100644
--- a/java-chassis-samples/jaxrs-sample/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>jaxrs-sample</artifactId>
<name>Java Chassis::Samples::JAXRS</name>
diff --git a/java-chassis-samples/local-service-registry/local-registry-client/pom.xml b/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
index 9e100fd..b1d1248 100644
--- a/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
+++ b/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>local-service-registry</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>local-registry-client</artifactId>
<name>Java Chassis::Demo::LocalServiceRegistry::Client</name>
diff --git a/java-chassis-samples/local-service-registry/local-registry-server/pom.xml b/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
index 6163b50..30b84b4 100644
--- a/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
+++ b/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>local-service-registry</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>local-registry-server</artifactId>
<name>Java Chassis::Demo::LocalRegistry::Server</name>
diff --git a/java-chassis-samples/local-service-registry/pom.xml b/java-chassis-samples/local-service-registry/pom.xml
index ba18fea..e4462de 100644
--- a/java-chassis-samples/local-service-registry/pom.xml
+++ b/java-chassis-samples/local-service-registry/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>local-service-registry</artifactId>
<name>Java Chassis::Demo::Local service registry</name>
diff --git a/java-chassis-samples/metrics-extend-healthcheck/pom.xml b/java-chassis-samples/metrics-extend-healthcheck/pom.xml
index 7148b1e..4f3b0e5 100644
--- a/java-chassis-samples/metrics-extend-healthcheck/pom.xml
+++ b/java-chassis-samples/metrics-extend-healthcheck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml b/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
index d4c9e0f..3ab1cec 100644
--- a/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
+++ b/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>metrics-write-file-sample</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/metrics-write-file-sample/pom.xml b/java-chassis-samples/metrics-write-file-sample/pom.xml
index cc98acf..0c81667 100644
--- a/java-chassis-samples/metrics-write-file-sample/pom.xml
+++ b/java-chassis-samples/metrics-write-file-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml b/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
index ff77ebb..64208c4 100644
--- a/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
+++ b/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
@@ -21,46 +21,26 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>pojo-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>pojo-consumer</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-bizkeeper</artifactId>
+ <artifactId>solution-basic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-loadbalance</artifactId>
+ <artifactId>servicestage</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-vertx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-flowcontrol-qps</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-pojo</artifactId>
+ <groupId>org.apache.servicecomb.samples</groupId>
+ <artifactId>common-schema</artifactId>
</dependency>
<!--log4j2-->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.samples</groupId>
- <artifactId>common-schema</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/java-chassis-samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml b/java-chassis-samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
index 7978f20..71d803c 100644
--- a/java-chassis-samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
@@ -22,7 +22,18 @@ servicecomb:
version: 0.0.1
registry:
- address: http://127.0.0.1:30100
+ # Default using local service center
+ address: http://localhost:30100
+ # address: https://cse.cn-south-1.myhuaweicloud.com
+ instance:
+ watch: false
+ config:
+ client:
+ # Default using local config center
+ # serverUri: https://cse.cn-south-1.myhuaweicloud.com
+ serverUri: http://localhost:30113
+ refreshMode: 1
+
handler:
chain:
Consumer:
@@ -33,3 +44,11 @@ servicecomb:
references:
hello:
version-rule: 0.0.1
+
+# Using Huawei Cloud Service Engine Professional Edition, AK/SK is required
+# credentials:
+# akskEnabled: true
+# accessKey: add your ak/sk from huaweicloud
+# secretKey: add your ak/sk from huaweicloud
+# akskCustomCipher: default
+# project: cn-south-1
\ No newline at end of file
diff --git a/java-chassis-samples/pojo-sample/pojo-provider/pom.xml b/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
index 2b18bdc..8abca49 100644
--- a/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
+++ b/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
@@ -21,46 +21,26 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>pojo-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>pojo-provider</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-bizkeeper</artifactId>
+ <artifactId>solution-basic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-loadbalance</artifactId>
+ <artifactId>servicestage</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-vertx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-flowcontrol-qps</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-pojo</artifactId>
+ <groupId>org.apache.servicecomb.samples</groupId>
+ <artifactId>common-schema</artifactId>
</dependency>
<!--log4j2-->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.samples</groupId>
- <artifactId>common-schema</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml b/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
index df4ad23..68f6894 100644
--- a/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
@@ -22,7 +22,26 @@ servicecomb:
version: 0.0.1
registry:
- address: http://127.0.0.1:30100
+ # Default using local service center
+ address: http://localhost:30100
+ # address: https://cse.cn-south-1.myhuaweicloud.com
+ instance:
+ watch: false
+ config:
+ client:
+ # Default using local config center
+ # serverUri: https://cse.cn-south-1.myhuaweicloud.com
+ serverUri: http://localhost:30113
+ refreshMode: 1
+
rest:
address: 0.0.0.0:8080
+# Using Huawei Cloud Service Engine Professional Edition, AK/SK is required
+# credentials:
+# akskEnabled: true
+# accessKey: add your ak/sk from huaweicloud
+# secretKey: add your ak/sk from huaweicloud
+# akskCustomCipher: default
+# project: cn-south-1
+
diff --git a/java-chassis-samples/pojo-sample/pom.xml b/java-chassis-samples/pojo-sample/pom.xml
index afae2a1..fa6f731 100644
--- a/java-chassis-samples/pojo-sample/pom.xml
+++ b/java-chassis-samples/pojo-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>pojo-sample</artifactId>
<packaging>pom</packaging>
diff --git a/java-chassis-samples/pom.xml b/java-chassis-samples/pom.xml
index bc7f92e..79ced0c 100644
--- a/java-chassis-samples/pom.xml
+++ b/java-chassis-samples/pom.xml
@@ -24,7 +24,7 @@
<artifactId>samples</artifactId>
<name>Java Chassis::Samples</name>
<packaging>pom</packaging>
- <version>2.1.2</version>
+ <version>2.1.3</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/java-chassis-samples/springmvc-sample/pom.xml b/java-chassis-samples/springmvc-sample/pom.xml
index 2e852cb..098df04 100644
--- a/java-chassis-samples/springmvc-sample/pom.xml
+++ b/java-chassis-samples/springmvc-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>springmvc-sample</artifactId>
<packaging>pom</packaging>
diff --git a/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml b/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
index d14863f..fd2490b 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
+++ b/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
@@ -21,33 +21,17 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>springmvc-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>springmvc-consumer</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-bizkeeper</artifactId>
+ <artifactId>solution-basic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-loadbalance</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-vertx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-flowcontrol-qps</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-springmvc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-pojo</artifactId>
+ <artifactId>servicestage</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.samples</groupId>
@@ -58,13 +42,5 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml b/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
index d1d24c5..4b2cfe2 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
@@ -22,7 +22,18 @@ servicecomb:
version: 0.0.1
registry:
- address: http://127.0.0.1:30100
+ # Default using local service center
+ address: http://localhost:30100
+ # address: https://cse.cn-south-1.myhuaweicloud.com
+ instance:
+ watch: false
+ config:
+ client:
+ # Default using local config center
+ # serverUri: https://cse.cn-south-1.myhuaweicloud.com
+ serverUri: http://localhost:30113
+ refreshMode: 1
+
handler:
chain:
Consumer:
@@ -30,3 +41,11 @@ servicecomb:
isolation:
Consumer:
enabled: false
+
+# Using Huawei Cloud Service Engine Professional Edition, AK/SK is required
+# credentials:
+# akskEnabled: true
+# accessKey: add your ak/sk from huaweicloud
+# secretKey: add your ak/sk from huaweicloud
+# akskCustomCipher: default
+# project: cn-south-1
\ No newline at end of file
diff --git a/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml b/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
index 3b31a13..3beb85a 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
+++ b/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
@@ -21,29 +21,17 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>springmvc-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>springmvc-provider</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-bizkeeper</artifactId>
+ <artifactId>solution-basic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-loadbalance</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-vertx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-flowcontrol-qps</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-springmvc</artifactId>
+ <artifactId>servicestage</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.samples</groupId>
@@ -54,13 +42,5 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml b/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
index e618b9b..087daea 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
@@ -22,10 +22,29 @@ servicecomb:
version: 0.0.1
registry:
- address: http://127.0.0.1:30100
+ # Default using local service center
+ address: http://localhost:30100
+ # address: https://cse.cn-south-1.myhuaweicloud.com
+ instance:
+ watch: false
+ config:
+ client:
+ # Default using local config center
+ # serverUri: https://cse.cn-south-1.myhuaweicloud.com
+ serverUri: http://localhost:30113
+ refreshMode: 1
+
rest:
address: 0.0.0.0:8080
handler:
chain:
Provider:
default: bizkeeper-provider
+
+# Using Huawei Cloud Service Engine Professional Edition, AK/SK is required
+# credentials:
+# akskEnabled: true
+# accessKey: add your ak/sk from huaweicloud
+# secretKey: add your ak/sk from huaweicloud
+# akskCustomCipher: default
+# project: cn-south-1
\ No newline at end of file
diff --git a/java-chassis-samples/trust-sample/customer/pom.xml b/java-chassis-samples/trust-sample/customer/pom.xml
index 5d9a638..918397f 100644
--- a/java-chassis-samples/trust-sample/customer/pom.xml
+++ b/java-chassis-samples/trust-sample/customer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>customer</artifactId>
<dependencies>
diff --git a/java-chassis-samples/trust-sample/hacker/pom.xml b/java-chassis-samples/trust-sample/hacker/pom.xml
index 788d91e..a14e08d 100644
--- a/java-chassis-samples/trust-sample/hacker/pom.xml
+++ b/java-chassis-samples/trust-sample/hacker/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>hacker</artifactId>
<dependencies>
diff --git a/java-chassis-samples/trust-sample/pom.xml b/java-chassis-samples/trust-sample/pom.xml
index 2c88ac8..afdf8e5 100644
--- a/java-chassis-samples/trust-sample/pom.xml
+++ b/java-chassis-samples/trust-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>trust-sample</artifactId>
<packaging>pom</packaging>
diff --git a/java-chassis-samples/trust-sample/store/pom.xml b/java-chassis-samples/trust-sample/store/pom.xml
index c6fe384..27d9250 100644
--- a/java-chassis-samples/trust-sample/store/pom.xml
+++ b/java-chassis-samples/trust-sample/store/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<artifactId>store</artifactId>
<dependencies>
diff --git a/java-chassis-samples/use-log4j2-sample/pom.xml b/java-chassis-samples/use-log4j2-sample/pom.xml
index 313179f..7018b7a 100644
--- a/java-chassis-samples/use-log4j2-sample/pom.xml
+++ b/java-chassis-samples/use-log4j2-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.1.2</version>
+ <version>2.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>