From 24681c81c09022f584a57006f2534b5f74723414 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 30 六月 2026 09:27:31 +0800
Subject: [PATCH] 初始化项目
---
yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/redis/core/job/RedisPendingMessageResendJob.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/redis/core/job/RedisPendingMessageResendJob.java b/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/redis/core/job/RedisPendingMessageResendJob.java
index bb16be0..d0b7ae3 100644
--- a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/redis/core/job/RedisPendingMessageResendJob.java
+++ b/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/redis/core/job/RedisPendingMessageResendJob.java
@@ -23,7 +23,9 @@
@AllArgsConstructor
public class RedisPendingMessageResendJob {
- private static final String LOCK_KEY = "redis:stream:pending-message-resend:lock";
+ public static final String DEFAULT_RESEND_LOCK_KEY = "redis:stream:pending-message-resend:lock";
+
+ public static final String IOT_RESEND_LOCK_KEY = "redis:stream:pending-message-resend:lock:iot";
/**
* 娑堟伅瓒呮椂鏃堕棿锛岄粯璁� 5 鍒嗛挓
@@ -36,22 +38,26 @@
private final List<AbstractRedisStreamMessageListener<?>> listeners;
private final RedisMQTemplate redisTemplate;
private final RedissonClient redissonClient;
+ private final String resendLockKey;
/**
* 涓�鍒嗛挓鎵ц涓�娆�,杩欓噷閫夋嫨姣忓垎閽熺殑 35 绉掓墽琛岋紝鏄负浜嗛伩鍏嶆暣鐐逛换鍔¤繃澶氱殑闂
*/
@Scheduled(cron = "35 * * * * ?")
public void messageResend() {
- RLock lock = redissonClient.getLock(LOCK_KEY);
- // 灏濊瘯鍔犻攣
+ RLock lock = redissonClient.getLock(resendLockKey);
if (lock.tryLock()) {
try {
execute();
} catch (Exception ex) {
- log.error("[messageResend][鎵ц寮傚父]", ex);
+ log.error("[messageResend][鎵ц寮傚父][lockKey={}]", resendLockKey, ex);
} finally {
- lock.unlock();
+ if (lock.isHeldByCurrentThread()) {
+ lock.unlock();
+ }
}
+ } else {
+ log.debug("[messageResend][鏈幏鍙栧埌閿侊紝璺宠繃鏈疆][lockKey={}]", resendLockKey);
}
}
--
Gitblit v1.9.3