From 7a70db75ac1e3da3b6b902c55d25f07254520b61 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 29 Nov 2024 15:21:14 +0800 Subject: [PATCH] =?UTF-8?q?test=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/SpringBootTestController.java | 12 +++++++++++- .../com/jsowell/common/config/mq/RabbitConfig.java | 7 ++++--- .../java/com/jsowell/mq/OrderRabbitListener.java | 2 +- .../java/com/jsowell/pile/dto/TestRabbitMQDTO.java | 2 +- .../programlogic/DelayMerchantProgramLogic.java | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index d697496aa..347b1cd87 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -3913,7 +3913,17 @@ public class SpringBootTestController { .orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) .orderRefundAmount(orderBasicInfo.getRefundAmount()) .build(); - rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO); + System.out.println(JSON.toJSONString(afterSettleOrderDTO)); + + // for (int i = 0; i < 30; i++) { + // // try { + // // Thread.sleep(5000); + // // } catch (InterruptedException e) { + // // throw new RuntimeException(e); + // // } + // afterSettleOrderDTO.setOrderCode(orderCode + "_" + i); + // rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO); + // } } } diff --git a/jsowell-common/src/main/java/com/jsowell/common/config/mq/RabbitConfig.java b/jsowell-common/src/main/java/com/jsowell/common/config/mq/RabbitConfig.java index 9b4c5aeec..efa684869 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/config/mq/RabbitConfig.java +++ b/jsowell-common/src/main/java/com/jsowell/common/config/mq/RabbitConfig.java @@ -1,6 +1,6 @@ package com.jsowell.common.config.mq; -import org.springframework.amqp.core.AcknowledgeMode; +import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.config.RetryInterceptorBuilder; import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; @@ -28,6 +28,7 @@ import org.springframework.retry.support.RetryTemplate; // #以下是rabbitmqTemplate配置 // mandatory: true) // 3---设置重试 +@Slf4j @Configuration public class RabbitConfig { @@ -77,7 +78,7 @@ public class RabbitConfig { // 预加载消息数量 -- QOS containerFactory.setPrefetchCount(1); // 应答模式（此处设置为手动） - containerFactory.setAcknowledgeMode(AcknowledgeMode.MANUAL); + // containerFactory.setAcknowledgeMode(AcknowledgeMode.MANUAL); // 消息序列化方式 containerFactory.setMessageConverter(new Jackson2JsonMessageConverter()); // 设置通知调用链 （这里设置的是重试机制的调用链） @@ -143,7 +144,7 @@ public class RabbitConfig { @Override public void onError(RetryContext retryContext, RetryCallback retryCallback, Throwable throwable) { // 异常 都会调用 - System.err.println("-----第{}次调用"+retryContext.getRetryCount()); + log.info("-----第{}次调用", retryContext.getRetryCount()); } }); retryTemplate.setBackOffPolicy(backOffPolicyByProperties()); diff --git a/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java b/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java index 13e800ea3..c066b92a0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java +++ b/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java @@ -36,6 +36,6 @@ public class OrderRabbitListener { // } //由于配置设置了手动应答，所以这里要进行一个手动应答。注意：如果设置了自动应答，这里又进行手动应答，会出现double ack，那么程序会报错。 - channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); + // channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/TestRabbitMQDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/TestRabbitMQDTO.java index 77b91712a..f6a04fc6e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/TestRabbitMQDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/TestRabbitMQDTO.java @@ -6,5 +6,5 @@ import lombok.Data; public class TestRabbitMQDTO { private String exchange; private String routingKey; - private String data; + private Object data; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index bd3fc16d8..288a0a859 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -479,7 +479,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { transactionService.doUpdateOrder(dto); // 订单退款 - // refundOrder(orderBasicInfo); + refundOrder(orderBasicInfo); // 组装after参数 AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()