polish #761 update pkg name & maven coordinate for Greenwich

spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-acm</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/AcmApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -27,8 +27,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @EnableDiscoveryClient
 public class AcmApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(AcmApplication.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(AcmApplication.class, args);
+	}
 
 }

spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/EchoController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,14 +28,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class EchoController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class);
 
-    @Value("${user.id}")
-    private String userId;
+	@Value("${user.id}")
+	private String userId;
 
-    @RequestMapping(value = "/")
-    public String echo() {
-        LOGGER.info("User id is " + userId);
-        return userId;
-    }
+	@RequestMapping(value = "/")
+	public String echo() {
+		LOGGER.info("User id is " + userId);
+		return userId;
+	}
 }

spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-ans</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -24,11 +24,11 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author xiaolongzuo
  */
 @SpringBootApplication
-@EnableFeignClients(basePackages = {"org.springframework.cloud.alibaba.cloud.examples"})
+@EnableFeignClients(basePackages = { "com.alibaba.cloud.examples" })
 public class ConsumerApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(ConsumerApplication.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(ConsumerApplication.class, args);
+	}
 
 }

spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/EchoService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(value = "ans-provider")
 public interface EchoService {
 
-    @RequestMapping(path = "echo/{str}")
-    String echo(@RequestParam("str") String param);
+	@RequestMapping(path = "echo/{str}")
+	String echo(@RequestParam("str") String param);
 
 }

spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/HomeController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,18 +29,18 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class HomeController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(HomeController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(HomeController.class);
 
-    @Autowired
-    private EchoService echoService;
+	@Autowired
+	private EchoService echoService;
 
-    @RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json")
-    public String home() {
-        LOGGER.info("-----------------consumer调用开始-----------------");
-        String param = "Nice to meet you.";
-        LOGGER.info("消费者传递参数：" + param);
-        String result = echoService.echo(param);
-        LOGGER.info("收到提供者响应：" + result);
-        return param + "<br>" + result;
-    }
+	@RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json")
+	public String home() {
+		LOGGER.info("-----------------consumer调用开始-----------------");
+		String param = "Nice to meet you.";
+		LOGGER.info("消费者传递参数：" + param);
+		String result = echoService.echo(param);
+		LOGGER.info("收到提供者响应：" + result);
+		return param + "<br>" + result;
+	}
 }

spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties

@@ -1,3 +1,4 @@
+spring.application.name=feign-consumer
 server.port=18083
 # The following configuration can be omitted.
 spring.cloud.alicloud.ans.server-list=127.0.0.1

spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-ans</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -30,14 +30,14 @@ import org.springframework.web.client.RestTemplate;
 @EnableDiscoveryClient
 public class ConsumerApplication {
 
-    @Bean
-    @LoadBalanced
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
+	@Bean
+	@LoadBalanced
+	public RestTemplate restTemplate() {
+		return new RestTemplate();
+	}
 
-    public static void main(String[] args) {
-        SpringApplication.run(ConsumerApplication.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(ConsumerApplication.class, args);
+	}
 
 }

spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/HomeController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,18 +30,19 @@ import org.springframework.web.client.RestTemplate;
 @RestController
 public class HomeController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(HomeController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(HomeController.class);
 
-    @Autowired
-    private RestTemplate restTemplate;
+	@Autowired
+	private RestTemplate restTemplate;
 
-    @RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json")
-    public String home() {
-        LOGGER.info("-----------------consumer调用开始-----------------");
-        String param = "Nice to meet you.";
-        LOGGER.info("消费者传递参数：" + param);
-        String result = restTemplate.getForObject("http://ans-provider/echo/" + param, String.class);
-        LOGGER.info("收到提供者响应：" + result);
-        return param + "<br>" + result;
-    }
+	@RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json")
+	public String home() {
+		LOGGER.info("-----------------consumer调用开始-----------------");
+		String param = "Nice to meet you.";
+		LOGGER.info("消费者传递参数：" + param);
+		String result = restTemplate.getForObject("http://ans-provider/echo/" + param,
+				String.class);
+		LOGGER.info("收到提供者响应：" + result);
+		return param + "<br>" + result;
+	}
 }

spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties

@@ -1,3 +1,4 @@
+spring.application.name=ribbon-consumer
 server.port=18082
 # The following configuration can be omitted.
 spring.cloud.alicloud.ans.server-list=127.0.0.1

spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-ans</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,14 +29,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class EchoController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class);
 
-    @RequestMapping(value = "/echo/{str}", method = RequestMethod.GET, produces = "application/json")
-    public String echo(@PathVariable String str) {
-        LOGGER.info("-----------收到消费者请求-----------");
-        LOGGER.info("收到消费者传递的参数：" + str);
-        String result = "Nice to meet you, too.";
-        LOGGER.info("提供者返回结果：" + result);
-        return result;
-    }
+	@RequestMapping(value = "/echo/{str}", method = RequestMethod.GET, produces = "application/json")
+	public String echo(@PathVariable String str) {
+		LOGGER.info("-----------收到消费者请求-----------");
+		LOGGER.info("收到消费者传递的参数：" + str);
+		String result = "Nice to meet you, too.";
+		LOGGER.info("提供者返回结果：" + result);
+		return result;
+	}
 }

spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -27,8 +27,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @EnableDiscoveryClient
 public class ProviderApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(ProviderApplication.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(ProviderApplication.class, args);
+	}
 
 }

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

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
@@ -22,7 +22,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme-zh.md

@@ -15,7 +15,7 @@
 1. 首先，修改 pom.xml 文件，引入 Nacos Config Starter。
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 	

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme.md

@@ -15,7 +15,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl
 1. Add dependency spring-cloud-starter-alibaba-nacos-config in the pom.xml file in your Spring Cloud project.
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 	

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -11,12 +11,12 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.cloud.nacos.NacosConfigProperties;
 import com.alibaba.nacos.api.config.listener.Listener;
 
 /**
@@ -87,7 +87,6 @@ class SampleController {
 	@Value("${user.name}")
 	String userName;
 
-
 	@Value("${user.age:25}")
 	int age;
 

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

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>nacos-discovery-example</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
     </parent>
@@ -21,7 +21,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 
@@ -41,7 +41,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java

@@ -1,9 +1,7 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.cloud.examples.ConsumerApplication.EchoService;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -15,6 +13,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.cloud.examples.ConsumerApplication.EchoService;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+
 /**
  * @author xiaojing
  */

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/TestController.java

@@ -1,7 +1,6 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.cloud.examples.ConsumerApplication.EchoService;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.cloud.examples.ConsumerApplication.EchoService;
+
 /**
  * @author xiaojing
  */

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

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>nacos-discovery-example</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
     </parent>
@@ -21,7 +21,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

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

@@ -3,14 +3,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <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>
+    <artifactId>nacos-discovery-spring-cloud-config-client</artifactId>
     <packaging>jar</packaging>
     <description>Example demonstrating how to use nacos discovery</description>
 
@@ -21,7 +21,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java

@@ -0,0 +1,35 @@
+/*
+ * 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.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class GetConfigController {
+
+	@Value("${config}")
+	private String config;
+
+	@RequestMapping(value = "/config", method = RequestMethod.GET)
+	public String getConfig() {
+		return config;
+	}
+
+}

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigClientApplication.java

@@ -0,0 +1,34 @@
+/*
+ * 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;
+
+/**
+ * @author JevonYang
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+public class SpringCloudConfigClientApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SpringCloudConfigClientApplication.class, args);
+	}
+
+}

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
+spring:
+  application:
+    name: client
+  cloud:
+    nacos:
+      discovery:
+        server-addr: localhost:8848
+    config:
+      discovery:
+        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>spring-cloud-starter-alibaba-nacos-discovery</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/nacos-discovery-with-spring-cloud-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/GetConfigController.java

@@ -1,19 +0,0 @@
-package org.springframework.cloud.alibaba.cloud.examples;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class GetConfigController {
-
-	@Value("${config}")
-	private String config;
-
-	@RequestMapping(value = "/config", method = RequestMethod.GET)
-	public String getConfig() {
-		return config;
-	}
-
-}

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java

@@ -1,18 +0,0 @@
-package org.springframework.cloud.alibaba.cloud.examples;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-
-/**
- * @author JevonYang
- */
-@SpringBootApplication
-@EnableDiscoveryClient
-public class NacosDiscoverySpringConfigApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(NacosDiscoverySpringConfigApplication.class, args);
-	}
-
-}

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

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
@@ -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-server</module>
+        <module>nacos-discovery-spring-cloud-config-client</module>
     </modules>
 </project>

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md

@@ -15,7 +15,7 @@
 1. 首先，修改 pom.xml 文件，引入 Nacos Discovery Starter。
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 	

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md

@@ -14,7 +14,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl
 1. Add dependency spring-cloud-starter-alibaba-nacos-discovery in the pom.xml file in your Spring Cloud project.
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 	

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

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>nacos-gateway-example</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
     </parent>
@@ -22,7 +22,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/java/com/alibaba/cloud/examples/GatewayApplication.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>nacos-gateway-example</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
     </parent>
@@ -21,7 +21,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

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

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>

spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme-zh.md

@@ -17,7 +17,7 @@
 
 ```xml
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme.md

@@ -17,7 +17,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl
 
 ```xml
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/oss-example/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
     </parent>
@@ -21,7 +21,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/oss-example/readme-zh.md

@@ -16,7 +16,7 @@
 1. 修改 pom.xml 文件，引入 alicloud-oss starter。	
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
         </dependency>
 	

spring-cloud-alibaba-examples/oss-example/readme.md

@@ -16,7 +16,7 @@ Before we start the demo, let's learn how to connect OSS to a Spring Cloud appli
 1. Add dependency spring-cloud-starter-alicloud-oss in the pom.xml file in your Spring Cloud project.
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java

@@ -0,0 +1,51 @@
+package com.alibaba.cloud.examples;
+
+import java.net.URISyntaxException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+import com.aliyun.oss.OSS;
+
+/**
+ * OSS Application
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+@SpringBootApplication
+public class OssApplication {
+
+	public static final String BUCKET_NAME = "spring-cloud-alibaba-test";
+
+	public static void main(String[] args) throws URISyntaxException {
+		SpringApplication.run(OssApplication.class, args);
+	}
+
+	@Bean
+	public AppRunner appRunner() {
+		return new AppRunner();
+	}
+
+	class AppRunner implements ApplicationRunner {
+		@Autowired
+		private OSS ossClient;
+
+		@Override
+		public void run(ApplicationArguments args) throws Exception {
+			try {
+				if (!ossClient.doesBucketExist(BUCKET_NAME)) {
+					ossClient.createBucket(BUCKET_NAME);
+				}
+			}
+			catch (Exception e) {
+				System.err.println("oss handle bucket error: " + e.getMessage());
+				System.exit(-1);
+			}
+		}
+	}
+
+}

spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java

@@ -0,0 +1,70 @@
+package com.alibaba.cloud.examples;
+
+import java.nio.charset.Charset;
+
+import org.apache.commons.codec.CharEncoding;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.common.utils.IOUtils;
+import com.aliyun.oss.model.OSSObject;
+
+/**
+ * OSS Controller
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+@RestController
+public class OssController {
+
+	@Autowired
+	private OSS ossClient;
+
+	@Value("oss://" + OssApplication.BUCKET_NAME + "/oss-test.json")
+	private Resource file;
+
+	@GetMapping("/upload")
+	public String upload() {
+		try {
+			ossClient.putObject(OssApplication.BUCKET_NAME, "oss-test.json", this
+					.getClass().getClassLoader().getResourceAsStream("oss-test.json"));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			return "upload fail: " + e.getMessage();
+		}
+		return "upload success";
+	}
+
+	@GetMapping("/file-resource")
+	public String fileResource() {
+		try {
+			return "get file resource success. content: " + StreamUtils.copyToString(
+					file.getInputStream(), Charset.forName(CharEncoding.UTF_8));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			return "get resource fail: " + e.getMessage();
+		}
+	}
+
+	@GetMapping("/download")
+	public String download() {
+		try {
+			OSSObject ossObject = ossClient.getObject(OssApplication.BUCKET_NAME,
+					"oss-test.json");
+			return "download success, content: " + IOUtils
+					.readStreamAsString(ossObject.getObjectContent(), CharEncoding.UTF_8);
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			return "download fail: " + e.getMessage();
+		}
+	}
+
+}

spring-cloud-alibaba-examples/oss-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OssApplication.java

@@ -1,49 +0,0 @@
-package org.springframework.cloud.alibaba.cloud.examples;
-
-import com.aliyun.oss.OSS;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-
-import java.net.URISyntaxException;
-
-/**
- * OSS Application
- *
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- */
-@SpringBootApplication
-public class OssApplication {
-
-    public static final String BUCKET_NAME = "spring-cloud-alibaba-test";
-
-    public static void main(String[] args) throws URISyntaxException {
-        SpringApplication.run(OssApplication.class, args);
-    }
-
-    @Bean
-    public AppRunner appRunner() {
-        return new AppRunner();
-    }
-
-    class AppRunner implements ApplicationRunner {
-        @Autowired
-        private OSS ossClient;
-
-        @Override
-        public void run(ApplicationArguments args) throws Exception {
-            try {
-                if (!ossClient.doesBucketExist(BUCKET_NAME)) {
-                    ossClient.createBucket(BUCKET_NAME);
-                }
-            } catch (Exception e) {
-                System.err.println("oss handle bucket error: " + e.getMessage());
-                System.exit(-1);
-            }
-        }
-    }
-
-}

spring-cloud-alibaba-examples/oss-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OssController.java

@@ -1,65 +0,0 @@
-package org.springframework.cloud.alibaba.cloud.examples;
-
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.common.utils.IOUtils;
-import com.aliyun.oss.model.OSSObject;
-import org.apache.commons.codec.CharEncoding;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
-import org.springframework.util.StreamUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.nio.charset.Charset;
-
-/**
- * OSS Controller
- *
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- */
-@RestController
-public class OssController {
-
-    @Autowired
-    private OSS ossClient;
-
-    @Value("oss://" + OssApplication.BUCKET_NAME + "/oss-test.json")
-    private Resource file;
-
-    @GetMapping("/upload")
-    public String upload() {
-        try {
-            ossClient.putObject(OssApplication.BUCKET_NAME, "oss-test.json", this
-                .getClass().getClassLoader().getResourceAsStream("oss-test.json"));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "upload fail: " + e.getMessage();
-        }
-        return "upload success";
-    }
-
-    @GetMapping("/file-resource")
-    public String fileResource() {
-        try {
-            return "get file resource success. content: " + StreamUtils.copyToString(
-                file.getInputStream(), Charset.forName(CharEncoding.UTF_8));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "get resource fail: " + e.getMessage();
-        }
-    }
-
-    @GetMapping("/download")
-    public String download() {
-        try {
-            OSSObject ossObject = ossClient.getObject(OssApplication.BUCKET_NAME, "oss-test.json");
-            return "download success, content: " + IOUtils
-                .readStreamAsString(ossObject.getObjectContent(), CharEncoding.UTF_8);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "download fail: " + e.getMessage();
-        }
-    }
-
-}

spring-cloud-alibaba-examples/pom.xml

@@ -3,14 +3,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-
     <artifactId>spring-cloud-alibaba-examples</artifactId>
     <packaging>pom</packaging>
     <name>Spring Cloud Alibaba Examples</name>

spring-cloud-alibaba-examples/rocketmq-example/readme-zh.md

@@ -40,7 +40,7 @@ Binding 在消息中间件与应用程序提供的 Provider 和 Consumer 之间
 
 ```xml
 <dependency>
-    <groupId>org.springframework.cloud</groupId>
+    <groupId>com.alibaba.cloud</groupId>
     <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
 </dependency>
 ```

spring-cloud-alibaba-examples/rocketmq-example/readme.md

@@ -36,7 +36,7 @@ Before we start the demo, let's learn how to Integration with RocketMQ Binder to
 
 ```xml
 <dependency>
-    <groupId>org.springframework.cloud</groupId>
+    <groupId>com.alibaba.cloud</groupId>
     <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
 </dependency>
 ```

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/Foo.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
@@ -24,15 +24,15 @@ public class Foo {
 		this.id = id;
 	}
 
-    public String getBar() {
-        return bar;
-    }
+	public String getBar() {
+		return bar;
+	}
 
-    public void setBar(String bar) {
-        this.bar = bar;
-    }
+	public void setBar(String bar) {
+		this.bar = bar;
+	}
 
-    @Override
+	@Override
 	public String toString() {
 		return "Foo{" + "id=" + id + ", bar='" + bar + '\'' + '}';
 	}

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/ReceiveService.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.cloud.stream.annotation.StreamListener;
 import org.springframework.messaging.handler.annotation.Payload;

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java

@@ -1,10 +1,9 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.cloud.examples.RocketMQConsumerApplication.MySink;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.Input;
 import org.springframework.cloud.stream.binder.PollableMessageSource;
@@ -12,6 +11,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.messaging.SubscribableChannel;
 
+import com.alibaba.cloud.examples.RocketMQConsumerApplication.MySink;
+
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/Foo.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
@@ -24,15 +24,15 @@ public class Foo {
 		this.id = id;
 	}
 
-    public String getBar() {
-        return bar;
-    }
+	public String getBar() {
+		return bar;
+	}
 
-    public void setBar(String bar) {
-        this.bar = bar;
-    }
+	public void setBar(String bar) {
+		this.bar = bar;
+	}
 
-    @Override
+	@Override
 	public String toString() {
 		return "Foo{" + "id=" + id + ", bar='" + bar + '\'' + '}';
 	}

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java

@@ -1,16 +1,17 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.cloud.examples.RocketMQProduceApplication.MySource;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.Output;
 import org.springframework.context.annotation.Bean;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.MessageBuilder;
 
+import com.alibaba.cloud.examples.RocketMQProduceApplication.MySource;
+
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
@@ -80,7 +81,7 @@ public class RocketMQProduceApplication {
 				}
 			}
 			else if (this.bindingName.equals("output3")) {
-				int count = 50;
+				int count = 20;
 				for (int index = 1; index <= count; index++) {
 					String msgContent = "pullMsg-" + index;
 					mySource.output3()

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/SenderService.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -6,13 +6,14 @@ import java.util.stream.Stream;
 import org.apache.rocketmq.common.message.MessageConst;
 import org.apache.rocketmq.spring.support.RocketMQHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.cloud.examples.RocketMQProduceApplication.MySource;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.MimeTypeUtils;
 
+import com.alibaba.cloud.examples.RocketMQProduceApplication.MySource;
+
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/TransactionListenerImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.apache.rocketmq.spring.annotation.RocketMQTransactionListener;
 import org.apache.rocketmq.spring.core.RocketMQLocalTransactionListener;

spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-logging.level.org.springframework.cloud.stream.binder.rocketmq=DEBUG
+logging.level.com.alibaba.cloud.stream.binder.rocketmq=DEBUG
 
 spring.cloud.stream.rocketmq.binder.name-server=127.0.0.1:9876
 

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-schedulerx</artifactId>
         </dependency>
         <dependency>

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处理接口：SimpleTask
         类型：简单Job单机版
         定时表达式：默认选项——0 * * * * ?
         Job描述：无

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/HelloController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/ScxApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/SimpleTask.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.beans.factory.annotation.Autowired;
 

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/TestController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/TestService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.stereotype.Service;
 

spring-cloud-alibaba-examples/seata-example/account-service/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.util.Random;
 
-import io.seata.core.context.RootContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -26,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.seata.core.context.RootContext;
+
 /**
  * @author xiaojing
  */

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java

@@ -13,19 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.sql.SQLException;
 
-import com.alibaba.druid.pool.DruidDataSource;
-
-import io.seata.rm.datasource.DataSourceProxy;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import com.alibaba.druid.pool.DruidDataSource;
+
+import io.seata.rm.datasource.DataSourceProxy;
+
 /**
  * @author xiaojing
  */
@@ -51,7 +52,8 @@ public class DatabaseConfiguration {
 		String password = environment.getProperty("mysql.user.password");
 
 		DruidDataSource druidDataSource = new DruidDataSource();
-		druidDataSource.setUrl("jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC");
+		druidDataSource.setUrl(
+				"jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC");
 		druidDataSource.setUsername(userName);
 		druidDataSource.setPassword(password);
 		druidDataSource.setDriverClassName("com.mysql.jdbc.Driver");

spring-cloud-alibaba-examples/seata-example/business-service/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
         <dependency>
@@ -33,7 +33,7 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/BusinessApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java

@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
-
-import io.seata.spring.annotation.GlobalTransactional;
+package com.alibaba.cloud.examples;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.cloud.examples.BusinessApplication.OrderService;
-import org.springframework.cloud.alibaba.cloud.examples.BusinessApplication.StorageService;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -33,6 +29,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.cloud.examples.BusinessApplication.OrderService;
+import com.alibaba.cloud.examples.BusinessApplication.StorageService;
+
+import io.seata.spring.annotation.GlobalTransactional;
+
 /**
  * @author xiaojing
  */

spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/Order.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.io.Serializable;
 

spring-cloud-alibaba-examples/seata-example/order-service/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.sql.SQLException;
 
@@ -24,6 +24,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import com.alibaba.druid.pool.DruidDataSource;
+
 import io.seata.rm.datasource.DataSourceProxy;
 
 /**

spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OderApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/Order.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.io.Serializable;
 

spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderController.java

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
-import io.seata.core.context.RootContext;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Random;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,10 +38,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Random;
+import io.seata.core.context.RootContext;
 
 /**
  * @author xiaojing

spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
         <dependency>

spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java

@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.sql.SQLException;
 
-import com.alibaba.druid.pool.DruidDataSource;
-import io.seata.rm.datasource.DataSourceProxy;
-
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import com.alibaba.druid.pool.DruidDataSource;
+
+import io.seata.rm.datasource.DataSourceProxy;
+
 /**
  * @author xiaojing
  */
@@ -52,7 +53,8 @@ public class DatabaseConfiguration {
 		String password = environment.getProperty("mysql.user.password");
 
 		DruidDataSource druidDataSource = new DruidDataSource();
-		druidDataSource.setUrl("jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC");
+		druidDataSource.setUrl(
+				"jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC");
 		druidDataSource.setUsername(userName);
 		druidDataSource.setPassword(password);
 		druidDataSource.setDriverClassName("com.mysql.jdbc.Driver");

spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageController.java

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.cloud.examples;
-
-import io.seata.core.context.RootContext;
+package com.alibaba.cloud.examples;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.seata.core.context.RootContext;
+
 /**
  * @author xiaojing
  */

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md

@@ -15,7 +15,7 @@ Before we start the demo, let's learn how to connect Sentinel to a Spring Cloud
 1. Add dependency spring-cloud-starter-alibaba-sentinel in the pom.xml file in your Spring Cloud project.
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 	

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java

@@ -1,9 +1,9 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
-import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 
+import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
 import com.alibaba.csp.sentinel.slots.block.BlockException;
 
 /**

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/JsonFlowRuleListConverter.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import java.util.List;
 

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ServiceApplication.java

@@ -1,11 +1,11 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
 import com.alibaba.csp.sentinel.datasource.Converter;
 
 /**

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/TestController.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,15 +24,15 @@ public class TestController {
 	}
 
 	@RequestMapping(value = "/aa", method = RequestMethod.GET)
-    @SentinelResource("aa")
+	@SentinelResource("aa")
 	public String aa(int b, int a) {
 		return "Hello test";
 	}
 
-    @RequestMapping(value = "/test", method = RequestMethod.GET)
-    public String test1() {
-        return "Hello test";
-    }
+	@RequestMapping(value = "/test", method = RequestMethod.GET)
+	public String test1() {
+		return "Hello test";
+	}
 
 	@RequestMapping(value = "/template", method = RequestMethod.GET)
 	public String client() {

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

@@ -18,7 +18,7 @@ Before we start the demo, let's learn how to connect Sentinel with Dubbo to a Sp
 1. Add dependency spring-cloud-starter-alibaba-sentinel and dubbo-spring-boot-starter in the pom.xml file in your Spring Cloud project.
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
         
@@ -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 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 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-dubbo-example/sentinel-dubbo-api/pom.xml

@@ -3,14 +3,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-
+    <groupId>com.alibaba.cloud</groupId>
     <artifactId>sentinel-dubbo-api</artifactId>
     <packaging>jar</packaging>
     <description>api for sentinel dubbo example</description>

spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/com/alibaba/cloud/examples/FooService.java

@@ -0,0 +1,10 @@
+package com.alibaba.cloud.examples;
+
+/**
+ * @author fangjian
+ */
+public interface FooService {
+
+	String hello(String name);
+
+}

spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooService.java

@@ -1,10 +0,0 @@
-package org.springframework.cloud.alibaba.cloud.examples;
-
-/**
- * @author fangjian
- */
-public interface FooService {
-
-    String hello(String name);
-
-}

spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
@@ -18,12 +18,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>sentinel-dubbo-api</artifactId>
         </dependency>