From f6e598d225764c2b76f9fd4dcf0903ef3decad69 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 25 Jul 2024 11:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4fst=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pom.xml                                |   7 --
 .../com/jeesite/common/lang/ObjectUtils.java  | 108 ++++++++----------
 parent/pom.xml                                |   1 -
 3 files changed, 49 insertions(+), 67 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index c804cf12..1b7a3871 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -46,13 +46,6 @@
 			<version>${commons-io.version}</version>
 		</dependency>
 		
-		<!-- Java serialization -->
-		<dependency>
-			<groupId>de.ruedigermoeller</groupId>
-			<artifactId>fst</artifactId>
-			<version>${fst.version}</version>
-		</dependency>
-		
 		<!-- Jackson json -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
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 b2e61fc4..8ae03d69 100644
--- a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
@@ -5,11 +5,9 @@
 package com.jeesite.common.lang;
 
 import org.apache.commons.lang3.BooleanUtils;
-import org.nustaq.serialization.FSTConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
-import org.springframework.core.NamedThreadLocal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -24,14 +22,14 @@ import java.lang.reflect.InvocationTargetException;
  */
 public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 
-	private static Logger logger = LoggerFactory.getLogger(ObjectUtils.class);
-	private static final boolean isJavaSerialize; 
-	
+	private static final Logger logger = LoggerFactory.getLogger(ObjectUtils.class);
+	private static final boolean isJavaSerialize;
+
 	static {
 		String[] ver = StringUtils.split(System.getProperty("java.version"), StringUtils.DOT);
 		isJavaSerialize = ver.length > 0 && Integer.parseInt(ver[0]) > 1;
 	}
-	
+
 	/**
 	 * 转换为 Double 类型
 	 */
@@ -164,11 +162,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 */
 	public static byte[] serialize(Object object) {
 		try {
-			if (isJavaSerialize) {
-				return ObjectUtils.serializeJava(object);
-			}else {
-				return ObjectUtils.serializeFst(object);
-			}
+			return ObjectUtils.serializeJava(object);
 		} catch (Exception e) {
 			logger.error("serialize: {}", e.getMessage());
 		}
@@ -182,11 +176,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 */
 	public static Object unserialize(byte[] bytes) {
 		try {
-			if (isJavaSerialize) {
-				return ObjectUtils.unserializeJava(bytes);
-			}else {
-				return ObjectUtils.unserializeFst(bytes);
-			}
+			return ObjectUtils.unserializeJava(bytes);
 		} catch (Exception e) {
 			logger.error("unserialize: {}", e.getMessage());
 		}
@@ -243,50 +233,50 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 		}
 		return object;
 	}
-	
-	private static ThreadLocal<FSTConfiguration> fstConfiguration = 
-				new NamedThreadLocal<FSTConfiguration>("FSTConfiguration") {
-		@Override
-		public FSTConfiguration initialValue() {
-			return FSTConfiguration.createDefaultConfiguration();
-		}
-	};
 
-	/**
-	 * FST 序列化对象
-	 * @param object
-	 * @return
-	 */
-	public static byte[] serializeFst(Object object) {
-		if (object == null){
-			return null;
-		}
-		long beginTime = System.currentTimeMillis();
-		byte[] bytes = fstConfiguration.get().asByteArray(object);
-		long totalTime = System.currentTimeMillis() - beginTime;
-		if (totalTime > 30000){
-			logger.warn(object.getClass() + " fst serialize time: " + TimeUtils.formatTime(totalTime));
-		}
-		return bytes;
-	}
-
-	/**
-	 * FST 反序列化对象
-	 * @param bytes
-	 * @return
-	 */
-	public static Object unserializeFst(byte[] bytes) {
-		if (bytes == null){
-			return null;
-		}
-		long beginTime = System.currentTimeMillis();
-		Object object = fstConfiguration.get().asObject(bytes);
-		long totalTime = System.currentTimeMillis() - beginTime;
-		if (totalTime > 30000 && object != null){
-			logger.warn(object.getClass() + " fst unserialize time: " + TimeUtils.formatTime(totalTime));
-		}
-		return object;
-	}
+//	private static ThreadLocal<FSTConfiguration> fstConfiguration =
+//				new NamedThreadLocal<FSTConfiguration>("FSTConfiguration") {
+//		@Override
+//		public FSTConfiguration initialValue() {
+//			return FSTConfiguration.createDefaultConfiguration();
+//		}
+//	};
+//
+//	/**
+//	 * FST 序列化对象
+//	 * @param object
+//	 * @return
+//	 */
+//	public static byte[] serializeFst(Object object) {
+//		if (object == null){
+//			return null;
+//		}
+//		long beginTime = System.currentTimeMillis();
+//		byte[] bytes = fstConfiguration.get().asByteArray(object);
+//		long totalTime = System.currentTimeMillis() - beginTime;
+//		if (totalTime > 30000){
+//			logger.warn(object.getClass() + " fst serialize time: " + TimeUtils.formatTime(totalTime));
+//		}
+//		return bytes;
+//	}
+//
+//	/**
+//	 * FST 反序列化对象
+//	 * @param bytes
+//	 * @return
+//	 */
+//	public static Object unserializeFst(byte[] bytes) {
+//		if (bytes == null){
+//			return null;
+//		}
+//		long beginTime = System.currentTimeMillis();
+//		Object object = fstConfiguration.get().asObject(bytes);
+//		long totalTime = System.currentTimeMillis() - beginTime;
+//		if (totalTime > 30000 && object != null){
+//			logger.warn(object.getClass() + " fst unserialize time: " + TimeUtils.formatTime(totalTime));
+//		}
+//		return object;
+//	}
 
 //	private static Pool<Kryo> kryoPool = new Pool<Kryo>(true, false, 8) {
 //		protected Kryo create() {
diff --git a/parent/pom.xml b/parent/pom.xml
index cafb462e..8b30df3a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,6 @@
 
 		<jackson-bom2.version>2.17.1</jackson-bom2.version>
 		<fastjson.version>2.0.51</fastjson.version>
-		<fst.version>3.0.4-jdk17</fst.version>
 
 		<snakeyaml.version>2.2</snakeyaml.version>
 		<glassfish-jaxb.version>2.3.9</glassfish-jaxb.version>