diff --git a/pom.xml b/pom.xml
index b2aa6b97..db106a0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,6 @@
3.9.1
2.5
1.3.3
- 1.9.3
1.11.3
3.17
1.7
@@ -138,13 +137,6 @@
${commons.fileupload.version}
-
-
- commons-beanutils
- commons-beanutils
- ${commons.beanutils.version}
-
-
org.jsoup
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 @@
+
+
+
@@ -118,7 +124,7 @@
if (value == 0) {
return '成功';
} else if (value == 1) {
- return '异常';
+ return '失败';
}
}
},
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 @@
commons-fileupload
-
-
- commons-beanutils
- commons-beanutils
-
-
org.jsoup
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"
AND business_type = #{businessType}
+
+ AND status = #{status}
+
AND oper_name like concat('%', #{operName}, '%')