From 4aa69607ee3c57043e865238bc1d9f26393c25fb Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 28 Dec 2021 22:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81jdk17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/lang/ObjectUtils.java   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
index 31856a93..c6597261 100644
--- a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
@@ -26,6 +26,12 @@ import org.springframework.core.NamedThreadLocal;
 public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 
 	private static Logger logger = LoggerFactory.getLogger(ObjectUtils.class);
+	private static final boolean isJavaSerialize; 
+	
+	static {
+		String[] ver = StringUtils.split(System.getProperty("java.version"), '.');
+		isJavaSerialize = ver.length > 0 && Integer.parseInt(ver[0]) > 1;
+	}
 	
 	/**
 	 * 转换为 Double 类型
@@ -155,7 +161,11 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 * @return
 	 */
 	public static byte[] serialize(Object object) {
-		return ObjectUtils.serializeFst(object);
+		if (isJavaSerialize) {
+			return ObjectUtils.serializeJava(object);
+		}else {
+			return ObjectUtils.serializeFst(object);
+		}
 	}
 
 	/**
@@ -164,7 +174,11 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 * @return
 	 */
 	public static Object unserialize(byte[] bytes) {
-		return ObjectUtils.unserializeFst(bytes);
+		if (isJavaSerialize) {
+			return ObjectUtils.unserializeJava(bytes);
+		}else {
+			return ObjectUtils.unserializeFst(bytes);
+		}
 	}
 	
 	/**