From 7ff9c5780ca9168b9dd05e04593d5f2fec9e77a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Thu, 18 Dec 2025 15:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=8F=AF=E8=83=BD=E7=9A=84?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/tuoheng/machine/config/RedisConfig.java | 8 +++++---
 .../machine/mqtt/store/RedisMqttCallbackStore.java        | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/tuoheng/machine/config/RedisConfig.java b/src/main/java/com/tuoheng/machine/config/RedisConfig.java
index 7da1760..ff8feaf 100644
--- a/src/main/java/com/tuoheng/machine/config/RedisConfig.java
+++ b/src/main/java/com/tuoheng/machine/config/RedisConfig.java
@@ -15,11 +15,13 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 public class RedisConfig {
 
     /**
-     * 创建 Redis 消息监听容器
+     * 创建 Redis 消息监听容器（专用于机器框架的 MQTT 回调）
      * 用于 Redis Pub/Sub 功能
+     *
+     * 注意：使用特定的 Bean 名称避免与其他模块冲突
      */
-    @Bean
-    public RedisMessageListenerContainer redisMessageListenerContainer(
+    @Bean(name = "machineFrameworkRedisMessageListenerContainer")
+    public RedisMessageListenerContainer machineFrameworkRedisMessageListenerContainer(
             RedisConnectionFactory connectionFactory) {
         RedisMessageListenerContainer container = new RedisMessageListenerContainer();
         container.setConnectionFactory(connectionFactory);
diff --git a/src/main/java/com/tuoheng/machine/mqtt/store/RedisMqttCallbackStore.java b/src/main/java/com/tuoheng/machine/mqtt/store/RedisMqttCallbackStore.java
index 099c68c..9ebe829 100644
--- a/src/main/java/com/tuoheng/machine/mqtt/store/RedisMqttCallbackStore.java
+++ b/src/main/java/com/tuoheng/machine/mqtt/store/RedisMqttCallbackStore.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.connection.MessageListener;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -51,9 +52,10 @@ public class RedisMqttCallbackStore implements MqttCallbackStore {
     // 配置回调信息的过期时间
     private static final long EXPIRE_SECONDS = 3600; // 1小时
 
-    public RedisMqttCallbackStore(StringRedisTemplate stringRedisTemplate,
-                                  RedisMessageListenerContainer redisMessageListenerContainer,
-                                  ObjectMapper objectMapper) {
+    public RedisMqttCallbackStore(
+            StringRedisTemplate stringRedisTemplate,
+            @Qualifier("machineFrameworkRedisMessageListenerContainer") RedisMessageListenerContainer redisMessageListenerContainer,
+            ObjectMapper objectMapper) {
         this.stringRedisTemplate = stringRedisTemplate;
         this.redisMessageListenerContainer = redisMessageListenerContainer;
         this.objectMapper = objectMapper;