diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index bdfc1d18..a5c21cc8 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -27,7 +27,7 @@ 4.0.1 1.0.5 2.16.0 - 2.0.2-SNAPSHOT + 2.0.2 2.1.6 2.6.5 0.2.1.RELEASE diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java index 3e28c826..0bd48410 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java @@ -16,12 +16,9 @@ package org.springframework.cloud.alibaba.cloud.examples; -import java.util.HashMap; - import org.apache.rocketmq.spring.annotation.RocketMQTransactionListener; import org.apache.rocketmq.spring.core.RocketMQLocalTransactionListener; import org.apache.rocketmq.spring.core.RocketMQLocalTransactionState; -import org.apache.rocketmq.spring.support.RocketMQHeaders; import org.springframework.messaging.Message; /** @@ -32,8 +29,7 @@ public class TransactionListenerImpl implements RocketMQLocalTransactionListener @Override public RocketMQLocalTransactionState executeLocalTransaction(Message msg, Object arg) { - Object num = ((HashMap) msg.getHeaders().get(RocketMQHeaders.PROPERTIES)) - .get("USERS_test"); + Object num = msg.getHeaders().get("test"); if ("1".equals(num)) { System.out.println( @@ -55,4 +51,4 @@ public class TransactionListenerImpl implements RocketMQLocalTransactionListener System.out.println("check: " + new String((byte[]) msg.getPayload())); return RocketMQLocalTransactionState.COMMIT; } -} +} \ No newline at end of file diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java index 7c24012a..b50e799d 100644 --- a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java @@ -25,7 +25,7 @@ import org.springframework.util.StringUtils; */ public class RocketMQBinderUtils { - public static RocketMQBinderConfigurationProperties mergeProducerProperties( + public static RocketMQBinderConfigurationProperties mergeProperties( RocketMQBinderConfigurationProperties rocketBinderConfigurationProperties, RocketMQProperties rocketMQProperties) { RocketMQBinderConfigurationProperties result = new RocketMQBinderConfigurationProperties(); diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java index 921caf6a..e864067c 100644 --- a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java @@ -87,7 +87,7 @@ public class RocketMQMessageChannelBinder extends if (producerProperties.getExtension().getEnabled()) { RocketMQBinderConfigurationProperties mergedProperties = RocketMQBinderUtils - .mergeProducerProperties(rocketBinderConfigurationProperties, + .mergeProperties(rocketBinderConfigurationProperties, rocketMQProperties); RocketMQTemplate rocketMQTemplate;