From 30f0bdc754cc1d85a72c5cb86b84ca20a67ef20c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 16 四月 2022 14:08:11 +0800
Subject: [PATCH] update 使用 spring cglib 替换 停止维护的 cglib
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java | 75 ++++++++++++++++++++++++++++++++++---
pom.xml | 7 ---
ruoyi-common/pom.xml | 5 --
3 files changed, 68 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index e28caf8..7592c0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
<poi.version>4.1.2</poi.version>
<commons-compress.version>1.21</commons-compress.version>
<easyexcel.version>3.0.5</easyexcel.version>
- <cglib.version>3.3.0</cglib.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.29.0</satoken.version>
<mybatis-plus.version>3.5.1</mybatis-plus.version>
@@ -132,12 +131,6 @@
<artifactId>poi-ooxml-schemas</artifactId>
</exclusion>
</exclusions>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>${cglib.version}</version>
</dependency>
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 81a983f..c5fadf2 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -69,11 +69,6 @@
<artifactId>easyexcel</artifactId>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </dependency>
-
<!-- yml瑙ｆ瀽鍣� -->
<dependency>
<groupId>org.yaml</groupId>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
index 23ace00..ae84222 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -1,15 +1,20 @@
package com.ruoyi.common.utils;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.SimpleCache;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.extra.cglib.CglibUtil;
+import cn.hutool.core.util.StrUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import net.sf.cglib.core.Converter;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.cglib.beans.BeanMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* bean娣辨嫹璐濆伐鍏�(鍩轰簬 cglib 鎬ц兘浼樺紓)
@@ -37,7 +42,8 @@
if (ObjectUtil.isNull(desc)) {
return null;
}
- return CglibUtil.copy(source, desc);
+ final V target = ReflectUtil.newInstanceIfPossible(desc);
+ return copy(source, target);
}
/**
@@ -54,7 +60,8 @@
if (ObjectUtil.isNull(desc)) {
return null;
}
- CglibUtil.copy(source, desc);
+ BeanCopier beanCopier = BeanCopierCache.INSTANCE.get(source.getClass(), desc.getClass(), null);
+ beanCopier.copy(source, desc, null);
return desc;
}
@@ -72,7 +79,11 @@
if (CollUtil.isEmpty(sourceList)) {
return CollUtil.newArrayList();
}
- return CglibUtil.copyList(sourceList, () -> ReflectUtil.newInstanceIfPossible(desc));
+ return sourceList.stream().map(source -> {
+ V target = ReflectUtil.newInstanceIfPossible(desc);
+ copy(source, target);
+ return target;
+ }).collect(Collectors.toList());
}
/**
@@ -81,11 +92,12 @@
* @param bean 鏁版嵁鏉ユ簮瀹炰綋
* @return map瀵硅薄
*/
+ @SuppressWarnings("unchecked")
public static <T> Map<String, Object> copyToMap(T bean) {
if (ObjectUtil.isNull(bean)) {
return null;
}
- return CglibUtil.toMap(bean);
+ return BeanMap.create(bean);
}
/**
@@ -102,7 +114,8 @@
if (ObjectUtil.isNull(beanClass)) {
return null;
}
- return CglibUtil.toBean(map, beanClass);
+ T bean = ReflectUtil.newInstanceIfPossible(beanClass);
+ return mapToBean(map, bean);
}
/**
@@ -119,6 +132,54 @@
if (ObjectUtil.isNull(bean)) {
return null;
}
- return CglibUtil.fillBean(map, bean);
+ BeanMap.create(bean).putAll(map);
+ return bean;
}
+
+ /**
+ * BeanCopier灞炴�х紦瀛�<br>
+ * 缂撳瓨鐢ㄤ簬闃叉澶氭鍙嶅皠閫犳垚鐨勬�ц兘闂
+ *
+ * @author Looly
+ * @since 5.4.1
+ */
+ public enum BeanCopierCache {
+ /**
+ * BeanCopier灞炴�х紦瀛樺崟渚�
+ */
+ INSTANCE;
+
+ private final SimpleCache<String, BeanCopier> cache = new SimpleCache<>();
+
+ /**
+ * 鑾峰緱绫讳笌杞崲鍣ㄧ敓鎴愮殑key鍦▄@link BeanCopier}鐨凪ap涓搴旂殑鍏冪礌
+ *
+ * @param srcClass 婧怋ean鐨勭被
+ * @param targetClass 鐩爣Bean鐨勭被
+ * @param converter 杞崲鍣�
+ * @return Map涓搴旂殑BeanCopier
+ */
+ public BeanCopier get(Class<?> srcClass, Class<?> targetClass, Converter converter) {
+ final String key = genKey(srcClass, targetClass, converter);
+ return cache.get(key, () -> BeanCopier.create(srcClass, targetClass, converter != null));
+ }
+
+ /**
+ * 鑾峰緱绫讳笌杞崲鍣ㄧ敓鎴愮殑key
+ *
+ * @param srcClass 婧怋ean鐨勭被
+ * @param targetClass 鐩爣Bean鐨勭被
+ * @param converter 杞崲鍣�
+ * @return 灞炴�у悕鍜孧ap鏄犲皠鐨刱ey
+ */
+ private String genKey(Class<?> srcClass, Class<?> targetClass, Converter converter) {
+ final StringBuilder key = StrUtil.builder()
+ .append(srcClass.getName()).append('#').append(targetClass.getName());
+ if(null != converter){
+ key.append('#').append(converter.getClass().getName());
+ }
+ return key.toString();
+ }
+ }
+
}
--
Gitblit v1.9.3