From bb390b3ba875963357526cb74b0ec3045791c444 Mon Sep 17 00:00:00 2001 From: PushM <584406942@qq.com> Date: Thu, 6 Jun 2024 12:56:33 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/response/AuditAdvice.java | 5 +++-- .../protection/server/command/CommandMapper.java | 1 + .../protection/server/whitelist/WhiteListService.java | 4 ++++ src/main/resources/mappers/StaticRuleMapper.xml | 3 +-- src/main/resources/mappers/TemplateNewMapper.xml | 4 ++-- src/main/resources/mappers/WhiteListMapper.xml | 11 ++++++++++- .../defense/templatenew/NewTemplateServiceTest.java | 11 +++++++++++ .../server/rule/dynamic/DynamicRuleServiceTest.java | 7 ++++--- .../server/whitelist/WhiteListServiceTest.java | 4 ++-- 9 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java b/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java index 39178d0..123e70e 100644 --- a/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java +++ b/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java @@ -60,7 +60,7 @@ public class AuditAdvice implements ResponseBodyAdvice { public ResponseResult beforeBodyWrite(ResponseResult body, MethodParameter returnType, MediaType selectedContentType, Class> selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) { AuditData auditData = getAuditData(body, request); -// System.out.println("auditData-----------:"+auditData); + log.info("auditData-----------:"+auditData); Mono mono = webClient .post() @@ -68,9 +68,10 @@ public class AuditAdvice implements ResponseBodyAdvice { .bodyValue(auditData) .exchangeToMono(res -> { if (res.statusCode().equals(HttpStatus.OK)) { + log.info("发送审计日志成功：{}",res.statusCode()); return res.bodyToMono(String.class); } -// log.info("发送审计日志成功：{}",res); + log.info("发送审计日志失败：{}",res.statusCode()); return null; }) .doOnError(WebClientRequestException.class, err -> diff --git a/src/main/java/com/realtime/protection/server/command/CommandMapper.java b/src/main/java/com/realtime/protection/server/command/CommandMapper.java index 980d16f..0ba5dce 100644 --- a/src/main/java/com/realtime/protection/server/command/CommandMapper.java +++ b/src/main/java/com/realtime/protection/server/command/CommandMapper.java @@ -17,6 +17,7 @@ public interface CommandMapper { Boolean stopCommandsByTaskId(@Param("task_id") Long taskId); + @DS("doris") Boolean removeCommandsByTaskId(@Param("task_id") Long taskId); Boolean startCommandsByTaskId(@Param("task_id") Long taskId); diff --git a/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java b/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java index 23a5ab7..8860c99 100644 --- a/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java +++ b/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java @@ -122,6 +122,10 @@ public class WhiteListService { } public Integer updateWhiteListObject(Integer id, WhiteListObject object) { + Integer auditStatus = whiteListMapper.queryWhiteListObjectAuditStuatusById(id); + if (auditStatus == null) { + throw new IllegalArgumentException("无法找到白名单 " + id + ", 可能该白名单不存在"); + } if (!whiteListMapper.queryWhiteListObjectAuditStuatusById(id).equals(AuditStatusEnum.AUDITED.getNum())) { throw new IllegalStateException("无法修改白名单信息，因为其并未处于" + AuditStatusEnum.AUDITED + "状态"); } diff --git a/src/main/resources/mappers/StaticRuleMapper.xml b/src/main/resources/mappers/StaticRuleMapper.xml index 5e0c6e5..e71119f 100644 --- a/src/main/resources/mappers/StaticRuleMapper.xml +++ b/src/main/resources/mappers/StaticRuleMapper.xml @@ -25,8 +25,7 @@ #{object.auditStatus}, #{object.staticRuleDisplayId},#{object.eventType},NOW()) - + insert into t_static_rule(static_rule_name, static_rule_create_time, static_rule_create_username, static_rule_create_depart, static_rule_create_user_id, static_rule_sip, static_rule_msip, diff --git a/src/main/resources/mappers/TemplateNewMapper.xml b/src/main/resources/mappers/TemplateNewMapper.xml index d68b6d7..99f7a6f 100644 --- a/src/main/resources/mappers/TemplateNewMapper.xml +++ b/src/main/resources/mappers/TemplateNewMapper.xml @@ -80,7 +80,7 @@ audit_user_name, audit_user_id, audit_user_depart - ) + from t_strategy_template_new where strategy_template_id = #{id} @@ -181,7 +181,7 @@ modify_time = NOW(), audit_status = #{auditStatus}, audit_user_name = #{auditUserName}, - audit_user_depart = #{auditUserDepart} + audit_user_depart = #{auditUserDepart}, audit_user_id = #{auditUserId} WHERE strategy_template_id = #{id} diff --git a/src/main/resources/mappers/WhiteListMapper.xml b/src/main/resources/mappers/WhiteListMapper.xml index 60dc1a7..3d841ba 100644 --- a/src/main/resources/mappers/WhiteListMapper.xml +++ b/src/main/resources/mappers/WhiteListMapper.xml @@ -33,7 +33,7 @@ #{object.whiteListUrl}, #{object.whiteListProtocol}, 0, NOW(), #{object.whiteListDisplayId}, #{object.createUserName}, #{object.createUserDepartment}, - #{object.createUserId} + #{object.createUserId}) @@ -284,6 +284,15 @@ #{id} + + update t_white_list + set white_list_audit_status = #{status}, + audit_user_name = #{auditUserName}, + audit_user_id = #{auditUserId}, + audit_user_depart = #{auditUserDepart}, + modify_time = NOW() + where white_list_id = #{id} +