1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

set default producer group

This commit is contained in:
fangjian0423 2019-03-14 15:23:05 +08:00
parent 16ff3a4331
commit 768feaa3ec

View File

@ -83,6 +83,12 @@ public class RocketMQMessageChannelBinder extends
MessageChannel errorChannel) throws Exception { MessageChannel errorChannel) throws Exception {
if (producerProperties.getExtension().getEnabled()) { if (producerProperties.getExtension().getEnabled()) {
// if producerGroup is empty, using destination
String extendedProducerGroup = producerProperties.getExtension().getGroup();
String producerGroup = StringUtils.isEmpty(extendedProducerGroup)
? destination.getName()
: extendedProducerGroup;
RocketMQBinderConfigurationProperties mergedProperties = RocketMQBinderUtils RocketMQBinderConfigurationProperties mergedProperties = RocketMQBinderUtils
.mergeProperties(rocketBinderConfigurationProperties, .mergeProperties(rocketBinderConfigurationProperties,
rocketMQProperties); rocketMQProperties);
@ -111,8 +117,7 @@ public class RocketMQMessageChannelBinder extends
if (!StringUtils.isEmpty(ak) && !StringUtils.isEmpty(sk)) { if (!StringUtils.isEmpty(ak) && !StringUtils.isEmpty(sk)) {
RPCHook rpcHook = new AclClientRPCHook( RPCHook rpcHook = new AclClientRPCHook(
new SessionCredentials(ak, sk)); new SessionCredentials(ak, sk));
producer = new DefaultMQProducer( producer = new DefaultMQProducer(producerGroup, rpcHook,
producerProperties.getExtension().getGroup(), rpcHook,
mergedProperties.isEnableMsgTrace(), mergedProperties.isEnableMsgTrace(),
mergedProperties.getCustomizedTraceTopic()); mergedProperties.getCustomizedTraceTopic());
producer.setVipChannelEnabled(false); producer.setVipChannelEnabled(false);
@ -120,8 +125,7 @@ public class RocketMQMessageChannelBinder extends
RocketMQUtil.getInstanceName(rpcHook, destination.getName())); RocketMQUtil.getInstanceName(rpcHook, destination.getName()));
} }
else { else {
producer = new DefaultMQProducer( producer = new DefaultMQProducer(producerGroup);
producerProperties.getExtension().getGroup());
producer.setVipChannelEnabled( producer.setVipChannelEnabled(
producerProperties.getExtension().getVipChannelEnabled()); producerProperties.getExtension().getVipChannelEnabled());
} }
@ -142,8 +146,7 @@ public class RocketMQMessageChannelBinder extends
} }
RocketMQMessageHandler messageHandler = new RocketMQMessageHandler( RocketMQMessageHandler messageHandler = new RocketMQMessageHandler(
rocketMQTemplate, destination.getName(), rocketMQTemplate, destination.getName(), producerGroup,
producerProperties.getExtension().getGroup(),
producerProperties.getExtension().getTransactional(), producerProperties.getExtension().getTransactional(),
instrumentationManager); instrumentationManager);
messageHandler.setBeanFactory(this.getApplicationContext().getBeanFactory()); messageHandler.setBeanFactory(this.getApplicationContext().getBeanFactory());