From 649eda2a2106e2a47326985d7aa1300434e51c1c Mon Sep 17 00:00:00 2001 From: lbc97 <82015813+lbc97@users.noreply.github.com> Date: Fri, 10 Dec 2021 17:40:10 +0800 Subject: [PATCH] upgrate to latests version and add readme info (#87) --- README.md | 9 +++++++++ ServiceComb-SpringMVC/README.md | 5 +++-- ServiceComb-SpringMVC/pom.xml | 2 +- .../src/main/resources/microservice.yaml | 7 ++----- basic/README.md | 6 ++++++ basic/consumer/src/main/resources/application.yml | 8 ++------ basic/gateway/src/main/resources/application.yml | 8 ++------ basic/pom.xml | 2 +- basic/provider/src/main/resources/application.yml | 8 ++------ java-chassis-deployment-samples/README.md | 7 +++++-- .../spring-boot-external-tomcat/README.md | 5 ++++- .../spring-boot-external-tomcat/pom.xml | 2 +- .../war-external-tomcat/pom.xml | 2 +- java-chassis-perfermance/README.md | 8 ++++++-- java-chassis-perfermance/pom.xml | 2 +- java-chassis-samples/README.md | 5 ++++- java-chassis-samples/apm-agent/pom.xml | 2 +- java-chassis-samples/auth-sample/README.md | 3 +++ java-chassis-samples/auth-sample/auth-consumer/pom.xml | 2 +- java-chassis-samples/auth-sample/auth-provider/pom.xml | 2 +- java-chassis-samples/auth-sample/pom.xml | 2 +- java-chassis-samples/bmi/README.md | 3 +++ java-chassis-samples/bmi/calculator/pom.xml | 2 +- java-chassis-samples/bmi/pom.xml | 2 +- java-chassis-samples/bmi/webapp/pom.xml | 2 +- java-chassis-samples/codefirst-sample/README.md | 5 ++++- .../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/README.md | 3 +++ java-chassis-samples/config-apollo-sample/pom.xml | 2 +- java-chassis-samples/custom-handler-sample/README.md | 5 +++++ .../custom-handler-consumer/pom.xml | 2 +- .../custom-handler-provider/pom.xml | 2 +- java-chassis-samples/custom-handler-sample/pom.xml | 2 +- java-chassis-samples/jaxrs-sample/README.md | 6 +++++- .../jaxrs-sample/jaxrs-consumer/pom.xml | 2 +- .../src/main/resources/microservice.yaml | 9 +++------ .../jaxrs-sample/jaxrs-provider/pom.xml | 2 +- .../src/main/resources/microservice.yaml | 8 ++------ java-chassis-samples/jaxrs-sample/pom.xml | 2 +- java-chassis-samples/local-service-registry/README.md | 4 ++++ .../local-registry-client/pom.xml | 2 +- .../local-registry-server/pom.xml | 2 +- java-chassis-samples/local-service-registry/pom.xml | 2 +- .../metrics-extend-healthcheck/README.md | 6 +++++- .../metrics-extend-healthcheck/pom.xml | 2 +- .../metrics-write-file-sample/README.md | 5 ++++- .../metrics-write-file/pom.xml | 2 +- java-chassis-samples/metrics-write-file-sample/pom.xml | 2 +- java-chassis-samples/pojo-sample/README.md | 5 ++++- java-chassis-samples/pojo-sample/pojo-consumer/pom.xml | 2 +- .../pojo-consumer/src/main/resources/microservice.yaml | 8 ++------ java-chassis-samples/pojo-sample/pojo-provider/pom.xml | 2 +- .../pojo-provider/src/main/resources/microservice.yaml | 8 ++------ java-chassis-samples/pojo-sample/pom.xml | 2 +- java-chassis-samples/pom.xml | 2 +- java-chassis-samples/springmvc-sample/README.md | 5 ++++- java-chassis-samples/springmvc-sample/pom.xml | 2 +- .../springmvc-sample/springmvc-consumer/pom.xml | 2 +- .../src/main/resources/microservice.yaml | 8 ++------ .../springmvc-sample/springmvc-provider/pom.xml | 2 +- .../src/main/resources/microservice.yaml | 8 ++------ java-chassis-samples/trust-sample/README.md | 6 +++++- 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 +- porter_lightweight/README.md | 7 +++++++ porter_lightweight/api/common/endpoint/pom.xml | 2 +- porter_lightweight/api/common/pom.xml | 2 +- porter_lightweight/api/common/service/pom.xml | 2 +- porter_lightweight/api/file-service/endpoint/pom.xml | 2 +- porter_lightweight/api/file-service/pom.xml | 2 +- porter_lightweight/api/file-service/service/pom.xml | 2 +- porter_lightweight/api/pom.xml | 2 +- porter_lightweight/api/user-service/endpoint/pom.xml | 2 +- porter_lightweight/api/user-service/pom.xml | 2 +- porter_lightweight/api/user-service/service/pom.xml | 2 +- porter_lightweight/file-service/pom.xml | 2 +- porter_lightweight/gateway-service/pom.xml | 2 +- porter_lightweight/pom.xml | 2 +- porter_lightweight/user-service/pom.xml | 2 +- porter_springboot/README.md | 10 +++++++++- .../file-service/src/main/resources/application.yml | 8 ++------ .../gateway-service/src/main/resources/application.yml | 8 ++------ porter_springboot/pom.xml | 2 +- .../user-service/src/main/resources/application.yml | 8 ++------ .../website/src/main/resources/application.yml | 8 ++------ 91 files changed, 187 insertions(+), 155 deletions(-) diff --git a/README.md b/README.md index 0ca62620..6ae91933 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,10 @@ A sample shows an application with basic login, download file, delete file funct ## java-chassis-samples Featured samples for java-chassis modules. Each module contains 10 minutes guides. +## Precondition + +Before running the samples，install [service center](https://github.com/apache/servicecomb-service-center) and [kie](https://github.com/apache/servicecomb-kie). Or download [Lightweight Cloud Service Engine](https://support.huaweicloud.com/devg-cse/cse_devg_0036.html) which integrates both serivce center and kie for ease of use. + # 使用ServiceComb开发微服务的示例项目 这个项目使用java-chassis 2.0.x版本。可以切换分支，查看其他版本的例子。 @@ -31,3 +35,8 @@ REST over Servlet。 ## java-chassis-samples java-chassis 各个模块功能的例子。每个子项目包含了10分钟可以学习完成的简单示例。 + +## 前提条件 + +运行这些例子之前，需要先安装[注册中心](https://github.com/apache/servicecomb-service-center) 和[配置中心](https://github.com/apache/servicecomb-kie) 。华为云提供一个出色的[本地轻量化微服务引擎](https://support.huaweicloud.com/devg-cse/cse_devg_0036.html) ,可以直接下载安装使用。 + diff --git a/ServiceComb-SpringMVC/README.md b/ServiceComb-SpringMVC/README.md index 9c68bf34..5c3221b1 100644 --- a/ServiceComb-SpringMVC/README.md +++ b/ServiceComb-SpringMVC/README.md @@ -16,6 +16,9 @@ This sample includes: * src/main - this directory contains your Java service source files * src/test - this directory contains your Java service unit test files +## Precondition +see [Precondition](../README.md) + ## Getting Started Clone your code repository and start developing your application on IDE of your choice @@ -35,5 +38,3 @@ Clone your code repository and start developing your application on IDE of your 6. Open http://127.0.0.1:8080/rest/helloworld?name=hellworld in a web browser to view your application. if you want to deploy the sample code on servicestage, View your CI/CD pipeline and service stack on ServiceStage and customize it as per your needs - -## Contributing diff --git a/ServiceComb-SpringMVC/pom.xml b/ServiceComb-SpringMVC/pom.xml index dbd85e57..d54a7fda 100644 --- a/ServiceComb-SpringMVC/pom.xml +++ b/ServiceComb-SpringMVC/pom.xml @@ -39,7 +39,7 @@ org.apache.servicecomb java-chassis-dependencies - 2.5.0 + 2.6.0 pom import diff --git a/ServiceComb-SpringMVC/src/main/resources/microservice.yaml b/ServiceComb-SpringMVC/src/main/resources/microservice.yaml index 5b0f6fc5..0d61c0ce 100644 --- a/ServiceComb-SpringMVC/src/main/resources/microservice.yaml +++ b/ServiceComb-SpringMVC/src/main/resources/microservice.yaml @@ -10,11 +10,8 @@ cse: address: http://127.0.0.1:30100 instance: watch: false - config: - client: - serverUri: http://127.0.0.1:30113 - refreshMode: 1 - refresh_interval: 5000 + kie: + serverUri: http://localhost:30110 #monitor: #client: #serverUri: https://cse.cn-north-1.myhuaweicloud.com diff --git a/basic/README.md b/basic/README.md index 6ee8673d..8d1a0487 100644 --- a/basic/README.md +++ b/basic/README.md @@ -10,6 +10,8 @@ A Microserivce using Java Chassis with a REST interface. Consumer calls provider * gateway A Microserivce using Java Chassis Edge Service to forward requests to consumer. +## Precondition +see [Precondition](../README.md) # Build and Run * Build @@ -38,6 +40,8 @@ A Microserivce using Java Chassis Edge Service to forward requests to consumer. Open in browser： http://localhost:9090/sayHello?name=World + + # 项目说明 这个项目提供了 Java Chassis 的简单例子，例子包括： @@ -78,3 +82,5 @@ Open in browser： http://localhost:9090/sayHello?name=World * 测试 启动3个微服务后， 然后通过界面访问： http://localhost:9090/sayHello?name=World + + diff --git a/basic/consumer/src/main/resources/application.yml b/basic/consumer/src/main/resources/application.yml index 9a985901..46a7ad8f 100644 --- a/basic/consumer/src/main/resources/application.yml +++ b/basic/consumer/src/main/resources/application.yml @@ -33,12 +33,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:9092 # should be same with server.port to use web container diff --git a/basic/gateway/src/main/resources/application.yml b/basic/gateway/src/main/resources/application.yml index b625f414..ac1f63d4 100644 --- a/basic/gateway/src/main/resources/application.yml +++ b/basic/gateway/src/main/resources/application.yml @@ -30,12 +30,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:9090?sslEnabled=false diff --git a/basic/pom.xml b/basic/pom.xml index 6d96998c..946c2c4b 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -27,7 +27,7 @@ UTF-8 - 2.5.0 + 2.6.0 diff --git a/basic/provider/src/main/resources/application.yml b/basic/provider/src/main/resources/application.yml index ab73b031..a2cb3457 100644 --- a/basic/provider/src/main/resources/application.yml +++ b/basic/provider/src/main/resources/application.yml @@ -33,12 +33,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:9093 # should be same with server.port to use web container diff --git a/java-chassis-deployment-samples/README.md b/java-chassis-deployment-samples/README.md index 7a47b502..31b6edf7 100644 --- a/java-chassis-deployment-samples/README.md +++ b/java-chassis-deployment-samples/README.md @@ -1,4 +1,7 @@ -This folder contains some examples of java-chassis deployments. +This folder contains some examples of java-chassis deployments. * spring-boot-external-tomcat : deploy java-chassis with spring boot, but run in an external web container. -* war-external-tomcat : deploy java-chassis into a traditional war and run in an external web container. \ No newline at end of file +* war-external-tomcat : deploy java-chassis into a traditional war and run in an external web container. + +## Precondition +see [Precondition](../README.md) \ No newline at end of file diff --git a/java-chassis-deployment-samples/spring-boot-external-tomcat/README.md b/java-chassis-deployment-samples/spring-boot-external-tomcat/README.md index 9d554669..d2230b36 100644 --- a/java-chassis-deployment-samples/spring-boot-external-tomcat/README.md +++ b/java-chassis-deployment-samples/spring-boot-external-tomcat/README.md @@ -8,4 +8,7 @@ Following are some useful articles to run spring boot in external web container. For java-chassis using spring boot, check following articles. -* [Working with Spring Boot](https://docs.servicecomb.io/java-chassis/zh_CN/using-java-chassis-in-spring-boot/using-java-chassis-in-spring-boot/) \ No newline at end of file +* [Working with Spring Boot](https://docs.servicecomb.io/java-chassis/zh_CN/using-java-chassis-in-spring-boot/using-java-chassis-in-spring-boot/) + +## Precondition +see [Precondition](../../README.md) \ No newline at end of file diff --git a/java-chassis-deployment-samples/spring-boot-external-tomcat/pom.xml b/java-chassis-deployment-samples/spring-boot-external-tomcat/pom.xml index 37f6011d..c62c8cef 100644 --- a/java-chassis-deployment-samples/spring-boot-external-tomcat/pom.xml +++ b/java-chassis-deployment-samples/spring-boot-external-tomcat/pom.xml @@ -31,7 +31,7 @@ org.apache.servicecomb java-chassis-dependencies - 2.5.0 + 2.6.0 pom import diff --git a/java-chassis-deployment-samples/war-external-tomcat/pom.xml b/java-chassis-deployment-samples/war-external-tomcat/pom.xml index a6475c4e..cbeb2557 100644 --- a/java-chassis-deployment-samples/war-external-tomcat/pom.xml +++ b/java-chassis-deployment-samples/war-external-tomcat/pom.xml @@ -37,7 +37,7 @@ org.apache.servicecomb java-chassis-dependencies - 2.5.0 + 2.6.0 pom import diff --git a/java-chassis-perfermance/README.md b/java-chassis-perfermance/README.md index 00062abf..7c6a5a90 100644 --- a/java-chassis-perfermance/README.md +++ b/java-chassis-perfermance/README.md @@ -1,4 +1,7 @@ -suppose jar named perf.jar +## Precondition +see [Precondition](../README.md) + +suppose jar named perf.jar 1.copy perf.jar to different directory 2.create microservice.yaml in each directory @@ -42,4 +45,5 @@ redis: java -jar perf.jar 4.start consumer -java -jar perf.jar -c \ No newline at end of file +java -jar perf.jar -c + diff --git a/java-chassis-perfermance/pom.xml b/java-chassis-perfermance/pom.xml index 77b32d53..bf2a1364 100644 --- a/java-chassis-perfermance/pom.xml +++ b/java-chassis-perfermance/pom.xml @@ -28,7 +28,7 @@ UTF-8 - 2.5.0 + 2.6.0 org.apache.servicecomb.demo.perf.PerfMain 3.8.3 diff --git a/java-chassis-samples/README.md b/java-chassis-samples/README.md index 08d84503..373d12d6 100644 --- a/java-chassis-samples/README.md +++ b/java-chassis-samples/README.md @@ -7,4 +7,7 @@ It's the samples of Java chassis 4. code first sample 5. customer handler sample 6. extend metrics health checker sample -7. write metrics data into separate text files sample \ No newline at end of file +7. write metrics data into separate text files sample + +## Precondition +see [Precondition](../README.md) \ No newline at end of file diff --git a/java-chassis-samples/apm-agent/pom.xml b/java-chassis-samples/apm-agent/pom.xml index 5ac32b94..f628715e 100644 --- a/java-chassis-samples/apm-agent/pom.xml +++ b/java-chassis-samples/apm-agent/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 4.0.0 diff --git a/java-chassis-samples/auth-sample/README.md b/java-chassis-samples/auth-sample/README.md index 180f66c1..a84a7488 100644 --- a/java-chassis-samples/auth-sample/README.md +++ b/java-chassis-samples/auth-sample/README.md @@ -43,6 +43,8 @@ servicecomb: Consumer: default: auth-provider ``` +## Precondition +see [Precondition](../../README.md) ## Sample Quick Start @@ -93,3 +95,4 @@ mvn exec:java -Dexec.mainClass="org.apache.servicecomb.samples.auth.consumer.Aut On the consumer side, you can see the following outputs if the consumer can invoke the producer: 1. *'Hello Authenticate'* means the consumer calls sayhi with name=Authenticate successfully 2. *'Hello person ServiceComb/Authenticate'* means the consumer calls sayhello successfully + diff --git a/java-chassis-samples/auth-sample/auth-consumer/pom.xml b/java-chassis-samples/auth-sample/auth-consumer/pom.xml index b7398a90..5161eed3 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 @@ org.apache.servicecomb.samples auth-sample - 2.5.0 + 2.6.0 auth-consumer Java Chassis::Samples::Auth::Consumer diff --git a/java-chassis-samples/auth-sample/auth-provider/pom.xml b/java-chassis-samples/auth-sample/auth-provider/pom.xml index fdb6d548..bd94b581 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 @@ org.apache.servicecomb.samples auth-sample - 2.5.0 + 2.6.0 auth-provider diff --git a/java-chassis-samples/auth-sample/pom.xml b/java-chassis-samples/auth-sample/pom.xml index 2ce01873..32e4fb23 100644 --- a/java-chassis-samples/auth-sample/pom.xml +++ b/java-chassis-samples/auth-sample/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 auth-sample Java Chassis::Samples::Auth diff --git a/java-chassis-samples/bmi/README.md b/java-chassis-samples/bmi/README.md index b2159ec1..ed2eb0c3 100644 --- a/java-chassis-samples/bmi/README.md +++ b/java-chassis-samples/bmi/README.md @@ -11,6 +11,8 @@ There are two microservices in this demo. 1. [Oracle JDK 1.8+](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html) 2. [Maven 3.x](https://maven.apache.org/install.html) 3. [Gradle 4.x](https://gradle.org/install/)(Optional) +## Precondition +see [Precondition](../../README.md) ## Quick Start(Linux) * Run the service center @@ -48,3 +50,4 @@ There are two microservices in this demo. ``` * Visit the services via **http://127.0.0.1:8889**. + diff --git a/java-chassis-samples/bmi/calculator/pom.xml b/java-chassis-samples/bmi/calculator/pom.xml index 9ca6fed6..40a70185 100644 --- a/java-chassis-samples/bmi/calculator/pom.xml +++ b/java-chassis-samples/bmi/calculator/pom.xml @@ -21,7 +21,7 @@ bmi org.apache.servicecomb.samples - 2.5.0 + 2.6.0 4.0.0 diff --git a/java-chassis-samples/bmi/pom.xml b/java-chassis-samples/bmi/pom.xml index 3067f15b..a0352bb4 100644 --- a/java-chassis-samples/bmi/pom.xml +++ b/java-chassis-samples/bmi/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 bmi diff --git a/java-chassis-samples/bmi/webapp/pom.xml b/java-chassis-samples/bmi/webapp/pom.xml index c6bee351..525c004d 100644 --- a/java-chassis-samples/bmi/webapp/pom.xml +++ b/java-chassis-samples/bmi/webapp/pom.xml @@ -21,7 +21,7 @@ bmi org.apache.servicecomb.samples - 2.5.0 + 2.6.0 4.0.0 diff --git a/java-chassis-samples/codefirst-sample/README.md b/java-chassis-samples/codefirst-sample/README.md index 4db4a14e..278a671d 100644 --- a/java-chassis-samples/codefirst-sample/README.md +++ b/java-chassis-samples/codefirst-sample/README.md @@ -80,4 +80,7 @@ servicecomb: 3. *'Spring mvc Hello Java Chassis'* means the consumer calls SpringMvc sayhi successfully 4. *'Pojo Hello person ServiceComb/Java Chassis'* means the consumer calls sayhello successfully 5. *'Jaxrs Hello person ServiceComb/Java Chassis'* means the consumer calls Jaxrs sayhello successfully - 6. *'Spring mvc Hello person ServiceComb/Java Chassis'* means the consumer calls SpringMvc sayhello successfully \ No newline at end of file + 6. *'Spring mvc Hello person ServiceComb/Java Chassis'* means the consumer calls SpringMvc sayhello successfully + +## Precondition +see [Precondition](../../README.md) \ No newline at end of file diff --git a/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml b/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml index 1effe80d..78537ec4 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 @@ org.apache.servicecomb.samples codefirst-sample - 2.5.0 + 2.6.0 codefirst-consumer Java Chassis::Samples::CodeFirst::Consumer diff --git a/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml b/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml index 0ca0132b..e9c0f11c 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 @@ org.apache.servicecomb.samples codefirst-sample - 2.5.0 + 2.6.0 codefirst-provider Java Chassis::Samples::CodeFirst::Provider diff --git a/java-chassis-samples/codefirst-sample/pom.xml b/java-chassis-samples/codefirst-sample/pom.xml index 25a436b9..2d25302f 100644 --- a/java-chassis-samples/codefirst-sample/pom.xml +++ b/java-chassis-samples/codefirst-sample/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 codefirst-sample Java Chassis::Samples::CodeFirst diff --git a/java-chassis-samples/common-schema/pom.xml b/java-chassis-samples/common-schema/pom.xml index 4fbfdb31..97065bfd 100644 --- a/java-chassis-samples/common-schema/pom.xml +++ b/java-chassis-samples/common-schema/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 common-schema Java Chassis::Samples::Common Schema diff --git a/java-chassis-samples/config-apollo-sample/README.md b/java-chassis-samples/config-apollo-sample/README.md index fb218b3b..eb992c87 100644 --- a/java-chassis-samples/config-apollo-sample/README.md +++ b/java-chassis-samples/config-apollo-sample/README.md @@ -1,3 +1,6 @@ +## Precondition +see [Precondition](../../README.md) + ## Use Apollo as Configuration Center To use Apollo as configuration source in ServiceComb Java Chassis services: diff --git a/java-chassis-samples/config-apollo-sample/pom.xml b/java-chassis-samples/config-apollo-sample/pom.xml index 9c95ce2e..d983b8e0 100644 --- a/java-chassis-samples/config-apollo-sample/pom.xml +++ b/java-chassis-samples/config-apollo-sample/pom.xml @@ -22,7 +22,7 @@ samples org.apache.servicecomb.samples - 2.5.0 + 2.6.0 4.0.0 diff --git a/java-chassis-samples/custom-handler-sample/README.md b/java-chassis-samples/custom-handler-sample/README.md index 3860abe8..85f57ada 100644 --- a/java-chassis-samples/custom-handler-sample/README.md +++ b/java-chassis-samples/custom-handler-sample/README.md @@ -40,6 +40,9 @@ ServiceComb support users to define a customized handler and and invoke the hand Consumer: default: bizkeeper-consumer,loadbalance, myhandler ``` +## Precondition +see [Precondition](../../README.md) + ## Sample Quick Start @@ -87,4 +90,6 @@ servicecomb: On the consumer side, you can see the following outputs: 1. *'It's my handler!'* means custom handler had take effect + + \ No newline at end of file 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 558accfd..7683c915 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 @@ org.apache.servicecomb.samples custom-handler-sample - 2.5.0 + 2.6.0 custom-handler-consumer Java Chassis::Samples::Custom Handler::Consumer 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 0c1afed6..56869c93 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 @@ org.apache.servicecomb.samples custom-handler-sample - 2.5.0 + 2.6.0 custom-handler-provider Java Chassis::Samples::Custom Handler::Provider diff --git a/java-chassis-samples/custom-handler-sample/pom.xml b/java-chassis-samples/custom-handler-sample/pom.xml index 2080147a..0b5dbd95 100644 --- a/java-chassis-samples/custom-handler-sample/pom.xml +++ b/java-chassis-samples/custom-handler-sample/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 custom-handler-sample Java Chassis::Samples::Custom Handler diff --git a/java-chassis-samples/jaxrs-sample/README.md b/java-chassis-samples/jaxrs-sample/README.md index a14a3668..a4911f37 100644 --- a/java-chassis-samples/jaxrs-sample/README.md +++ b/java-chassis-samples/jaxrs-sample/README.md @@ -15,6 +15,9 @@ ServiceComb supports developers in developing services in JAX-RS mode by using J To consume a provider-service, only need to decalare a member of a service API type and add the `RpcReference` annotation for the member, the microservice that depends on the declaration and the `schemaID` just like pojo consumer sample. +## Precondition +see [Precondition](../../README.md) + ### Sample Quick Start 1. Start the ServiceComb/Service Center @@ -62,4 +65,5 @@ servicecomb: On the consumer side, you can see the following outputs if the consumer can invoke the producer: 1. *'Hello Java Chassis'* means the consumer calls sayhi by RpcReference successfully 2. *'Hello person ServiceComb/Java Chassis'* means the consumer calls sayhello by RpcReference successfully - 3. *'Bye !'* means the consumer calls saybye by RestTemplate successfully \ No newline at end of file + 3. *'Bye !'* means the consumer calls saybye by RestTemplate successfully + diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml index 8143feab..97af4ffb 100644 --- a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml +++ b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples jaxrs-sample - 2.5.0 + 2.6.0 jaxrs-consumer Java Chassis::Samples::JAXRS::Consumer 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 e5f9622f..9e7e73d7 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 @@ -27,12 +27,9 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 + handler: chain: Consumer: diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml b/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml index f57480f2..bcb61c4b 100644 --- a/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml +++ b/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples jaxrs-sample - 2.5.0 + 2.6.0 jaxrs-provider Java Chassis::Samples::JAXRS::Provider 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 2897c5ef..84840144 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 @@ -26,12 +26,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:8080 diff --git a/java-chassis-samples/jaxrs-sample/pom.xml b/java-chassis-samples/jaxrs-sample/pom.xml index 1cf65a3f..396b528b 100644 --- a/java-chassis-samples/jaxrs-sample/pom.xml +++ b/java-chassis-samples/jaxrs-sample/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 jaxrs-sample Java Chassis::Samples::JAXRS diff --git a/java-chassis-samples/local-service-registry/README.md b/java-chassis-samples/local-service-registry/README.md index 44a7db1b..d7141379 100644 --- a/java-chassis-samples/local-service-registry/README.md +++ b/java-chassis-samples/local-service-registry/README.md @@ -7,6 +7,9 @@ Consumer will use local registry function and it will connect the server end poi Please find the details as follows. +## Precondition +see [Precondition](../../README.md) + ## Provider Side * run the provider with/without service center and get the schema file. @@ -47,3 +50,4 @@ Please find the details as follows. -here microserviceName is servers's microservice name. Like this multiple schemaId files we can put in same location. * Run the consumer and verify the API's output. + 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 0370379a..86e4055b 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 @@ org.apache.servicecomb.samples local-service-registry - 2.5.0 + 2.6.0 local-registry-client Java Chassis::Demo::LocalServiceRegistry::Client 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 1b7e61ec..0dc337f6 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 @@ org.apache.servicecomb.samples local-service-registry - 2.5.0 + 2.6.0 local-registry-server Java Chassis::Demo::LocalRegistry::Server diff --git a/java-chassis-samples/local-service-registry/pom.xml b/java-chassis-samples/local-service-registry/pom.xml index 76c37d2e..f77b486b 100644 --- a/java-chassis-samples/local-service-registry/pom.xml +++ b/java-chassis-samples/local-service-registry/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 local-service-registry Java Chassis::Demo::Local service registry diff --git a/java-chassis-samples/metrics-extend-healthcheck/README.md b/java-chassis-samples/metrics-extend-healthcheck/README.md index 09596766..1666f649 100644 --- a/java-chassis-samples/metrics-extend-healthcheck/README.md +++ b/java-chassis-samples/metrics-extend-healthcheck/README.md @@ -4,6 +4,9 @@ Because micro-services is desgin by SRP(Single Responsibility Principle),one mic Health check mechanism can let user write some logic to check components of micro-service dependent and return check result. +## Precondition +see [Precondition](../../README.md) + ## How to use ### Add your checker implementation Implement *org.apache.servicecomb.foundation.metrics.health.HealthChecker* interface: @@ -48,4 +51,5 @@ Then you can invoke http://{serverip}:7777/health get summary check result : tru **Only all registered health checker confirm isHealthy=true,the summary check result will be true,otherwise false** -Also can invoke http://{serverip}:7777/health/details get details of each health checker reported. \ No newline at end of file +Also can invoke http://{serverip}:7777/health/details get details of each health checker reported. + diff --git a/java-chassis-samples/metrics-extend-healthcheck/pom.xml b/java-chassis-samples/metrics-extend-healthcheck/pom.xml index ce5d619c..85da3c60 100644 --- a/java-chassis-samples/metrics-extend-healthcheck/pom.xml +++ b/java-chassis-samples/metrics-extend-healthcheck/pom.xml @@ -22,7 +22,7 @@ samples org.apache.servicecomb.samples - 2.5.0 + 2.6.0 4.0.0 diff --git a/java-chassis-samples/metrics-write-file-sample/README.md b/java-chassis-samples/metrics-write-file-sample/README.md index 9598cc63..8a80e0cc 100644 --- a/java-chassis-samples/metrics-write-file-sample/README.md +++ b/java-chassis-samples/metrics-write-file-sample/README.md @@ -4,4 +4,7 @@ This sample show how direct get metrics data and write them into separate text f ## What Contains -This module implements MetricsInitializer, to customize user defined output, see [documents](https://docs.servicecomb.io/java-chassis/zh_CN/general-development/metrics/) \ No newline at end of file +This module implements MetricsInitializer, to customize user defined output, see [documents](https://docs.servicecomb.io/java-chassis/zh_CN/general-development/metrics/) + +## Precondition +see [Precondition](../../README.md) \ No newline at end of file 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 26881aa1..d34da9b4 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 @@ metrics-write-file-sample org.apache.servicecomb.samples - 2.5.0 + 2.6.0 4.0.0 diff --git a/java-chassis-samples/metrics-write-file-sample/pom.xml b/java-chassis-samples/metrics-write-file-sample/pom.xml index a2987238..db5d1ceb 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 @@ samples org.apache.servicecomb.samples - 2.5.0 + 2.6.0 4.0.0 diff --git a/java-chassis-samples/pojo-sample/README.md b/java-chassis-samples/pojo-sample/README.md index 530cf2a8..35785749 100644 --- a/java-chassis-samples/pojo-sample/README.md +++ b/java-chassis-samples/pojo-sample/README.md @@ -35,6 +35,8 @@ public class CodeFirstConsumerMain { } } ``` +## Precondition +see [Precondition](../../README.md) ### Sample Quick Start @@ -83,4 +85,5 @@ servicecomb: On the consumer side, you can see the following outputs if the consumer can invoke the producer: 1. *'Hello person ServiceComb/Java Chassis'* means the consumer calls sayHello by RpcReference successfully 2. *'a=1, b=2, result=3'* means the consumer calls compute.add by RpcReference successfully - ​ \ No newline at end of file + ​ + diff --git a/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml b/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml index c9adc823..f0f35760 100644 --- a/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml +++ b/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples pojo-sample - 2.5.0 + 2.6.0 pojo-consumer 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 71d803c1..96b93ad5 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 @@ -27,12 +27,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 handler: chain: diff --git a/java-chassis-samples/pojo-sample/pojo-provider/pom.xml b/java-chassis-samples/pojo-sample/pojo-provider/pom.xml index 2ba3ca9f..bd4b1d98 100644 --- a/java-chassis-samples/pojo-sample/pojo-provider/pom.xml +++ b/java-chassis-samples/pojo-sample/pojo-provider/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples pojo-sample - 2.5.0 + 2.6.0 pojo-provider 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 68f6894b..6913ac34 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 @@ -27,12 +27,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:8080 diff --git a/java-chassis-samples/pojo-sample/pom.xml b/java-chassis-samples/pojo-sample/pom.xml index bfa7c520..c7a63897 100644 --- a/java-chassis-samples/pojo-sample/pom.xml +++ b/java-chassis-samples/pojo-sample/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 pojo-sample pom diff --git a/java-chassis-samples/pom.xml b/java-chassis-samples/pom.xml index 62333d3d..7a392f17 100644 --- a/java-chassis-samples/pom.xml +++ b/java-chassis-samples/pom.xml @@ -24,7 +24,7 @@ samples Java Chassis::Samples pom - 2.5.0 + 2.6.0 UTF-8 diff --git a/java-chassis-samples/springmvc-sample/README.md b/java-chassis-samples/springmvc-sample/README.md index 1bb3f8b7..c0c6d5d2 100644 --- a/java-chassis-samples/springmvc-sample/README.md +++ b/java-chassis-samples/springmvc-sample/README.md @@ -5,6 +5,9 @@ * The URL must be in format of ServiceComb: `cse://microserviceName/path?querystring`. * During use of this URL format, the ServiceComb framework will perform internal microservice discovery, fallback, and fault tolerance and send the requests to the microservice providers. +## Precondition +see [Precondition](../../README.md) + ## Sample Quick Start 1. Start the ServiceComb/Service Center @@ -57,4 +60,4 @@ servicecomb: ​ ## More -[Develop with SpringMVC](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/springmvc/) \ No newline at end of file +[Develop with SpringMVC](https://docs.servicecomb.io/java-chassis/zh_CN/build-provider/springmvc/) diff --git a/java-chassis-samples/springmvc-sample/pom.xml b/java-chassis-samples/springmvc-sample/pom.xml index a3db8b1d..a902efa7 100644 --- a/java-chassis-samples/springmvc-sample/pom.xml +++ b/java-chassis-samples/springmvc-sample/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 springmvc-sample pom diff --git a/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml b/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml index b07d989d..467c6f73 100644 --- a/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml +++ b/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples springmvc-sample - 2.5.0 + 2.6.0 springmvc-consumer 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 4b2cfe24..81bb70a8 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 @@ -27,12 +27,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 handler: chain: diff --git a/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml b/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml index 521b407e..aae73f1e 100644 --- a/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml +++ b/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples springmvc-sample - 2.5.0 + 2.6.0 springmvc-provider 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 087daeae..b4078e25 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 @@ -27,12 +27,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:8080 diff --git a/java-chassis-samples/trust-sample/README.md b/java-chassis-samples/trust-sample/README.md index 7df6b7ba..a49bcf83 100644 --- a/java-chassis-samples/trust-sample/README.md +++ b/java-chassis-samples/trust-sample/README.md @@ -3,8 +3,12 @@ This sample shows using public key mechanism to authenticate user and black/whit In this sample, both customer and hacker try to access store, while store configure it's black list to deny hacker's access. +## Precondition +see [Precondition](../../README.md) + ## How to run You can run the samples from your IDE. First start TrustMain in store service. And then start HackerMain in hacker service, the running result should be `InvocationException: code=401;msg={message=UNAUTHORIZED}`. And then -start CustomerMain in customer service, the running result should be `a=1, b=2, result=3` . \ No newline at end of file +start CustomerMain in customer service, the running result should be `a=1, b=2, result=3` . + diff --git a/java-chassis-samples/trust-sample/customer/pom.xml b/java-chassis-samples/trust-sample/customer/pom.xml index 10b95470..1803b85f 100644 --- a/java-chassis-samples/trust-sample/customer/pom.xml +++ b/java-chassis-samples/trust-sample/customer/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples trust-sample - 2.5.0 + 2.6.0 customer diff --git a/java-chassis-samples/trust-sample/hacker/pom.xml b/java-chassis-samples/trust-sample/hacker/pom.xml index d715c30d..0b307af6 100644 --- a/java-chassis-samples/trust-sample/hacker/pom.xml +++ b/java-chassis-samples/trust-sample/hacker/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples trust-sample - 2.5.0 + 2.6.0 hacker diff --git a/java-chassis-samples/trust-sample/pom.xml b/java-chassis-samples/trust-sample/pom.xml index 444ff81f..2cbd3da5 100644 --- a/java-chassis-samples/trust-sample/pom.xml +++ b/java-chassis-samples/trust-sample/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples samples - 2.5.0 + 2.6.0 trust-sample pom diff --git a/java-chassis-samples/trust-sample/store/pom.xml b/java-chassis-samples/trust-sample/store/pom.xml index dee3aa6d..31ade65a 100644 --- a/java-chassis-samples/trust-sample/store/pom.xml +++ b/java-chassis-samples/trust-sample/store/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.samples trust-sample - 2.5.0 + 2.6.0 store diff --git a/java-chassis-samples/use-log4j2-sample/pom.xml b/java-chassis-samples/use-log4j2-sample/pom.xml index db1e32bf..a1c0a17b 100644 --- a/java-chassis-samples/use-log4j2-sample/pom.xml +++ b/java-chassis-samples/use-log4j2-sample/pom.xml @@ -22,7 +22,7 @@ samples org.apache.servicecomb.samples - 2.5.0 + 2.6.0 4.0.0 diff --git a/porter_lightweight/README.md b/porter_lightweight/README.md index 297dbb6e..ea4e8f2d 100644 --- a/porter_lightweight/README.md +++ b/porter_lightweight/README.md @@ -1,5 +1,8 @@ This project shows how to using java-chassis and service-center to create a simple microservice application. It shows basic authentication and authorization, uploading files and delete files operations. +## Precondition +see [Precondition](../README.md) + ## build and run * compile @@ -39,6 +42,10 @@ java $JAVA_OPT -Dgateway.webroot=webapp -jar porter-gateway-service-0.0.1-SNAPSH 3. Delete file. Input the random number generated in step 2. +## 前提条件 + +查看 [前提条件](../README.md) + 这个项目帮助开发者学习如何使用ServiceComb开发完整的微服务。 这个项目实现的功能非常简单，用户登录后，上传一个文件和删除一个文件，验证了没有权限的用户无法删除文件。 # 编译和运行 diff --git a/porter_lightweight/api/common/endpoint/pom.xml b/porter_lightweight/api/common/endpoint/pom.xml index b0cb3b51..5950ae53 100644 --- a/porter_lightweight/api/common/endpoint/pom.xml +++ b/porter_lightweight/api/common/endpoint/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter common-api - 2.5.0 + 2.6.0 common-api-endpoint diff --git a/porter_lightweight/api/common/pom.xml b/porter_lightweight/api/common/pom.xml index 0c484d08..8462680d 100644 --- a/porter_lightweight/api/common/pom.xml +++ b/porter_lightweight/api/common/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.samples.porter porter-api - 2.5.0 + 2.6.0 common-api diff --git a/porter_lightweight/api/common/service/pom.xml b/porter_lightweight/api/common/service/pom.xml index 878e4c71..90d72e45 100644 --- a/porter_lightweight/api/common/service/pom.xml +++ b/porter_lightweight/api/common/service/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter common-api - 2.5.0 + 2.6.0 common-api-service diff --git a/porter_lightweight/api/file-service/endpoint/pom.xml b/porter_lightweight/api/file-service/endpoint/pom.xml index b5ee189b..4c41f2da 100644 --- a/porter_lightweight/api/file-service/endpoint/pom.xml +++ b/porter_lightweight/api/file-service/endpoint/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter file-service-api - 2.5.0 + 2.6.0 file-service-api-endpoint diff --git a/porter_lightweight/api/file-service/pom.xml b/porter_lightweight/api/file-service/pom.xml index b2c9ee3a..ee32f092 100644 --- a/porter_lightweight/api/file-service/pom.xml +++ b/porter_lightweight/api/file-service/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.samples.porter porter-api - 2.5.0 + 2.6.0 file-service-api diff --git a/porter_lightweight/api/file-service/service/pom.xml b/porter_lightweight/api/file-service/service/pom.xml index 7fc68159..9a9cac46 100644 --- a/porter_lightweight/api/file-service/service/pom.xml +++ b/porter_lightweight/api/file-service/service/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter file-service-api - 2.5.0 + 2.6.0 file-service-api-service diff --git a/porter_lightweight/api/pom.xml b/porter_lightweight/api/pom.xml index 10cc257a..f941ef91 100644 --- a/porter_lightweight/api/pom.xml +++ b/porter_lightweight/api/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.samples.porter porter-application - 2.5.0 + 2.6.0 porter-api diff --git a/porter_lightweight/api/user-service/endpoint/pom.xml b/porter_lightweight/api/user-service/endpoint/pom.xml index cdd1cf4f..90e4d7dc 100644 --- a/porter_lightweight/api/user-service/endpoint/pom.xml +++ b/porter_lightweight/api/user-service/endpoint/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter user-service-api - 2.5.0 + 2.6.0 user-service-api-endpoint diff --git a/porter_lightweight/api/user-service/pom.xml b/porter_lightweight/api/user-service/pom.xml index 26e2a3d1..fcabb124 100644 --- a/porter_lightweight/api/user-service/pom.xml +++ b/porter_lightweight/api/user-service/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.samples.porter porter-api - 2.5.0 + 2.6.0 user-service-api diff --git a/porter_lightweight/api/user-service/service/pom.xml b/porter_lightweight/api/user-service/service/pom.xml index 69c74b1e..d0d034d7 100644 --- a/porter_lightweight/api/user-service/service/pom.xml +++ b/porter_lightweight/api/user-service/service/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter user-service-api - 2.5.0 + 2.6.0 user-service-api-service diff --git a/porter_lightweight/file-service/pom.xml b/porter_lightweight/file-service/pom.xml index 396cb5fd..be81dc71 100644 --- a/porter_lightweight/file-service/pom.xml +++ b/porter_lightweight/file-service/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter porter-application - 2.5.0 + 2.6.0 porter-file-service diff --git a/porter_lightweight/gateway-service/pom.xml b/porter_lightweight/gateway-service/pom.xml index 551e32c5..eeb8393f 100644 --- a/porter_lightweight/gateway-service/pom.xml +++ b/porter_lightweight/gateway-service/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter porter-application - 2.5.0 + 2.6.0 porter-gateway-service diff --git a/porter_lightweight/pom.xml b/porter_lightweight/pom.xml index 38450c36..a3450a46 100644 --- a/porter_lightweight/pom.xml +++ b/porter_lightweight/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.samples.porter porter-application - 2.5.0 + 2.6.0 pom diff --git a/porter_lightweight/user-service/pom.xml b/porter_lightweight/user-service/pom.xml index dafaeaf7..d175f6d7 100644 --- a/porter_lightweight/user-service/pom.xml +++ b/porter_lightweight/user-service/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.samples.porter porter-application - 2.5.0 + 2.6.0 porter-user-service diff --git a/porter_springboot/README.md b/porter_springboot/README.md index 67434fcc..dab1ab4f 100644 --- a/porter_springboot/README.md +++ b/porter_springboot/README.md @@ -1,5 +1,8 @@ This project shows how to using java-chassis and service-center to create a simple microservice application. It shows basic authentication and authorization, uploading files and delete files operations. +## Precondition +see [Precondition](../README.md) + ## build and run * compile @@ -45,7 +48,11 @@ java $JAVA_OPT -jar porter-website-2.0-SNAPSHOT.jar >/dev/null 2>&1 & 这个项目帮助开发者学习如何使用ServiceComb开发完整的微服务。 这个项目实现的功能非常简单，用户登录后，上传一个文件和删除一个文件，验证了没有权限的用户无法删除文件。 -# 编译和运行 +## 前提条件 + +查看 [前提条件](../README.md) + +## 编译和运行 * 编译 @@ -88,3 +95,4 @@ java $JAVA_OPT -jar porter-website-2.0-SNAPSHOT.jar >/dev/null 2>&1 & 2. 选择一个文件上传，上传成功，上传成功后的文件会保存在file-service的当前目录， 文件名称是一个随机的数字，这个数字就是文件ID。 3. 删除文件：输入上一步的文件ID，点击删除。 如果是admin用户，上传成功；如果是guest用户，上传失败。 + diff --git a/porter_springboot/file-service/src/main/resources/application.yml b/porter_springboot/file-service/src/main/resources/application.yml index 10ed3186..195279a7 100644 --- a/porter_springboot/file-service/src/main/resources/application.yml +++ b/porter_springboot/file-service/src/main/resources/application.yml @@ -33,12 +33,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:9092 # should be same with server.port to use web container diff --git a/porter_springboot/gateway-service/src/main/resources/application.yml b/porter_springboot/gateway-service/src/main/resources/application.yml index 85f64f5c..6e6cedb2 100644 --- a/porter_springboot/gateway-service/src/main/resources/application.yml +++ b/porter_springboot/gateway-service/src/main/resources/application.yml @@ -30,12 +30,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:9090?sslEnabled=false diff --git a/porter_springboot/pom.xml b/porter_springboot/pom.xml index 65bcbdd6..86d25ea8 100644 --- a/porter_springboot/pom.xml +++ b/porter_springboot/pom.xml @@ -27,7 +27,7 @@ UTF-8 - 2.5.0 + 2.6.0 diff --git a/porter_springboot/user-service/src/main/resources/application.yml b/porter_springboot/user-service/src/main/resources/application.yml index ad957715..4eb69c71 100644 --- a/porter_springboot/user-service/src/main/resources/application.yml +++ b/porter_springboot/user-service/src/main/resources/application.yml @@ -33,12 +33,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:9093 # should be same with server.port to use web container diff --git a/porter_springboot/website/src/main/resources/application.yml b/porter_springboot/website/src/main/resources/application.yml index ec74bcb3..c6198cf7 100644 --- a/porter_springboot/website/src/main/resources/application.yml +++ b/porter_springboot/website/src/main/resources/application.yml @@ -14,12 +14,8 @@ servicecomb: # 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 + kie: + serverUri: http://localhost:30110 rest: address: 0.0.0.0:9091 # should be same with server.port to use web container