study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

refactor & upgrade rocketmq-client version

Browse Source
This commit is contained in:
fangjian0423 2019-03-12 13:59:57 +08:00
parent 0b8c2ad5a3
commit 53c4a6adf6
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-alibaba-dependencies/pom.xml
View File

@ -27,7 +27,7 @@
<aliyun.sdk.version>4.0.1</aliyun.sdk.version> <aliyun.sdk.version>4.0.1</aliyun.sdk.version>
<alicloud.context.version>1.0.5</alicloud.context.version> <alicloud.context.version>1.0.5</alicloud.context.version>
<aliyun.sdk.edas.version>2.16.0</aliyun.sdk.edas.version> <aliyun.sdk.edas.version>2.16.0</aliyun.sdk.edas.version>
<rocketmq.starter.version>2.0.2-SNAPSHOT</rocketmq.starter.version> <rocketmq.starter.version>2.0.2</rocketmq.starter.version>
<schedulerX.client.version>2.1.6</schedulerX.client.version> <schedulerX.client.version>2.1.6</schedulerX.client.version>
<dubbo.version>2.6.5</dubbo.version> <dubbo.version>2.6.5</dubbo.version>
<dubbo-spring-boot.version>0.2.1.RELEASE</dubbo-spring-boot.version> <dubbo-spring-boot.version>0.2.1.RELEASE</dubbo-spring-boot.version>

8
spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java
View File

@ -16,12 +16,9 @@
package org.springframework.cloud.alibaba.cloud.examples; package org.springframework.cloud.alibaba.cloud.examples;
import java.util.HashMap;
import org.apache.rocketmq.spring.annotation.RocketMQTransactionListener; import org.apache.rocketmq.spring.annotation.RocketMQTransactionListener;
import org.apache.rocketmq.spring.core.RocketMQLocalTransactionListener; import org.apache.rocketmq.spring.core.RocketMQLocalTransactionListener;
import org.apache.rocketmq.spring.core.RocketMQLocalTransactionState; import org.apache.rocketmq.spring.core.RocketMQLocalTransactionState;
import org.apache.rocketmq.spring.support.RocketMQHeaders;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
/** /**
@ -32,8 +29,7 @@ public class TransactionListenerImpl implements RocketMQLocalTransactionListener
@Override @Override
public RocketMQLocalTransactionState executeLocalTransaction(Message msg, public RocketMQLocalTransactionState executeLocalTransaction(Message msg,
Object arg) { Object arg) {
Object num = ((HashMap) msg.getHeaders().get(RocketMQHeaders.PROPERTIES)) Object num = msg.getHeaders().get("test");
.get("USERS_test");
if ("1".equals(num)) { if ("1".equals(num)) {
System.out.println( System.out.println(
@ -55,4 +51,4 @@ public class TransactionListenerImpl implements RocketMQLocalTransactionListener
System.out.println("check: " + new String((byte[]) msg.getPayload())); System.out.println("check: " + new String((byte[]) msg.getPayload()));
return RocketMQLocalTransactionState.COMMIT; return RocketMQLocalTransactionState.COMMIT;
} }
} }

2
spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java
View File

@ -25,7 +25,7 @@ import org.springframework.util.StringUtils;
*/ */
public class RocketMQBinderUtils { public class RocketMQBinderUtils {
public static RocketMQBinderConfigurationProperties mergeProducerProperties( public static RocketMQBinderConfigurationProperties mergeProperties(
RocketMQBinderConfigurationProperties rocketBinderConfigurationProperties, RocketMQBinderConfigurationProperties rocketBinderConfigurationProperties,
RocketMQProperties rocketMQProperties) { RocketMQProperties rocketMQProperties) {
RocketMQBinderConfigurationProperties result = new RocketMQBinderConfigurationProperties(); RocketMQBinderConfigurationProperties result = new RocketMQBinderConfigurationProperties();

2
spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
View File

@ -87,7 +87,7 @@ public class RocketMQMessageChannelBinder extends
if (producerProperties.getExtension().getEnabled()) { if (producerProperties.getExtension().getEnabled()) {
RocketMQBinderConfigurationProperties mergedProperties = RocketMQBinderUtils RocketMQBinderConfigurationProperties mergedProperties = RocketMQBinderUtils
.mergeProducerProperties(rocketBinderConfigurationProperties, .mergeProperties(rocketBinderConfigurationProperties,
rocketMQProperties); rocketMQProperties);
RocketMQTemplate rocketMQTemplate; RocketMQTemplate rocketMQTemplate;