diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AbstractAliYunRocketMQReceiver.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AbstractAliYunRocketMQReceiver.java index 028a089..aaeff6c 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AbstractAliYunRocketMQReceiver.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AbstractAliYunRocketMQReceiver.java @@ -25,7 +25,7 @@ public abstract class AbstractAliYunRocketMQReceiver implements IMQMsgReceiver, * * @return */ - public abstract String getCusumerName(); + public abstract String getConsumerName(); /** * 发送类型 @@ -48,16 +48,16 @@ public abstract class AbstractAliYunRocketMQReceiver implements IMQMsgReceiver, public Action consume(Message message, ConsumeContext context) { try { receiveMsg(new String(message.getBody())); - log.info("【{}】MQ消息消费成功topic:{}, messageId:{}", getCusumerName(), message.getTopic(), message.getMsgID()); + log.info("【{}】MQ消息消费成功topic:{}, messageId:{}", getConsumerName(), message.getTopic(), message.getMsgID()); return Action.CommitMessage; } catch (Exception e) { - log.error("【{}】MQ消息消费失败topic:{}, messageId:{}", getCusumerName(), message.getTopic(), message.getMsgID(), e); + log.error("【{}】MQ消息消费失败topic:{}, messageId:{}", getConsumerName(), message.getTopic(), message.getMsgID(), e); } return Action.ReconsumeLater; } }); consumerClient.start(); - log.info("初始化[{}]消费者topic: {},tag: {}成功", getCusumerName(), this.getMQName(), AliYunRocketMQFactory.defaultTag); + log.info("初始化[{}]消费者topic: {},tag: {}成功", getConsumerName(), this.getMQName(), AliYunRocketMQFactory.defaultTag); } } diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQFactory.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQFactory.java index aac2810..ed5aae0 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQFactory.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQFactory.java @@ -1,14 +1,17 @@ package com.jeequan.jeepay.components.mq.vender.aliyunrocketmq; import com.aliyun.openservices.ons.api.*; +import com.jeequan.jeepay.components.mq.constant.MQVenderCS; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import java.util.Properties; @Service +@ConditionalOnProperty(name = MQVenderCS.YML_VENDER_KEY, havingValue = MQVenderCS.ALIYUN_ROCKET_MQ) public class AliYunRocketMQFactory { public static final String defaultTag = "Default"; diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQSender.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQSender.java index 4f26506..d861372 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQSender.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQSender.java @@ -19,10 +19,12 @@ import com.alibaba.fastjson.JSONObject; import com.aliyun.openservices.ons.api.Message; import com.aliyun.openservices.ons.api.Producer; import com.aliyun.openservices.ons.api.SendResult; +import com.jeequan.jeepay.components.mq.constant.MQVenderCS; import com.jeequan.jeepay.components.mq.model.AbstractMQ; import com.jeequan.jeepay.components.mq.vender.IMQSender; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -34,6 +36,7 @@ import java.util.TreeMap; */ @Slf4j @Component +@ConditionalOnProperty(name = MQVenderCS.YML_VENDER_KEY, havingValue = MQVenderCS.ALIYUN_ROCKET_MQ) public class AliYunRocketMQSender implements IMQSender { private static final List DELAY_TIME_LEVEL = new ArrayList<>(); diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/CleanMchLoginAuthCacheAliYunRocketMQReceiver.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/CleanMchLoginAuthCacheAliYunRocketMQReceiver.java index ed6313c..41b61c0 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/CleanMchLoginAuthCacheAliYunRocketMQReceiver.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/CleanMchLoginAuthCacheAliYunRocketMQReceiver.java @@ -36,7 +36,8 @@ import org.springframework.stereotype.Component; @Slf4j public class CleanMchLoginAuthCacheAliYunRocketMQReceiver extends AbstractAliYunRocketMQReceiver { - private static final String cusumerName = "清除商户登录消息"; + private static final String CONSUMER_NAME = "清除商户登录消息"; + @Autowired private CleanMchLoginAuthCacheMQ.IMQReceiver mqReceiver; @@ -65,8 +66,8 @@ public class CleanMchLoginAuthCacheAliYunRocketMQReceiver extends AbstractAliYun * @return */ @Override - public String getCusumerName() { - return cusumerName; + public String getConsumerName() { + return CONSUMER_NAME; } } diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderDivisionAliYunRocketMQReceiver.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderDivisionAliYunRocketMQReceiver.java index 5e3dea4..9a8afa3 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderDivisionAliYunRocketMQReceiver.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderDivisionAliYunRocketMQReceiver.java @@ -34,7 +34,8 @@ import org.springframework.stereotype.Component; @ConditionalOnBean(PayOrderDivisionMQ.IMQReceiver.class) public class PayOrderDivisionAliYunRocketMQReceiver extends AbstractAliYunRocketMQReceiver { - private static final String cusumerName = "支付订单分账消息"; + private static final String CONSUMER_NAME = "支付订单分账消息"; + @Autowired private PayOrderDivisionMQ.IMQReceiver mqReceiver; @@ -62,8 +63,8 @@ public class PayOrderDivisionAliYunRocketMQReceiver extends AbstractAliYunRocket * @return */ @Override - public String getCusumerName() { - return cusumerName; + public String getConsumerName() { + return CONSUMER_NAME; } } diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderMchNotifyAliYunRocketMQReceiver.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderMchNotifyAliYunRocketMQReceiver.java index e75bd35..149d2bc 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderMchNotifyAliYunRocketMQReceiver.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderMchNotifyAliYunRocketMQReceiver.java @@ -36,7 +36,8 @@ import org.springframework.stereotype.Component; @ConditionalOnBean(PayOrderMchNotifyMQ.IMQReceiver.class) public class PayOrderMchNotifyAliYunRocketMQReceiver extends AbstractAliYunRocketMQReceiver { - private static final String cusumerName = "支付订单商户消息"; + private static final String CONSUMER_NAME = "支付订单商户消息"; + @Autowired private PayOrderMchNotifyMQ.IMQReceiver mqReceiver; @@ -65,8 +66,8 @@ public class PayOrderMchNotifyAliYunRocketMQReceiver extends AbstractAliYunRocke * @return */ @Override - public String getCusumerName() { - return cusumerName; + public String getConsumerName() { + return CONSUMER_NAME; } } diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderReissueAliYunRocketMQReceiver.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderReissueAliYunRocketMQReceiver.java index 3d547ea..601621b 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderReissueAliYunRocketMQReceiver.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/PayOrderReissueAliYunRocketMQReceiver.java @@ -36,7 +36,8 @@ import org.springframework.stereotype.Component; @ConditionalOnBean(PayOrderReissueMQ.IMQReceiver.class) public class PayOrderReissueAliYunRocketMQReceiver extends AbstractAliYunRocketMQReceiver { - private static final String cusumerName = "支付订单补单消息"; + private static final String CONSUMER_NAME = "支付订单补单消息"; + @Autowired private PayOrderReissueMQ.IMQReceiver mqReceiver; @@ -65,7 +66,7 @@ public class PayOrderReissueAliYunRocketMQReceiver extends AbstractAliYunRocketM * @return */ @Override - public String getCusumerName() { - return cusumerName; + public String getConsumerName() { + return CONSUMER_NAME; } } diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/ResetAppConfigAliYunRocketMQReceiver.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/ResetAppConfigAliYunRocketMQReceiver.java index 89af8f9..3048586 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/ResetAppConfigAliYunRocketMQReceiver.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/ResetAppConfigAliYunRocketMQReceiver.java @@ -35,7 +35,8 @@ import org.springframework.stereotype.Component; @ConditionalOnBean(ResetAppConfigMQ.IMQReceiver.class) public class ResetAppConfigAliYunRocketMQReceiver extends AbstractAliYunRocketMQReceiver { - private static final String cusumerName = "更新系统配置参数消息"; + private static final String CONSUMER_NAME = "更新系统配置参数消息"; + @Autowired private ResetAppConfigMQ.IMQReceiver mqReceiver; @@ -70,8 +71,8 @@ public class ResetAppConfigAliYunRocketMQReceiver extends AbstractAliYunRocketMQ * @return */ @Override - public String getCusumerName() { - return cusumerName; + public String getConsumerName() { + return CONSUMER_NAME; } /** diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/ResetIsvMchAppInfoAliYunRocketMQReceiver.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/ResetIsvMchAppInfoAliYunRocketMQReceiver.java index c657816..1c012c8 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/ResetIsvMchAppInfoAliYunRocketMQReceiver.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/receive/ResetIsvMchAppInfoAliYunRocketMQReceiver.java @@ -35,7 +35,8 @@ import org.springframework.stereotype.Component; @ConditionalOnBean(ResetIsvMchAppInfoConfigMQ.IMQReceiver.class) public class ResetIsvMchAppInfoAliYunRocketMQReceiver extends AbstractAliYunRocketMQReceiver { - private static final String cusumerName = "更新服务商/商户/商户应用配置信息消息"; + private static final String CONSUMER_NAME = "更新服务商/商户/商户应用配置信息消息"; + @Autowired private ResetIsvMchAppInfoConfigMQ.IMQReceiver mqReceiver; @@ -70,8 +71,8 @@ public class ResetIsvMchAppInfoAliYunRocketMQReceiver extends AbstractAliYunRock * @return */ @Override - public String getCusumerName() { - return cusumerName; + public String getConsumerName() { + return CONSUMER_NAME; } /**