diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java index 8b83db1..9c9f94c 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java @@ -68,7 +68,7 @@ public class SysLogsVo { /** *操作类型 */ - @ApiModelProperty(value = "操作类型 增删改查 登陆 登出") + @ApiModelProperty(value = "操作类型 增删改查 登录 登出") private String operType; /** * 操作方法 @@ -147,6 +147,8 @@ public class SysLogsVo { //日志类型 1 业务日志 0 系统日志 2异常日志 private String type; + private String capacity; + /** * 越权记录 * @param loginUser diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/SysRecordLogService.java b/bonus-auth/src/main/java/com/bonus/auth/service/SysRecordLogService.java index 4580edc..b2b39d1 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/service/SysRecordLogService.java +++ b/bonus-auth/src/main/java/com/bonus/auth/service/SysRecordLogService.java @@ -70,13 +70,13 @@ public class SysRecordLogService sysLogsVo.setLogId(uuid); sysLogsVo.setOperaUserName(username); sysLogsVo.setIp(IpUtils.getIpAddr()); - sysLogsVo.setModel("系统登陆"); + sysLogsVo.setModel("系统登录"); sysLogsVo.setOperTime(DateUtils.getTime()); sysLogsVo.setMethodType(SystemGlobal.POST); sysLogsVo.setMethod("login()"); sysLogsVo.setParams("{\"username\":\""+username+"\"}"); - sysLogsVo.setOperateDetail("用户登陆系统"); - sysLogsVo.setOperType("登陆"); + sysLogsVo.setOperateDetail("用户登录系统"); + sysLogsVo.setOperType("登录"); sysLogsVo.setOperUri("/login"); sysLogsVo.setLogType(0); if (StringUtils.isNotEmpty(result)){ @@ -88,7 +88,7 @@ public class SysRecordLogService sysLogsVo.setUserId(userId); } sysLogsVo.setFailureReason(message); - sysLogsVo.setTitle("系统登陆"); + sysLogsVo.setTitle("系统登录"); sysLogsVo.setResultData(resultData); try{ long times=endTime-startTime; @@ -128,7 +128,7 @@ public class SysRecordLogService sysLogsVo.setOperaUserName(username); sysLogsVo.setIp(IpUtils.getIpAddr()); sysLogsVo.setParams("{\"username\":\""+username+"\"}"); - sysLogsVo.setOperateDetail("用户登陆系统"); + sysLogsVo.setOperateDetail("用户登录系统"); sysLogsVo.setErrType("IP异常"); try{ long times=endTime-startTime; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysLogController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysLogController.java index e9c7d4a..b3373be 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysLogController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysLogController.java @@ -155,7 +155,7 @@ public class SysLogController extends BaseController { @ApiOperation(value = "查询日志容量") @PostMapping("getLogsSet") - @SysLog(title = "审计日志", module = "审计日志->日志容量配置", grade = OperaType.QUERY, details = "查询日志容量", type = "系统日志") + @SysLog(title = "审计日志", module = "审计日志->日志容量配置", businessType = OperaType.QUERY, details = "查询日志容量", type = "系统日志") public R getLogsSet() { return service.getLogsSet(); } @@ -163,15 +163,16 @@ public class SysLogController extends BaseController { @ApiOperation(value = "设置日志容量") @PostMapping("setLogsSet") - @SysLog(title = "审计日志", module = "审计日志->日志容量配置", grade = OperaType.QUERY, details = "修改日志容量", type = "系统日志") - public R setLogsSet(@RequestBody String capacity) { - return service.setLogsSet(capacity); + @SysLog(title = "审计日志", module = "审计日志->日志容量配置", businessType = OperaType.QUERY, details = "修改日志容量", type = "系统日志") + public R setLogsSet(@RequestBody SysLogsVo dto) { + + return service.setLogsSet(dto.getCapacity()); } @ApiOperation(value = "查询日志统计分析") @PostMapping("getLogStatistics") - @SysLog(title = "审计日志", module = "审计日志->日志分析", grade = OperaType.QUERY, details = "查询日志分析", type = "系统日志") + @SysLog(title = "审计日志", module = "审计日志->日志分析", businessType = OperaType.QUERY, details = "查询日志分析", type = "系统日志") public R> getLogStatistics(@RequestBody SysLogsVo dto) { return service.getLogStatistics(dto); }