diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ImgMqMessageRecordService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ImgMqMessageRecordService.java index d7e0ef4..9af091e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ImgMqMessageRecordService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ImgMqMessageRecordService.java @@ -44,12 +44,10 @@ public interface ImgMqMessageRecordService { /** * 保存消息记录 - * @param topic - * @param tag * @param message * @return */ - ImgMqMessageRecord saveMessageRecord(String topic, String tag, MqRecordMessage message); + ImgMqMessageRecord saveMessageRecord(MqRecordMessage message); /** * 修改消息记录状态 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ImgMqMessageRecordServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ImgMqMessageRecordServiceImpl.java index 80bd290..47a65e3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ImgMqMessageRecordServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ImgMqMessageRecordServiceImpl.java @@ -91,7 +91,7 @@ public class ImgMqMessageRecordServiceImpl implements ImgMqMessageRecordService //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - ImgMqMessageRecord imgMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + ImgMqMessageRecord imgMqMessageRecord = saveMessageRecord(mqRecordMessage); mqRecordMessage.setId(imgMqMessageRecord.getId()); //发消息 Message sendMessage = MessageBuilder.withPayload(mqRecordMessage).setHeader(RocketMQHeaders.KEYS, mqRecordMessage.getMessageKey()).build(); @@ -118,7 +118,7 @@ public class ImgMqMessageRecordServiceImpl implements ImgMqMessageRecordService //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - ImgMqMessageRecord imgMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + ImgMqMessageRecord imgMqMessageRecord = saveMessageRecord(mqRecordMessage); mqRecordMessage.setId(imgMqMessageRecord.getId()); //发消息 rocketMQTemplate.asyncSend(rocketMQEnhanceTemplate.buildDestination(topic,tag), MessageBuilder.withPayload(mqRecordMessage).build(), new SendCallback() { @@ -146,7 +146,7 @@ public class ImgMqMessageRecordServiceImpl implements ImgMqMessageRecordService //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - ImgMqMessageRecord imgMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + ImgMqMessageRecord imgMqMessageRecord = saveMessageRecord(mqRecordMessage); mqRecordMessage.setId(imgMqMessageRecord.getId()); //发消息 rocketMQTemplate.asyncSend(rocketMQEnhanceTemplate.buildDestination(topic,tag), MessageBuilder.withPayload(mqRecordMessage).build(), new SendCallback() { @@ -168,13 +168,12 @@ public class ImgMqMessageRecordServiceImpl implements ImgMqMessageRecordService * @param message */ @Transactional - public ImgMqMessageRecord saveMessageRecord(String topic, String tag, MqRecordMessage message){ - topic = rocketMQEnhanceTemplate.reBuildTopic(topic); + public ImgMqMessageRecord saveMessageRecord(MqRecordMessage message){ ImgMqMessageRecord imgMqMessageRecord = new ImgMqMessageRecord(); imgMqMessageRecord.setStatus(EnumMessageStatus.PROCESS); - imgMqMessageRecord.setConsumerGroupName(topic); - imgMqMessageRecord.setTopic(topic); - imgMqMessageRecord.setTag(tag); + imgMqMessageRecord.setConsumerGroupName(message.getConsumerGroupName()); + imgMqMessageRecord.setTopic(message.getTopic()); + imgMqMessageRecord.setTag(message.getTag()); imgMqMessageRecord.setCreateTime(new Date()); imgMqMessageRecord.setMessageKey(IdUtils.randomUUID()); imgMqMessageRecord.setContent(JSON.toJSONString(message)); diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/OrderMqMessageRecordService.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/OrderMqMessageRecordService.java index 4dd955e..92cf2a8 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/OrderMqMessageRecordService.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/OrderMqMessageRecordService.java @@ -44,12 +44,10 @@ public interface OrderMqMessageRecordService { /** * 保存消息记录 - * @param topic - * @param tag * @param message * @return */ - OrderMqMessageRecord saveMessageRecord(String topic, String tag, MqRecordMessage message); + OrderMqMessageRecord saveMessageRecord(MqRecordMessage message); /** * 修改消息记录状态 diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java index 74f8c7c..12ec9e0 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java @@ -90,7 +90,7 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - OrderMqMessageRecord orderMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + OrderMqMessageRecord orderMqMessageRecord = saveMessageRecord(mqRecordMessage); //发消息 Message sendMessage = MessageBuilder.withPayload(mqRecordMessage).setHeader(RocketMQHeaders.KEYS, mqRecordMessage.getMessageKey()).build(); SendResult sendResult; @@ -116,7 +116,7 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - OrderMqMessageRecord orderMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + OrderMqMessageRecord orderMqMessageRecord = saveMessageRecord(mqRecordMessage); mqRecordMessage.setId(orderMqMessageRecord.getId()); //发消息 rocketMQTemplate.asyncSend(rocketMQEnhanceTemplate.buildDestination(topic,tag), MessageBuilder.withPayload(mqRecordMessage).build(), new SendCallback() { @@ -144,7 +144,7 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - OrderMqMessageRecord orderMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + OrderMqMessageRecord orderMqMessageRecord = saveMessageRecord(mqRecordMessage); mqRecordMessage.setId(orderMqMessageRecord.getId()); //发消息 rocketMQTemplate.asyncSend(rocketMQEnhanceTemplate.buildDestination(topic,tag), MessageBuilder.withPayload(mqRecordMessage).build(), new SendCallback() { @@ -167,12 +167,12 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ * @param */ @Transactional - public OrderMqMessageRecord saveMessageRecord(String topic, String tag, MqRecordMessage message){ + public OrderMqMessageRecord saveMessageRecord(MqRecordMessage message){ OrderMqMessageRecord orderMqMessageRecord = new OrderMqMessageRecord(); orderMqMessageRecord.setStatus(EnumMessageStatus.PROCESS); - orderMqMessageRecord.setConsumerGroupName(topic); - orderMqMessageRecord.setTopic(topic); - orderMqMessageRecord.setTag(tag); + orderMqMessageRecord.setConsumerGroupName(message.getConsumerGroupName()); + orderMqMessageRecord.setTopic(message.getTopic()); + orderMqMessageRecord.setTag(message.getTag()); orderMqMessageRecord.setCreateTime(new Date()); orderMqMessageRecord.setMessageKey(IdUtils.randomUUID()); orderMqMessageRecord.setContent(JSON.toJSONString(message)); diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/PayMqMessageRecordService.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/PayMqMessageRecordService.java index feed491..c83dbc7 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/PayMqMessageRecordService.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/PayMqMessageRecordService.java @@ -44,12 +44,10 @@ public interface PayMqMessageRecordService { /** * 保存消息记录 - * @param topic - * @param tag * @param message * @return */ - PayMqMessageRecord saveMessageRecord(String topic, String tag, MqRecordMessage message); + PayMqMessageRecord saveMessageRecord(MqRecordMessage message); /** * 修改消息记录状态 diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayMqMessageRecordServiceImpl.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayMqMessageRecordServiceImpl.java index 1dc97cd..1e9c845 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayMqMessageRecordServiceImpl.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayMqMessageRecordServiceImpl.java @@ -92,7 +92,7 @@ public class PayMqMessageRecordServiceImpl implements PayMqMessageRecordService //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - PayMqMessageRecord payMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + PayMqMessageRecord payMqMessageRecord = saveMessageRecord(mqRecordMessage); mqRecordMessage.setId(payMqMessageRecord.getId()); //发消息 Message sendMessage = MessageBuilder.withPayload(mqRecordMessage).setHeader(RocketMQHeaders.KEYS, mqRecordMessage.getMessageKey()).build(); @@ -119,7 +119,7 @@ public class PayMqMessageRecordServiceImpl implements PayMqMessageRecordService //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - PayMqMessageRecord payMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + PayMqMessageRecord payMqMessageRecord = saveMessageRecord(mqRecordMessage); mqRecordMessage.setId(payMqMessageRecord.getId()); //发消息 rocketMQTemplate.asyncSend(rocketMQEnhanceTemplate.buildDestination(topic,tag), MessageBuilder.withPayload(mqRecordMessage).build(), new SendCallback() { @@ -147,7 +147,7 @@ public class PayMqMessageRecordServiceImpl implements PayMqMessageRecordService //保存消息记录 log.info("消息发送中,开始入库本地消息记录表"); MqRecordMessage mqRecordMessage = getMqRecordMessage(topic, tag, message); - PayMqMessageRecord payMqMessageRecord = saveMessageRecord(topic,tag, mqRecordMessage); + PayMqMessageRecord payMqMessageRecord = saveMessageRecord(mqRecordMessage); mqRecordMessage.setId(payMqMessageRecord.getId()); //发消息 rocketMQTemplate.asyncSend(rocketMQEnhanceTemplate.buildDestination(topic,tag), MessageBuilder.withPayload(mqRecordMessage).build(), new SendCallback() { @@ -169,12 +169,12 @@ public class PayMqMessageRecordServiceImpl implements PayMqMessageRecordService * @param message */ @Transactional - public PayMqMessageRecord saveMessageRecord(String topic, String tag, MqRecordMessage message){ + public PayMqMessageRecord saveMessageRecord(MqRecordMessage message){ PayMqMessageRecord payMqMessageRecord = new PayMqMessageRecord(); payMqMessageRecord.setStatus(EnumMessageStatus.PROCESS); - payMqMessageRecord.setConsumerGroupName(topic); - payMqMessageRecord.setTopic(topic); - payMqMessageRecord.setTag(tag); + payMqMessageRecord.setConsumerGroupName(message.getConsumerGroupName()); + payMqMessageRecord.setTopic(message.getTopic()); + payMqMessageRecord.setTag(message.getTag()); payMqMessageRecord.setCreateTime(new Date()); payMqMessageRecord.setMessageKey(IdUtils.randomUUID()); payMqMessageRecord.setContent(JSON.toJSONString(message));