From 9e26f3005e66284c3c98a736fec49edfe5863892 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 20 Mar 2019 20:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E7=BB=84=E4=BB=B6beanutils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          |  8 ++++++++
 ruoyi-common/pom.xml                             | 10 ++++++++--
 .../com/ruoyi/common/utils/bean/BeanUtils.java   | 16 ++--------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab1b7772..ab9ba7d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
 		<oshi.version>3.9.1</oshi.version>
 		<commons.io.version>2.5</commons.io.version>
 		<commons.fileupload.version>1.3.3</commons.fileupload.version>
+		<commons.beanutils.version>1.9.3</commons.beanutils.version>
 		<jsoup.version>1.11.3</jsoup.version>
 		<poi.version>3.17</poi.version>
 		<velocity.version>1.7</velocity.version>
@@ -137,6 +138,13 @@
 				<version>${commons.fileupload.version}</version>
 			</dependency>
 			
+			<!-- 简化反射封工具类 -->
+			<dependency>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils</artifactId>
+				<version>${commons.beanutils.version}</version>
+			</dependency>
+			
 			<!-- HTML解析器 -->
 			<dependency>
 				<groupId>org.jsoup</groupId>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index b6f76615..05136e96 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -47,18 +47,24 @@
 		    <artifactId>jackson-databind</artifactId>
 		</dependency>
 
-		<!--io常用工具类 -->
+		<!-- io常用工具类 -->
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 		</dependency>
 
-		<!--文件上传工具类 -->
+		<!-- 文件上传工具类 -->
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
 		</dependency>
 		
+		<!-- 简化反射封工具类 -->
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+		</dependency>
+		
 		<!-- HTML解析器 -->
 		<dependency>
 			<groupId>org.jsoup</groupId>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java
index c214cf2c..11bf2871 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java
@@ -11,7 +11,7 @@ import java.util.regex.Pattern;
  * 
  * @author ruoyi
  */
-public class BeanUtils
+public class BeanUtils extends org.apache.commons.beanutils.BeanUtils
 {
     /** Bean方法名中属性名开始的下标 */
     private static final int BEAN_METHOD_PROP_INDEX = 3;
@@ -30,21 +30,9 @@ public class BeanUtils
      */
     public static void copyBeanProp(Object dest, Object src)
     {
-        List<Method> destSetters = getSetterMethods(dest);
-        List<Method> srcGetters = getGetterMethods(src);
         try
         {
-            for (Method setter : destSetters)
-            {
-                for (Method getter : srcGetters)
-                {
-                    if (isMethodPropEquals(setter.getName(), getter.getName())
-                            && setter.getParameterTypes()[0].equals(getter.getReturnType()))
-                    {
-                        setter.invoke(dest, getter.invoke(src));
-                    }
-                }
-            }
+            copyProperties(dest, src);
         }
         catch (Exception e)
         {