From 7ef593e1e3c35aaeecf9318f0b3941230d3ed002 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 十月 2024 11:22:54 +0800
Subject: [PATCH] 增加在数据点计算规则后数据点名称加_n的适配

---
 collect/src/main/java/com/qianwen/mdc/collect/config/RedisConfig.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/collect/src/main/java/com/qianwen/mdc/collect/config/RedisConfig.java b/collect/src/main/java/com/qianwen/mdc/collect/config/RedisConfig.java
index 2312efc..24c2cd3 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/config/RedisConfig.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/config/RedisConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
@@ -32,14 +33,20 @@
 		//Jackson2JsonRedisSerializer<Object> jacksonSeial = new Jackson2JsonRedisSerializer<>(Object.class);
 		ObjectMapper om = new ObjectMapper();
 		om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-		om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-		
+		//om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+		om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
 		//om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL,JsonTypeInfo.As.WRAPPER_ARRAY);
 		
 		jacksonSeial.setObjectMapper(om);
 		template.setValueSerializer(jacksonSeial);
 		template.setKeySerializer(new StringRedisSerializer());
-		template.setHashKeySerializer(new StringRedisSerializer());
+		
+        //new JdkSerializationRedisSerializer(classLoader);
+        
+		//template.setHashKeySerializer(new StringRedisSerializer());
+		
+		ClassLoader classLoader = getClass().getClassLoader();
+        template.setHashKeySerializer(new JdkSerializationRedisSerializer(classLoader));
 		template.setHashValueSerializer(jacksonSeial);
 		template.afterPropertiesSet();
 		return template;

--
Gitblit v1.9.3