From 6e3d48c63ed4f85f0f6bf929f5e1953956ed74b7 Mon Sep 17 00:00:00 2001 From: PushM <584406942@qq.com> Date: Tue, 4 Jun 2024 20:08:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81AlertMessage=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5=E5=92=8C=E5=BA=93=E8=A1=A8?= =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0display=5Fid=202=E3=80=81command=E5=A2=9E=E5=8A=A0disp?= =?UTF-8?q?lay=5Fid=203=E3=80=81=E8=A7=84=E5=88=99=E3=80=81=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=81=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=EF=BC=88=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=99=A4=E5=A4=96=EF=BC=89=E3=80=81=E4=BB=BB=E5=8A=A1=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E7=8A=B6=E6=80=81=E3=80=81=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=94=B9=E5=8F=98=E6=97=B6=E7=9A=84=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kafka/MyKafkaListenerErrorHandler.java | 1 + .../resources/mappers/AlertMessageMapper.xml | 29 +++++++------------ src/main/resources/mappers/CommandMapper.xml | 9 +++--- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/realtime/protection/configuration/kafka/MyKafkaListenerErrorHandler.java b/src/main/java/com/realtime/protection/configuration/kafka/MyKafkaListenerErrorHandler.java index 4abaf8c..e23867c 100644 --- a/src/main/java/com/realtime/protection/configuration/kafka/MyKafkaListenerErrorHandler.java +++ b/src/main/java/com/realtime/protection/configuration/kafka/MyKafkaListenerErrorHandler.java @@ -24,6 +24,7 @@ public class MyKafkaListenerErrorHandler implements KafkaListenerErrorHandler { log.error("消息详情：" + message); log.error("异常信息：：" + exception.getCause()); + exception.printStackTrace(); log.error("消费者详情：：" + consumer.groupMetadata()); log.error("监听主题：：" + consumer.listTopics()); return KafkaListenerErrorHandler.super.handleError(message, exception, consumer); diff --git a/src/main/resources/mappers/AlertMessageMapper.xml b/src/main/resources/mappers/AlertMessageMapper.xml index 0f36aef..36d3e93 100644 --- a/src/main/resources/mappers/AlertMessageMapper.xml +++ b/src/main/resources/mappers/AlertMessageMapper.xml @@ -95,34 +95,31 @@ c_provid, c_event_id, c_priority, - c_time, + t_time, c_flowid, - c_s_boundary, - c_src_ipv6, c_s_tunnel_ip, c_s_tunnel_port, c_dest_ipv6, c_d_tunnel_ip, c_d_tunnel_port, - c_des_IPv6, - c_proto_type, --- c_return_info, c_s_boundary, c_s_region, c_s_city, c_s_district, - c_s_operators, + c_s_operator, c_s_owner, c_d_boundary, c_d_region, c_d_city, c_d_district, - c_d_operators, + c_d_operator, c_d_owner, c_ret_file_type, - c_ret_file_name, - c_curl + c_ret_filename, + c_url, + display_id, + c_return_info ) values ( #{taskId}, @@ -152,18 +149,12 @@ #{c_priority}, #{c_time}, #{c_flowid}, --- #{c_src_ipv4}, #{c_src_ipv6}, --- #{c_src_port}, #{c_s_tunnel_ip}, #{c_s_tunnel_port}, --- #{c_dest_ipv4}, #{c_dest_ipv6}, --- #{c_dest_port}, - #{c_d_tunnel_ip}, + #{c_d_tunnel_ip}, #{c_d_tunnel_port}, --- #{c_proto_type}, --- #{c_return_info}, #{c_s_boundary}, #{c_s_region}, #{c_s_city}, @@ -178,7 +169,9 @@ #{c_d_owner}, #{c_ret_file_type}, #{c_ret_file_name}, - #{c_curl} + #{c_url}, + #{display_id}, + #{c_return_info} ) diff --git a/src/main/resources/mappers/CommandMapper.xml b/src/main/resources/mappers/CommandMapper.xml index fee5ed7..7eeadad 100644 --- a/src/main/resources/mappers/CommandMapper.xml +++ b/src/main/resources/mappers/CommandMapper.xml @@ -9,7 +9,7 @@ MASK_SRC_IP, MASK_SRC_PORT, MASK_DST_IP, MASK_DST_PORT, MASK_PROTOCOL, VALID_TIME, INVALID_TIME, IS_VALID, IS_JUDGED, SEND_TIMES, SUCCESS_TIMES, CREATE_TIME, LAST_UPDATE, IS_DELETED, - TASKTYPE, RULE_ID) + TASKTYPE, RULE_ID, display_id) values (#{info.UUID}, #{info.taskId}, #{info.taskAct}, #{info.taskName}, #{info.eventType}, #{info.taskCreateDepart}, #{info.distributePoint}, #{info.frequency}, DEFAULT, @@ -22,7 +22,8 @@ #{info.startTime}, #{info.endTime}, #{info.isValid}, #{info.isJudged}, 0, 0, - NOW(), NOW(), FALSE, #{info.taskType}, #{info.ruleId}) + NOW(), NOW(), FALSE, #{info.taskType}, #{info.ruleId}, #{info.displayId} + ) @@ -32,7 +33,7 @@ MASK_SRC_IP, MASK_SRC_PORT, MASK_DST_IP, MASK_DST_PORT, MASK_PROTOCOL, VALID_TIME, INVALID_TIME, IS_VALID, IS_JUDGED, SEND_TIMES, SUCCESS_TIMES, CREATE_TIME, LAST_UPDATE, IS_DELETED, - TASKTYPE, RULE_ID) + TASKTYPE, RULE_ID, display_id) values (#{info.UUID}, #{info.taskId}, #{info.taskAct}, #{info.taskName}, #{info.eventType}, #{info.taskCreateDepart}, #{info.distributePoint}, @@ -47,7 +48,7 @@ #{info.startTime}, #{info.endTime}, #{info.isValid}, #{info.isJudged}, 0, 0, - NOW(), NOW(), FALSE, #{info.taskType}, #{info.ruleId} + NOW(), NOW(), FALSE, #{info.taskType}, #{info.ruleId}, #{info.displayId} )