From 668a0aca881b3f178db45e24ae53dde4d1cceacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=BB=8D=E5=AE=8F?= <994233303@qq.com>
Date: Mon, 14 Sep 2026 23:38:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(syslog-consumer-rule)=E8=A7=A3=E5=86=B3Obje?=
 =?UTF-8?q?ctMapper=E5=A4=9A=E5=AE=9E=E4=BE=8B=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/RawLogCaptureClusterStore.java    |  4 +-
 .../RawLogCaptureClusterStoreWiringTest.java  | 45 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 haobang-security-dm/syslog-consumer-rule/src/test/java/com/common/service/RawLogCaptureClusterStoreWiringTest.java

diff --git a/haobang-security-dm/syslog-consumer-rule/src/main/java/com/common/service/RawLogCaptureClusterStore.java b/haobang-security-dm/syslog-consumer-rule/src/main/java/com/common/service/RawLogCaptureClusterStore.java
index 744bb1e..92dafcb 100644
--- a/haobang-security-dm/syslog-consumer-rule/src/main/java/com/common/service/RawLogCaptureClusterStore.java
+++ b/haobang-security-dm/syslog-consumer-rule/src/main/java/com/common/service/RawLogCaptureClusterStore.java
@@ -3,6 +3,7 @@ package com.common.service;
 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.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
@@ -35,7 +36,8 @@ public class RawLogCaptureClusterStore {
     @Value("${syslog.raw-capture.cluster-activation-delay-ms:1000}")
     private long activationDelayMs = 1000L;
 
-    public RawLogCaptureClusterStore(StringRedisTemplate redis, ObjectMapper mapper,
+    public RawLogCaptureClusterStore(StringRedisTemplate redis,
+                                     @Qualifier("httpObjectMapper") ObjectMapper mapper,
                                      @Value("${syslog.raw-capture.node-id:${HOSTNAME:unknown}}")
                                      String configuredNodeId) {
         this.redis = redis;
diff --git a/haobang-security-dm/syslog-consumer-rule/src/test/java/com/common/service/RawLogCaptureClusterStoreWiringTest.java b/haobang-security-dm/syslog-consumer-rule/src/test/java/com/common/service/RawLogCaptureClusterStoreWiringTest.java
new file mode 100644
index 0000000..49ca496
--- /dev/null
+++ b/haobang-security-dm/syslog-consumer-rule/src/test/java/com/common/service/RawLogCaptureClusterStoreWiringTest.java
@@ -0,0 +1,45 @@
+package com.common.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Mockito.mock;
+
+class RawLogCaptureClusterStoreWiringTest {
+
+    @Test
+    void usesHttpObjectMapperWhenApplicationHasMultipleObjectMappers() {
+        try (AnnotationConfigApplicationContext context =
+                     new AnnotationConfigApplicationContext(TestConfiguration.class,
+                             RawLogCaptureClusterStore.class)) {
+            RawLogCaptureClusterStore store = context.getBean(RawLogCaptureClusterStore.class);
+
+            assertSame(context.getBean("httpObjectMapper"),
+                    ReflectionTestUtils.getField(store, "mapper"));
+        }
+    }
+
+    @Configuration
+    static class TestConfiguration {
+        @Bean
+        ObjectMapper objectMapper() {
+            return new ObjectMapper();
+        }
+
+        @Bean
+        ObjectMapper httpObjectMapper() {
+            return new ObjectMapper();
+        }
+
+        @Bean
+        StringRedisTemplate stringRedisTemplate() {
+            return mock(StringRedisTemplate.class);
+        }
+    }
+}