操作日志新增状态查询&热部署重启菜单丢失修复

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>

ruoyi-admin/src/main/resources/application.yml

@@ -6,7 +6,7 @@ ruoyi:
   version: 3.3.0
   # 版权年份
   copyrightYear: 2019
-  # 文件上传
+  # 文件路径
   profile: D:/profile/
   # 获取ip地址开关
   addressEnabled: true

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>';
 		                }
 		            }
 		        },

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>

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)
         {

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>