From 4003350d090a9285543fb853239eb2353e056285 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Wed, 24 Jul 2019 22:20:19 +0800 Subject: [PATCH] fix fescar typo & other typo --- README-zh.md | 2 +- Roadmap-zh.md | 2 +- Roadmap.md | 2 +- .../java/com/alibaba/cloud/examples/HomeController.java | 4 ++-- .../src/main/resources/application.properties | 2 +- spring-cloud-alibaba-examples/seata-example/readme-zh.md | 6 +++--- .../sentinel-example/sentinel-dubbo-example/readme-zh.md | 4 ++-- .../sentinel-example/sentinel-dubbo-example/readme.md | 4 ++-- .../alicloud/context/sms/SmsContextAutoConfiguration.java | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README-zh.md b/README-zh.md index 136a0b52e..598042147 100644 --- a/README-zh.md +++ b/README-zh.md @@ -109,7 +109,7 @@ Example 列表： [RocketMQ Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/rocketmq-example/readme-zh.md) -[Fescar Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/fescar-example/readme-zh.md) +[Seata Example](https://github.com/alibaba/spring-cloud-alibaba/blob/finchley/spring-cloud-alibaba-examples/seata-example/readme-zh.md) [Alibaba Cloud OSS Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/oss-example/readme-zh.md) diff --git a/Roadmap-zh.md b/Roadmap-zh.md index b22e59acc..73559795c 100644 --- a/Roadmap-zh.md +++ b/Roadmap-zh.md @@ -25,7 +25,7 @@ Apache RocketMQ™ 基于 Java 的高性能、高吞吐量的分布式消息和 Apache Dubbo™ 是一款高性能 Java RPC 框架。 -**Fescar** +**Seata** 阿里巴巴开源产品，一个易于使用的高性能微服务分布式事务解决方案。 diff --git a/Roadmap.md b/Roadmap.md index 490789e1d..32722c70f 100644 --- a/Roadmap.md +++ b/Roadmap.md @@ -28,7 +28,7 @@ Apache RocketMQ™ is an open source distributed messaging and streaming data pl Apache Dubbo™ is a high-performance, Java based open source RPC framework. -**Fescar** +**Seata** A distributed transaction solution with high performance and ease of use for microservices architecture. diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java index c377706f3..8b4ab39dc 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java +++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java @@ -60,7 +60,7 @@ public class HomeController { } @GlobalTransactional(timeoutMills = 300000, name = "spring-cloud-demo-tx") - @RequestMapping(value = "/fescar/rest", method = RequestMethod.GET, produces = "application/json") + @RequestMapping(value = "/seata/rest", method = RequestMethod.GET, produces = "application/json") public String rest() { String result = restTemplate.getForObject( @@ -96,7 +96,7 @@ public class HomeController { } @GlobalTransactional(timeoutMills = 300000, name = "spring-cloud-demo-tx") - @RequestMapping(value = "/fescar/feign", method = RequestMethod.GET, produces = "application/json") + @RequestMapping(value = "/seata/feign", method = RequestMethod.GET, produces = "application/json") public String feign() { String result = storageService.storage(COMMODITY_CODE, ORDER_COUNT); diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties index 1832ce6f5..75ed92904 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties +++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties @@ -5,4 +5,4 @@ spring.application.name=business-service #feign.hystrix.enabled=true #feign.sentinel.enabled=true -logging.level.com.alibaba.fescar=debug \ No newline at end of file +logging.level.io.seata=debug \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/seata-example/readme-zh.md b/spring-cloud-alibaba-examples/seata-example/readme-zh.md index 25a096680..cc18b5595 100644 --- a/spring-cloud-alibaba-examples/seata-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/seata-example/readme-zh.md @@ -121,16 +121,16 @@ sh seata-server.sh -p 8091 -m file 启动示例后，通过 HTTP 的 GET 方法访问如下两个 URL，可以分别验证在 `business-service` 中 通过 RestTemplate 和 FeignClient 调用其他服务的场景。 ```$xslt -http://127.0.0.1:18081/fescar/feign +http://127.0.0.1:18081/seata/feign -http://127.0.0.1:18081/fescar/rest +http://127.0.0.1:18081/seata/rest ``` ## 如何验证分布式事务成功？ ### Xid 信息是否成功传递 -在 `account-server`、`order-service` 和 `storage-service` 三个 服务的 Controller 中，第一个执行的逻辑都是输出 RootContext 中的 Xid 信息，如果看到都输出了正确的 Xid 信息，即每次都发生变化，且同一次调用中所有服务的 Xid 都一致。则表明 Fescar 的 Xid 的传递和还原是正常的。 +在 `account-server`、`order-service` 和 `storage-service` 三个 服务的 Controller 中，第一个执行的逻辑都是输出 RootContext 中的 Xid 信息，如果看到都输出了正确的 Xid 信息，即每次都发生变化，且同一次调用中所有服务的 Xid 都一致。则表明 Seata 的 Xid 的传递和还原是正常的。 ### 数据库中数据是否一致 diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md index 44e7da892..3ff703f49 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md @@ -66,7 +66,7 @@ Provider端在application.properties文件中定义dubbo相关的配置，比如 `sentinel-dubbo-api`模块中定义了FooService服务，内容如下： - package FooService; + package com.alibaba.cloud.examples; public interface FooService { String hello(String name); } @@ -93,7 +93,7 @@ Consumer端在服务调用之前，先定义限流规则。 `sentinel-dubbo-api`模块中定义了FooService服务，内容如下： - package FooService; + package com.alibaba.cloud.examples; public interface FooService { String hello(String name); } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md index 4686e1b18..569c0c0da 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md @@ -64,7 +64,7 @@ Define some configs of dubbo in `application.properties` in provider side, like `sentinel-dubbo-api` define a service named FooService: - package FooService; + package com.alibaba.cloud.examples; public interface FooService { String hello(String name); } @@ -91,7 +91,7 @@ We will configure flow control rules before service invocation in consumer side. `sentinel-dubbo-api` define a service named FooService: - package FooService; + package com.alibaba.cloud.examples; public interface FooService { String hello(String name); } diff --git a/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java index 4b23c3fc2..b3665b7ca 100644 --- a/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @EnableConfigurationProperties(SmsProperties.class) @ConditionalOnClass(name = "com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest") -@ConditionalOnProperty(value = "spring.cloud.alibaba.deshao.enable.sms", matchIfMissing = true) +@ConditionalOnProperty(name = "spring.cloud.alicloud.sms.enabled", matchIfMissing = true) public class SmsContextAutoConfiguration { } \ No newline at end of file