update maven coordinates & docs

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)
 

Roadmap-zh.md

@@ -25,7 +25,7 @@ Apache RocketMQ™ 基于 Java 的高性能、高吞吐量的分布式消息和
 
 Apache Dubbo™ 是一款高性能 Java RPC 框架。
 
-**Fescar**
+**Seata**
 
 阿里巴巴开源产品，一个易于使用的高性能微服务分布式事务解决方案。
 

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.
 

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描述：无

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`)。
 

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

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

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

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
 
-    <artifactId>nacos-discovery-with-spring-cloud-config-example</artifactId>
+    <artifactId>nacos-discovery-spring-cloud-config-client</artifactId>
     <packaging>jar</packaging>
     <description>Example demonstrating how to use nacos discovery</description>
 

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:
+spring:
-  application:
+  application:
-    name: client
+    name: client
-  cloud:
+  cloud:
-    nacos:
+    nacos:
-      discovery:
+      discovery:
-        server-addr: localhost:8848
+        server-addr: localhost:8848
-    config:
+    config:
-      discovery:
+      discovery:
-        enabled: true
+        enabled: true
+  profiles:
+    active: dev

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>com.alibaba.cloud</groupId>
+        <artifactId>nacos-discovery-example</artifactId>
+        <version>0.9.1.BUILD-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+
+    <artifactId>nacos-discovery-with-spring-cloud-config-example</artifactId>
+    <packaging>jar</packaging>
+    <description>Example demonstrating how to use nacos discovery</description>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>alibaba-nacos-discovery-spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>${maven-deploy-plugin.version}</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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 <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableConfigServer
+public class SpringCloudConfigServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringCloudConfigServerApplication.class, args);
+    }
+
+}

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: /
+

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml

@@ -19,6 +19,7 @@
     <modules>
         <module>nacos-discovery-consumer-example</module>
         <module>nacos-discovery-provider-example</module>
-        <module>nacos-discovery-with-spring-cloud-config-example</module>
+        <module>nacos-discovery-spring-cloud-config-client</module>
+        <module>nacos-discovery-spring-cloud-config-server</module>
     </modules>
 </project>

spring-cloud-alibaba-examples/pom.xml

@@ -41,7 +41,7 @@
         <module>sms-example</module>
         <module>rocketmq-spring-cloud-bus-example</module>
         <module>schedulerx-example/schedulerx-simple-task-example</module>
-        <module>spring-cloud-alibaba-dubbo-examples</module>
+        <module>dubbo-spring-cloud-alibaba-examples</module>
     </modules>
 
     <build>

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描述：无

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);

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
+logging.level.io.seata=debug

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 的传递和还原是正常的。
 
 ### 数据库中数据是否一致
 

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");

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");

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<String> test() {
+        return Flux.fromArray(new String[] { "test" })
+            // transform the publisher here.
+            .transform(new SentinelReactorTransformer<>("test"));
+    }
+
 }

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 信息