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

1、静态、动态规则删去局点，任务添加局点

Browse Source 
2、修改fakec3的测试ip地址

(cherry picked from commit 540795b5f6)
This commit is contained in:
PushM
2024-04-29 17:32:13 +08:00
parent 335c9690ed
commit 093ed45c66
17 changed files with 211 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/DynamicRuleObject.java
View File

@@ -86,9 +86,9 @@ public class DynamicRuleObject {
@Schema(description = "优先级", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer dynamicRulePriority;
@NotNull
@JsonProperty("dynamic_rule_range")
@Schema(description = "范围", example = "北京", requiredMode = Schema.RequiredMode.REQUIRED)
private String dynamicRuleRange;
// @JsonProperty("dynamic_rule_range")
// @Schema(description = "范围", example = "北京", requiredMode = Schema.RequiredMode.REQUIRED)
// private String dynamicRuleRange;
@NotNull
@JsonProperty("dynamic_rule_frequency")
@Schema(description = "频率", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)

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

@@ -135,10 +135,10 @@ public class StaticRuleObject {
@Min(value = 1)
@Schema(description = "优先级,1代表高2代表中3代表低", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer staticRulePriority;
@JsonProperty("static_rule_range")
@ExcelProperty("范围")
@Schema(description = "范围", example = "北京", requiredMode = Schema.RequiredMode.REQUIRED)
private String staticRuleRange;
// @JsonProperty("static_rule_range")
// @ExcelProperty("范围")
// @Schema(description = "范围", example = "北京", requiredMode = Schema.RequiredMode.REQUIRED)
// private String staticRuleRange;
@JsonProperty("static_rule_frequency")
@ExcelProperty("频率")
@Min(value = 1)

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

@@ -78,4 +78,9 @@ public class Task {
@JsonProperty("task_audit_status")
@Schema(description = "任务审核状态（0为未审核，1为已退回，2为已通过）", accessMode = Schema.AccessMode.READ_ONLY)
private Integer taskAuditStatus;
@JsonProperty("task_range")
@NotNull(message = "task_range字段不能为空。")
@Schema(description = "局点范围，由规则移动到任务", example = "1009")
private String taskRange;
}