From 8ae8c5498da43d15e8fc511c7534fc9ff4a9c750 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 14 一月 2023 00:58:30 +0800
Subject: [PATCH] fix 修复 多数据源适配 jakarta 异常 bug (临时)
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 deletions(-)
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 3bc4434..e1bafee 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,19 +1,31 @@
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 org.springframework.cglib.beans.BeanCopier;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.cglib.core.Converter;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* bean娣辨嫹璐濆伐鍏�(鍩轰簬 cglib 鎬ц兘浼樺紓)
+ * <p>
+ * 閲嶇偣 cglib 涓嶆敮鎸� 鎷疯礉鍒伴摼寮忓璞�
+ * 渚嬪: 婧愬璞� 鎷疯礉鍒� 鐩爣(閾惧紡瀵硅薄)
+ * 璇峰尯鍒嗗ソ`娴呮嫹璐漙鍜宍娣辨嫹璐漙鍐嶅仛浣跨敤
*
* @author Lion Li
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class BeanCopyUtils {
/**
@@ -30,7 +42,8 @@
if (ObjectUtil.isNull(desc)) {
return null;
}
- return CglibUtil.copy(source, desc);
+ final V target = ReflectUtil.newInstanceIfPossible(desc);
+ return copy(source, target);
}
/**
@@ -47,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;
}
@@ -65,7 +79,11 @@
if (CollUtil.isEmpty(sourceList)) {
return CollUtil.newArrayList();
}
- return CglibUtil.copyList(sourceList, () -> ReflectUtil.newInstanceIfPossible(desc));
+ return StreamUtils.toList(sourceList, source -> {
+ V target = ReflectUtil.newInstanceIfPossible(desc);
+ copy(source, target);
+ return target;
+ });
}
/**
@@ -74,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);
}
/**
@@ -95,7 +114,8 @@
if (ObjectUtil.isNull(beanClass)) {
return null;
}
- return CglibUtil.toBean(map, beanClass);
+ T bean = ReflectUtil.newInstanceIfPossible(beanClass);
+ return mapToBean(map, bean);
}
/**
@@ -112,6 +132,73 @@
if (ObjectUtil.isNull(bean)) {
return null;
}
- return CglibUtil.fillBean(map, bean);
+ BeanMap.create(bean).putAll(map);
+ return bean;
}
+
+ /**
+ * map鎷疯礉鍒癿ap
+ *
+ * @param map 鏁版嵁鏉ユ簮
+ * @param clazz 杩斿洖鐨勫璞＄被鍨�
+ * @return map瀵硅薄
+ */
+ public static <T, V> Map<String, V> mapToMap(Map<String, T> map, Class<V> clazz) {
+ if (MapUtil.isEmpty(map)) {
+ return null;
+ }
+ if (ObjectUtil.isNull(clazz)) {
+ return null;
+ }
+ Map<String, V> copyMap = new LinkedHashMap<>(map.size());
+ map.forEach((k, v) -> copyMap.put(k, copy(v, clazz)));
+ return copyMap;
+ }
+
+ /**
+ * 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