| 
					
				 | 
			
			
				@@ -1,52 +1,44 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 package com.ruoyi.common.redis.configure; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import java.nio.charset.Charset; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import org.springframework.data.redis.serializer.RedisSerializer; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import org.springframework.data.redis.serializer.SerializationException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson2.JSON; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson2.JSONReader; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson2.JSONWriter; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.alibaba.fastjson2.filter.Filter; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ruoyi.common.core.constant.Constants; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import org.springframework.data.redis.serializer.RedisSerializer; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import org.springframework.data.redis.serializer.SerializationException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.nio.charset.Charset; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * Redis使用FastJson序列化 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- *  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * @author ruoyi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    static final Filter AUTO_TYPE_FILTER = JSONReader.autoTypeFilter(Constants.JSON_WHITELIST_STR); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private Class<T> clazz; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public FastJson2JsonRedisSerializer(Class<T> clazz) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public FastJson2JsonRedisSerializer(Class<T> clazz) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         super(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.clazz = clazz; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public byte[] serialize(T t) throws SerializationException 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (t == null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public byte[] serialize(T t) throws SerializationException { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (t == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return new byte[0]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return JSON.toJSONString(t, JSONWriter.Feature.WriteClassName).getBytes(DEFAULT_CHARSET); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public T deserialize(byte[] bytes) throws SerializationException 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (bytes == null || bytes.length <= 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public T deserialize(byte[] bytes) throws SerializationException { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (bytes == null || bytes.length <= 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String str = new String(bytes, DEFAULT_CHARSET); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return JSON.parseObject(str, clazz, AUTO_TYPE_FILTER); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return JSON.parseObject(str, clazz, JSONReader.autoTypeFilter("org.springframework", "com.ruoyi", "com.huashe")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |