From a185e0f5fbec0fa4c25cbaa97c60d3aa2bdaf7c0 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 15 八月 2023 12:17:44 +0800
Subject: [PATCH] 升级fastjson到最新版2.0.39
---
src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java | 6 +++++-
src/main/java/com/ruoyi/common/constant/Constants.java | 5 +++++
pom.xml | 2 +-
src/main/java/com/ruoyi/framework/security/service/TokenService.java | 5 +++++
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 63d8171..464dd9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<pagehelper.spring.boot.starter.version>1.4.6</pagehelper.spring.boot.starter.version>
- <fastjson.version>2.0.34</fastjson.version>
+ <fastjson.version>2.0.39</fastjson.version>
<druid.version>1.2.16</druid.version>
<commons.io.version>2.13.0</commons.io.version>
<commons.collections.version>3.2.2</commons.collections.version>
diff --git a/src/main/java/com/ruoyi/common/constant/Constants.java b/src/main/java/com/ruoyi/common/constant/Constants.java
index 5afb252..fca7b7b 100644
--- a/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -130,6 +130,11 @@
public static final String LOOKUP_LDAPS = "ldaps:";
/**
+ * 鑷姩璇嗗埆json瀵硅薄鐧藉悕鍗曢厤缃紙浠呭厑璁歌В鏋愮殑鍖呭悕锛岃寖鍥磋秺灏忚秺瀹夊叏锛�
+ */
+ public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
+
+ /**
* 瀹氭椂浠诲姟鐧藉悕鍗曢厤缃紙浠呭厑璁歌闂殑鍖呭悕锛屽鍏朵粬闇�瑕佸彲浠ヨ嚜琛屾坊鍔狅級
*/
public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" };
diff --git a/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
index 9503f25..bd369b4 100644
--- a/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
+++ b/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
@@ -6,6 +6,8 @@
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搴忓垪鍖�
@@ -15,6 +17,8 @@
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;
@@ -43,6 +47,6 @@
}
String str = new String(bytes, DEFAULT_CHARSET);
- return JSON.parseObject(str, clazz, JSONReader.Feature.SupportAutoType);
+ return JSON.parseObject(str, clazz, AUTO_TYPE_FILTER);
}
}
diff --git a/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index 4eeee56..77e3ea9 100644
--- a/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -4,6 +4,8 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -29,6 +31,8 @@
@Component
public class TokenService
{
+ private static final Logger log = LoggerFactory.getLogger(TokenService.class);
+
// 浠ょ墝鑷畾涔夋爣璇�
@Value("${token.header}")
private String header;
@@ -72,6 +76,7 @@
}
catch (Exception e)
{
+ log.error("鑾峰彇鐢ㄦ埛淇℃伅寮傚父'{}'", e.getMessage());
}
}
return null;
--
Gitblit v1.9.3