hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-30 01:38:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix PR

Browse Source
This commit is contained in:
wfm
2023-05-16 09:58:58 +08:00
parent 494928ed88
commit 86be0bdf80
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/job/RedisPendingMessageResendJob.java
View File

@@ -29,8 +29,13 @@ public class RedisPendingMessageResendJob {
private final RedisMQTemplate redisTemplate; private final RedisMQTemplate redisTemplate;
private final String groupName; private final String groupName;
private final RedissonClient redissonClient; private final RedissonClient redissonClient;
/**
private final long expireTime = 1000 * 60; * 消息超时时间，默认5分钟
* <p>超时的消息才会被重新投递<p/>
* <p>由于定时任务1分钟一次，消息超时后不会被立即重投，
* 极端情况下消息5分钟过期后，再等1分钟才会被扫瞄到<p/>
*/
private final long expireTime = 5 * 60;
/** /**
* 一分钟执行一次,这里选择每分钟的35秒执行，是为了避免整点任务过多的问题 * 一分钟执行一次,这里选择每分钟的35秒执行，是为了避免整点任务过多的问题
@@ -58,15 +63,22 @@ public class RedisPendingMessageResendJob {
Map<String, Long> pendingMessagesPerConsumer = pendingMessagesSummary.getPendingMessagesPerConsumer(); Map<String, Long> pendingMessagesPerConsumer = pendingMessagesSummary.getPendingMessagesPerConsumer();
pendingMessagesPerConsumer.forEach((consumerName, pendingMessageCount) -> { pendingMessagesPerConsumer.forEach((consumerName, pendingMessageCount) -> {
log.info("[processPendingMessage][消费者({}) 消息数量({})]", consumerName, pendingMessageCount); log.info("[processPendingMessage][消费者({}) 消息数量({})]", consumerName, pendingMessageCount);
// 每个消费者的 pending消息的详情信息
PendingMessages pendingMessages = ops.pending(listener.getStreamKey(), Consumer.from(groupName, consumerName), Range.unbounded(), pendingMessageCount); PendingMessages pendingMessages = ops.pending(listener.getStreamKey(), Consumer.from(groupName, consumerName), Range.unbounded(), pendingMessageCount);
if(pendingMessages.isEmpty()){ if(pendingMessages.isEmpty()){
return; return;
} }
for (PendingMessage pendingMessage : pendingMessages) { for (PendingMessage pendingMessage : pendingMessages) {
if(pendingMessage.getElapsedTimeSinceLastDelivery().toMillis() - expireTime >= 0){ // 获取消息上一次传递到 consumer 的时间,
long lastDelivery = pendingMessage.getElapsedTimeSinceLastDelivery().getSeconds();
if(lastDelivery < expireTime){
continue;
}
// 获取指定id的消息体
List<MapRecord<String, Object, Object>> records = ops.range(listener.getStreamKey(), Range.of(Range.Bound.inclusive(pendingMessage.getIdAsString()), Range.Bound.inclusive(pendingMessage.getIdAsString()))); List<MapRecord<String, Object, Object>> records = ops.range(listener.getStreamKey(), Range.of(Range.Bound.inclusive(pendingMessage.getIdAsString()), Range.Bound.inclusive(pendingMessage.getIdAsString())));
if(!CollUtil.isEmpty(records)){ if(CollUtil.isEmpty(records)){
continue;
}
// 重新投递消息 // 重新投递消息
redisTemplate.getRedisTemplate().opsForStream().add(StreamRecords.newRecord() redisTemplate.getRedisTemplate().opsForStream().add(StreamRecords.newRecord()
.ofObject(records.get(0).getValue()) // 设置内容 .ofObject(records.get(0).getValue()) // 设置内容
@@ -74,8 +86,6 @@ public class RedisPendingMessageResendJob {
// ack 消息消费完成 // ack 消息消费完成
redisTemplate.getRedisTemplate().opsForStream().acknowledge(groupName, records.get(0)); redisTemplate.getRedisTemplate().opsForStream().acknowledge(groupName, records.get(0));
} }
}
}
}); });
}); });
} }