From abf9ce31173210d483480d3c7e8f05ce586d5936 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Thu, 12 Sep 2024 14:36:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/domain/SysLog.java | 2 + .../entity/system/SystemGlobal.java | 6 ++- .../common/log/enums/OperationType.java | 3 ++ .../interceptor/ParamSecureHandler.java | 6 +-- .../system/controller/SysLogController.java | 52 ++++++++++++++++++- 5 files changed, 63 insertions(+), 6 deletions(-) diff --git a/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/domain/SysLog.java b/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/domain/SysLog.java index c893f46..7b8c443 100644 --- a/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/domain/SysLog.java +++ b/securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/domain/SysLog.java @@ -55,6 +55,8 @@ public class SysLog { @ApiModelProperty(value = "执行结果(1.成功/2.失败)") private Integer result; + + private String fruit; @ApiModelProperty(value = "执行时间(秒/ms)") diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java index f2596af..d5f61c9 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java @@ -69,8 +69,10 @@ public class SystemGlobal { * 成功数据数量 */ public final static int MIN_NUM=0; - - public final static int LOG_DEFEAT=1024; + /** + * 日志容量 + */ + public final static int LOG_DEFEAT=1; /** * 地市 diff --git a/securitycontrol-commons/securitycontrol-commons-log/src/main/java/com/securitycontrol/common/log/enums/OperationType.java b/securitycontrol-commons/securitycontrol-commons-log/src/main/java/com/securitycontrol/common/log/enums/OperationType.java index e2653b4..4ed8ac8 100644 --- a/securitycontrol-commons/securitycontrol-commons-log/src/main/java/com/securitycontrol/common/log/enums/OperationType.java +++ b/securitycontrol-commons/securitycontrol-commons-log/src/main/java/com/securitycontrol/common/log/enums/OperationType.java @@ -28,6 +28,9 @@ public enum OperationType { * 业务数据 */ QUERY_BUSINESS("查询"), + + QUERY_SHORT("排序"), + ADD_BUSINESS("新增"), DELETE_BUSINESS("删除"), UPDATE_BUSINESS("修改"), diff --git a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java index 707bd35..99fed0b 100644 --- a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java +++ b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java @@ -102,9 +102,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - XssRequestWrapper requestWrapper = new XssRequestWrapper(request); try{ - if (!checkIsYq(request, requestWrapper)) { + if (!checkIsYq(request)) { returnJson(response, "越权访问,接口未授权", 401); return false; } @@ -115,6 +114,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { if(isFileUpload(request)){ return true; } + XssRequestWrapper requestWrapper = new XssRequestWrapper(request); System.out.println("进入了拦截器"); System.err.println(request.getRequestURI()); String requestUrl = requestWrapper.getRequestURI(); @@ -197,7 +197,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { /** * 判断是否越权 */ - private boolean checkIsYq(HttpServletRequest request, XssRequestWrapper requestWrapper) throws Exception { + private boolean checkIsYq(HttpServletRequest request) throws Exception { String requestUri = request.getRequestURI(); if(Arrays.asList(WHITE_URLS).contains(requestUri)){ return true; diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SysLogController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SysLogController.java index 7cacab8..ba9f2d7 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SysLogController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SysLogController.java @@ -76,6 +76,20 @@ public class SysLogController extends BaseController { } } + @ApiOperation(value = "查询系统日志") + @GetMapping("getSystemLogs2") + @Log(title = "审计日志", menu = "审计日志->系统日志", grade = OperationType.QUERY_SHORT, details = "系统日志排序", type = "系统日志") + public TableDataInfo getSystemLogs2(SysLog dto) { + try{ + dto.setLogType(0); + startPage(); + List list = service.getSystemLogs(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } @ApiOperation(value = "查询业务日志") @GetMapping("getYwLogs") @@ -92,7 +106,20 @@ public class SysLogController extends BaseController { } } - + @ApiOperation(value = "查询业务日志") + @GetMapping("getYwLogs2") + @Log(title = "审计日志", menu = "审计日志->业务日志", grade = OperationType.QUERY_SHORT, details = "业务日志排序", type = "系统日志") + public TableDataInfo getYwLogs2(SysLog dto) { + try{ + dto.setLogType(1); + startPage(); + List list = service.getSystemLogs(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } @ApiOperation(value = "查询异常日志") @GetMapping("getErrLogs") @Log(title = "审计日志", menu = "审计日志->异常日志", grade = OperationType.QUERY_BUSINESS, details = "查询系统异常日志", type = "系统日志") @@ -107,6 +134,21 @@ public class SysLogController extends BaseController { return getDataTableBad(new ArrayList<>(),"请求出错了"); } } + @ApiOperation(value = "查询异常日志") + @GetMapping("getErrLogs2") + @Log(title = "审计日志", menu = "审计日志->异常日志", grade = OperationType.QUERY_SHORT, details = "异常日志排序", type = "系统日志") + public TableDataInfo getErrLogs2(SysLog dto) { + try{ + dto.setLogType(2); + startPage(); + List list = service.getSystemLogs(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } + @ApiOperation(value = "日志备份") @GetMapping("downloadErrLogs") @Log(title = "审计日志", menu = "审计日志->异常日志", grade = OperationType.COPY_LOG, details = "异常日志备份", type = "系统日志") @@ -169,6 +211,14 @@ public class SysLogController extends BaseController { public Result> getLogStatistics(@RequestBody SysLog dto) { return service.getLogStatistics(dto); } + + @ApiOperation(value = "查询日志统计分析") + @PostMapping("getLogStatistics2") + @Log(title = "审计日志", menu = "审计日志->日志分析", grade = OperationType.QUERY_SHORT, details = "日志分析排序", type = "系统日志") + public Result> getLogStatistics2(@RequestBody SysLog dto) { + return service.getLogStatistics(dto); + } + @ApiOperation(value = "查询日志告警") @PostMapping("logWarn") public Result> logWarn() {