diff --git a/common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java b/common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java index 340019a04dd228b93ac761f4eeb05998e0418be8..0565c6260db799124bb122fe0dca6da3300e67dc 100644 --- a/common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java +++ b/common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java @@ -47,19 +47,23 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb stopped = false; } - @SneakyThrows @Override protected List<GetResponse> doPoll(long durationInMillis) { List<GetResponse> result = queues.stream() .map(queue -> { try { - AMQP.Queue.DeclareOk declareOk = channel.queueDeclarePassive(queue); + //AMQP.Queue.DeclareOk declareOk = channel.queueDeclarePassive(queue); //log.info("declareOk:{}",JSON.toJSONString(declareOk)); GetResponse getResponse = channel.basicGet(queue, true); return getResponse; } catch (IOException e) { log.error("Failed to get messages from queue: {},{}" , queue,e); + try { + channel = connection.createChannel(); + } catch (IOException ioException) { + ioException.printStackTrace(); + } return null; } }).filter(Objects::nonNull).collect(Collectors.toList()); diff --git a/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http b/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http index 8c7f7842afb3d1548b858eb124821ea769e84800..f7dd8acd9a572fb348e379fc3d2343d48ba957f8 100644 --- a/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http +++ b/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http @@ -136,7 +136,7 @@ Content-Type: application/json Authorization: {{authToken}} { - "deviceCode": "a101", + "deviceCode": "a102", "action": "upload" }