From 5e3f504c8029929f29df25d8654dc02bd49ad7c1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 三月 2023 23:37:21 +0800
Subject: [PATCH] remove 移除 BeanCopyUtils 工具类 与 JDK17 不兼容
---
/dev/null | 204 ---------------------------------------------------
ruoyi-admin/pom.xml | 12 ---
pom.xml | 5 -
3 files changed, 0 insertions(+), 221 deletions(-)
diff --git a/.run/RuoYiApplication.run.xml b/.run/RuoYiApplication.run.xml
deleted file mode 100644
index 12dacba..0000000
--- a/.run/RuoYiApplication.run.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="RuoYiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="ruoyi-admin" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.ruoyi.RuoYiApplication" />
- <option name="VM_PARAMETERS" value="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
-</component>
diff --git a/pom.xml b/pom.xml
index b22fd6a..64a5f25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,11 +385,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
- <argLine>
- -Dfile.encoding=UTF-8
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.lang.invoke=ALL-UNNAMED
- </argLine>
<!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
<groups>${profiles.active}</groups>
<!-- 鎺掗櫎鏍囩 -->
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 8c7d365..3ef0a58 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -120,13 +120,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
- <configuration>
- <archive>
- <manifestEntries>
- <Add-Opens>java.base/java.lang java.base/java.lang.invoke</Add-Opens>
- </manifestEntries>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -135,11 +128,6 @@
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
- <archive>
- <manifestEntries>
- <Add-Opens>java.base/java.lang java.base/java.lang.invoke</Add-Opens>
- </manifestEntries>
- </archive>
</configuration>
</plugin>
</plugins>
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java
deleted file mode 100644
index 0661d9e..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.ruoyi.common.core.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.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 {
-
- /**
- * 鍗曞璞″熀浜巆lass鍒涘缓鎷疯礉
- *
- * @param source 鏁版嵁鏉ユ簮瀹炰綋
- * @param desc 鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
- * @return desc
- */
- public static <T, V> V copy(T source, Class<V> desc) {
- if (ObjectUtil.isNull(source)) {
- return null;
- }
- if (ObjectUtil.isNull(desc)) {
- return null;
- }
- final V target = ReflectUtil.newInstanceIfPossible(desc);
- return copy(source, target);
- }
-
- /**
- * 鍗曞璞″熀浜庡璞″垱寤烘嫹璐�
- *
- * @param source 鏁版嵁鏉ユ簮瀹炰綋
- * @param desc 杞崲鍚庣殑瀵硅薄
- * @return desc
- */
- public static <T, V> V copy(T source, V desc) {
- if (ObjectUtil.isNull(source)) {
- return null;
- }
- if (ObjectUtil.isNull(desc)) {
- return null;
- }
- BeanCopier beanCopier = BeanCopierCache.INSTANCE.get(source.getClass(), desc.getClass(), null);
- beanCopier.copy(source, desc, null);
- return desc;
- }
-
- /**
- * 鍒楄〃瀵硅薄鍩轰簬class鍒涘缓鎷疯礉
- *
- * @param sourceList 鏁版嵁鏉ユ簮瀹炰綋鍒楄〃
- * @param desc 鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
- * @return desc
- */
- public static <T, V> List<V> copyList(List<T> sourceList, Class<V> desc) {
- if (ObjectUtil.isNull(sourceList)) {
- return null;
- }
- if (CollUtil.isEmpty(sourceList)) {
- return CollUtil.newArrayList();
- }
- return StreamUtils.toList(sourceList, source -> {
- V target = ReflectUtil.newInstanceIfPossible(desc);
- copy(source, target);
- return target;
- });
- }
-
- /**
- * bean鎷疯礉鍒癿ap
- *
- * @param bean 鏁版嵁鏉ユ簮瀹炰綋
- * @return map瀵硅薄
- */
- @SuppressWarnings("unchecked")
- public static <T> Map<String, Object> copyToMap(T bean) {
- if (ObjectUtil.isNull(bean)) {
- return null;
- }
- return BeanMap.create(bean);
- }
-
- /**
- * map鎷疯礉鍒癰ean
- *
- * @param map 鏁版嵁鏉ユ簮
- * @param beanClass bean绫�
- * @return bean瀵硅薄
- */
- public static <T> T mapToBean(Map<String, Object> map, Class<T> beanClass) {
- if (MapUtil.isEmpty(map)) {
- return null;
- }
- if (ObjectUtil.isNull(beanClass)) {
- return null;
- }
- T bean = ReflectUtil.newInstanceIfPossible(beanClass);
- return mapToBean(map, bean);
- }
-
- /**
- * map鎷疯礉鍒癰ean
- *
- * @param map 鏁版嵁鏉ユ簮
- * @param bean bean瀵硅薄
- * @return bean瀵硅薄
- */
- public static <T> T mapToBean(Map<String, Object> map, T bean) {
- if (MapUtil.isEmpty(map)) {
- return null;
- }
- if (ObjectUtil.isNull(bean)) {
- return null;
- }
- 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