Merge remote-tracking branch 'origin/master'

This commit is contained in:
Hao Miao
2024-01-04 17:05:48 +08:00
16 changed files with 342 additions and 73 deletions

View File

@@ -20,17 +20,23 @@ public class Template {
@NotNull(message = "default_op should not be empty")
private String defaultOp;
private boolean hasProtectObjectIP;
@JsonProperty("template_running_tasks")
private Integer templateRunningTasks;
private boolean hasProtectObjectPort;
@JsonProperty("template_used")
private Integer templateUsedTimes;
private boolean hasPeerIP;
private Boolean hasProtectObjectIP;
private boolean hasPeerPort;
private Boolean hasProtectObjectPort;
private boolean hasProtocol;
private Boolean hasPeerIP;
private boolean hasURL;
private Boolean hasPeerPort;
private boolean hasDNS;
private Boolean hasProtocol;
private Boolean hasURL;
private Boolean hasDNS;
}

View File

@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class Task {
@@ -53,13 +54,13 @@ public class Task {
// -----------------------------------------------------------
@JsonProperty("static_rule_ids")
private Integer[] staticRuleIds;
private List<Integer> staticRuleIds;
@JsonProperty("dynamic_rule_ids")
private Integer[] dynamicRuleIds;
private List<Integer> dynamicRuleIds;
@JsonProperty("protect_object_ids")
private Integer[] protectObjectIds;
private List<Integer> protectObjectIds;
@JsonProperty("task_status")
private Integer taskStatus;