From d05dbb33b18ef9162cee5372bd793d0b0fea2316 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 3 Apr 2019 17:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2&=E7=83=AD?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E9=87=8D=E5=90=AF=E8=8F=9C=E5=8D=95=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 8 --------
 ruoyi-admin/src/main/resources/application.yml            | 2 +-
 .../main/resources/templates/monitor/operlog/operlog.html | 8 +++++++-
 ruoyi-common/pom.xml                                      | 6 ------
 .../main/java/com/ruoyi/common/utils/bean/BeanUtils.java  | 4 ++--
 .../src/main/resources/mapper/system/SysOperLogMapper.xml | 3 +++
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2aa6b97..db106a0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,6 @@
 		<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>
@@ -138,13 +137,6 @@
 				<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-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 1a58f960..0d959287 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -6,7 +6,7 @@ ruoyi:
   version: 3.3.0
   # 版权年份
   copyrightYear: 2019
-  # 文件上传
+  # 文件路径
   profile: D:/profile/
   # 获取ip地址开关
   addressEnabled: true
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
index 9d26b051..8c2a9a3d 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
@@ -22,6 +22,12 @@
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 								</select>
 							</li>
+							<li>
+								<label>操作状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
+									<option value="">所有</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+								</select>
+							</li>
 							<li class="select-time">
 								<label>操作时间： </label>
 								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
@@ -118,7 +124,7 @@
 		                if (value == 0) {
 		                    return '<span class="badge badge-primary">成功</span>';
 		                } else if (value == 1) {
-		                    return '<span class="badge badge-danger">异常</span>';
+		                    return '<span class="badge badge-danger">失败</span>';
 		                }
 		            }
 		        },
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index d2f77d4c..7cd5e77a 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -59,12 +59,6 @@
 			<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 11bf2871..51cdc2fb 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 extends org.apache.commons.beanutils.BeanUtils
+public class BeanUtils extends org.springframework.beans.BeanUtils
 {
     /** Bean方法名中属性名开始的下标 */
     private static final int BEAN_METHOD_PROP_INDEX = 3;
@@ -32,7 +32,7 @@ public class BeanUtils extends org.apache.commons.beanutils.BeanUtils
     {
         try
         {
-            copyProperties(dest, src);
+            copyProperties(src, dest);
         }
         catch (Exception e)
         {
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index d972ea5e..2ca518a2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -40,6 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="businessType != null">
 				AND business_type = #{businessType}
 			</if>
+			<if test="status != null">
+				AND status = #{status}
+			</if>
 			<if test="operName != null and operName != ''">
 				AND oper_name like concat('%', #{operName}, '%')
 			</if>