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

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

View File

@@ -109,8 +109,8 @@ public class DynamicRuleService {
Template template = dynamicRuleMapper.queryTemplateByRuleId(dynamicRuleId);
if (template == null){
//template在表中删除了需要重新设置template感觉这种情况不多见
dynamicRuleObject.setDynamicRuleSourceSystem("need reset");
dynamicRuleObject.setDynamicRuleEventType("need reset");
dynamicRuleObject.setDynamicRuleSourceSystem(null);
dynamicRuleObject.setDynamicRuleEventType(null);
}else{
dynamicRuleObject.setDynamicRuleSourceSystem(template.getSourceSystem());
dynamicRuleObject.setDynamicRuleEventType(template.getTemplateName());

View File

@@ -2,6 +2,7 @@ package com.realtime.protection.server.rule.staticrule;
import com.alibaba.excel.util.ListUtils;
import com.realtime.protection.configuration.entity.rule.staticrule.StaticRuleObject;
import com.realtime.protection.configuration.utils.Counter;
import com.realtime.protection.configuration.entity.whitelist.WhiteListObject;
import com.realtime.protection.configuration.utils.SqlSessionWrapper;
import com.realtime.protection.configuration.utils.enums.RuleEnum;
@@ -16,6 +17,11 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.function.Function;
@@ -70,6 +76,9 @@ public class StaticRuleService {
if (!RuleEnum.checkValidate(object)) {
throw new IllegalArgumentException("静态规则不符合指定的配置方法,请参考规则模板以配置静态规则");
}
/*
新建静态规则,过一下白名单审核
*/
List<StaticRuleObject> staticRuleObjects = new ArrayList<>();
staticRuleObjects.add(object);
List<WhiteListObject> whiteListsHit = whiteListService.whiteListStaticRulesObjectCheck(staticRuleObjects);

View File

@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicReference;
public class StateHandler {
private final WebClient client = WebClient.builder()
.baseUrl("http://192.168.107.89:9081")
.baseUrl("http://192.168.107.49:8088")
.build();
protected Boolean handleStart(TaskService taskService, CommandService commandService, Long taskId) {