gfwleak/enderbyendera-realtime-protection
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、修复动态规则、任务批量审批bug

Browse Source 
2、配置新增批量审批
3、规则、任务补全创建人属性
4、删去kafkatest配置文件
This commit is contained in:
PushM
2024-05-09 13:06:21 +08:00
parent 1b7460be64
commit dc70c713b2
32 changed files with 373 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/realtime/protection/configuration/entity/defense/object/ProtectObject.java
View File

@@ -66,16 +66,16 @@ public class ProtectObject {
@JsonProperty("proobj_create_username")
@ExcelIgnore
@Schema(description = "防护对象创建人", example = "xxx", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "防护对象创建人", example = "xxx")
private String protectObjectCreateUsername;
@JsonProperty("proobj_create_depart")
@ExcelIgnore
@Schema(description = "防护对象创建人处室", example = "xxx", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "防护对象创建人处室", example = "xxx")
private String protectObjectCreateDepart;
@JsonProperty("proobj_create_userid")
@ExcelIgnore
@Schema(description = "防护对象创建人ID", example = "0", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "防护对象创建人ID", example = "0")
private Integer protectObjectCreateUserId;
}

6
src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java
View File

@@ -62,15 +62,15 @@ public class Template {
private Integer runningTasks;
@JsonProperty("create_user_id")
@Schema(description = "防御策略模板创建人ID", example = "1", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "防御策略模板创建人ID", example = "1")
private Integer createUserId;
@JsonProperty("create_user_name")
@Schema(description = "防御策略模板创建人名称", example = "xxx", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "防御策略模板创建人名称", example = "xxx")
private String createUsername;
@JsonProperty("create_user_depart")
@Schema(description = "防御策略模板创建人处室", example = "xxx", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "防御策略模板创建人处室", example = "xxx")
private String createDepart;
@JsonProperty("audit_status")

8
src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java
View File

@@ -50,19 +50,19 @@ public class StaticRuleObject {
@JsonProperty("static_rule_create_username")
@ExcelIgnore
@Schema(description = "静态规则创建用户名称", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "静态规则创建用户名称")
private String staticRuleCreateUsername;
@JsonProperty("static_rule_audit_status")
@ExcelIgnore
@Schema(description = "静态规则审核状态（0为未审核，1为已退回，2为审核通过）", example = "2", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "静态规则审核状态（0为未审核，1为已退回，2为审核通过）", example = "2")
private Integer auditStatus;
@JsonProperty("static_rule_create_depart")
@ExcelIgnore
@Schema(description = "静态规则创建用户所属部门", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "静态规则创建用户所属部门")
private String staticRuleCreateDepart;
@JsonProperty("static_rule_create_user_id")
@ExcelIgnore
@Schema(hidden = true)
@Schema(description = "静态规则创建人ID")
private Integer staticRuleCreateUserId;
@JsonProperty("static_rule_used_task_id")
@ExcelIgnore

10
src/main/java/com/realtime/protection/configuration/entity/task/Task.java
View File

@@ -56,15 +56,19 @@ public class Task {
private String taskAct;
@JsonProperty("task_create_username")
@Schema(description = "任务创建人名称", accessMode = Schema.AccessMode.READ_ONLY)
// @Schema(description = "任务创建人名称", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "任务创建人名称")
private String taskCreateUsername;
@JsonProperty("task_create_depart")
@Schema(description = "任务创建人处室", accessMode = Schema.AccessMode.READ_ONLY)
// @Schema(description = "任务创建人处室", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "任务创建人处室")
private String taskCreateDepart;
@JsonProperty("task_create_userid")
@Schema(description = "任务创建人ID", accessMode = Schema.AccessMode.READ_ONLY)
// @Schema(description = "任务创建人ID", accessMode = Schema.AccessMode.READ_ONLY)
@Schema(description = "任务创建人ID")
private Integer taskCreateUserId;
@JsonProperty("static_rule_ids")

13
src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java
View File

@@ -56,7 +56,6 @@ public class WhiteListObject {
@Schema(description = "白名单对象网络协议", example = "TCP", requiredMode = Schema.RequiredMode.REQUIRED)
private String whiteListProtocol;
@JsonProperty("audit_status")
@ExcelIgnore
@Schema(description = "白名单对象审核状态（0为未审核，1为已退回，2为审核通过）", example = "2")
@@ -67,4 +66,16 @@ public class WhiteListObject {
@Schema(description = "白名单展示id", example = "BMD-20200101-123456", accessMode = Schema.AccessMode.READ_ONLY)
private String whiteListDisplayId;
@JsonProperty("white_list_create_user_name")
@Schema(description = "白名单对象创建人名称")
private String createUserName;
@JsonProperty("white_list_create_user_id")
@Schema(description = "白名单对象创建人id")
private String createUserId;
@JsonProperty("white_list_create_user_department")
@Schema(description = "白名单对象创建人部门")
private String createUserDepartment;
}