1、AlertMessage入库修复字段和库表不匹配问题,增加display_id
2、command增加display_id 3、规则、任务、配置增加新建时(批量导入除外)、任务运行状态、审核状态改变时的历史记录
This commit is contained in:
@@ -24,6 +24,7 @@ public class MyKafkaListenerErrorHandler implements KafkaListenerErrorHandler {
|
|||||||
|
|
||||||
log.error("消息详情:" + message);
|
log.error("消息详情:" + message);
|
||||||
log.error("异常信息::" + exception.getCause());
|
log.error("异常信息::" + exception.getCause());
|
||||||
|
exception.printStackTrace();
|
||||||
log.error("消费者详情::" + consumer.groupMetadata());
|
log.error("消费者详情::" + consumer.groupMetadata());
|
||||||
log.error("监听主题::" + consumer.listTopics());
|
log.error("监听主题::" + consumer.listTopics());
|
||||||
return KafkaListenerErrorHandler.super.handleError(message, exception, consumer);
|
return KafkaListenerErrorHandler.super.handleError(message, exception, consumer);
|
||||||
|
|||||||
@@ -95,34 +95,31 @@
|
|||||||
c_provid,
|
c_provid,
|
||||||
c_event_id,
|
c_event_id,
|
||||||
c_priority,
|
c_priority,
|
||||||
c_time,
|
t_time,
|
||||||
c_flowid,
|
c_flowid,
|
||||||
c_s_boundary,
|
|
||||||
|
|
||||||
c_src_ipv6,
|
c_src_ipv6,
|
||||||
c_s_tunnel_ip,
|
c_s_tunnel_ip,
|
||||||
c_s_tunnel_port,
|
c_s_tunnel_port,
|
||||||
c_dest_ipv6,
|
c_dest_ipv6,
|
||||||
c_d_tunnel_ip,
|
c_d_tunnel_ip,
|
||||||
c_d_tunnel_port,
|
c_d_tunnel_port,
|
||||||
c_des_IPv6,
|
|
||||||
c_proto_type,
|
|
||||||
-- c_return_info,
|
|
||||||
c_s_boundary,
|
c_s_boundary,
|
||||||
c_s_region,
|
c_s_region,
|
||||||
c_s_city,
|
c_s_city,
|
||||||
c_s_district,
|
c_s_district,
|
||||||
c_s_operators,
|
c_s_operator,
|
||||||
c_s_owner,
|
c_s_owner,
|
||||||
c_d_boundary,
|
c_d_boundary,
|
||||||
c_d_region,
|
c_d_region,
|
||||||
c_d_city,
|
c_d_city,
|
||||||
c_d_district,
|
c_d_district,
|
||||||
c_d_operators,
|
c_d_operator,
|
||||||
c_d_owner,
|
c_d_owner,
|
||||||
c_ret_file_type,
|
c_ret_file_type,
|
||||||
c_ret_file_name,
|
c_ret_filename,
|
||||||
c_curl
|
c_url,
|
||||||
|
display_id,
|
||||||
|
c_return_info
|
||||||
)
|
)
|
||||||
values (
|
values (
|
||||||
#{taskId},
|
#{taskId},
|
||||||
@@ -152,18 +149,12 @@
|
|||||||
#{c_priority},
|
#{c_priority},
|
||||||
#{c_time},
|
#{c_time},
|
||||||
#{c_flowid},
|
#{c_flowid},
|
||||||
-- #{c_src_ipv4},
|
|
||||||
#{c_src_ipv6},
|
#{c_src_ipv6},
|
||||||
-- #{c_src_port},
|
|
||||||
#{c_s_tunnel_ip},
|
#{c_s_tunnel_ip},
|
||||||
#{c_s_tunnel_port},
|
#{c_s_tunnel_port},
|
||||||
-- #{c_dest_ipv4},
|
|
||||||
#{c_dest_ipv6},
|
#{c_dest_ipv6},
|
||||||
-- #{c_dest_port},
|
#{c_d_tunnel_ip},
|
||||||
#{c_d_tunnel_ip},
|
|
||||||
#{c_d_tunnel_port},
|
#{c_d_tunnel_port},
|
||||||
-- #{c_proto_type},
|
|
||||||
-- #{c_return_info},
|
|
||||||
#{c_s_boundary},
|
#{c_s_boundary},
|
||||||
#{c_s_region},
|
#{c_s_region},
|
||||||
#{c_s_city},
|
#{c_s_city},
|
||||||
@@ -178,7 +169,9 @@
|
|||||||
#{c_d_owner},
|
#{c_d_owner},
|
||||||
#{c_ret_file_type},
|
#{c_ret_file_type},
|
||||||
#{c_ret_file_name},
|
#{c_ret_file_name},
|
||||||
#{c_curl}
|
#{c_url},
|
||||||
|
#{display_id},
|
||||||
|
#{c_return_info}
|
||||||
)
|
)
|
||||||
|
|
||||||
</insert>
|
</insert>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
MASK_SRC_IP, MASK_SRC_PORT, MASK_DST_IP, MASK_DST_PORT, MASK_PROTOCOL, VALID_TIME,
|
MASK_SRC_IP, MASK_SRC_PORT, MASK_DST_IP, MASK_DST_PORT, MASK_PROTOCOL, VALID_TIME,
|
||||||
INVALID_TIME, IS_VALID, IS_JUDGED,
|
INVALID_TIME, IS_VALID, IS_JUDGED,
|
||||||
SEND_TIMES, SUCCESS_TIMES, CREATE_TIME, LAST_UPDATE, IS_DELETED,
|
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},
|
values (#{info.UUID}, #{info.taskId}, #{info.taskAct}, #{info.taskName}, #{info.eventType}, #{info.taskCreateDepart}, #{info.distributePoint},
|
||||||
#{info.frequency},
|
#{info.frequency},
|
||||||
DEFAULT,
|
DEFAULT,
|
||||||
@@ -22,7 +22,8 @@
|
|||||||
#{info.startTime}, #{info.endTime}, #{info.isValid},
|
#{info.startTime}, #{info.endTime}, #{info.isValid},
|
||||||
#{info.isJudged},
|
#{info.isJudged},
|
||||||
0, 0,
|
0, 0,
|
||||||
NOW(), NOW(), FALSE, #{info.taskType}, #{info.ruleId})
|
NOW(), NOW(), FALSE, #{info.taskType}, #{info.ruleId}, #{info.displayId}
|
||||||
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<insert id="createCommands" parameterType="com.realtime.protection.configuration.entity.task.TaskCommandInfo">
|
<insert id="createCommands" parameterType="com.realtime.protection.configuration.entity.task.TaskCommandInfo">
|
||||||
@@ -32,7 +33,7 @@
|
|||||||
MASK_SRC_IP, MASK_SRC_PORT, MASK_DST_IP, MASK_DST_PORT, MASK_PROTOCOL, VALID_TIME, INVALID_TIME, IS_VALID,
|
MASK_SRC_IP, MASK_SRC_PORT, MASK_DST_IP, MASK_DST_PORT, MASK_PROTOCOL, VALID_TIME, INVALID_TIME, IS_VALID,
|
||||||
IS_JUDGED,
|
IS_JUDGED,
|
||||||
SEND_TIMES, SUCCESS_TIMES, CREATE_TIME, LAST_UPDATE, IS_DELETED,
|
SEND_TIMES, SUCCESS_TIMES, CREATE_TIME, LAST_UPDATE, IS_DELETED,
|
||||||
TASKTYPE, RULE_ID)
|
TASKTYPE, RULE_ID, display_id)
|
||||||
values
|
values
|
||||||
<foreach collection="command_infos" item="info" separator=",">
|
<foreach collection="command_infos" item="info" separator=",">
|
||||||
(#{info.UUID}, #{info.taskId}, #{info.taskAct}, #{info.taskName}, #{info.eventType}, #{info.taskCreateDepart}, #{info.distributePoint},
|
(#{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.startTime}, #{info.endTime}, #{info.isValid},
|
||||||
#{info.isJudged},
|
#{info.isJudged},
|
||||||
0, 0,
|
0, 0,
|
||||||
NOW(), NOW(), FALSE, #{info.taskType}, #{info.ruleId}
|
NOW(), NOW(), FALSE, #{info.taskType}, #{info.ruleId}, #{info.displayId}
|
||||||
)
|
)
|
||||||
</foreach>
|
</foreach>
|
||||||
</insert>
|
</insert>
|
||||||
|
|||||||
Reference in New Issue
Block a user