diff --git a/README-zh.md b/README-zh.md
index a97e1bb2..b246aa18 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/spring-cloud-incubator/spring-cloud-alibaba/blob/master/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 b22e59ac..73559795 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 490789e1..32722c70 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-docs/src/main/asciidoc-zh/schedulerx.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc
index f3526317..12796181 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc
@@ -75,7 +75,7 @@ public class SimpleTask implements ScxSimpleJobProcessor {
[source,text]
----
Job分组:测试——***-*-*-****
-Job处理接口:org.springframework.cloud.alibaba.cloud.examples.SimpleTask
+Job处理接口:com.alibaba.cloud.examples.SimpleTask
类型:简单Job单机版
定时表达式:默认选项——0 * * * * ?
Job描述:无
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
index 736a24b8..fa6e2bba 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
@@ -193,7 +193,7 @@ spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
#spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json
#spring.cloud.sentinel.datasource.ds1.file.data-type=custom
-#spring.cloud.sentinel.datasource.ds1.file.converter-class=org.springframework.cloud.alibaba.cloud.examples.JsonFlowRuleListConverter
+#spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter
#spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
spring.cloud.sentinel.datasource.ds2.nacos.server-addr=localhost:8848
@@ -219,7 +219,7 @@ NOTE: d1, ds2, ds3, ds4 是 `ReadableDataSource` 的名字,可随意编写。
每种数据源都有两个共同的配置项: `data-type`、 `converter-class` 以及 `rule-type`。
-`data-type` 配置项表示 `Converter` 类型,Spring Cloud Alibaba Sentinel 默认提供两种内置的值,分别是 `json` 和 `xml` (不填默认是json)。 如果不想使用内置的 `json` 或 `xml` 这两种 `Converter`,可以填写 `custom` 表示自定义 `Converter`,然后再配置 `converter-class` 配置项,该配置项需要写类的全路径名(比如 `spring.cloud.sentinel.datasource.ds1.file.converter-class=org.springframework.cloud.alibaba.cloud.examples.JsonFlowRuleListConverter`)。
+`data-type` 配置项表示 `Converter` 类型,Spring Cloud Alibaba Sentinel 默认提供两种内置的值,分别是 `json` 和 `xml` (不填默认是json)。 如果不想使用内置的 `json` 或 `xml` 这两种 `Converter`,可以填写 `custom` 表示自定义 `Converter`,然后再配置 `converter-class` 配置项,该配置项需要写类的全路径名(比如 `spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter`)。
`rule-type` 配置表示该数据源中的规则属于哪种类型的规则(`flow`,`degrade`,`authority`,`system`, `param-flow`)。
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc
index 2c95df6b..8b2f466c 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc
@@ -75,7 +75,7 @@ Go to the https://edas.console.aliyun.com/#/edasSchedulerXJob?regionNo=cn-test[S
[source,text]
----
Job Group: Test——***-*-*-****
-Job process interface:org.springframework.cloud.alibaba.cloud.examples.SimpleTask
+Job process interface:com.alibaba.cloud.examples.SimpleTask
Type: Simple Single-Server Job
Quartz Cron Expression: Default Option——0 * * * * ?
Job Description: Empty
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
index a2a828b2..bedae880 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
@@ -195,7 +195,7 @@ spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
#spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json
#spring.cloud.sentinel.datasource.ds1.file.data-type=custom
-#spring.cloud.sentinel.datasource.ds1.file.converter-class=org.springframework.cloud.alibaba.cloud.examples.JsonFlowRuleListConverter
+#spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter
#spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
spring.cloud.sentinel.datasource.ds2.nacos.server-addr=localhost:8848
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md
similarity index 99%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md
index 70ddae33..e8c54e78 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md
@@ -119,7 +119,7 @@ class EchoServiceImpl implements EchoService {
dubbo:
scan:
# dubbo 服务扫描基准包
- base-packages: org.springframework.cloud.alibaba.dubbo.bootstrap
+ base-packages: com.alibaba.cloud.dubbo.bootstrap
protocol:
# dubbo 协议
name: dubbo
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-client-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-client-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-client-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-client-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-consumer-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-consumer-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/application.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/application.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/application.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/pom.xml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/pom.xml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-server-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-server-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/application.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/application.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/application.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/pom.xml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/pom.xml
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml
similarity index 96%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/pom.xml
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml
index d7834ef6..13b92c40 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/pom.xml
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml
@@ -10,7 +10,7 @@
4.0.0
- nacos-discovery-with-spring-cloud-config-example
+ nacos-discovery-spring-cloud-config-client
jar
Example demonstrating how to use nacos discovery
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/com/alibaba/cloud/examples/GetConfigController.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java
similarity index 100%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/com/alibaba/cloud/examples/GetConfigController.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java
similarity index 100%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/application.yml
similarity index 100%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/application.yml
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/application.yml
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/bootstrap.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/bootstrap.yml
similarity index 74%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/bootstrap.yml
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/bootstrap.yml
index 66fab66f..f9bbcea9 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/bootstrap.yml
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/bootstrap.yml
@@ -1,10 +1,12 @@
-spring:
- application:
- name: client
- cloud:
- nacos:
- discovery:
- server-addr: localhost:8848
- config:
- discovery:
- enabled: true
\ No newline at end of file
+spring:
+ application:
+ name: client
+ cloud:
+ nacos:
+ discovery:
+ server-addr: localhost:8848
+ config:
+ discovery:
+ enabled: true
+ profiles:
+ active: dev
\ No newline at end of file
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml
new file mode 100644
index 00000000..fe887a9d
--- /dev/null
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ com.alibaba.cloud
+ nacos-discovery-example
+ 0.9.1.BUILD-SNAPSHOT
+
+ 4.0.0
+
+
+ nacos-discovery-with-spring-cloud-config-example
+ jar
+ Example demonstrating how to use nacos discovery
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.cloud
+ spring-cloud-config-server
+
+
+
+ com.alibaba.cloud
+ alibaba-nacos-discovery-spring-cloud-starter
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ ${maven-deploy-plugin.version}
+
+ true
+
+
+
+
+
+
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java
new file mode 100644
index 00000000..0789b5e5
--- /dev/null
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.examples;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.config.server.EnableConfigServer;
+
+/**
+ * @author Jim
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableConfigServer
+public class SpringCloudConfigServerApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SpringCloudConfigServerApplication.class, args);
+ }
+
+}
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/resources/application.yml
new file mode 100644
index 00000000..e7fe16a4
--- /dev/null
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+server:
+ port: 7070
+
+spring:
+ application:
+ name: configserver
+ cloud:
+ nacos:
+ discovery:
+ server-addr: localhost:8848
+ config:
+ server:
+ git:
+ uri: https://github.com/fangjian0423/blogimages
+ search-paths: /
+
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
index dce71884..4f694a0b 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
@@ -19,6 +19,7 @@
nacos-discovery-consumer-example
nacos-discovery-provider-example
- nacos-discovery-with-spring-cloud-config-example
+ nacos-discovery-spring-cloud-config-client
+ nacos-discovery-spring-cloud-config-server
diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml
index 9ae30ae2..ad1b98b6 100644
--- a/spring-cloud-alibaba-examples/pom.xml
+++ b/spring-cloud-alibaba-examples/pom.xml
@@ -41,7 +41,7 @@
sms-example
rocketmq-spring-cloud-bus-example
schedulerx-example/schedulerx-simple-task-example
- spring-cloud-alibaba-dubbo-examples
+ dubbo-spring-cloud-alibaba-examples
diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md
index 9e9b6f02..0760f3ea 100644
--- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md
+++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md
@@ -25,7 +25,7 @@ SchedulerX 是阿里中间件团队开发的一款分布式任务调度产品。
6. 进入[SchedulerX任务列表](https://edas.console.aliyun.com/#/edasSchedulerXJob?regionNo=cn-test)页面,选择上方"测试"区域,点击右上角"新建Job",创建一个Job,即如下所示。
Job分组:测试——111-1-1-1111
- Job处理接口:org.springframework.cloud.alibaba.cloud.examples.SimpleTask
+ Job处理接口:com.alibaba.cloud.examples.SimpleTask
类型:简单Job单机版
定时表达式:默认选项——0 * * * * ?
Job描述:无
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 fbcd8210..d1cf3bb8 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 1832ce6f..75ed9290 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 9c12eb50..b54c4da7 100644
--- a/spring-cloud-alibaba-examples/seata-example/readme-zh.md
+++ b/spring-cloud-alibaba-examples/seata-example/readme-zh.md
@@ -120,16 +120,16 @@ sh seata-server.sh 8091 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 25efd6dd..47844f26 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
@@ -50,7 +50,7 @@ Provider端在application.properties文件中定义dubbo相关的配置,比如
foo.service.version = 1.0.0
- dubbo.scan.basePackages = org.springframework.cloud.alibaba.cloud.examples
+ dubbo.scan.basePackages = com.alibaba.cloud.examples
dubbo.application.id = dubbo-provider-demo
dubbo.application.name = dubbo-provider-demo
@@ -66,7 +66,7 @@ Provider端在application.properties文件中定义dubbo相关的配置,比如
`sentinel-dubbo-api`模块中定义了FooService服务,内容如下:
- package org.springframework.cloud.alibaba.cloud.examples.FooService;
+ package com.alibaba.cloud.examples.FooService;
public interface FooService {
String hello(String name);
}
@@ -93,17 +93,17 @@ Consumer端在服务调用之前,先定义限流规则。
`sentinel-dubbo-api`模块中定义了FooService服务,内容如下:
- package org.springframework.cloud.alibaba.cloud.examples.FooService;
+ package com.alibaba.cloud.examples.FooService;
public interface FooService {
String hello(String name);
}
-该服务在Sentinel下对应的资源名是 `org.springframework.cloud.alibaba.cloud.examples.dubbo.FooService:hello(java.lang.String)` 。
+该服务在Sentinel下对应的资源名是 `com.alibaba.cloud.examples.FooService:hello(java.lang.String)` 。
定义该资源名对应的限流规则:
FlowRule flowRule = new FlowRule();
- flowRule.setResource("org.springframework.cloud.alibaba.cloud.examples.dubbo.FooService:hello(java.lang.String)");
+ flowRule.setResource("com.alibaba.cloud.examples.FooService:hello(java.lang.String)");
flowRule.setCount(10);
flowRule.setGrade(RuleConstant.FLOW_GRADE_QPS);
flowRule.setLimitApp("default");
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 a69ea0b1..8cbb24c6 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
@@ -48,7 +48,7 @@ Define some configs of dubbo in `application.properties` in provider side, like
foo.service.version = 1.0.0
- dubbo.scan.basePackages = org.springframework.cloud.alibaba.cloud.examples
+ dubbo.scan.basePackages = com.alibaba.cloud.examples
dubbo.application.id = dubbo-provider-demo
dubbo.application.name = dubbo-provider-demo
@@ -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 org.springframework.cloud.alibaba.cloud.examples.FooService;
+ package com.alibaba.cloud.examples.FooService;
public interface FooService {
String hello(String name);
}
@@ -91,17 +91,17 @@ We will configure flow control rules before service invocation in consumer side.
`sentinel-dubbo-api` define a service named FooService:
- package org.springframework.cloud.alibaba.cloud.examples.FooService;
+ package com.alibaba.cloud.examples.FooService;
public interface FooService {
String hello(String name);
}
-The resource name of this service's `hello` method is `org.springframework.cloud.alibaba.cloud.examples.dubbo.FooService:hello(java.lang.String)` .
+The resource name of this service's `hello` method is `com.alibaba.cloud.examples.FooService:hello(java.lang.String)` .
Configure rules:
FlowRule flowRule = new FlowRule();
- flowRule.setResource("org.springframework.cloud.alibaba.cloud.examples.dubbo.FooService:hello(java.lang.String)");
+ flowRule.setResource("com.alibaba.cloud.examples.FooService:hello(java.lang.String)");
flowRule.setCount(10);
flowRule.setGrade(RuleConstant.FLOW_GRADE_QPS);
flowRule.setLimitApp("default");
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java
index 08b9bbbb..32b008bf 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java
@@ -44,4 +44,11 @@ public class SentinelWebFluxController {
.transform(new SentinelReactorTransformer<>("flux"));
}
+ @GetMapping("/test")
+ public Flux test() {
+ return Flux.fromArray(new String[] { "test" })
+ // transform the publisher here.
+ .transform(new SentinelReactorTransformer<>("test"));
+ }
+
}
diff --git a/spring-cloud-alibaba-examples/sms-example/readme-zh.md b/spring-cloud-alibaba-examples/sms-example/readme-zh.md
index c07b3608..9c99b1a4 100644
--- a/spring-cloud-alibaba-examples/sms-example/readme-zh.md
+++ b/spring-cloud-alibaba-examples/sms-example/readme-zh.md
@@ -251,7 +251,7 @@ public QuerySendDetailsResponse querySendDetailsResponse(
发送状态的回执消息如下所示:
```plain
-org.springframework.cloud.alibaba.cloud.example.SmsReportMessageListener; MessageID:9F3CFCE6BB3B2C8F-2-1682D84D9AD-20000000A,MessageMD5:C6AFEE0EE560BBC3380252337AC36985,RequestID:5C349CCEB8C115CCF344A3EB,MessageBody:"{"send_time":"2019-01-08 20:51:40","report_time":"2019-01-08 20:51:47","success":true,"err_msg":"用户接收成功","err_code":"DELIVERED","phone_number":"152********","sms_size":"1","biz_id":"667618746951900475^0","out_id":"edasTraceId"}",ReceiptHandle:"1-ODU4OTkzNDYwMi0xNTQ2OTUxOTM3LTItOA==",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:51:47 CST 2019",FirstDequeueTime:"Tue Jan 08 20:51:47 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:17 CST 2019",Priority:"8"
+com.alibaba.cloud.examples.SmsReportMessageListener; MessageID:9F3CFCE6BB3B2C8F-2-1682D84D9AD-20000000A,MessageMD5:C6AFEE0EE560BBC3380252337AC36985,RequestID:5C349CCEB8C115CCF344A3EB,MessageBody:"{"send_time":"2019-01-08 20:51:40","report_time":"2019-01-08 20:51:47","success":true,"err_msg":"用户接收成功","err_code":"DELIVERED","phone_number":"152********","sms_size":"1","biz_id":"667618746951900475^0","out_id":"edasTraceId"}",ReceiptHandle:"1-ODU4OTkzNDYwMi0xNTQ2OTUxOTM3LTItOA==",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:51:47 CST 2019",FirstDequeueTime:"Tue Jan 08 20:51:47 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:17 CST 2019",Priority:"8"
```
### 上行短信消息
@@ -290,7 +290,7 @@ org.springframework.cloud.alibaba.cloud.example.SmsReportMessageListener; Messag
短信成功恢复后,上行短信消息 SmsUpMessageListener 回调后的信息如下所示:
```plain
-org.springframework.cloud.alibaba.cloud.example.SmsUpMessageListener; MessageID:BF030215BA85BB41-1-1682D85425F-400000003,MessageMD5:D1AF5C2D7410EF190532CBF8E17FE2B7,RequestID:5C349CEE36AF628D2A847D50,MessageBody:"{"dest_code":"2493559","send_time":"2019-01-08 20:52:14","sign_name":"【企业级分布式应用服务】","sequence_id":568585703,"phone_number":"152********","content":"5279"}",ReceiptHandle:"1-MTcxNzk4NjkxODctMTU0Njk1MTk2NC0xLTg=",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:52:14 CST 2019",FirstDequeueTime:"Tue Jan 08 20:52:14 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:44 CST 2019",Priority:"8"
+com.alibaba.cloud.examples.SmsUpMessageListener; MessageID:BF030215BA85BB41-1-1682D85425F-400000003,MessageMD5:D1AF5C2D7410EF190532CBF8E17FE2B7,RequestID:5C349CEE36AF628D2A847D50,MessageBody:"{"dest_code":"2493559","send_time":"2019-01-08 20:52:14","sign_name":"【企业级分布式应用服务】","sequence_id":568585703,"phone_number":"152********","content":"5279"}",ReceiptHandle:"1-MTcxNzk4NjkxODctMTU0Njk1MTk2NC0xLTg=",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:52:14 CST 2019",FirstDequeueTime:"Tue Jan 08 20:52:14 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:44 CST 2019",Priority:"8"
```
## 查看 Endpoint 信息