Merge branch '1.x' into 1.x

spring-cloud-alibaba-examples/pom.xml

@@ -29,6 +29,7 @@
         <module>acm-example/acm-local-example</module>
         <module>rocketmq-example</module>
         <module>spring-cloud-bus-rocketmq-example</module>
+        <module>schedulerx-example/schedulerx-simple-task-example</module>
     </modules>
 
     <build>

spring-cloud-alibaba-examples/rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/MyTransactionCheckListener.java

@@ -0,0 +1,18 @@
+package org.springframework.cloud.alibaba.cloud.examples;
+
+import org.apache.rocketmq.client.producer.LocalTransactionState;
+import org.apache.rocketmq.client.producer.TransactionCheckListener;
+import org.apache.rocketmq.common.message.MessageExt;
+
+/**
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+public class MyTransactionCheckListener implements TransactionCheckListener {
+
+	@Override
+	public LocalTransactionState checkLocalTransactionState(MessageExt msg) {
+		System.out.println("TransactionCheckListener: " + new String(msg.getBody()));
+		return LocalTransactionState.COMMIT_MESSAGE;
+	}
+
+}

spring-cloud-alibaba-examples/rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/MyTransactionExecuter.java

@@ -0,0 +1,20 @@
+package org.springframework.cloud.alibaba.cloud.examples;
+
+import org.apache.rocketmq.client.producer.LocalTransactionExecuter;
+import org.apache.rocketmq.client.producer.LocalTransactionState;
+import org.apache.rocketmq.common.message.Message;
+
+/**
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+public class MyTransactionExecuter implements LocalTransactionExecuter {
+	@Override
+	public LocalTransactionState executeLocalTransactionBranch(Message msg, Object arg) {
+		if ("1".equals(msg.getUserProperty("test"))) {
+			System.out.println(new String(msg.getBody()) + " rollback");
+			return LocalTransactionState.ROLLBACK_MESSAGE;
+		}
+		System.out.println(new String(msg.getBody()) + " commit");
+		return LocalTransactionState.COMMIT_MESSAGE;
+	}
+}

spring-cloud-alibaba-examples/rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ReceiveService.java

@@ -30,4 +30,9 @@ public class ReceiveService {
 		System.out.println("input1 receive again: " + receiveMsg);
 	}
 
+	@StreamListener("input4")
+	public void receiveTransactionalMsg(String transactionMsg) {
+		System.out.println("input4 receive transaction msg: " + transactionMsg);
+	}
+
 }

spring-cloud-alibaba-examples/rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RocketMQApplication.java

@@ -5,17 +5,19 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.alibaba.cloud.examples.RocketMQApplication.MySink;
+import org.springframework.cloud.alibaba.cloud.examples.RocketMQApplication.MySource;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.messaging.Source;
+import org.springframework.cloud.stream.annotation.Output;
 import org.springframework.context.annotation.Bean;
+import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.SubscribableChannel;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
 @SpringBootApplication
-@EnableBinding({ Source.class, MySink.class })
+@EnableBinding({ MySource.class, MySink.class })
 public class RocketMQApplication {
 
 	public interface MySink {
@@ -29,17 +31,33 @@ public class RocketMQApplication {
 		@Input("input3")
 		SubscribableChannel input3();
 
+		@Input("input4")
+		SubscribableChannel input4();
+
+	}
+
+	public interface MySource {
+		@Output("output1")
+		MessageChannel output1();
+
+		@Output("output2")
+		MessageChannel output2();
 	}
 
 	public static void main(String[] args) {
 		SpringApplication.run(RocketMQApplication.class, args);
-    }
+	}
 
 	@Bean
 	public CustomRunner customRunner() {
 		return new CustomRunner();
 	}
 
+	@Bean
+	public CustomRunnerWithTransactional customRunnerWithTransactional() {
+		return new CustomRunnerWithTransactional();
+	}
+
 	public static class CustomRunner implements CommandLineRunner {
 		@Autowired
 		private SenderService senderService;
@@ -62,4 +80,21 @@ public class RocketMQApplication {
 		}
 	}
 
+	public static class CustomRunnerWithTransactional implements CommandLineRunner {
+		@Autowired
+		private SenderService senderService;
+
+		@Override
+		public void run(String... args) throws Exception {
+			// COMMIT_MESSAGE message
+			senderService.sendTransactionalMsg("transactional-msg1", false);
+			// ROLLBACK_MESSAGE message
+			senderService.sendTransactionalMsg("transactional-msg2", true);
+			// ROLLBACK_MESSAGE message
+			senderService.sendTransactionalMsg("transactional-msg3", true);
+			// COMMIT_MESSAGE message
+			senderService.sendTransactionalMsg("transactional-msg4", false);
+		}
+	}
+
 }

spring-cloud-alibaba-examples/rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SenderService.java

@@ -5,7 +5,7 @@ import java.util.Map;
 
 import org.apache.rocketmq.common.message.MessageConst;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.stream.messaging.Source;
+import org.springframework.cloud.alibaba.cloud.examples.RocketMQApplication.MySource;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.support.MessageBuilder;
@@ -19,17 +19,17 @@ import org.springframework.util.MimeTypeUtils;
 public class SenderService {
 
 	@Autowired
-	private Source source;
+	private MySource source;
 
 	public void send(String msg) throws Exception {
-		source.output().send(MessageBuilder.withPayload(msg).build());
+		source.output1().send(MessageBuilder.withPayload(msg).build());
 	}
 
 	public <T> void sendWithTags(T msg, String tag) throws Exception {
 		Map<String, Object> map = new HashMap<>();
 		map.put(MessageConst.PROPERTY_TAGS, tag);
 		Message message = MessageBuilder.createMessage(msg, new MessageHeaders(map));
-		source.output().send(message);
+		source.output1().send(message);
 	}
 
 	public <T> void sendObject(T msg, String tag) throws Exception {
@@ -37,7 +37,17 @@ public class SenderService {
 				.setHeader(MessageConst.PROPERTY_TAGS, tag)
 				.setHeader(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.APPLICATION_JSON)
 				.build();
-		source.output().send(message);
+		source.output1().send(message);
+	}
+
+	public <T> void sendTransactionalMsg(T msg, boolean error) throws Exception {
+		MessageBuilder builder = MessageBuilder.withPayload(msg)
+				.setHeader(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.APPLICATION_JSON);
+		if (error) {
+			builder.setHeader("test", "1");
+		}
+		Message message = builder.build();
+		source.output2().send(message);
 	}
 
 }

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

@@ -2,8 +2,14 @@ spring.cloud.stream.default-binder=rocketmq
 
 spring.cloud.stream.rocketmq.binder.namesrv-addr=127.0.0.1:9876
 
-spring.cloud.stream.bindings.output.destination=test-topic
-spring.cloud.stream.bindings.output.content-type=application/json
+spring.cloud.stream.bindings.output1.destination=test-topic
+spring.cloud.stream.bindings.output1.content-type=application/json
+
+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.executer=org.springframework.cloud.alibaba.cloud.examples.MyTransactionExecuter
+spring.cloud.stream.rocketmq.bindings.output2.producer.transaction-check-listener=org.springframework.cloud.alibaba.cloud.examples.MyTransactionCheckListener
 
 spring.cloud.stream.bindings.input1.destination=test-topic
 spring.cloud.stream.bindings.input1.content-type=text/plain
@@ -26,5 +32,12 @@ spring.cloud.stream.rocketmq.bindings.input3.consumer.tags=tagObj
 spring.cloud.stream.bindings.input3.consumer.concurrency=20
 spring.cloud.stream.bindings.input3.consumer.maxAttempts=1
 
+spring.cloud.stream.bindings.input4.destination=TransactionTopic
+spring.cloud.stream.bindings.input4.content-type=text/plain
+spring.cloud.stream.bindings.input4.group=transaction-group
+spring.cloud.stream.bindings.input4.consumer.concurrency=210
+
+spring.application.name=rocketmq-example
+
 server.port=28081
 management.security.enabled=false

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

@@ -0,0 +1,37 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>spring-cloud-alibaba-examples</artifactId>
+        <groupId>org.springframework.cloud</groupId>
+        <version>0.1.1.BUILD-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>schedulerx-simple-task-example</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-alicloud-schedulerx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md

@@ -0,0 +1,47 @@
+# SchedulerX Simple Task Example
+
+## 项目说明
+
+本项目展示了，在Spring Cloud体系中，如何快如接入SchedulerX，使用任务调度服务。
+
+SchedulerX 是阿里中间件团队开发的一款分布式任务调度产品。它为您提供秒级、精准、高可靠、高可用的定时（基于 Cron 表达式）任务调度服务。同时提供分布式的任务执行模型，如网格任务。网格任务支持海量子任务均匀分配到所有 Worker（schedulerx-client）上执行。
+
+## 示例
+
+### 准备工作
+
+1. 请先[注册阿里云账号](https://account.aliyun.com/register/register.htm?spm=5176.8142029.388261.26.e9396d3eEIv28g&oauth_callback=https%3A%2F%2Fwww.aliyun.com%2F)
+
+2. SchedulerX集成到了EDAS组件中心，因此需要[开通EDAS服务](https://common-buy.aliyun.com/?spm=5176.11451019.0.0.6f5965c0Uq5tue&commodityCode=edaspostpay#/buy)
+
+3. 到[EDAS组件中心](https://edas.console.aliyun.com/#/edasTools)开通SchedulerX组件，即分布式任务管理。
+
+4. 进入[SchedulerX分组管理](https://edas.console.aliyun.com/#/schedulerXGroup?regionNo=cn-test)页面，选择上方"测试"区域，点击右上角"新建分组"，创建一个分组。
+ 
+5. 将"分组ID"的值填写到`application.properties`文件中`key`为`spring.cloud.alicloud.scx.group-id`对应的value值，即如下所示。
+
+        spring.cloud.alicloud.scx.group-id=111-1-1-1111
+        
+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单机版
+        定时表达式：默认选项——0 * * * * ?
+        Job描述：无
+        自定义参数：无
+        
+### 启动应用
+
+直接运行main class，即`ScxApplication`。
+
+### 查看效果
+
+观察应用的控制台日志输出，可以看到每一分钟会打印一次如下日志。
+
+```
+    -----------Hello world---------------
+```
+
+如果您对 Spring Cloud SchedulerX Starter 有任何建议或想法，欢迎提交 issue 中或者通过其他社区渠道向我们反馈。
+

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

@@ -0,0 +1,32 @@
+/*
+ * 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
+ *
+ *      http://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 org.springframework.cloud.alibaba.cloud.examples;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author xiaolongzuo
+ */
+@SpringBootApplication
+public class ScxApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(ScxApplication.class, args);
+	}
+
+}

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SimpleTask.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
+ *
+ *      http://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 org.springframework.cloud.alibaba.cloud.examples;
+
+import com.alibaba.edas.schedulerx.ProcessResult;
+import com.alibaba.edas.schedulerx.ScxSimpleJobContext;
+import com.alibaba.edas.schedulerx.ScxSimpleJobProcessor;
+
+/**
+ * @author xiaolongzuo
+ */
+public class SimpleTask implements ScxSimpleJobProcessor {
+
+	@Override
+	public ProcessResult process(ScxSimpleJobContext context) {
+		System.out.println("-----------Hello world---------------");
+		ProcessResult processResult = new ProcessResult(true);
+		return processResult;
+	}
+
+}

spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+server.port=18033
+spring.cloud.alicloud.scx.group-id=***
+spring.cloud.alicloud.edas.namespace=cn-test