From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java | 39 ++++++++++-----------------------------
1 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
index 56bbdbf..bd369b4 100644
--- a/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
+++ b/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
@@ -1,15 +1,13 @@
package com.ruoyi.framework.config;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
+import java.nio.charset.Charset;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.SerializationException;
-import com.alibaba.fastjson.parser.ParserConfig;
-import org.springframework.util.Assert;
-import java.nio.charset.Charset;
+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.constant.Constants;
/**
* Redis浣跨敤FastJson搴忓垪鍖�
@@ -18,17 +16,11 @@
*/
public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
{
- @SuppressWarnings("unused")
- private ObjectMapper objectMapper = new ObjectMapper();
-
public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
- private Class<T> clazz;
+ static final Filter AUTO_TYPE_FILTER = JSONReader.autoTypeFilter(Constants.JSON_WHITELIST_STR);
- static
- {
- ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
- }
+ private Class<T> clazz;
public FastJson2JsonRedisSerializer(Class<T> clazz)
{
@@ -43,7 +35,7 @@
{
return new byte[0];
}
- return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
+ return JSON.toJSONString(t, JSONWriter.Feature.WriteClassName).getBytes(DEFAULT_CHARSET);
}
@Override
@@ -55,17 +47,6 @@
}
String str = new String(bytes, DEFAULT_CHARSET);
- return JSON.parseObject(str, clazz);
- }
-
- public void setObjectMapper(ObjectMapper objectMapper)
- {
- Assert.notNull(objectMapper, "'objectMapper' must not be null");
- this.objectMapper = objectMapper;
- }
-
- protected JavaType getJavaType(Class<?> clazz)
- {
- return TypeFactory.defaultInstance().constructType(clazz);
+ return JSON.parseObject(str, clazz, AUTO_TYPE_FILTER);
}
}
--
Gitblit v1.9.3