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/incubator-servicecomb-java-chassis.git
commit d12f88cb12717c7557428c62d3e057ad451f0955 Author: liubao <bao....@huawei.com> AuthorDate: Sat Aug 25 11:20:25 2018 +0800 [SBC-870]fix test error. --- .../servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java | 2 +- demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml | 4 ++-- demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml | 4 ++-- .../src/main/resources/microservice.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java index 2481e52..38ae6e9 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java +++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java @@ -110,7 +110,7 @@ public class CodeFirstRestTemplateJaxrs extends CodeFirstRestTemplate { private void test404(RestTemplate template) { HttpClientErrorException exception = null; try { - template.getForEntity("http://127.0.0.1:8086/aPathNotExist", String.class); + template.getForEntity("http://127.0.0.1:8080/aPathNotExist", String.class); } catch (RestClientException e) { if (e instanceof HttpClientErrorException) { exception = (HttpClientErrorException) e; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml b/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml index c4bbcdd..89f324c 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml +++ b/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml @@ -24,9 +24,9 @@ servicecomb: registry: address: http://127.0.0.1:30100 rest: - address: 0.0.0.0:8086 + address: 0.0.0.0:8080 highway: - address: 0.0.0.0:7076 + address: 0.0.0.0:7070 handler: chain: Provider: diff --git a/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml b/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml index 77e9502..e705183 100644 --- a/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml +++ b/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml @@ -24,9 +24,9 @@ servicecomb: registry: address: http://127.0.0.1:30100 rest: - address: 0.0.0.0:8086?protocol=http2 + address: 0.0.0.0:8080?protocol=http2 highway: - address: 0.0.0.0:7076 + address: 0.0.0.0:7070 #executors: #default: test #Provider: diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml index 89e1297..09c50e3 100644 --- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml +++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml @@ -25,9 +25,9 @@ servicecomb: registry: address: http://127.0.0.1:30100 rest: - address: 0.0.0.0:8086 + address: 0.0.0.0:8080 highway: - address: 0.0.0.0:7076 + address: 0.0.0.0:7070 handler: chain: Provider: