mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

操作日志记录排除敏感属性字段

master
RuoYi 2020-08-17 11:46:56 +08:00
parent 03174f1ead
commit 9ab3a297bd
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -175,7 +175,6 @@ public class SysUserController extends BaseController
} }
@RequiresPermissions("system:user:resetPwd") @RequiresPermissions("system:user:resetPwd")
@Log(title = "重置密码", businessType = BusinessType.UPDATE)
@GetMapping("/resetPwd/{userId}") @GetMapping("/resetPwd/{userId}")
public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap) public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap)
{ {

6
ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html
View File

@ -28,7 +28,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">再次确认：</label> <label class="col-sm-3 control-label">再次确认：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="password" name="confirm" id="confirm"> <input class="form-control" type="password" name="confirmPassword" id="confirmPassword">
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 请再次输入您的密码</span> <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 请再次输入您的密码</span>
</div> </div>
</div> </div>
@ -57,7 +57,7 @@
minlength: 5, minlength: 5,
maxlength: 20 maxlength: 20
}, },
confirm: { confirmPassword: {
required: true, required: true,
equalTo: "#newPassword" equalTo: "#newPassword"
} }
@ -72,7 +72,7 @@
minlength: "密码不能小于6个字符", minlength: "密码不能小于6个字符",
maxlength: "密码不能大于20个字符" maxlength: "密码不能大于20个字符"
}, },
confirm: { confirmPassword: {
required: "请再次输入新密码", required: "请再次输入新密码",
equalTo: "两次密码输入不一致" equalTo: "两次密码输入不一致"
} }

12
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View File

@ -12,6 +12,8 @@ import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.support.spring.PropertyPreFilters;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessStatus; import com.ruoyi.common.enums.BusinessStatus;
import com.ruoyi.common.json.JSON; import com.ruoyi.common.json.JSON;
@ -34,6 +36,9 @@ public class LogAspect
{ {
private static final Logger log = LoggerFactory.getLogger(LogAspect.class); private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
/** 排除敏感属性字段 */
public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };
// 配置织入点 // 配置织入点
@Pointcut("@annotation(com.ruoyi.common.annotation.Log)") @Pointcut("@annotation(com.ruoyi.common.annotation.Log)")
public void logPointCut() public void logPointCut()
@ -154,9 +159,14 @@ public class LogAspect
private void setRequestValue(SysOperLog operLog) throws Exception private void setRequestValue(SysOperLog operLog) throws Exception
{ {
Map<String, String[]> map = ServletUtils.getRequest().getParameterMap(); Map<String, String[]> map = ServletUtils.getRequest().getParameterMap();
String params = JSON.marshal(map); if (StringUtils.isNotEmpty(map))
{
PropertyPreFilters.MySimplePropertyPreFilter excludefilter = new PropertyPreFilters().addFilter();
excludefilter.addExcludes(EXCLUDE_PROPERTIES);
String params = JSONObject.toJSONString(map, excludefilter);
operLog.setOperParam(StringUtils.substring(params, 0, 2000)); operLog.setOperParam(StringUtils.substring(params, 0, 2000));
} }
}
/** /**
* 是否存在注解，如果存在就获取 * 是否存在注解，如果存在就获取