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

1、动态任务增加发送指令下发信号

Browse Source 
2、动态规则批量删除增加使用中判断
3、静态规则返回字段为‘’自动处理为null
4、修复防护对象查询返回ip没有转为ip格式错误
This commit is contained in:
PushM
2024-06-09 00:09:16 +08:00
parent b463a4fe3e
commit 0523eb790b
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package com.realtime.protection.configuration.entity.rule.staticrule;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.realtime.protection.configuration.utils.EmptyStringToNullDeserializer;
import com.realtime.protection.configuration.utils.enums.audit.AuditStatusEnum;
import com.realtime.protection.configuration.utils.enums.audit.AuditStatusValidator;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -14,6 +15,8 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.time.LocalDateTime;
import java.util.List;
@@ -76,10 +79,12 @@ public class StaticRuleObject {
@JsonProperty("static_rule_sip")
@ExcelProperty("源IP地址")
@Pattern(regexp = "^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$", message = "错误 IPv4 地址")
@JsonDeserialize(using = EmptyStringToNullDeserializer.class)
@Schema(description = "源IP地址", example = "1.1.1.1")
private String staticRuleSip;
@JsonProperty("static_rule_msip")
@Pattern(regexp = "^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$", message = "I错误 IPv4 地址")
@JsonDeserialize(using = EmptyStringToNullDeserializer.class)
@ExcelProperty("源IP地址掩码")
@Schema(description = "源IP地址掩码", example = "255.255.255.0")
private String staticRuleMsip;
@@ -98,10 +103,12 @@ public class StaticRuleObject {
@JsonProperty("static_rule_dip")
@Pattern(regexp = "^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$", message = "错误 IPv4 地址")
@ExcelProperty("目的IP地址")
@JsonDeserialize(using = EmptyStringToNullDeserializer.class)
@Schema(description = "目的IP地址", example = "2.2.2.2")
private String staticRuleDip;
@JsonProperty("static_rule_mdip")
@ExcelProperty("目的IP地址掩码")
@JsonDeserialize(using = EmptyStringToNullDeserializer.class)
@Pattern(regexp = "^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$", message = "错误 IPv4 地址")
@Schema(description = "目的IP地址掩码", example = "255.255.255.0")
private String staticRuleMdip;

2
src/main/java/com/realtime/protection/server/task/TaskMapper.java
View File

@@ -116,7 +116,7 @@ public interface TaskMapper {
List<Task> queryHistory(Long id, Integer page, Integer pageSize);
@Select("SELECT task_id FROM t_task WHERE task_start_time >= NOW() " +
@Select("SELECT task_id FROM t_task WHERE task_start_time <= NOW() " +
"AND task_status = #{stateNum} AND task_audit_status = #{AuditNum}")
List<Long> queryRunnableTasks(Integer stateNum, Integer AuditNum);