update examples

pom.xml

@@ -74,6 +74,10 @@
         <javax-servlet-api>3.0</javax-servlet-api>
         <slf4j-api.version>1.7.25</slf4j-api.version>
 
+        <!-- Apache Dubbo -->
+        <dubbo.version>2.7.3</dubbo.version>
+        <dubbo-spring-boot.version>2.7.3</dubbo-spring-boot.version>
+
         <!-- Apache RocketMQ -->
         <rocketmq.starter.version>2.0.2</rocketmq.starter.version>
 
@@ -140,6 +144,34 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Dubbo Spring Boot Starter -->
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-spring-boot-starter</artifactId>
+                <version>${dubbo-spring-boot.version}</version>
+            </dependency>
+
+            <!-- Dubbo -->
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo</artifactId>
+                <version>${dubbo.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-context</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.rocketmq</groupId>
                 <artifactId>rocketmq-spring-boot-starter</artifactId>

spring-cloud-alibaba-dependencies/pom.xml

@@ -27,8 +27,6 @@
         <alicloud.context.version>1.0.5</alicloud.context.version>
         <aliyun.sdk.edas.version>2.44.0</aliyun.sdk.edas.version>
         <schedulerX.client.version>2.1.6</schedulerX.client.version>
-        <dubbo.version>2.7.3</dubbo.version>
-        <dubbo-spring-boot.version>2.7.1</dubbo-spring-boot.version>
         <aliyun.java.sdk.dysmsapi>1.1.0</aliyun.java.sdk.dysmsapi>
         <aliyun.sdk.mns>1.1.8.6</aliyun.sdk.mns>
         <aliyun.java.sdk.dyvmsapi>1.1.1</aliyun.java.sdk.dyvmsapi>
@@ -188,34 +186,6 @@
                 <version>${seata.version}</version>
             </dependency>
 
-            <!-- Dubbo Spring Boot Starter -->
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-spring-boot-starter</artifactId>
-                <version>${dubbo-spring-boot.version}</version>
-            </dependency>
-
-            <!-- Dubbo -->
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo</artifactId>
-                <version>${dubbo.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <!-- Aliyun OSS dependencies -->
             <dependency>
                 <groupId>com.aliyun.oss</groupId>

spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc

@@ -281,7 +281,7 @@ NOTE: 该配置必须放在 bootstrap.properties 文件中。并且在添加配
 
 === 支持自定义扩展的 Data Id 配置
 
-Nacos Config 从 0.2.1 版本后，可支持自定义 Data Id 的配置。关于这部分详细的设计可参考 https://github.com/spring-cloud-incubator/spring-cloud-alibaba/issues/141[这里]。
+Nacos Config 从 0.2.1 版本后，可支持自定义 Data Id 的配置。关于这部分详细的设计可参考 https://github.com/alibaba/spring-cloud-alibaba/issues/141[这里]。
 一个完整的配置案例如下所示：
 
 [source,properties]

spring-cloud-alibaba-docs/src/main/asciidoc/nacos-config.adoc

@@ -280,7 +280,7 @@ NOTE: This configuration must be in the bootstrap.properties file, and the value
 
 === Support Custom Data Id
 
-As of Spring Cloud Alibaba Nacos Config, data id can be self-defined. For detailed design of this part, refer to https://github.com/spring-cloud-incubator/spring-cloud-alibaba/issues/141[Github issue].
+As of Spring Cloud Alibaba Nacos Config, data id can be self-defined. For detailed design of this part, refer to https://github.com/alibaba/spring-cloud-alibaba/issues/141[Github issue].
 The following is a complete sample:
 
 [source,properties]

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

@@ -26,6 +26,7 @@ public class ConsumerApplication {
 
 	@LoadBalanced
 	@Bean
+	@SentinelRestTemplate(urlCleanerClass = UrlCleaner.class, urlCleaner = "clean")
 	public RestTemplate restTemplate() {
 		return new RestTemplate();
 	}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+public class UrlCleaner {
+	public static String clean(String url) {
+		System.out.println("enter urlCleaner");
+		if (url.matches(".*/echo/.*")) {
+			System.out.println("change url");
+			url = url.replaceAll("/echo/.*", "/echo/{str}");
+		}
+		return url;
+	}
+}

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/resources/application.properties

@@ -1,7 +1,8 @@
 spring.application.name=service-consumer-1X
 server.port=18083
 management.security.enabled=false
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+#spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.server-addr=127.0.0.1:8848
 feign.sentinel.enabled=true
 spring.cloud.sentinel.transport.dashboard=localhost:8080
 spring.cloud.sentinel.eager=true

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/application.yml

@@ -1 +1,3 @@
-config: config-from-yml
+config: config-from-yml
+server:
+  port: 7777

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

@@ -19,7 +19,7 @@ import org.springframework.context.annotation.Bean;
 @SpringBootApplication
 public class OssApplication {
 
-	public static final String BUCKET_NAME = "spring-cloud-alibaba-test";
+	public static final String BUCKET_NAME = "spring-cloud-alibaba";
 
 	public static void main(String[] args) throws URISyntaxException {
 		SpringApplication.run(OssApplication.class, args);

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

@@ -1,5 +1,23 @@
+/*
+ * Copyright 2013-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 java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.charset.Charset;
 
 import com.aliyun.oss.OSS;
@@ -10,12 +28,13 @@ 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.core.io.WritableResource;
 import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * OSS Controller
+ * OSS Controller.
  *
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
@@ -25,8 +44,11 @@ public class OssController {
 	@Autowired
 	private OSS ossClient;
 
+	@Value("classpath:/oss-test.json")
+	private Resource localFile;
+
 	@Value("oss://" + OssApplication.BUCKET_NAME + "/oss-test.json")
-	private Resource file;
+	private Resource remoteFile;
 
 	@GetMapping("/upload")
 	public String upload() {
@@ -45,7 +67,7 @@ public class OssController {
 	public String fileResource() {
 		try {
 			return "get file resource success. content: " + StreamUtils.copyToString(
-					file.getInputStream(), Charset.forName(CharEncoding.UTF_8));
+					remoteFile.getInputStream(), Charset.forName(CharEncoding.UTF_8));
 		}
 		catch (Exception e) {
 			e.printStackTrace();
@@ -67,4 +89,20 @@ public class OssController {
 		}
 	}
 
+	@GetMapping("/upload2")
+	public String uploadWithOutputStream() {
+		try {
+			try (OutputStream outputStream = ((WritableResource) this.remoteFile)
+					.getOutputStream();
+					InputStream inputStream = localFile.getInputStream()) {
+				StreamUtils.copy(inputStream, outputStream);
+			}
+		}
+		catch (Exception ex) {
+			ex.printStackTrace();
+			return "upload with outputStream failed";
+		}
+		return "upload success";
+	}
+
 }

spring-cloud-alibaba-examples/oss-example/src/main/resources/oss-test.json

@@ -1,6 +1,6 @@
 {
   "name": "spring-cloud-alibaba",
-  "github": "https://github.com/spring-cloud-incubator/spring-cloud-alibaba",
+  "github": "https://github.com/alibaba/spring-cloud-alibaba",
   "authors": ["Jim", "flystar32"],
   "emails": ["fangjian0423@gmail.com", "flystar32@163.com"]
 }

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

@@ -1,6 +1,7 @@
 package com.alibaba.cloud.examples;
 
 import org.springframework.cloud.stream.annotation.StreamListener;
+import org.springframework.messaging.Message;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.stereotype.Service;
 
@@ -10,10 +11,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class ReceiveService {
 
-	@StreamListener("input1")
+    @StreamListener("input1")
-	public void receiveInput1(String receiveMsg) {
+    public void receiveInput1(Message message) {
-		System.out.println("input1 receive: " + receiveMsg);
+        System.out.println("input1 receive: " + message.getPayload() + ", foo header: " + message.getHeaders().get("foo"));
-	}
+    }
 
 	@StreamListener("input2")
 	public void receiveInput2(String receiveMsg) {

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

@@ -28,6 +28,7 @@ public class RocketMQConsumerApplication {
 
 		@Input("input4")
 		SubscribableChannel input4();
+
 	}
 
 	public static void main(String[] args) {

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

@@ -4,6 +4,7 @@ spring.cloud.stream.bindings.input1.destination=test-topic
 spring.cloud.stream.bindings.input1.content-type=text/plain
 spring.cloud.stream.bindings.input1.group=test-group1
 spring.cloud.stream.rocketmq.bindings.input1.consumer.orderly=true
+spring.cloud.stream.rocketmq.bindings.input1.consumer.trustedPackages=com.alibaba.cloud
 
 spring.cloud.stream.bindings.input2.destination=test-topic
 spring.cloud.stream.bindings.input2.content-type=text/plain

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

@@ -0,0 +1,31 @@
+/*
+ * 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.cloud.stream.binder.PartitionSelectorStrategy;
+
+/**
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+public class MyPartitionSelectorStrategy implements PartitionSelectorStrategy {
+	@Override
+	public int selectPartition(Object key, int partitionCount) {
+		System.out
+				.println("partition key: " + key + ", partitionCount: " + partitionCount);
+		return 0;
+	}
+}

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

@@ -9,6 +9,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.Output;
 import org.springframework.context.annotation.Bean;
+import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 
 /**
@@ -24,6 +26,10 @@ public class RocketMQProduceApplication {
 
 		@Output("output2")
 		MessageChannel output2();
+
+		@Output("output3")
+		MessageChannel output3();
+
 	}
 
 	public static void main(String[] args) {
@@ -32,7 +38,12 @@ public class RocketMQProduceApplication {
 
 	@Bean
 	public CustomRunner customRunner() {
-		return new CustomRunner();
+		return new CustomRunner("output1");
+	}
+
+	@Bean
+	public CustomRunner customRunner2() {
+		return new CustomRunner("output3");
 	}
 
 	@Bean
@@ -41,24 +52,46 @@ public class RocketMQProduceApplication {
 	}
 
 	public static class CustomRunner implements CommandLineRunner {
+
+		private final String bindingName;
+
+		public CustomRunner(String bindingName) {
+			this.bindingName = bindingName;
+		}
+
 		@Autowired
 		private SenderService senderService;
 
+		@Autowired
+		private MySource mySource;
+
 		@Override
 		public void run(String... args) throws Exception {
-			int count = 5;
+			if (this.bindingName.equals("output1")) {
-			for (int index = 1; index <= count; index++) {
+				int count = 5;
-				String msgContent = "msg-" + index;
+				for (int index = 1; index <= count; index++) {
-				if (index % 3 == 0) {
+					String msgContent = "msg-" + index;
-					senderService.send(msgContent);
+					if (index % 3 == 0) {
-				}
+						senderService.send(msgContent);
-				else if (index % 3 == 1) {
+					}
-					senderService.sendWithTags(msgContent, "tagStr");
+					else if (index % 3 == 1) {
-				}
+						senderService.sendWithTags(msgContent, "tagStr");
-				else {
+					}
-					senderService.sendObject(new Foo(index, "foo"), "tagObj");
+					else {
+						senderService.sendObject(new Foo(index, "foo"), "tagObj");
+					}
 				}
 			}
+			else if (this.bindingName.equals("output3")) {
+				int count = 5;
+				for (int index = 1; index <= count; index++) {
+					String msgContent = "partitionMsg-" + index;
+					Message message = MessageBuilder.withPayload(msgContent)
+							.setHeader("myPartitionKey", "myPartitionKey").build();
+					mySource.output3().send(message);
+				}
+			}
+
 		}
 	}
 

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

@@ -38,6 +38,7 @@ public class SenderService {
 	public <T> void sendObject(T msg, String tag) throws Exception {
 		Message message = MessageBuilder.withPayload(msg)
 				.setHeader(MessageConst.PROPERTY_TAGS, tag)
+				.setHeader("foo", new Foo(1, "bar"))
 				.setHeader(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.APPLICATION_JSON)
 				.build();
 		source.output1().send(message);

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

@@ -6,12 +6,20 @@ spring.cloud.stream.bindings.output1.destination=test-topic
 spring.cloud.stream.bindings.output1.content-type=application/json
 spring.cloud.stream.rocketmq.bindings.output1.producer.group=binder-group
 spring.cloud.stream.rocketmq.bindings.output1.producer.sync=true
+spring.cloud.stream.rocketmq.bindings.output1.producer.sendMessageTimeout=30000
 
 spring.cloud.stream.bindings.output2.destination=TransactionTopic
 spring.cloud.stream.bindings.output2.content-type=application/json
 spring.cloud.stream.rocketmq.bindings.output2.producer.transactional=true
 spring.cloud.stream.rocketmq.bindings.output2.producer.group=myTxProducerGroup
 
+spring.cloud.stream.bindings.output3.destination=partition-topic
+spring.cloud.stream.bindings.output3.content-type=text/plain
+spring.cloud.stream.bindings.output3.producer.partition-key-expression=headers['myPartitionKey']
+spring.cloud.stream.bindings.output3.producer.partition-selector-class=com.alibaba.cloud.examples.MyPartitionSelectorStrategy
+spring.cloud.stream.bindings.output3.producer.partition-count=8
+spring.cloud.stream.rocketmq.bindings.output3.producer.group=partition-binder-group
+
 spring.application.name=rocketmq-produce-example
 
 server.port=28081

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-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;
 
 /**

spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/FooServiceConsumer.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-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.apache.dubbo.config.annotation.Reference;
@@ -7,7 +23,9 @@ import org.apache.dubbo.config.annotation.Reference;
  */
 public class FooServiceConsumer {
 
-	@Reference(version = "${foo.service.version}", application = "${dubbo.application.id}", url = "dubbo://localhost:12345", timeout = 30000)
+	@Reference(version = "${foo.service.version}",
+			application = "${dubbo.application.id}",
+			url = "dubbo://localhost:12345?version=1.0.0", timeout = 30000)
 	private FooService fooService;
 
 	public String hello(String name) {

spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboConsumerApp.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-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 java.util.Collections;
@@ -34,8 +50,9 @@ public class SentinelDubboConsumerApp {
 		FlowRuleManager.loadRules(Collections.singletonList(flowRule));
 
 		SpringApplicationBuilder consumerBuilder = new SpringApplicationBuilder();
-		ApplicationContext applicationContext = consumerBuilder.web(false)
+		ApplicationContext applicationContext = consumerBuilder
-				.sources(SentinelDubboConsumerApp.class).run(args);
+				.web(false).sources(SentinelDubboConsumerApp.class)
+				.run(args);
 
 		FooServiceConsumer service = applicationContext.getBean(FooServiceConsumer.class);
 

spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/com/alibaba/cloud/examples/FooServiceImpl.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-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.apache.dubbo.config.annotation.Service;
@@ -5,11 +21,13 @@ import org.apache.dubbo.config.annotation.Service;
 /**
  * @author fangjian
  */
-@Service(version = "${foo.service.version}", application = "${dubbo.application.id}", protocol = "${dubbo.protocol.id}", registry = "${dubbo.registry.id}")
+@Service(version = "${foo.service.version}", application = "${dubbo.application.id}",
+		protocol = "${dubbo.protocol.id}", registry = "${dubbo.registry.id}")
 public class FooServiceImpl implements FooService {
 
 	@Override
 	public String hello(String name) {
 		return "hello, " + name;
 	}
-}
+
+}

spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboProviderApp.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-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.autoconfigure.SpringBootApplication;

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/resources/application.yaml

@@ -13,8 +13,8 @@ spring:
         ruleType: gw-api-group
       transport:
         dashboard: localhost:8080
-      filter:
+#      filter:
-        enabled: false
+#        enabled: true
 
 management.endpoints.web.exposure.include: "*"
 

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java

@@ -91,6 +91,9 @@ public class SentinelBeanPostProcessor implements MergedBeanDefinitionPostProces
 		checkBlock4RestTemplate(sentinelRestTemplate.fallbackClass(),
 				sentinelRestTemplate.fallback(), beanName,
 				SentinelConstants.FALLBACK_TYPE);
+		checkBlock4RestTemplate(sentinelRestTemplate.urlCleanerClass(),
+				sentinelRestTemplate.urlCleaner(), beanName,
+				SentinelConstants.URLCLEANER_TYPE);
 	}
 
 	private void checkBlock4RestTemplate(Class<?> blockClass, String blockMethod,

spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java

@@ -16,6 +16,11 @@
 
 package com.alibaba.alicloud.oss;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 import com.alibaba.alicloud.oss.resource.OssStorageProtocolResolver;
 
 import com.aliyun.oss.OSS;
@@ -26,8 +31,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import static com.alibaba.alicloud.oss.OssConstants.OSS_TASK_EXECUTOR_BEAN_NAME;
+
 /**
- * OSS Auto {@link Configuration}
+ * OSS Auto {@link Configuration}.
  *
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
@@ -42,4 +49,12 @@ public class OssAutoConfiguration {
 		return new OssStorageProtocolResolver();
 	}
 
+	@Bean(name = OSS_TASK_EXECUTOR_BEAN_NAME)
+	@ConditionalOnMissingBean
+	public ExecutorService ossTaskExecutor() {
+		int coreSize = Runtime.getRuntime().availableProcessors();
+		return new ThreadPoolExecutor(coreSize, 128, 60, TimeUnit.SECONDS,
+				new LinkedBlockingQueue<Runnable>());
+	}
+
 }