From 81e65f25e927dacd36f19f40f4ccbf4bd5e5a2d5 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Wed, 1 Sep 2021 17:33:53 +0800 Subject: [PATCH 01/17] =?UTF-8?q?OCT=20REM:=201.=20=E6=96=B0=E5=A2=9Ekafka?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application-dispose.properties | 12 ++ pom.xml | 5 + .../dispose/config/KafkaConfiguration.java | 109 ++++++++++++++++++ .../com/dispose/setup/SpringBootBeanUtil.java | 79 +++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 src/main/java/com/dispose/config/KafkaConfiguration.java create mode 100644 src/main/java/com/dispose/setup/SpringBootBeanUtil.java diff --git a/config/application-dispose.properties b/config/application-dispose.properties index eed53e73..2e89a8a3 100644 --- a/config/application-dispose.properties +++ b/config/application-dispose.properties @@ -42,6 +42,18 @@ crypto.aes-key=hkoUV5ZWh0q1jSxMnpjovVn19Qg99HY6DD40 # 3DES秘钥 crypto.des-key=P3mq9iSIvQcvfyfdWR8sAnfAadO +# Kafka 服务器配置 +#重试次数 +kafka.producer.retries=3 +#批量大小 +kafka.producer.batch.size=16384 +#延时 +kafka.producer.linger=1 +#生产端缓冲区大小 +kafka.producer.buffer.memory=33554432 +kafka.producer.servers=172.21.44.189:9092,172.21.44.9:9092,172.21.44.244:9092,172.21.44.236:9092,172.21.44.80:9092 +kafka.dispose.topic=ddos-vip-customer-ck + #信任主机配置 # 白名单开关 trust.auth-white-list-check=true diff --git a/pom.xml b/pom.xml index 612ded6a..b5de00e0 100644 --- a/pom.xml +++ b/pom.xml @@ -84,6 +84,11 @@ 2.4 jdk15 + + org.springframework.kafka + spring-kafka + 2.7.2 + diff --git a/src/main/java/com/dispose/config/KafkaConfiguration.java b/src/main/java/com/dispose/config/KafkaConfiguration.java new file mode 100644 index 00000000..837f70d2 --- /dev/null +++ b/src/main/java/com/dispose/config/KafkaConfiguration.java @@ -0,0 +1,109 @@ +package com.dispose.config; + +import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.serialization.StringSerializer; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.annotation.EnableKafka; +import org.springframework.kafka.core.DefaultKafkaProducerFactory; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.kafka.core.ProducerFactory; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +/** + * The type Kafka configuration. + */ +@EnableKafka +@ConfigurationProperties(prefix = "kafka") +@Configuration +@Component +@Slf4j +public class KafkaConfiguration { + /** + * The Producer servers. + */ + @Value("${kafka.producer.servers}") + private String producerServers; + /** + * The Producer retries. + */ + @Value("${kafka.producer.retries}") + private Integer producerRetries; + /** + * The Producer batch size. + */ + @Value("${kafka.producer.batch.size}") + private Integer producerBatchSize; + /** + * The Producer linger. + */ + @Value("${kafka.producer.linger}") + private Integer producerLinger; + /** + * The Buffer memory. + */ + @Value("${kafka.producer.buffer.memory}") + private Integer bufferMemory; + + /** + * The Kafka topic. + */ + @Value("${kafka.dispose.topic}") + private String kafkaTopic; + + /** + * Producer configs map. + * + * @return the map + */ + public Map producerConfigs() { + Map props = new HashMap<>(1); + log.info("-----------------servers---------: {}", producerServers); + props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, producerServers); + props.put(ProducerConfig.RETRIES_CONFIG, producerRetries); + props.put(ProducerConfig.BATCH_SIZE_CONFIG, producerBatchSize); + props.put(ProducerConfig.LINGER_MS_CONFIG, producerLinger); + props.put(ProducerConfig.BUFFER_MEMORY_CONFIG, bufferMemory); + props.put(ProducerConfig.RECONNECT_BACKOFF_MS_CONFIG, 5000); + props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class); + props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class); + return props; + } + + /** + * Gets kafka topic. + * + * @return the kafka topic + */ + public String getKafkaTopic() { + return kafkaTopic; + } + + /** + * Producer factory. + * + * @return the producer factory + */ + public ProducerFactory producerFactory() { + return new DefaultKafkaProducerFactory<>(producerConfigs()); + } + + /** + * Kafka template. + * + * @return the kafka template + */ + @Bean + public KafkaTemplate kafkaTemplate() { + KafkaTemplate kafkaTemplate = new KafkaTemplate<>(producerFactory()); + kafkaTemplate.setDefaultTopic(kafkaTopic); + + return kafkaTemplate; + } +} diff --git a/src/main/java/com/dispose/setup/SpringBootBeanUtil.java b/src/main/java/com/dispose/setup/SpringBootBeanUtil.java new file mode 100644 index 00000000..f34424a4 --- /dev/null +++ b/src/main/java/com/dispose/setup/SpringBootBeanUtil.java @@ -0,0 +1,79 @@ +package com.dispose.setup; + +import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +/** + * The type Spring boot bean util. + */ +@Component +@Slf4j +public class SpringBootBeanUtil implements ApplicationContextAware { + /** + * The constant applicationContext. + */ + private static ApplicationContext applicationContext; + + /** + * Sets application context. + * + * @param applicationContext the application context + * @throws BeansException the beans exception + */ + @Override + public void setApplicationContext(@NotNull ApplicationContext applicationContext) throws BeansException { + if (SpringBootBeanUtil.applicationContext == null) { + SpringBootBeanUtil.applicationContext = applicationContext; + } + + log.debug("========ApplicationContext配置成功========"); + log.debug("========在普通类可以通过调用SpringUtils.getAppContext()获取applicationContext对象========"); + log.debug("========applicationContext=" + SpringBootBeanUtil.applicationContext + "========"); + } + + /** + * Gets application context. + * + * @return the application context + */ + public static ApplicationContext getApplicationContext() { + return applicationContext; + } + + /** + * Gets bean. + * + * @param name the name + * @return the bean + */ + public static Object getBean(String name) { + return getApplicationContext().getBean(name); + } + + /** + * Gets bean. + * + * @param the type parameter + * @param clazz the clazz + * @return the bean + */ + public static T getBean(Class clazz) { + return getApplicationContext().getBean(clazz); + } + + /** + * Gets bean. + * + * @param the type parameter + * @param name the name + * @param clazz the clazz + * @return the bean + */ + public static T getBean(String name, Class clazz) { + return getApplicationContext().getBean(name, clazz); + } +} From 5af36c1ac34e8a1382531aa9862eaf56776209c6 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Tue, 7 Sep 2021 10:14:07 +0800 Subject: [PATCH 02/17] =?UTF-8?q?OCT=20REM:=201.=20kafka=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application-dispose.properties | 5 + pom.xml | 1 - .../com/dispose/PhoenixBootApplication.java | 3 +- .../dispose/controller/kafkaController.java | 108 ++++ .../pojo/dto/protocol/kafka/AlarmInfo.java | 84 +++ .../pojo/dto/protocol/kafka/AlarmInfoReq.java | 29 + .../dev/controller/KafkaControllerTest.java | 126 ++++ .../java/com/dispose/test/dev/debug/demo.java | 583 +++++++++--------- 8 files changed, 660 insertions(+), 279 deletions(-) create mode 100644 src/main/java/com/dispose/controller/kafkaController.java create mode 100644 src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfo.java create mode 100644 src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfoReq.java create mode 100644 src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java diff --git a/config/application-dispose.properties b/config/application-dispose.properties index 2e89a8a3..10f23ceb 100644 --- a/config/application-dispose.properties +++ b/config/application-dispose.properties @@ -53,6 +53,11 @@ kafka.producer.linger=1 kafka.producer.buffer.memory=33554432 kafka.producer.servers=172.21.44.189:9092,172.21.44.9:9092,172.21.44.244:9092,172.21.44.236:9092,172.21.44.80:9092 kafka.dispose.topic=ddos-vip-customer-ck +kafka.consumer.group-id = testGroup +kafka.consumer.auto-offset-reset = earliest +kafka.consumer.enable-auto-commit = true +kafka.consumer.auto-commit-interval = 100 +kafka.consumer.max-poll-records =5 #信任主机配置 # 白名单开关 diff --git a/pom.xml b/pom.xml index b5de00e0..626c9ace 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,6 @@ spring-kafka 2.7.2 - mysql diff --git a/src/main/java/com/dispose/PhoenixBootApplication.java b/src/main/java/com/dispose/PhoenixBootApplication.java index 4ce40ae7..3a7d0795 100644 --- a/src/main/java/com/dispose/PhoenixBootApplication.java +++ b/src/main/java/com/dispose/PhoenixBootApplication.java @@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableAsync; @@ -16,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * * @author */ -@SpringBootApplication +@SpringBootApplication(exclude = {KafkaAutoConfiguration.class}) @EnableAsync @EnableScheduling @EnableAspectJAutoProxy diff --git a/src/main/java/com/dispose/controller/kafkaController.java b/src/main/java/com/dispose/controller/kafkaController.java new file mode 100644 index 00000000..082154a5 --- /dev/null +++ b/src/main/java/com/dispose/controller/kafkaController.java @@ -0,0 +1,108 @@ +package com.dispose.controller; + +import com.dispose.common.ErrorCode; +import com.dispose.config.KafkaConfiguration; +import com.dispose.pojo.dto.protocol.base.BaseRespStatus; +import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO; +import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; +import com.dispose.pojo.dto.protocol.kafka.AlarmInfo; +import com.dispose.pojo.dto.protocol.kafka.AlarmInfoReq; +import com.dispose.security.annotation.Decryption; +import com.dispose.security.annotation.Encryption; +import com.dispose.validation.group.ValidGroups; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.kafka.support.SendResult; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Controller; +import org.springframework.util.concurrent.ListenableFuture; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Objects; + +/** + * The type Auth controller. + * + * @author + */ +@Controller +@RequestMapping(value = "/kafka") +@Slf4j +@Api(value = "处置平台发送消息接口", tags = "处置平台发送消息接口") +@Component +@Validated +@Encryption +@Decryption +public class kafkaController { + /** + * The Object mapper. + */ + @Resource + private ObjectMapper objectMapper; + + /** + * The Kafka configuration. + */ +// final private KafkaConfiguration kafkaConfiguration = +// SpringBootBeanUtil.getBean(com.dispose.config.KafkaConfiguration.class); + @Resource + private KafkaConfiguration kafkaConfiguration; + + /** + * Dispatch command sent to kafka. + * + * @param mr the mr + * @return the protocol resp dto + */ + @PostMapping("/dispatchCommand") + @ResponseBody + @ApiOperation("发送消息") + public ProtocolRespDTO dispatchCommand( + @Validated(ValidGroups.ProtocolCommonValid.class) + @RequestBody ProtocolReqDTO mr) throws JsonProcessingException { + //获取入参信息，进行所需数据格式拼接 + log.info("alarm message information :{}", mr.getMsgContent().getAlarmInfo()); + AlarmInfo alarmInfo = objectMapper.readValue(mr.getMsgContent().getAlarmInfo(), new TypeReference() { + }); + + //推动数据格式到kafka + log.info("send alarm message :{}", alarmInfo.toString()); + String sendMessage = mr.getMsgContent().getAlarmInfo(); + ListenableFuture> sendResult = kafkaConfiguration + .kafkaTemplate() + .sendDefault(0, System.currentTimeMillis(), "dispose", sendMessage); + + sendResult.addCallback(v -> log.info("Kafka send {} to {} at {}", sendMessage, + Objects.requireNonNull(v) + .getRecordMetadata() + .topic(), v.getRecordMetadata().partition()), + ex -> log.error("Kafka send error: {}", ex.getMessage())); + + BaseRespStatus rspInfo = new BaseRespStatus(); + rspInfo.setStatus(ErrorCode.ERR_OK.getCode()); + rspInfo.setMessage(new String[]{ErrorCode.ERR_OK.getMsg()}); + return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspInfo); + } + + +// @KafkaListener(topics = {"ddos-vip-customer-ck"}) +// public void kafkaListen(ConsumerRecord consumerRecord) { +// //判断消息是否为null +// Optional kafkaMessage = Optional.ofNullable(consumerRecord.value()); +// log.info(">>>>>>>>>>> record = " + kafkaMessage); +// if (kafkaMessage.isPresent()) { +// String consumerMsg = kafkaMessage.get(); +// log.info("消费消息：" + consumerMsg); +// } +// } + +} diff --git a/src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfo.java b/src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfo.java new file mode 100644 index 00000000..8bb85b0e --- /dev/null +++ b/src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfo.java @@ -0,0 +1,84 @@ +package com.dispose.pojo.dto.protocol.kafka; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +@EqualsAndHashCode() +@Data +@Builder +@AllArgsConstructor +@JsonPropertyOrder({"alarmId", "dstIp", "attackType", "bpspps", "dstProvince", "dstCity", "srcIpLs", "startTime", + "endTime", "disposeType", "disposeTime", "maxBps", "maxPps"}) +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AlarmInfo { + /** + * 告警id. + */ + private String alarmId; + + /** + * 被攻击ip. + */ + private String dstIp; + + /** + * 攻击类型(类似HTTP Flood字符串形式). + */ + private String attackType; + + /** + * 被攻击ip. + */ + private String bpspps; + + /** + * 目的ip省份. + */ + private String dstProvince; + + /** + * 目的ip市. + */ + private String dstCity; + + /** + * 告警源ip列表,没有就给empty的list. + */ + private List srcIpLs; + + /** + * 告警开始时间. + */ + private String startTime; + + /** + * 告警结束时间. + */ + private String endTime; + + /** + * 处置类型(1:清洗,2:黑洞,3:高防),默认清洗. + */ + private Integer disposeType; + + /** + * 处置时长. + */ + private Integer disposeTime; + + /** + * 流量峰值(单位:bps). + */ + private String maxBps; + + /** + * 包数峰值(单位:pps). + */ + private String maxPps; +} diff --git a/src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfoReq.java b/src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfoReq.java new file mode 100644 index 00000000..a44dd327 --- /dev/null +++ b/src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfoReq.java @@ -0,0 +1,29 @@ +package com.dispose.pojo.dto.protocol.kafka; + +import com.dispose.validation.group.ValidGroups; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + + +/** + * The type Login req. + * + * @author + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AlarmInfoReq { + /** + * 告警信息. + */ + @NotBlank(message = "alarmInfo 告警信息不能为空", groups = ValidGroups.ProtocolCommonValid.class) + private String alarmInfo; +} diff --git a/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java b/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java new file mode 100644 index 00000000..566c5600 --- /dev/null +++ b/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java @@ -0,0 +1,126 @@ +package com.dispose.test.dev.controller; + +import cn.hutool.json.JSONObject; +import com.dispose.common.ConstValue; +import com.dispose.common.ErrorCode; +import com.dispose.common.ProtoCryptoType; +import com.dispose.pojo.dto.protocol.base.BaseRespStatus; +import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO; +import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; +import com.dispose.pojo.dto.protocol.kafka.AlarmInfoReq; +import com.dispose.test.dev.Global.InitTestEnvironment; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import jodd.net.HttpStatus; +import lombok.extern.slf4j.Slf4j; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * The type Auth controller test. + * + * @author + */ +@AutoConfigureMockMvc +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Transactional +@Rollback +@Slf4j +public class KafkaControllerTest extends InitTestEnvironment { + /** + * The Mock mvc. + */ + @Resource + private MockMvc mockMvc; + /** + * The Object mapper. + */ + @Resource + private ObjectMapper objectMapper; + + /** + * A 1 login. + * + * @throws Exception the exception + */ + @Test + public void a1_dispatchCommand() throws Exception { + JSONObject disposeParam = new JSONObject(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + disposeParam.set("alarmId", "1"); + disposeParam.set("dstIp", "192.168.1.1"); + disposeParam.set("attackType", "1"); + disposeParam.set("bpspps", "bps"); + disposeParam.set("dstProvince", "ZHEJIANG"); + disposeParam.set("dstCity", "HANGZHOU"); + disposeParam.set("startTime", sdf.format(new Date())); + // 1清洗，2流控，3黑洞 + disposeParam.set("disposeType", 1); + disposeParam.set("disposeTime", 30); + disposeParam.set("endTime", new Date()); + List srcIp = new ArrayList<>(); + srcIp.add("192.168.10.1"); + srcIp.add("192.168.10.2"); + disposeParam.set("srcIpLs", srcIp); + disposeParam.set("maxBps", "20bps"); + disposeParam.set("maxPps", "20pps"); + String jsonAlarmInfo = disposeParam.toString(); + log.info("============ jsonAlarmInfo :{}", jsonAlarmInfo); + + AlarmInfoReq alarmInfoReq = AlarmInfoReq.builder() + .alarmInfo(jsonAlarmInfo).build(); + + ProtocolReqDTO reqInfo = new ProtocolReqDTO<>(); + + reqInfo.setVer(ConstValue.Protocol.VERSION); + reqInfo.setCryptoType(ProtoCryptoType.CRYPTO_NONE.getCode()); + reqInfo.setTimeStamp(System.currentTimeMillis()); + reqInfo.setMsgContent(alarmInfoReq); + + String ret = mockMvc.perform(MockMvcRequestBuilders + .post("/kafka/dispatchCommand") + .contentType(MediaType.APPLICATION_JSON) + .header("Authorization", ConstValue.STRING_HTTP_AUTH_HEAD + getLoginToken()) + .content(objectMapper.writeValueAsString(reqInfo))) + .andDo(print()).andExpect(status().isOk()) + .andExpect(jsonPath("$.code").value(HttpStatus.ok().status())) + .andReturn() + .getResponse() + .getContentAsString(); + + ProtocolRespDTO rspInfo = objectMapper.readValue(ret, + new TypeReference>() { + }); + + verifyRespProtocol(rspInfo); + + log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rspInfo)); + Assert.assertEquals(ErrorCode.ERR_OK.getCode(), (long) rspInfo.getMsgContent().getStatus()); + } +} diff --git a/src/test/java/com/dispose/test/dev/debug/demo.java b/src/test/java/com/dispose/test/dev/debug/demo.java index 2f955ab6..03910ab1 100644 --- a/src/test/java/com/dispose/test/dev/debug/demo.java +++ b/src/test/java/com/dispose/test/dev/debug/demo.java @@ -1,5 +1,6 @@ package com.dispose.test.dev.debug; +import cn.hutool.json.JSONObject; import com.dispose.common.ConstValue; import com.dispose.common.DDoSAttackType; import com.dispose.common.DisposeConfigValue; @@ -26,8 +27,10 @@ import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.Hashtable; import java.util.List; import java.util.Map; @@ -141,29 +144,29 @@ public class demo { @Test public void classEnumValue() throws JsonProcessingException { DisposeDevice dev = DisposeDevice.builder() - .ipAddr("10.88.77.15") - .ipPort("") - .deviceType(DisposeDeviceType.DPTECH_UMC) - .areaCode(0) - .deviceName("中移杭研实验室迪普清洗设备") - .manufacturer("DPTech") - .model("UMC") - .version("5.7.13") - .userName("admin") - .password("UMCAdministrator") - .urlPath("UMC/service/AbnormalFlowCleaningService") - .urlType(HttpType.HTTP) - .readme("实验室测试设备") - .status(ObjectStatus.NORMAL) - .build(); + .ipAddr("10.88.77.15") + .ipPort("") + .deviceType(DisposeDeviceType.DPTECH_UMC) + .areaCode(0) + .deviceName("中移杭研实验室迪普清洗设备") + .manufacturer("DPTech") + .model("UMC") + .version("5.7.13") + .userName("admin") + .password("UMCAdministrator") + .urlPath("UMC/service/AbnormalFlowCleaningService") + .urlType(HttpType.HTTP) + .readme("实验室测试设备") + .status(ObjectStatus.NORMAL) + .build(); DisposeDevice dev2 = DisposeDevice.builder() - .version("5.7.135") - .build(); + .version("5.7.135") + .build(); log.debug(new ObjectMapper() - .writerWithDefaultPrettyPrinter() - .writeValueAsString(upgradeDisposeDeviceProperties(dev, dev2))); + .writerWithDefaultPrettyPrinter() + .writeValueAsString(upgradeDisposeDeviceProperties(dev, dev2))); } /** @@ -204,250 +207,250 @@ public class demo { @Test public void ipRang() { String[] src = new String[]{"112.13.86.0-112.13.86.255", "112.13.82.0-112.13.82.255", "117.148.175.0-117.148" + - ".175.255", "117.148.174.0-117.148.174.255", "117.148.172.0-117.148.172.255", "117.148.142.0-117.148.142" + - ".255", "117.148.141.0-117.148.141.255", "117.148.140.0-117.148.140.255", "117.148.131.0-117.148.131.255" - , "117.148.130.0-117.148.130.255", "117.148.129.0-117.148.129.255", "117.148.128.0-117.148.128.255", "112" + - ".17.42.0-112.17.42.255", "112.17.41.0-112.17.41.255", "112.17.40.0-112.17.40.255", "112.17.29.0-112.17" + - ".29.255", "112.17.28.0-112.17.28.255", "112.17.27.0-112.17.27.255", "112.17.14.0-112.17.14.255", "112.13" + - ".218.0-112.13.218.255", "112.13.217.0-112.13.217.255", "112.13.216.0-112.13.216.255", "112.13.210.0-112" + - ".13.210.255", "112.13.209.0-112.13.209.255", "112.13.208.0-112.13.208.255", "112.13.170.171-112.13.170" + - ".255", "112.13.111.0-112.13.111.255", "112.13.108.0-112.13.108.255", "112.13.107.0-112.13.107.255", "112" + - ".13.106.0-112.13.106.255", "112.13.105.0-112.13.105.255", "112.13.81.0-112.13.81.255", "112.13.87.0-112" + - ".13.87.255", "111.2.176.0-111.2.176.7", "112.13.80.0-112.13.80.255", "112.13.83.0-112.13.83.255", "112" + - ".13.84.0-112.13.84.255", "112.13.85.0-112.13.85.255", "112.13.170.0-112.13.170.169", "111.2.176.9-111.2" + - ".179.255", "117.147.196.0-117.147.199.255", "183.247.240.0-183.247.255.255", "117.148.170.0-117.148.170" + - ".255", "117.148.169.0-117.148.169.255", "112.17.43.0-112.17.43.255", "112.17.15.0-112.17.15.255", "112" + - ".13.103.0-112.13.103.255", "112.13.97.0-112.13.97.255", "112.13.112.0-112.13.127.255", "218.205.90.0-218" + - ".205.91.255", "218.205.88.0-218.205.88.255", "112.13.215.0-112.13.215.255", "112.13.214.0-112.13.214" + - ".255", "112.13.212.0-112.13.212.255", "112.13.211.0-112.13.211.255", "112.13.75.0-112.13.75.63", "112.13" + - ".67.0-112.13.67.255", "112.13.66.0-112.13.66.255", "117.148.177.0-117.148.177.255", "117.148.176.0-117" + - ".148.176.255", "112.13.166.0-112.13.166.255", "112.17.252.0-112.17.252.255", "112.17.251.0-112.17.251" + - ".255", "112.17.250.0-112.17.250.255", "117.148.167.0-117.148.167.255", "112.13.174.0-112.13.174.255", - "112.13.172.0-112.13.172.255", "211.138.129.128-211.138.129.255", "112.17.0.0-112.17.7.255", "218.205.80" + - ".0-218.205.86.255", "218.205.79.0-218.205.79.255", "218.205.78.0-218.205.78.255", "218.205.77.0-218.205" + - ".77.255", "218.205.76.0-218.205.76.255", "218.205.74.0-218.205.74.255", "218.205.73.0-218.205.73.255", - "218.205.72.0-218.205.72.255", "211.138.126.128-211.138.126.255", "211.138.126.112-211.138.126.127", "211" + - ".138.126.104-211.138.126.111", "211.138.126.64-211.138.126.95", "211.138.124.0-211.138.124.255", "211" + - ".138.120.0-211.138.123.255", "120.193.8.0-120.193.11.255", "111.1.52.0-111.1.55.255", "111.1.44.0-111.1" + - ".47.255", "111.1.36.0-111.1.39.255", "111.1.34.0-111.1.35.255", "111.1.33.0-111.1.33.255", "111.1.16" + - ".0-111.1.23.255", "111.0.37.0-111.0.37.255", "111.0.36.0-111.0.36.255", "111.0.35.0-111.0.35.255", "111" + - ".0.34.0-111.0.34.255", "111.0.33.0-111.0.33.255", "111.0.32.0-111.0.32.255", "111.0.31.0-111.0.31.255", - "111.0.30.0-111.0.30.255", "112.17.48.0-112.17.63.255", "111.3.80.0-111.3.95.255", "117.149.154.0-117.149" + - ".154.255", "117.147.184.0-117.147.184.255", "112.17.30.0-112.17.30.255", "111.3.76.0-111.3.76.255", "111" + - ".0.29.0-111.0.29.255", "111.0.28.0-111.0.28.255", "111.0.27.0-111.0.27.255", "111.0.26.0-111.0.26.255", - "111.0.25.0-111.0.25.255", "111.0.24.0-111.0.24.255", "111.0.23.0-111.0.23.255", "111.0.22.0-111.0.22" + - ".255", "218.205.75.0-218.205.75.255", "211.138.126.32-211.138.126.39", "117.148.166.0-117.148.166.255", - "117.148.165.0-117.148.165.255", "117.148.164.0-117.148.164.255", "117.148.163.0-117.148.163.255", "117" + - ".148.162.0-117.148.162.255", "117.148.161.0-117.148.161.255", "117.148.160.0-117.148.160.255", "112.13" + - ".223.0-112.13.223.255", "112.13.222.0-112.13.222.255", "112.13.221.0-112.13.221.255", "112.13.220.0-112" + - ".13.220.255", "112.13.213.0-112.13.213.255", "112.13.175.0-112.13.175.255", "112.13.173.0-112.13.173" + - ".255", "112.13.79.0-112.13.79.255", "112.13.78.0-112.13.78.255", "112.13.77.0-112.13.77.255", "112.13.76" + - ".0-112.13.76.255", "112.13.74.0-112.13.74.255", "112.13.73.0-112.13.73.255", "112.13.72.0-112.13.72.255" - , "112.13.71.0-112.13.71.255", "112.13.70.0-112.13.70.255", "112.13.69.0-112.13.69.255", "112.13.68.0-112" + - ".13.68.255", "112.13.65.0-112.13.65.255", "112.13.64.0-112.13.64.255", "111.2.184.0-111.2.184.255", "111" + - ".1.32.0-111.1.32.255", "111.1.41.36-111.1.41.39", "111.1.41.64-111.1.41.79", "120.199.68.38-120.199.68" + - ".38", "111.1.41.34-111.1.41.34", "111.1.41.30-111.1.41.30", "111.1.41.22-111.1.41.22", "120.199.68" + - ".46-120.199.68.46", "120.199.68.115-120.199.68.115", "120.199.68.114-120.199.68.114", "111.1.41.252-111" + - ".1.41.252", "111.1.41.184-111.1.41.191", "120.199.68.96-120.199.68.111", "120.199.68.93-120.199.68.93", - "120.199.68.92-120.199.68.92", "120.199.68.91-120.199.68.91", "120.199.68.90-120.199.68.90", "111.1.41" + - ".26-111.1.41.26", "120.199.82.6-120.199.82.6", "111.1.41.0-111.1.41.7", "111.1.41.118-111.1.41.118", - "120.199.93.54-120.199.93.54", "111.1.41.29-111.1.41.29", "111.1.41.43-111.1.41.43", "111.1.41.42-111.1" + - ".41.42", "120.199.80.32-120.199.80.47", "120.199.85.176-120.199.85.176", "120.199.85.184-120.199.85.191" - , "120.199.85.183-120.199.85.183", "120.199.85.182-120.199.85.182", "120.199.85.181-120.199.85.181", "120" + - ".199.85.180-120.199.85.180", "120.199.71.128-120.199.71.255", "120.199.85.160-120.199.85.175", "120.199" + - ".68.122-120.199.68.122", "120.199.78.144-120.199.78.144", "120.199.90.0-120.199.90.255", "120.199.78" + - ".145-120.199.78.145", "120.199.78.148-120.199.78.148", "120.199.78.147-120.199.78.147", "120.199.78" + - ".151-120.199.78.151", "120.199.78.150-120.199.78.150", "120.199.78.149-120.199.78.149", "120.199.78" + - ".146-120.199.78.146", "120.199.94.160-120.199.94.191", "120.199.69.0-120.199.69.255", "120.199.94.0-120" + - ".199.94.127", "120.199.95.0-120.199.95.255", "120.199.79.0-120.199.79.127", "120.199.71.0-120.199.71" + - ".127", "120.199.78.139-120.199.78.139", "120.199.78.138-120.199.78.138", "120.199.78.137-120.199.78.137" - , "120.199.78.136-120.199.78.136", "120.199.78.135-120.199.78.135", "120.199.78.134-120.199.78.134", "120" + - ".199.78.133-120.199.78.133", "120.199.78.132-120.199.78.132", "120.199.78.131-120.199.78.131", "120.199" + - ".78.130-120.199.78.130", "120.199.78.141-120.199.78.141", "120.199.78.140-120.199.78.140", "111.1.42" + - ".128-111.1.42.191", "120.199.92.64-120.199.92.127", "120.199.86.0-120.199.86.31", "120.199.85.64-120.199" + - ".85.95", "120.199.86.192-120.199.86.255", "120.199.91.0-120.199.91.255", "120.199.92.0-120.199.92.63", - "120.199.84.160-120.199.84.191", "120.199.84.128-120.199.84.159", "120.199.83.64-120.199.83.127", "120" + - ".199.70.0-120.199.70.255", "120.199.85.192-120.199.85.255", "120.199.80.192-120.199.80.255", "120.199.80" + - ".64-120.199.80.127", "120.199.80.48-120.199.80.63", "120.199.85.0-120.199.85.63", "120.199.93.64-120.199" + - ".93.127", "111.1.41.128-111.1.41.159", "112.17.33.80-112.17.33.83", "112.17.38.112-112.17.38.127", "183" + - ".247.184.0-183.247.184.63", "112.17.37.64-112.17.37.127", "112.17.37.128-112.17.37.255", "112.17.37" + - ".16-112.17.37.31", "183.247.184.80-183.247.184.95", "183.247.184.96-183.247.184.127", "183.247.184" + - ".64-183.247.184.79", "112.17.38.32-112.17.38.47", "112.17.33.0-112.17.33.7", "218.205.113.160-218.205" + - ".113.175", "112.17.33.84-112.17.33.87", "112.17.32.128-112.17.32.143", "112.17.33.128-112.17.33.255", - "112.17.38.128-112.17.38.255", "218.205.114.208-218.205.114.223", "112.17.32.32-112.17.32.63", "112.17.33" + - ".16-112.17.33.31", "112.17.38.0-112.17.38.15", "218.205.114.252-218.205.114.252", "218.205.113.190-218" + - ".205.113.190", "218.205.113.189-218.205.113.189", "218.205.113.188-218.205.113.188", "218.205.113" + - ".187-218.205.113.187", "218.205.113.186-218.205.113.186", "218.205.113.200-218.205.113.200", "218.205" + - ".113.202-218.205.113.202", "112.17.33.8-112.17.33.11", "112.17.33.12-112.17.33.15", "218.205.113.222-218" + - ".205.113.222", "218.205.113.251-218.205.113.251", "183.247.184.158-183.247.184.158", "112.17.37.8-112.17" + - ".37.15", "183.247.184.143-183.247.184.143", "112.17.32.64-112.17.32.95", "112.17.32.104-112.17.32.111", - "218.205.113.16-218.205.113.31", "112.17.33.96-112.17.33.111", "112.17.38.80-112.17.38.95", "112.17.33" + - ".88-112.17.33.95", "112.17.32.96-112.17.32.99", "112.17.33.32-112.17.33.63", "218.205.114.192-218.205" + - ".114.207", "218.205.114.247-218.205.114.247", "183.247.184.192-183.247.184.255", "183.247.184.139-183" + - ".247.184.139", "183.247.184.136-183.247.184.136", "218.205.113.8-218.205.113.15", "183.247.184.133-183" + - ".247.184.133", "112.17.35.120-112.17.35.123", "112.17.36.0-112.17.36.127", "218.205.115.192-218.205.115" + - ".255", "112.17.36.160-112.17.36.167", "112.17.36.128-112.17.36.159", "218.205.113.247-218.205.113.247", - "218.205.113.254-218.205.113.254", "111.3.71.35-111.3.71.35", "111.3.71.7-111.3.71.7", "111.3.71.128-111" + - ".3.71.159", "111.3.71.36-111.3.71.36", "111.3.71.37-111.3.71.37", "111.3.71.38-111.3.71.38", "111.3.71" + - ".34-111.3.71.34", "112.15.32.0-112.15.32.255", "112.15.31.128-112.15.31.255", "112.15.29.0-112.15.29" + - ".255", "112.15.28.0-112.15.28.255", "112.15.31.0-112.15.31.63", "112.15.30.0-112.15.30.255", "218.205" + - ".121.0-218.205.121.127", "218.205.120.0-218.205.120.255", "218.205.121.128-218.205.121.255", "218.205" + - ".119.36-218.205.119.39", "218.205.123.65-218.205.123.65", "218.205.123.66-218.205.123.66", "218.205.123" + - ".67-218.205.123.67", "218.205.123.68-218.205.123.68", "218.205.123.69-218.205.123.69", "218.205.123" + - ".70-218.205.123.70", "112.15.37.128-112.15.37.191", "112.15.38.208-112.15.38.223", "112.15.38.224-112.15" + - ".38.255", "117.149.150.0-117.149.150.31", "218.205.123.109-218.205.123.109", "218.205.123.17-218.205.123" + - ".17", "218.205.123.90-218.205.123.90", "117.149.150.114-117.149.150.114", "117.149.150.115-117.149.150" + - ".115", "117.149.150.116-117.149.150.116", "117.149.150.117-117.149.150.117", "117.149.150.118-117.149" + - ".150.118", "117.149.150.119-117.149.150.119", "117.149.150.120-117.149.150.120", "117.149.150.121-117" + - ".149.150.121", "111.1.70.146-111.1.70.146", "111.1.70.147-111.1.70.147", "218.205.123.140-218.205.123" + - ".140", "218.205.123.141-218.205.123.141", "218.205.123.72-218.205.123.79", "218.205.123.80-218.205.123" + - ".83", "218.205.123.86-218.205.123.86", "218.205.123.98-218.205.123.98", "218.205.123.99-218.205.123.99", - "112.15.1.0-112.15.1.255", "112.15.2.0-112.15.2.255", "112.15.3.0-112.15.3.255", "112.15.36.0-112.15.36" + - ".255", "112.15.37.0-112.15.37.127", "117.149.150.32-117.149.150.35", "117.149.150.36-117.149.150.39", - "117.149.150.40-117.149.150.47", "117.149.150.48-117.149.150.51", "117.149.150.52-117.149.150.55", "117" + - ".149.150.56-117.149.150.59", "117.149.144.67-117.149.144.67", "117.149.150.102-117.149.150.102", "117" + - ".149.150.103-117.149.150.103", "117.149.150.122-117.149.150.122", "117.149.150.123-117.149.150.123", - "117.149.150.124-117.149.150.124", "117.149.151.0-117.149.151.255", "218.205.123.0-218.205.123.7", "117" + - ".149.150.98-117.149.150.98", "218.205.123.30-218.205.123.30", "111.1.163.0-111.1.163.255", "111.1.162" + - ".128-111.1.162.159", "111.1.162.0-111.1.162.127", "111.1.175.0-111.1.175.255", "111.1.166.0-111.1.166" + - ".255", "111.1.167.0-111.1.167.127", "111.1.169.0-111.1.169.255", "111.1.170.0-111.1.170.255", "111.1.160" + - ".0-111.1.160.255", "111.1.161.0-111.1.161.255", "111.1.162.175-111.1.162.175", "111.1.173.0-111.1.173" + - ".255", "111.1.162.160-111.1.162.167", "120.199.88.30-120.199.88.30", "117.148.171.0-117.148.171.255", - "117.148.168.0-117.148.168.255", "117.148.143.0-117.148.143.255", "211.140.21.112-211.140.21.119", "111.1" + - ".60.0-111.1.60.255", "112.13.169.0-112.13.169.255", "112.13.168.0-112.13.168.255", "218.205.95.0-218.205" + - ".95.255", "218.205.94.0-218.205.94.255", "218.205.93.0-218.205.93.255", "218.205.92.0-218.205.92.255", - "112.17.26.0-112.17.26.255", "112.17.13.0-112.17.13.255", "112.17.11.0-112.17.11.255", "112.17.10.0-112" + - ".17.10.255", "112.17.12.0-112.17.12.255", "112.17.9.0-112.17.9.255", "112.17.8.0-112.17.8.255", "211.138" + - ".113.0-211.138.113.255", "211.140.23.0-211.140.23.255", "111.1.63.0-111.1.63.255", "111.1.62.0-111.1.62" + - ".255", "111.1.61.0-111.1.61.255", "111.1.59.0-111.1.59.188", "111.1.58.0-111.1.58.255", "111.1.57.0-111" + - ".1.57.255", "111.1.56.0-111.1.56.255", "111.1.51.0-111.1.51.255", "111.1.50.0-111.1.50.255", "111.1.48" + - ".0-111.1.48.255", "111.1.49.0-111.1.49.97", "111.1.59.190-111.1.59.255", "221.131.216.0-221.131.216.255" - , "111.2.186.0-111.2.186.255", "111.2.185.0-111.2.185.255", "111.2.183.0-111.2.183.255", "111.2.182.0-111" + - ".2.182.255", "111.2.181.0-111.2.181.255", "111.2.180.0-111.2.180.255", "112.13.207.0-112.13.207.255", - "112.13.206.0-112.13.206.255", "112.13.205.0-112.13.205.255", "112.13.204.0-112.13.204.255", "112.13.203" + - ".0-112.13.203.255", "112.13.202.0-112.13.202.255", "112.13.201.0-112.13.201.255", "112.13.200.0-112.13" + - ".200.255", "112.13.199.0-112.13.199.255", "112.13.198.0-112.13.198.255", "112.13.197.0-112.13.197.255", - "112.13.196.0-112.13.196.255", "112.13.195.0-112.13.195.255", "112.13.194.0-112.13.194.255", "112.13.193" + - ".0-112.13.193.255", "211.138.112.0-211.138.112.255", "112.13.93.0-112.13.93.255", "112.13.110.0-112.13" + - ".110.255", "112.13.95.0-112.13.95.255", "112.13.91.0-112.13.91.255", "112.13.89.0-112.13.89.255", "112" + - ".13.88.0-112.13.88.255", "112.13.109.0-112.13.109.255", "112.13.100.0-112.13.100.255", "112.13.99.0-112" + - ".13.99.255", "112.13.98.0-112.13.98.255", "117.142.240.214-117.142.240.214", "117.142.240.213-117.142" + - ".240.213", "117.142.240.212-117.142.240.212", "112.13.171.0-112.13.171.255", "112.13.102.0-112.13.102" + - ".255", "112.13.101.0-112.13.101.255", "112.13.96.0-112.13.96.255", "112.13.94.0-112.13.94.255", "112.13" + - ".92.0-112.13.92.255", "112.13.90.0-112.13.90.255", "111.3.72.144-111.3.72.159", "111.3.72.160-111.3.72" + - ".191", "111.3.72.192-111.3.72.193", "218.205.117.2-218.205.117.2", "111.3.72.138-111.3.72.138", "218.205" + - ".117.98-218.205.117.98", "218.205.117.114-218.205.117.114", "218.205.117.115-218.205.117.115", "218.205" + - ".117.116-218.205.117.116", "111.3.72.194-111.3.72.195", "111.3.72.196-111.3.72.199", "111.3.72.200-111.3" + - ".72.207", "111.3.72.208-111.3.72.223", "111.3.72.224-111.3.72.255", "183.246.192.0-183.246.192.255", - "183.246.193.0-183.246.193.1", "218.205.117.14-218.205.117.14", "218.205.117.22-218.205.117.22", "218.205" + - ".117.74-218.205.117.74", "111.3.72.142-111.3.72.142", "183.246.193.14-183.246.193.14", "218.205.117" + - ".82-218.205.117.82", "218.205.117.90-218.205.117.90", "218.205.117.94-218.205.117.94", "218.205.117" + - ".102-218.205.117.102", "218.205.117.122-218.205.117.122", "111.3.72.130-111.3.72.130", "111.3.72.131-111" + - ".3.72.131", "111.3.72.129-111.3.72.129", "218.205.117.126-218.205.117.126", "218.205.117.26-218.205.117" + - ".26", "218.205.117.58-218.205.117.58", "218.205.117.62-218.205.117.62", "218.205.117.66-218.205.117.66", - "218.205.117.70-218.205.117.70", "218.205.117.54-218.205.117.54", "218.205.117.36-218.205.117.39", "218" + - ".205.117.32-218.205.117.35", "218.205.117.128-218.205.117.255", "218.205.117.4-218.205.117.7", "218.205" + - ".117.76-218.205.117.79", "218.205.124.128-218.205.124.159", "218.205.124.100-218.205.124.103", "218.205" + - ".124.64-218.205.124.79", "218.205.124.80-218.205.124.83", "218.205.124.244-218.205.124.247", "218.205" + - ".124.84-218.205.124.87", "218.205.124.28-218.205.124.31", "218.205.124.8-218.205.124.15", "218.205.124" + - ".48-218.205.124.63", "218.205.124.192-218.205.124.223", "218.205.124.160-218.205.124.191", "218.205.124" + - ".0-218.205.124.7", "218.205.124.16-218.205.124.19", "218.205.125.128-218.205.125.255", "218.205.125" + - ".96-218.205.125.127", "120.199.74.4-120.199.74.12", "120.199.74.2-120.199.74.2", "120.199.73.154-120.199" + - ".73.157", "112.15.173.46-112.15.173.46", "111.1.43.64-111.1.43.79", "111.1.43.30-111.1.43.30", "111.1.43" + - ".26-111.1.43.26", "111.1.43.2-111.1.43.2", "111.1.43.154-111.1.43.155", "111.1.43.146-111.1.43.150", - "111.1.43.14-111.1.43.14", "111.1.40.82-111.1.40.84", "111.1.40.190-111.1.40.190", "111.1.40.66-111.1.40" + - ".75", "111.1.40.186-111.1.40.186", "111.1.40.182-111.1.40.182", "111.1.40.162-111.1.40.162", "111.1.40" + - ".128-111.1.40.159", "111.1.40.0-111.1.40.7", "111.1.3.74-111.1.3.75", "111.1.3.66-111.1.3.66", "111.1.3" + - ".208-111.1.3.223", "111.1.3.195-111.1.3.195", "111.1.3.176-111.1.3.191", "111.1.3.170-111.1.3.173", "111" + - ".1.3.128-111.1.3.159", "111.1.3.122-111.1.3.123", "111.1.3.0-111.1.3.31", "111.1.2.98-111.1.2.99", "111" + - ".1.2.64-111.1.2.79", "111.1.2.58-111.1.2.62", "111.1.2.202-111.1.2.206", "111.1.2.18-111.1.2.30", "111.1" + - ".2.155-111.1.2.155", "111.1.2.146-111.1.2.146", "111.1.2.100-111.1.2.126", "111.1.2.0-111.1.2.15", "111" + - ".1.1.90-111.1.1.90", "111.1.1.82-111.1.1.84", "111.1.1.50-111.1.1.53", "111.1.1.238-111.1.1.238", "111.1" + - ".1.234-111.1.1.234", "111.1.1.187-111.1.1.197", "111.1.1.106-111.1.1.107", "111.1.0.98-111.1.0.99", "111" + - ".1.0.166-111.1.0.166", "111.1.0.160-111.1.0.163", "111.1.0.101-111.1.0.155", "111.1.0.100-111.1.0.100", - "112.12.89.128-112.12.89.191", "112.12.88.0-112.12.88.255", "112.12.6.128-112.12.6.255", "112.12.58" + - ".20-112.12.58.20", "112.12.58.18-112.12.58.18", "112.12.58.0-112.12.58.15", "112.12.31.144-112.12.31" + - ".159", "112.12.26.128-112.12.26.255", "112.12.18.64-112.12.18.95", "112.12.18.128-112.12.18.255", "112" + - ".12.18.0-112.12.18.63", "112.12.15.128-112.12.15.191", "112.12.125.0-112.12.125.255", "111.2.127.0-111.2" + - ".127.255", "111.2.122.0-111.2.122.63", "111.1.9.0-111.1.9.255", "111.1.8.68-111.1.8.79", "111.1.8.48-111" + - ".1.8.61", "111.1.8.4-111.1.8.15", "111.1.8.36-111.1.8.47", "111.1.8.242-111.1.8.251", "111.1.8.173-111.1" + - ".8.174", "111.1.8.17-111.1.8.28", "111.1.8.164-111.1.8.172", "111.1.8.142-111.1.8.145", "111.1.8.132-111" + - ".1.8.134", "111.1.8.123-111.1.8.126", "111.1.8.118-111.1.8.118", "111.1.8.115-111.1.8.116", "111.1.8" + - ".113-111.1.8.113", "111.1.8.111-111.1.8.111", "111.1.8.107-111.1.8.107", "111.1.8.103-111.1.8.103", "111" + - ".1.10.0-111.1.10.255", "117.149.36.104-117.149.36.107", "112.17.25.0-112.17.25.255", "112.17.24.128-112" + - ".17.24.255", "112.17.24.0-112.17.24.127", "223.95.61.0-223.95.61.255", "223.95.60.0-223.95.60.255", "223" + - ".95.58.0-223.95.59.255", "223.95.56.0-223.95.56.255", "223.95.33.0-223.95.33.127", "223.94.74.0-223.94" + - ".74.255", "223.94.66.128-223.94.66.255", "211.140.141.94-211.140.141.94", "211.140.141.67-211.140.141" + - ".77", "211.140.141.47-211.140.141.47", "211.140.141.214-211.140.141.214", "211.140.141.206-211.140.141" + - ".206", "211.140.141.204-211.140.141.204", "211.140.141.179-211.140.141.179", "211.140.141.153-211.140" + - ".141.153", "211.140.140.50-211.140.140.50", "211.140.140.48-211.140.140.48", "211.140.140.38-211.140.140" + - ".38", "211.140.138.8-211.140.138.9", "211.140.138.28-211.140.138.28", "211.140.138.2-211.140.138.5", - "211.140.138.146-211.140.138.146", "211.140.138.10-211.140.138.12", "183.248.129.0-183.248.129.255", "183" + - ".248.128.0-183.248.128.255", "123.58.140.0-123.58.143.255", "117.149.39.96-117.149.39.127", "117.149.39" + - ".64-117.149.39.95", "117.149.39.160-117.149.39.191", "117.149.39.128-117.149.39.159", "117.149.39.0-117" + - ".149.39.63", "117.149.38.192-117.149.38.255", "117.149.38.0-117.149.38.63", "117.149.37.128-117.149.37" + - ".255", "117.149.37.0-117.149.37.127", "117.149.36.128-117.149.36.255", "111.1.26.128-111.1.26.255", "111" + - ".1.26.0-111.1.26.127", "111.1.25.98-111.1.25.99", "111.1.25.6-111.1.25.6", "111.1.25.34-111.1.25.34", - "111.1.25.2-111.1.25.3", "111.1.25.192-111.1.25.255", "111.1.25.16-111.1.25.31", "111.1.25.12-111.1.25" + - ".15", "111.1.25.114-111.1.25.114", "111.1.25.106-111.1.25.110", "111.1.25.100-111.1.25.102", "111.1.25" + - ".10-111.1.25.10", "111.1.24.128-111.1.24.255", "111.1.27.0-111.1.27.255", "111.1.5.119-111.1.5.125", - "111.1.5.130-111.1.5.130", "111.1.5.133-111.1.5.145", "111.1.5.147-111.1.5.149", "111.1.5.152-111.1.5" + - ".154", "111.1.5.162-111.1.5.165", "111.1.5.168-111.1.5.170", "111.1.5.172-111.1.5.179", "111.1.5.182-111" + - ".1.5.185", "111.1.5.189-111.1.5.189", "111.1.5.19-111.1.5.19", "111.1.5.2-111.1.5.2", "111.1.5.20-111.1" + - ".5.23", "111.1.5.25-111.1.5.25", "111.1.5.29-111.1.5.29", "111.1.5.3-111.1.5.3", "111.1.5.35-111.1.5.37" - , "111.1.5.4-111.1.5.5", "111.1.5.50-111.1.5.59", "111.1.5.6-111.1.5.6", "111.1.5.67-111.1.5.69", "111.1" + - ".5.77-111.1.5.77", "111.1.5.79-111.1.5.79", "111.1.5.8-111.1.5.8", "111.1.5.80-111.1.5.86", "111.1.6" + - ".12-111.1.6.12", "111.1.6.128-111.1.6.143", "111.1.6.13-111.1.6.13", "111.1.6.147-111.1.6.147", "111.1.6" + - ".149-111.1.6.149", "111.1.6.153-111.1.6.153", "111.1.6.156-111.1.6.158", "111.1.6.16-111.1.6.16", "111.1" + - ".6.160-111.1.6.191", "111.1.6.18-111.1.6.19", "111.1.6.192-111.1.6.199", "111.1.6.2-111.1.6.2", "111.1.6" + - ".200-111.1.6.216", "111.1.6.224-111.1.6.255", "111.1.6.35-111.1.6.39", "111.1.6.4-111.1.6.4", "111.1.6" + - ".40-111.1.6.49", "111.1.6.5-111.1.6.8", "111.1.6.50-111.1.6.50", "111.1.6.84-111.1.6.85", "111.1.6" + - ".88-111.1.6.91", "111.1.7.128-111.1.7.255", "111.3.64.0-111.3.67.255", "117.148.189.0-117.148.189.255", - "117.148.190.0-117.148.190.63", "117.148.190.128-117.148.190.255", "117.148.191.0-117.148.191.255", "183" + - ".245.10.0-183.245.10.255", "183.245.11.128-183.245.11.255", "183.245.12.0-183.245.12.31", "183.245.12" + - ".32-183.245.12.35", "183.245.5.0-183.245.5.255", "183.245.6.0-183.245.9.255", "39.175.96.0-39.175.97" + - ".255", "111.1.14.0-111.1.14.31", "111.1.14.32-111.1.14.47", "111.1.15.105-111.1.15.105", "111.1.15" + - ".11-111.1.15.11", "111.1.15.130-111.1.15.146", "111.1.15.157-111.1.15.164", "111.1.15.198-111.1.15.200", - "111.1.15.203-111.1.15.203", "111.1.15.240-111.1.15.255", "112.16.2.128-112.16.2.255", "112.16.224.0-112" + - ".16.230.255", "112.16.231.128-112.16.231.255", "112.17.18.0-112.17.19.255", "117.149.194.208-117.149.194" + - ".223", "117.149.194.224-117.149.194.255", "117.149.194.80-117.149.194.95", "117.149.195.0-117.149.195" + - ".63", "117.149.196.0-117.149.196.127", "117.149.197.0-117.149.197.255", "117.149.198.0-117.149.198.127", - "117.149.198.128-117.149.198.191", "117.149.198.192-117.149.198.207", "117.149.224.0-117.149.231.255", - "117.149.232.0-117.149.232.255", "117.149.240.0-117.149.241.255", "117.149.244.0-117.149.248.255", "117" + - ".149.249.0-117.149.249.255", "117.149.250.128-117.149.250.255", "117.149.251.128-117.149.251.255", "117" + - ".149.251.16-117.149.251.31", "117.149.251.32-117.149.251.63", "117.149.251.8-117.149.251.15", "117.149" + - ".252.0-117.149.252.255", "117.149.254.0-117.149.254.255", "117.149.255.124-117.149.255.131", "117.149" + - ".255.160-117.149.255.243", "120.193.39.105-120.193.39.105", "120.193.39.11-120.193.39.11", "120.193.39" + - ".13-120.193.39.13", "120.193.39.16-120.193.39.19", "120.193.39.21-120.193.39.21", "120.193.39.24-120.193" + - ".39.24", "120.193.39.32-120.193.39.55", "120.193.39.5-120.193.39.8", "120.193.39.56-120.193.39.62", "120" + - ".193.39.74-120.193.39.79", "120.193.39.80-120.193.39.90", "120.193.39.92-120.193.39.92", "120.193.39" + - ".94-120.193.39.94", "120.193.39.96-120.193.39.96", "211.140.62.0-211.140.62.127", "211.140.62.238-211" + - ".140.62.239", "211.140.62.242-211.140.62.243", "211.140.62.247-211.140.62.249", "221.131.255.128-221.131" + - ".255.143", "221.131.255.16-221.131.255.31", "221.131.255.240-221.131.255.255", "221.131.255.32-221.131" + - ".255.47", "221.131.255.64-221.131.255.95", "221.131.255.8-221.131.255.15", "221.131.255.98-221.131.255" + - ".99", "43.240.156.0-43.240.159.255", "43.240.72.0-43.240.75.255", "43.241.16.0-43.241.19.255", "103.107" + - ".195.0-103.107.195.255", "111.1.29.0-111.1.29.251", "111.1.30.0-111.1.30.255", "111.1.31.11-111.1.31.13" - , "111.1.31.119-111.1.31.120", "111.1.31.132-111.1.31.135", "111.1.31.141-111.1.31.141", "111.1.31" + - ".158-111.1.31.161", "111.1.31.164-111.1.31.165", "111.1.31.170-111.1.31.170", "111.1.31.172-111.1.31" + - ".176", "111.1.31.180-111.1.31.181", "111.1.31.184-111.1.31.186", "111.1.31.19-111.1.31.19", "111.1.31" + - ".196-111.1.31.200", "111.1.31.20-111.1.31.21", "111.1.31.202-111.1.31.202", "111.1.31.207-111.1.31.207", - "111.1.31.209-111.1.31.213", "111.1.31.2-111.1.31.7", "111.1.31.221-111.1.31.224", "111.1.31.24-111.1.31" + - ".28", "111.1.31.246-111.1.31.246", "111.1.31.30-111.1.31.30", "111.1.31.51-111.1.31.52", "111.1.31" + - ".65-111.1.31.69", "111.1.31.74-111.1.31.74", "111.1.31.8-111.1.31.9", "111.1.31.90-111.1.31.92", "111.1" + - ".31.99-111.1.31.101", "111.3.68.112-111.3.68.180", "111.3.68.228-111.3.68.236", "111.3.68.238-111.3.68" + - ".238", "111.3.68.96-111.3.68.111", "111.3.69.0-111.3.69.255", "117.149.146.0-117.149.147.255", "183.131" + - ".16.138-183.131.16.139", "183.131.16.148-183.131.16.151", "183.134.107.20-183.134.107.20", "183.134.107" + - ".7-183.134.107.7", "183.246.188.0-183.246.188.255", "183.246.189.0-183.246.189.127", "218.205.87.94-218" + - ".205.87.94", "112.13.170.170-112.13.170.170", "111.2.176.8-111.2.176.8", "111.1.59.189-111.1.59.189", - "112.13.104.0-112.13.104.255", "111.1.49.98-111.1.49.98", "111.3.72.50/32", "117.149.253.197/32", "111.1" + - ".49.100/32", "218.205.89.35/32", "117.148.173.130/32"}; + ".175.255", "117.148.174.0-117.148.174.255", "117.148.172.0-117.148.172.255", "117.148.142.0-117.148.142" + + ".255", "117.148.141.0-117.148.141.255", "117.148.140.0-117.148.140.255", "117.148.131.0-117.148.131.255" + , "117.148.130.0-117.148.130.255", "117.148.129.0-117.148.129.255", "117.148.128.0-117.148.128.255", "112" + + ".17.42.0-112.17.42.255", "112.17.41.0-112.17.41.255", "112.17.40.0-112.17.40.255", "112.17.29.0-112.17" + + ".29.255", "112.17.28.0-112.17.28.255", "112.17.27.0-112.17.27.255", "112.17.14.0-112.17.14.255", "112.13" + + ".218.0-112.13.218.255", "112.13.217.0-112.13.217.255", "112.13.216.0-112.13.216.255", "112.13.210.0-112" + + ".13.210.255", "112.13.209.0-112.13.209.255", "112.13.208.0-112.13.208.255", "112.13.170.171-112.13.170" + + ".255", "112.13.111.0-112.13.111.255", "112.13.108.0-112.13.108.255", "112.13.107.0-112.13.107.255", "112" + + ".13.106.0-112.13.106.255", "112.13.105.0-112.13.105.255", "112.13.81.0-112.13.81.255", "112.13.87.0-112" + + ".13.87.255", "111.2.176.0-111.2.176.7", "112.13.80.0-112.13.80.255", "112.13.83.0-112.13.83.255", "112" + + ".13.84.0-112.13.84.255", "112.13.85.0-112.13.85.255", "112.13.170.0-112.13.170.169", "111.2.176.9-111.2" + + ".179.255", "117.147.196.0-117.147.199.255", "183.247.240.0-183.247.255.255", "117.148.170.0-117.148.170" + + ".255", "117.148.169.0-117.148.169.255", "112.17.43.0-112.17.43.255", "112.17.15.0-112.17.15.255", "112" + + ".13.103.0-112.13.103.255", "112.13.97.0-112.13.97.255", "112.13.112.0-112.13.127.255", "218.205.90.0-218" + + ".205.91.255", "218.205.88.0-218.205.88.255", "112.13.215.0-112.13.215.255", "112.13.214.0-112.13.214" + + ".255", "112.13.212.0-112.13.212.255", "112.13.211.0-112.13.211.255", "112.13.75.0-112.13.75.63", "112.13" + + ".67.0-112.13.67.255", "112.13.66.0-112.13.66.255", "117.148.177.0-117.148.177.255", "117.148.176.0-117" + + ".148.176.255", "112.13.166.0-112.13.166.255", "112.17.252.0-112.17.252.255", "112.17.251.0-112.17.251" + + ".255", "112.17.250.0-112.17.250.255", "117.148.167.0-117.148.167.255", "112.13.174.0-112.13.174.255", + "112.13.172.0-112.13.172.255", "211.138.129.128-211.138.129.255", "112.17.0.0-112.17.7.255", "218.205.80" + + ".0-218.205.86.255", "218.205.79.0-218.205.79.255", "218.205.78.0-218.205.78.255", "218.205.77.0-218.205" + + ".77.255", "218.205.76.0-218.205.76.255", "218.205.74.0-218.205.74.255", "218.205.73.0-218.205.73.255", + "218.205.72.0-218.205.72.255", "211.138.126.128-211.138.126.255", "211.138.126.112-211.138.126.127", "211" + + ".138.126.104-211.138.126.111", "211.138.126.64-211.138.126.95", "211.138.124.0-211.138.124.255", "211" + + ".138.120.0-211.138.123.255", "120.193.8.0-120.193.11.255", "111.1.52.0-111.1.55.255", "111.1.44.0-111.1" + + ".47.255", "111.1.36.0-111.1.39.255", "111.1.34.0-111.1.35.255", "111.1.33.0-111.1.33.255", "111.1.16" + + ".0-111.1.23.255", "111.0.37.0-111.0.37.255", "111.0.36.0-111.0.36.255", "111.0.35.0-111.0.35.255", "111" + + ".0.34.0-111.0.34.255", "111.0.33.0-111.0.33.255", "111.0.32.0-111.0.32.255", "111.0.31.0-111.0.31.255", + "111.0.30.0-111.0.30.255", "112.17.48.0-112.17.63.255", "111.3.80.0-111.3.95.255", "117.149.154.0-117.149" + + ".154.255", "117.147.184.0-117.147.184.255", "112.17.30.0-112.17.30.255", "111.3.76.0-111.3.76.255", "111" + + ".0.29.0-111.0.29.255", "111.0.28.0-111.0.28.255", "111.0.27.0-111.0.27.255", "111.0.26.0-111.0.26.255", + "111.0.25.0-111.0.25.255", "111.0.24.0-111.0.24.255", "111.0.23.0-111.0.23.255", "111.0.22.0-111.0.22" + + ".255", "218.205.75.0-218.205.75.255", "211.138.126.32-211.138.126.39", "117.148.166.0-117.148.166.255", + "117.148.165.0-117.148.165.255", "117.148.164.0-117.148.164.255", "117.148.163.0-117.148.163.255", "117" + + ".148.162.0-117.148.162.255", "117.148.161.0-117.148.161.255", "117.148.160.0-117.148.160.255", "112.13" + + ".223.0-112.13.223.255", "112.13.222.0-112.13.222.255", "112.13.221.0-112.13.221.255", "112.13.220.0-112" + + ".13.220.255", "112.13.213.0-112.13.213.255", "112.13.175.0-112.13.175.255", "112.13.173.0-112.13.173" + + ".255", "112.13.79.0-112.13.79.255", "112.13.78.0-112.13.78.255", "112.13.77.0-112.13.77.255", "112.13.76" + + ".0-112.13.76.255", "112.13.74.0-112.13.74.255", "112.13.73.0-112.13.73.255", "112.13.72.0-112.13.72.255" + , "112.13.71.0-112.13.71.255", "112.13.70.0-112.13.70.255", "112.13.69.0-112.13.69.255", "112.13.68.0-112" + + ".13.68.255", "112.13.65.0-112.13.65.255", "112.13.64.0-112.13.64.255", "111.2.184.0-111.2.184.255", "111" + + ".1.32.0-111.1.32.255", "111.1.41.36-111.1.41.39", "111.1.41.64-111.1.41.79", "120.199.68.38-120.199.68" + + ".38", "111.1.41.34-111.1.41.34", "111.1.41.30-111.1.41.30", "111.1.41.22-111.1.41.22", "120.199.68" + + ".46-120.199.68.46", "120.199.68.115-120.199.68.115", "120.199.68.114-120.199.68.114", "111.1.41.252-111" + + ".1.41.252", "111.1.41.184-111.1.41.191", "120.199.68.96-120.199.68.111", "120.199.68.93-120.199.68.93", + "120.199.68.92-120.199.68.92", "120.199.68.91-120.199.68.91", "120.199.68.90-120.199.68.90", "111.1.41" + + ".26-111.1.41.26", "120.199.82.6-120.199.82.6", "111.1.41.0-111.1.41.7", "111.1.41.118-111.1.41.118", + "120.199.93.54-120.199.93.54", "111.1.41.29-111.1.41.29", "111.1.41.43-111.1.41.43", "111.1.41.42-111.1" + + ".41.42", "120.199.80.32-120.199.80.47", "120.199.85.176-120.199.85.176", "120.199.85.184-120.199.85.191" + , "120.199.85.183-120.199.85.183", "120.199.85.182-120.199.85.182", "120.199.85.181-120.199.85.181", "120" + + ".199.85.180-120.199.85.180", "120.199.71.128-120.199.71.255", "120.199.85.160-120.199.85.175", "120.199" + + ".68.122-120.199.68.122", "120.199.78.144-120.199.78.144", "120.199.90.0-120.199.90.255", "120.199.78" + + ".145-120.199.78.145", "120.199.78.148-120.199.78.148", "120.199.78.147-120.199.78.147", "120.199.78" + + ".151-120.199.78.151", "120.199.78.150-120.199.78.150", "120.199.78.149-120.199.78.149", "120.199.78" + + ".146-120.199.78.146", "120.199.94.160-120.199.94.191", "120.199.69.0-120.199.69.255", "120.199.94.0-120" + + ".199.94.127", "120.199.95.0-120.199.95.255", "120.199.79.0-120.199.79.127", "120.199.71.0-120.199.71" + + ".127", "120.199.78.139-120.199.78.139", "120.199.78.138-120.199.78.138", "120.199.78.137-120.199.78.137" + , "120.199.78.136-120.199.78.136", "120.199.78.135-120.199.78.135", "120.199.78.134-120.199.78.134", "120" + + ".199.78.133-120.199.78.133", "120.199.78.132-120.199.78.132", "120.199.78.131-120.199.78.131", "120.199" + + ".78.130-120.199.78.130", "120.199.78.141-120.199.78.141", "120.199.78.140-120.199.78.140", "111.1.42" + + ".128-111.1.42.191", "120.199.92.64-120.199.92.127", "120.199.86.0-120.199.86.31", "120.199.85.64-120.199" + + ".85.95", "120.199.86.192-120.199.86.255", "120.199.91.0-120.199.91.255", "120.199.92.0-120.199.92.63", + "120.199.84.160-120.199.84.191", "120.199.84.128-120.199.84.159", "120.199.83.64-120.199.83.127", "120" + + ".199.70.0-120.199.70.255", "120.199.85.192-120.199.85.255", "120.199.80.192-120.199.80.255", "120.199.80" + + ".64-120.199.80.127", "120.199.80.48-120.199.80.63", "120.199.85.0-120.199.85.63", "120.199.93.64-120.199" + + ".93.127", "111.1.41.128-111.1.41.159", "112.17.33.80-112.17.33.83", "112.17.38.112-112.17.38.127", "183" + + ".247.184.0-183.247.184.63", "112.17.37.64-112.17.37.127", "112.17.37.128-112.17.37.255", "112.17.37" + + ".16-112.17.37.31", "183.247.184.80-183.247.184.95", "183.247.184.96-183.247.184.127", "183.247.184" + + ".64-183.247.184.79", "112.17.38.32-112.17.38.47", "112.17.33.0-112.17.33.7", "218.205.113.160-218.205" + + ".113.175", "112.17.33.84-112.17.33.87", "112.17.32.128-112.17.32.143", "112.17.33.128-112.17.33.255", + "112.17.38.128-112.17.38.255", "218.205.114.208-218.205.114.223", "112.17.32.32-112.17.32.63", "112.17.33" + + ".16-112.17.33.31", "112.17.38.0-112.17.38.15", "218.205.114.252-218.205.114.252", "218.205.113.190-218" + + ".205.113.190", "218.205.113.189-218.205.113.189", "218.205.113.188-218.205.113.188", "218.205.113" + + ".187-218.205.113.187", "218.205.113.186-218.205.113.186", "218.205.113.200-218.205.113.200", "218.205" + + ".113.202-218.205.113.202", "112.17.33.8-112.17.33.11", "112.17.33.12-112.17.33.15", "218.205.113.222-218" + + ".205.113.222", "218.205.113.251-218.205.113.251", "183.247.184.158-183.247.184.158", "112.17.37.8-112.17" + + ".37.15", "183.247.184.143-183.247.184.143", "112.17.32.64-112.17.32.95", "112.17.32.104-112.17.32.111", + "218.205.113.16-218.205.113.31", "112.17.33.96-112.17.33.111", "112.17.38.80-112.17.38.95", "112.17.33" + + ".88-112.17.33.95", "112.17.32.96-112.17.32.99", "112.17.33.32-112.17.33.63", "218.205.114.192-218.205" + + ".114.207", "218.205.114.247-218.205.114.247", "183.247.184.192-183.247.184.255", "183.247.184.139-183" + + ".247.184.139", "183.247.184.136-183.247.184.136", "218.205.113.8-218.205.113.15", "183.247.184.133-183" + + ".247.184.133", "112.17.35.120-112.17.35.123", "112.17.36.0-112.17.36.127", "218.205.115.192-218.205.115" + + ".255", "112.17.36.160-112.17.36.167", "112.17.36.128-112.17.36.159", "218.205.113.247-218.205.113.247", + "218.205.113.254-218.205.113.254", "111.3.71.35-111.3.71.35", "111.3.71.7-111.3.71.7", "111.3.71.128-111" + + ".3.71.159", "111.3.71.36-111.3.71.36", "111.3.71.37-111.3.71.37", "111.3.71.38-111.3.71.38", "111.3.71" + + ".34-111.3.71.34", "112.15.32.0-112.15.32.255", "112.15.31.128-112.15.31.255", "112.15.29.0-112.15.29" + + ".255", "112.15.28.0-112.15.28.255", "112.15.31.0-112.15.31.63", "112.15.30.0-112.15.30.255", "218.205" + + ".121.0-218.205.121.127", "218.205.120.0-218.205.120.255", "218.205.121.128-218.205.121.255", "218.205" + + ".119.36-218.205.119.39", "218.205.123.65-218.205.123.65", "218.205.123.66-218.205.123.66", "218.205.123" + + ".67-218.205.123.67", "218.205.123.68-218.205.123.68", "218.205.123.69-218.205.123.69", "218.205.123" + + ".70-218.205.123.70", "112.15.37.128-112.15.37.191", "112.15.38.208-112.15.38.223", "112.15.38.224-112.15" + + ".38.255", "117.149.150.0-117.149.150.31", "218.205.123.109-218.205.123.109", "218.205.123.17-218.205.123" + + ".17", "218.205.123.90-218.205.123.90", "117.149.150.114-117.149.150.114", "117.149.150.115-117.149.150" + + ".115", "117.149.150.116-117.149.150.116", "117.149.150.117-117.149.150.117", "117.149.150.118-117.149" + + ".150.118", "117.149.150.119-117.149.150.119", "117.149.150.120-117.149.150.120", "117.149.150.121-117" + + ".149.150.121", "111.1.70.146-111.1.70.146", "111.1.70.147-111.1.70.147", "218.205.123.140-218.205.123" + + ".140", "218.205.123.141-218.205.123.141", "218.205.123.72-218.205.123.79", "218.205.123.80-218.205.123" + + ".83", "218.205.123.86-218.205.123.86", "218.205.123.98-218.205.123.98", "218.205.123.99-218.205.123.99", + "112.15.1.0-112.15.1.255", "112.15.2.0-112.15.2.255", "112.15.3.0-112.15.3.255", "112.15.36.0-112.15.36" + + ".255", "112.15.37.0-112.15.37.127", "117.149.150.32-117.149.150.35", "117.149.150.36-117.149.150.39", + "117.149.150.40-117.149.150.47", "117.149.150.48-117.149.150.51", "117.149.150.52-117.149.150.55", "117" + + ".149.150.56-117.149.150.59", "117.149.144.67-117.149.144.67", "117.149.150.102-117.149.150.102", "117" + + ".149.150.103-117.149.150.103", "117.149.150.122-117.149.150.122", "117.149.150.123-117.149.150.123", + "117.149.150.124-117.149.150.124", "117.149.151.0-117.149.151.255", "218.205.123.0-218.205.123.7", "117" + + ".149.150.98-117.149.150.98", "218.205.123.30-218.205.123.30", "111.1.163.0-111.1.163.255", "111.1.162" + + ".128-111.1.162.159", "111.1.162.0-111.1.162.127", "111.1.175.0-111.1.175.255", "111.1.166.0-111.1.166" + + ".255", "111.1.167.0-111.1.167.127", "111.1.169.0-111.1.169.255", "111.1.170.0-111.1.170.255", "111.1.160" + + ".0-111.1.160.255", "111.1.161.0-111.1.161.255", "111.1.162.175-111.1.162.175", "111.1.173.0-111.1.173" + + ".255", "111.1.162.160-111.1.162.167", "120.199.88.30-120.199.88.30", "117.148.171.0-117.148.171.255", + "117.148.168.0-117.148.168.255", "117.148.143.0-117.148.143.255", "211.140.21.112-211.140.21.119", "111.1" + + ".60.0-111.1.60.255", "112.13.169.0-112.13.169.255", "112.13.168.0-112.13.168.255", "218.205.95.0-218.205" + + ".95.255", "218.205.94.0-218.205.94.255", "218.205.93.0-218.205.93.255", "218.205.92.0-218.205.92.255", + "112.17.26.0-112.17.26.255", "112.17.13.0-112.17.13.255", "112.17.11.0-112.17.11.255", "112.17.10.0-112" + + ".17.10.255", "112.17.12.0-112.17.12.255", "112.17.9.0-112.17.9.255", "112.17.8.0-112.17.8.255", "211.138" + + ".113.0-211.138.113.255", "211.140.23.0-211.140.23.255", "111.1.63.0-111.1.63.255", "111.1.62.0-111.1.62" + + ".255", "111.1.61.0-111.1.61.255", "111.1.59.0-111.1.59.188", "111.1.58.0-111.1.58.255", "111.1.57.0-111" + + ".1.57.255", "111.1.56.0-111.1.56.255", "111.1.51.0-111.1.51.255", "111.1.50.0-111.1.50.255", "111.1.48" + + ".0-111.1.48.255", "111.1.49.0-111.1.49.97", "111.1.59.190-111.1.59.255", "221.131.216.0-221.131.216.255" + , "111.2.186.0-111.2.186.255", "111.2.185.0-111.2.185.255", "111.2.183.0-111.2.183.255", "111.2.182.0-111" + + ".2.182.255", "111.2.181.0-111.2.181.255", "111.2.180.0-111.2.180.255", "112.13.207.0-112.13.207.255", + "112.13.206.0-112.13.206.255", "112.13.205.0-112.13.205.255", "112.13.204.0-112.13.204.255", "112.13.203" + + ".0-112.13.203.255", "112.13.202.0-112.13.202.255", "112.13.201.0-112.13.201.255", "112.13.200.0-112.13" + + ".200.255", "112.13.199.0-112.13.199.255", "112.13.198.0-112.13.198.255", "112.13.197.0-112.13.197.255", + "112.13.196.0-112.13.196.255", "112.13.195.0-112.13.195.255", "112.13.194.0-112.13.194.255", "112.13.193" + + ".0-112.13.193.255", "211.138.112.0-211.138.112.255", "112.13.93.0-112.13.93.255", "112.13.110.0-112.13" + + ".110.255", "112.13.95.0-112.13.95.255", "112.13.91.0-112.13.91.255", "112.13.89.0-112.13.89.255", "112" + + ".13.88.0-112.13.88.255", "112.13.109.0-112.13.109.255", "112.13.100.0-112.13.100.255", "112.13.99.0-112" + + ".13.99.255", "112.13.98.0-112.13.98.255", "117.142.240.214-117.142.240.214", "117.142.240.213-117.142" + + ".240.213", "117.142.240.212-117.142.240.212", "112.13.171.0-112.13.171.255", "112.13.102.0-112.13.102" + + ".255", "112.13.101.0-112.13.101.255", "112.13.96.0-112.13.96.255", "112.13.94.0-112.13.94.255", "112.13" + + ".92.0-112.13.92.255", "112.13.90.0-112.13.90.255", "111.3.72.144-111.3.72.159", "111.3.72.160-111.3.72" + + ".191", "111.3.72.192-111.3.72.193", "218.205.117.2-218.205.117.2", "111.3.72.138-111.3.72.138", "218.205" + + ".117.98-218.205.117.98", "218.205.117.114-218.205.117.114", "218.205.117.115-218.205.117.115", "218.205" + + ".117.116-218.205.117.116", "111.3.72.194-111.3.72.195", "111.3.72.196-111.3.72.199", "111.3.72.200-111.3" + + ".72.207", "111.3.72.208-111.3.72.223", "111.3.72.224-111.3.72.255", "183.246.192.0-183.246.192.255", + "183.246.193.0-183.246.193.1", "218.205.117.14-218.205.117.14", "218.205.117.22-218.205.117.22", "218.205" + + ".117.74-218.205.117.74", "111.3.72.142-111.3.72.142", "183.246.193.14-183.246.193.14", "218.205.117" + + ".82-218.205.117.82", "218.205.117.90-218.205.117.90", "218.205.117.94-218.205.117.94", "218.205.117" + + ".102-218.205.117.102", "218.205.117.122-218.205.117.122", "111.3.72.130-111.3.72.130", "111.3.72.131-111" + + ".3.72.131", "111.3.72.129-111.3.72.129", "218.205.117.126-218.205.117.126", "218.205.117.26-218.205.117" + + ".26", "218.205.117.58-218.205.117.58", "218.205.117.62-218.205.117.62", "218.205.117.66-218.205.117.66", + "218.205.117.70-218.205.117.70", "218.205.117.54-218.205.117.54", "218.205.117.36-218.205.117.39", "218" + + ".205.117.32-218.205.117.35", "218.205.117.128-218.205.117.255", "218.205.117.4-218.205.117.7", "218.205" + + ".117.76-218.205.117.79", "218.205.124.128-218.205.124.159", "218.205.124.100-218.205.124.103", "218.205" + + ".124.64-218.205.124.79", "218.205.124.80-218.205.124.83", "218.205.124.244-218.205.124.247", "218.205" + + ".124.84-218.205.124.87", "218.205.124.28-218.205.124.31", "218.205.124.8-218.205.124.15", "218.205.124" + + ".48-218.205.124.63", "218.205.124.192-218.205.124.223", "218.205.124.160-218.205.124.191", "218.205.124" + + ".0-218.205.124.7", "218.205.124.16-218.205.124.19", "218.205.125.128-218.205.125.255", "218.205.125" + + ".96-218.205.125.127", "120.199.74.4-120.199.74.12", "120.199.74.2-120.199.74.2", "120.199.73.154-120.199" + + ".73.157", "112.15.173.46-112.15.173.46", "111.1.43.64-111.1.43.79", "111.1.43.30-111.1.43.30", "111.1.43" + + ".26-111.1.43.26", "111.1.43.2-111.1.43.2", "111.1.43.154-111.1.43.155", "111.1.43.146-111.1.43.150", + "111.1.43.14-111.1.43.14", "111.1.40.82-111.1.40.84", "111.1.40.190-111.1.40.190", "111.1.40.66-111.1.40" + + ".75", "111.1.40.186-111.1.40.186", "111.1.40.182-111.1.40.182", "111.1.40.162-111.1.40.162", "111.1.40" + + ".128-111.1.40.159", "111.1.40.0-111.1.40.7", "111.1.3.74-111.1.3.75", "111.1.3.66-111.1.3.66", "111.1.3" + + ".208-111.1.3.223", "111.1.3.195-111.1.3.195", "111.1.3.176-111.1.3.191", "111.1.3.170-111.1.3.173", "111" + + ".1.3.128-111.1.3.159", "111.1.3.122-111.1.3.123", "111.1.3.0-111.1.3.31", "111.1.2.98-111.1.2.99", "111" + + ".1.2.64-111.1.2.79", "111.1.2.58-111.1.2.62", "111.1.2.202-111.1.2.206", "111.1.2.18-111.1.2.30", "111.1" + + ".2.155-111.1.2.155", "111.1.2.146-111.1.2.146", "111.1.2.100-111.1.2.126", "111.1.2.0-111.1.2.15", "111" + + ".1.1.90-111.1.1.90", "111.1.1.82-111.1.1.84", "111.1.1.50-111.1.1.53", "111.1.1.238-111.1.1.238", "111.1" + + ".1.234-111.1.1.234", "111.1.1.187-111.1.1.197", "111.1.1.106-111.1.1.107", "111.1.0.98-111.1.0.99", "111" + + ".1.0.166-111.1.0.166", "111.1.0.160-111.1.0.163", "111.1.0.101-111.1.0.155", "111.1.0.100-111.1.0.100", + "112.12.89.128-112.12.89.191", "112.12.88.0-112.12.88.255", "112.12.6.128-112.12.6.255", "112.12.58" + + ".20-112.12.58.20", "112.12.58.18-112.12.58.18", "112.12.58.0-112.12.58.15", "112.12.31.144-112.12.31" + + ".159", "112.12.26.128-112.12.26.255", "112.12.18.64-112.12.18.95", "112.12.18.128-112.12.18.255", "112" + + ".12.18.0-112.12.18.63", "112.12.15.128-112.12.15.191", "112.12.125.0-112.12.125.255", "111.2.127.0-111.2" + + ".127.255", "111.2.122.0-111.2.122.63", "111.1.9.0-111.1.9.255", "111.1.8.68-111.1.8.79", "111.1.8.48-111" + + ".1.8.61", "111.1.8.4-111.1.8.15", "111.1.8.36-111.1.8.47", "111.1.8.242-111.1.8.251", "111.1.8.173-111.1" + + ".8.174", "111.1.8.17-111.1.8.28", "111.1.8.164-111.1.8.172", "111.1.8.142-111.1.8.145", "111.1.8.132-111" + + ".1.8.134", "111.1.8.123-111.1.8.126", "111.1.8.118-111.1.8.118", "111.1.8.115-111.1.8.116", "111.1.8" + + ".113-111.1.8.113", "111.1.8.111-111.1.8.111", "111.1.8.107-111.1.8.107", "111.1.8.103-111.1.8.103", "111" + + ".1.10.0-111.1.10.255", "117.149.36.104-117.149.36.107", "112.17.25.0-112.17.25.255", "112.17.24.128-112" + + ".17.24.255", "112.17.24.0-112.17.24.127", "223.95.61.0-223.95.61.255", "223.95.60.0-223.95.60.255", "223" + + ".95.58.0-223.95.59.255", "223.95.56.0-223.95.56.255", "223.95.33.0-223.95.33.127", "223.94.74.0-223.94" + + ".74.255", "223.94.66.128-223.94.66.255", "211.140.141.94-211.140.141.94", "211.140.141.67-211.140.141" + + ".77", "211.140.141.47-211.140.141.47", "211.140.141.214-211.140.141.214", "211.140.141.206-211.140.141" + + ".206", "211.140.141.204-211.140.141.204", "211.140.141.179-211.140.141.179", "211.140.141.153-211.140" + + ".141.153", "211.140.140.50-211.140.140.50", "211.140.140.48-211.140.140.48", "211.140.140.38-211.140.140" + + ".38", "211.140.138.8-211.140.138.9", "211.140.138.28-211.140.138.28", "211.140.138.2-211.140.138.5", + "211.140.138.146-211.140.138.146", "211.140.138.10-211.140.138.12", "183.248.129.0-183.248.129.255", "183" + + ".248.128.0-183.248.128.255", "123.58.140.0-123.58.143.255", "117.149.39.96-117.149.39.127", "117.149.39" + + ".64-117.149.39.95", "117.149.39.160-117.149.39.191", "117.149.39.128-117.149.39.159", "117.149.39.0-117" + + ".149.39.63", "117.149.38.192-117.149.38.255", "117.149.38.0-117.149.38.63", "117.149.37.128-117.149.37" + + ".255", "117.149.37.0-117.149.37.127", "117.149.36.128-117.149.36.255", "111.1.26.128-111.1.26.255", "111" + + ".1.26.0-111.1.26.127", "111.1.25.98-111.1.25.99", "111.1.25.6-111.1.25.6", "111.1.25.34-111.1.25.34", + "111.1.25.2-111.1.25.3", "111.1.25.192-111.1.25.255", "111.1.25.16-111.1.25.31", "111.1.25.12-111.1.25" + + ".15", "111.1.25.114-111.1.25.114", "111.1.25.106-111.1.25.110", "111.1.25.100-111.1.25.102", "111.1.25" + + ".10-111.1.25.10", "111.1.24.128-111.1.24.255", "111.1.27.0-111.1.27.255", "111.1.5.119-111.1.5.125", + "111.1.5.130-111.1.5.130", "111.1.5.133-111.1.5.145", "111.1.5.147-111.1.5.149", "111.1.5.152-111.1.5" + + ".154", "111.1.5.162-111.1.5.165", "111.1.5.168-111.1.5.170", "111.1.5.172-111.1.5.179", "111.1.5.182-111" + + ".1.5.185", "111.1.5.189-111.1.5.189", "111.1.5.19-111.1.5.19", "111.1.5.2-111.1.5.2", "111.1.5.20-111.1" + + ".5.23", "111.1.5.25-111.1.5.25", "111.1.5.29-111.1.5.29", "111.1.5.3-111.1.5.3", "111.1.5.35-111.1.5.37" + , "111.1.5.4-111.1.5.5", "111.1.5.50-111.1.5.59", "111.1.5.6-111.1.5.6", "111.1.5.67-111.1.5.69", "111.1" + + ".5.77-111.1.5.77", "111.1.5.79-111.1.5.79", "111.1.5.8-111.1.5.8", "111.1.5.80-111.1.5.86", "111.1.6" + + ".12-111.1.6.12", "111.1.6.128-111.1.6.143", "111.1.6.13-111.1.6.13", "111.1.6.147-111.1.6.147", "111.1.6" + + ".149-111.1.6.149", "111.1.6.153-111.1.6.153", "111.1.6.156-111.1.6.158", "111.1.6.16-111.1.6.16", "111.1" + + ".6.160-111.1.6.191", "111.1.6.18-111.1.6.19", "111.1.6.192-111.1.6.199", "111.1.6.2-111.1.6.2", "111.1.6" + + ".200-111.1.6.216", "111.1.6.224-111.1.6.255", "111.1.6.35-111.1.6.39", "111.1.6.4-111.1.6.4", "111.1.6" + + ".40-111.1.6.49", "111.1.6.5-111.1.6.8", "111.1.6.50-111.1.6.50", "111.1.6.84-111.1.6.85", "111.1.6" + + ".88-111.1.6.91", "111.1.7.128-111.1.7.255", "111.3.64.0-111.3.67.255", "117.148.189.0-117.148.189.255", + "117.148.190.0-117.148.190.63", "117.148.190.128-117.148.190.255", "117.148.191.0-117.148.191.255", "183" + + ".245.10.0-183.245.10.255", "183.245.11.128-183.245.11.255", "183.245.12.0-183.245.12.31", "183.245.12" + + ".32-183.245.12.35", "183.245.5.0-183.245.5.255", "183.245.6.0-183.245.9.255", "39.175.96.0-39.175.97" + + ".255", "111.1.14.0-111.1.14.31", "111.1.14.32-111.1.14.47", "111.1.15.105-111.1.15.105", "111.1.15" + + ".11-111.1.15.11", "111.1.15.130-111.1.15.146", "111.1.15.157-111.1.15.164", "111.1.15.198-111.1.15.200", + "111.1.15.203-111.1.15.203", "111.1.15.240-111.1.15.255", "112.16.2.128-112.16.2.255", "112.16.224.0-112" + + ".16.230.255", "112.16.231.128-112.16.231.255", "112.17.18.0-112.17.19.255", "117.149.194.208-117.149.194" + + ".223", "117.149.194.224-117.149.194.255", "117.149.194.80-117.149.194.95", "117.149.195.0-117.149.195" + + ".63", "117.149.196.0-117.149.196.127", "117.149.197.0-117.149.197.255", "117.149.198.0-117.149.198.127", + "117.149.198.128-117.149.198.191", "117.149.198.192-117.149.198.207", "117.149.224.0-117.149.231.255", + "117.149.232.0-117.149.232.255", "117.149.240.0-117.149.241.255", "117.149.244.0-117.149.248.255", "117" + + ".149.249.0-117.149.249.255", "117.149.250.128-117.149.250.255", "117.149.251.128-117.149.251.255", "117" + + ".149.251.16-117.149.251.31", "117.149.251.32-117.149.251.63", "117.149.251.8-117.149.251.15", "117.149" + + ".252.0-117.149.252.255", "117.149.254.0-117.149.254.255", "117.149.255.124-117.149.255.131", "117.149" + + ".255.160-117.149.255.243", "120.193.39.105-120.193.39.105", "120.193.39.11-120.193.39.11", "120.193.39" + + ".13-120.193.39.13", "120.193.39.16-120.193.39.19", "120.193.39.21-120.193.39.21", "120.193.39.24-120.193" + + ".39.24", "120.193.39.32-120.193.39.55", "120.193.39.5-120.193.39.8", "120.193.39.56-120.193.39.62", "120" + + ".193.39.74-120.193.39.79", "120.193.39.80-120.193.39.90", "120.193.39.92-120.193.39.92", "120.193.39" + + ".94-120.193.39.94", "120.193.39.96-120.193.39.96", "211.140.62.0-211.140.62.127", "211.140.62.238-211" + + ".140.62.239", "211.140.62.242-211.140.62.243", "211.140.62.247-211.140.62.249", "221.131.255.128-221.131" + + ".255.143", "221.131.255.16-221.131.255.31", "221.131.255.240-221.131.255.255", "221.131.255.32-221.131" + + ".255.47", "221.131.255.64-221.131.255.95", "221.131.255.8-221.131.255.15", "221.131.255.98-221.131.255" + + ".99", "43.240.156.0-43.240.159.255", "43.240.72.0-43.240.75.255", "43.241.16.0-43.241.19.255", "103.107" + + ".195.0-103.107.195.255", "111.1.29.0-111.1.29.251", "111.1.30.0-111.1.30.255", "111.1.31.11-111.1.31.13" + , "111.1.31.119-111.1.31.120", "111.1.31.132-111.1.31.135", "111.1.31.141-111.1.31.141", "111.1.31" + + ".158-111.1.31.161", "111.1.31.164-111.1.31.165", "111.1.31.170-111.1.31.170", "111.1.31.172-111.1.31" + + ".176", "111.1.31.180-111.1.31.181", "111.1.31.184-111.1.31.186", "111.1.31.19-111.1.31.19", "111.1.31" + + ".196-111.1.31.200", "111.1.31.20-111.1.31.21", "111.1.31.202-111.1.31.202", "111.1.31.207-111.1.31.207", + "111.1.31.209-111.1.31.213", "111.1.31.2-111.1.31.7", "111.1.31.221-111.1.31.224", "111.1.31.24-111.1.31" + + ".28", "111.1.31.246-111.1.31.246", "111.1.31.30-111.1.31.30", "111.1.31.51-111.1.31.52", "111.1.31" + + ".65-111.1.31.69", "111.1.31.74-111.1.31.74", "111.1.31.8-111.1.31.9", "111.1.31.90-111.1.31.92", "111.1" + + ".31.99-111.1.31.101", "111.3.68.112-111.3.68.180", "111.3.68.228-111.3.68.236", "111.3.68.238-111.3.68" + + ".238", "111.3.68.96-111.3.68.111", "111.3.69.0-111.3.69.255", "117.149.146.0-117.149.147.255", "183.131" + + ".16.138-183.131.16.139", "183.131.16.148-183.131.16.151", "183.134.107.20-183.134.107.20", "183.134.107" + + ".7-183.134.107.7", "183.246.188.0-183.246.188.255", "183.246.189.0-183.246.189.127", "218.205.87.94-218" + + ".205.87.94", "112.13.170.170-112.13.170.170", "111.2.176.8-111.2.176.8", "111.1.59.189-111.1.59.189", + "112.13.104.0-112.13.104.255", "111.1.49.98-111.1.49.98", "111.3.72.50/32", "117.149.253.197/32", "111.1" + + ".49.100/32", "218.205.89.35/32", "117.148.173.130/32"}; String ip = "117.149.253.197"; for (String n : src) { log.info("{} network {}contains {}", n, - Helper.ipInRange(n, ip) ? "is " : "not ", - ip); + Helper.ipInRange(n, ip) ? "is " : "not ", + ip); } } @@ -459,8 +462,8 @@ public class demo { String n = "0.0.0.0"; log.info("{} network {}contains {}", n, - Helper.ipInRange(n, ip) ? "is " : "not ", - ip); + Helper.ipInRange(n, ip) ? "is " : "not ", + ip); } /** @@ -468,7 +471,7 @@ public class demo { */ public void haohanStartError() { String errMsg = "[{ip=192.168.50.2, 任务名称=三方接口任务467}, {ip=192.168.50.2, 任务名称=三方接口任务468}, {ip=192.168" + - ".50.2, 任务名称=三方接口任务470}, {ip=192.168.50.2, 任务名称=三方接口任务469}]"; + ".50.2, 任务名称=三方接口任务470}, {ip=192.168.50.2, 任务名称=三方接口任务469}]"; String reg = "(\\[(.*?)])"; @@ -477,8 +480,8 @@ public class demo { while (n.find()) { log.info("\tsub items: {}", n.group(1) - .substring(n.group(1).lastIndexOf("=") + 1) - .replaceAll("\\D", "")); + .substring(n.group(1).lastIndexOf("=") + 1) + .replaceAll("\\D", "")); } } @@ -487,11 +490,11 @@ public class demo { */ public void ipaddrVariety() { String[] ipAddrs = new String[]{ - "ffff::8fff:ffff:0:ffff", - "::1", - "192.168.0.1", - "192.168.00.1", - "023.0.2.1" + "ffff::8fff:ffff:0:ffff", + "::1", + "192.168.0.1", + "192.168.00.1", + "023.0.2.1" }; for (String s : ipAddrs) { @@ -515,7 +518,7 @@ public class demo { Map> groupMap = orgList.stream() - .collect(Collectors.groupingBy(diffList::contains)); + .collect(Collectors.groupingBy(diffList::contains)); log.info("Result: {}", groupMap); } @@ -572,12 +575,12 @@ public class demo { * @throws NoSuchPaddingException the no such padding exception */ public void aes() throws IllegalBlockSizeException, InvalidKeyException, BadPaddingException, - NoSuchAlgorithmException, NoSuchPaddingException { + NoSuchAlgorithmException, NoSuchPaddingException { String plainText = "{\"disposeTime\":60,\"flowDirection\":0,\"mulDisposeIp\":[\"1.1.1.1\"],\"type\":0}"; String aesKey = "hkoUV5ZWh0q1jSxMnpjovVn19Qg99HY6DD40"; byte[] encode = CryptoHelper.aes128Encryption(plainText.getBytes(StandardCharsets.UTF_8), - aesKey); + aesKey); log.info("AES Key: {}", aesKey); log.info("Src: {}", plainText); log.info("AES256: {}", CryptoHelper.base64Encryption(encode)); @@ -593,9 +596,9 @@ public class demo { * @throws NoSuchPaddingException the no such padding exception */ public void aesdec() throws IllegalBlockSizeException, InvalidKeyException, BadPaddingException, - NoSuchAlgorithmException, NoSuchPaddingException { + NoSuchAlgorithmException, NoSuchPaddingException { String plainText = "6PgUrZa8zZUzDAxAFpV307JfUDVI1gFNo3ZFT7LKtVzRXc3UbwFh6+5i6" + - "+667frPR5j1p0XOG1i7Nhy85uHUDWUBZUxHF3vXNkgiKtbWLHw="; + "+667frPR5j1p0XOG1i7Nhy85uHUDWUBZUxHF3vXNkgiKtbWLHw="; String aesKey = "hkoUV5ZWh0q1jSxMnpjovVn19Qg99HY6DD40"; @@ -674,14 +677,40 @@ public class demo { */ @Test public void ipPortMatchTest() { - String[] srcPort = new String[] {"", "80", "443", "81", null}; - String[] dstPort = new String[] {"", "80", "443", "81", null}; + String[] srcPort = new String[]{"", "80", "443", "81", null}; + String[] dstPort = new String[]{"", "80", "443", "81", null}; - for(String s : srcPort) { - for(String d : dstPort) { + for (String s : srcPort) { + for (String d : dstPort) { log.info("HTTP: [{}] match [{}] is {}", s, d, Helper.isIpPortMatch(s, d, HttpType.HTTP)); log.info("HTTPS: [{}] match [{}] is {}", s, d, Helper.isIpPortMatch(s, d, HttpType.HTTPS)); } } } + + @Test + public void alarmInfoTest() { + JSONObject disposeParam = new JSONObject(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + disposeParam.set("alarmId", "1"); + disposeParam.set("dstIp", "192.168.1.1"); + disposeParam.set("attackType", "1"); + disposeParam.set("bpspps", "bps"); + disposeParam.set("dstProvince", "ZHEJIANG"); + disposeParam.set("dstCity", "HANGZHOU"); + disposeParam.set("startTime", sdf.format(new Date())); + // 1清洗，2流控，3黑洞 + disposeParam.set("disposeType", 1); + disposeParam.set("disposeTime", 30); + disposeParam.set("endTime", ""); + List srcIp = new ArrayList<>(); + srcIp.add("192.168.10.1"); + srcIp.add("192.168.10.2"); + disposeParam.set("srcIpLs", srcIp); + disposeParam.set("maxBps", "20bps"); + disposeParam.set("maxPps", "20pps"); + String jsonAlarmInfo = disposeParam.toString(); + log.info("============ jsonAlarmInfo :{}", jsonAlarmInfo); + } } From 17655252ff769519187365387faef9439eba15f0 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Tue, 7 Sep 2021 15:38:22 +0800 Subject: [PATCH 03/17] =?UTF-8?q?OCT=20REM:=201.=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dispose/controller/kafkaController.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/main/java/com/dispose/controller/kafkaController.java b/src/main/java/com/dispose/controller/kafkaController.java index 082154a5..231a188a 100644 --- a/src/main/java/com/dispose/controller/kafkaController.java +++ b/src/main/java/com/dispose/controller/kafkaController.java @@ -52,8 +52,6 @@ public class kafkaController { /** * The Kafka configuration. */ -// final private KafkaConfiguration kafkaConfiguration = -// SpringBootBeanUtil.getBean(com.dispose.config.KafkaConfiguration.class); @Resource private KafkaConfiguration kafkaConfiguration; @@ -92,17 +90,4 @@ public class kafkaController { rspInfo.setMessage(new String[]{ErrorCode.ERR_OK.getMsg()}); return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspInfo); } - - -// @KafkaListener(topics = {"ddos-vip-customer-ck"}) -// public void kafkaListen(ConsumerRecord consumerRecord) { -// //判断消息是否为null -// Optional kafkaMessage = Optional.ofNullable(consumerRecord.value()); -// log.info(">>>>>>>>>>> record = " + kafkaMessage); -// if (kafkaMessage.isPresent()) { -// String consumerMsg = kafkaMessage.get(); -// log.info("消费消息：" + consumerMsg); -// } -// } - } From 5c492a6c0bc8f15857d52b7ed5bfe7afdcd1b4ea Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Thu, 9 Sep 2021 17:43:42 +0800 Subject: [PATCH 04/17] =?UTF-8?q?OCT=20REM:=201.=20kafka=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=98=9F=E5=88=97=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5=202.=20kafka=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application-dispose.properties | 17 +- pom.xml | 4 + .../java/com/dispose/common/Constants.java | 93 ++++++++++ .../java/com/dispose/common/ErrorCode.java | 4 + .../dispose/controller/kafkaController.java | 161 +++++++++++++++--- .../{AlarmInfo.java => EmosAlarmInfo.java} | 2 +- .../com/dispose/setup/SpringBootBeanUtil.java | 79 --------- .../dev/controller/KafkaControllerTest.java | 2 +- 8 files changed, 249 insertions(+), 113 deletions(-) create mode 100644 src/main/java/com/dispose/common/Constants.java rename src/main/java/com/dispose/pojo/dto/protocol/kafka/{AlarmInfo.java => EmosAlarmInfo.java} (98%) delete mode 100644 src/main/java/com/dispose/setup/SpringBootBeanUtil.java diff --git a/config/application-dispose.properties b/config/application-dispose.properties index 10f23ceb..26d9b602 100644 --- a/config/application-dispose.properties +++ b/config/application-dispose.properties @@ -6,32 +6,27 @@ dispose.split_char=, dispose.request-timeout-second=5 # 是否开启隐私保护 dispose.used-privacy-protect=false - dispose.call-error-retry-times=3 # 分页配置项 # 最大每页数据条数 dispose.max-split-page-size=100 # 最小每页数据条数 dispose.min-split-page-size=10 - # 迪普设备配置 # 发送超时时间(s) dptech.soap-conn-timeout-second=60 # 接收超时时间(s) dptech.soap-recv-timeout-second=60 - # 用户权限配置 # 是否对设备管理进行用户验证 permission.admin-check=true # 运行管理设备的操作员用户名 permission.admin-users=admin - # 认证配置 # 是否对接口访问进行认证 auth.verify-request-token=true # token访问超时时间 auth.token-timeout-minute=30 - # 安全配置 #加密类型： 0 不加密 # 1 Base64编码 @@ -41,7 +36,6 @@ crypto.security-protocol-type=0 crypto.aes-key=hkoUV5ZWh0q1jSxMnpjovVn19Qg99HY6DD40 # 3DES秘钥 crypto.des-key=P3mq9iSIvQcvfyfdWR8sAnfAadO - # Kafka 服务器配置 #重试次数 kafka.producer.retries=3 @@ -53,12 +47,11 @@ kafka.producer.linger=1 kafka.producer.buffer.memory=33554432 kafka.producer.servers=172.21.44.189:9092,172.21.44.9:9092,172.21.44.244:9092,172.21.44.236:9092,172.21.44.80:9092 kafka.dispose.topic=ddos-vip-customer-ck -kafka.consumer.group-id = testGroup -kafka.consumer.auto-offset-reset = earliest -kafka.consumer.enable-auto-commit = true -kafka.consumer.auto-commit-interval = 100 -kafka.consumer.max-poll-records =5 - +#redis config +spring.redis.database=0 +spring.redis.host=172.21.48.211 +spring.redis.port=6379 +spring.redis.password=!Q2w3e4r #信任主机配置 # 白名单开关 trust.auth-white-list-check=true diff --git a/pom.xml b/pom.xml index 626c9ace..d78177dd 100644 --- a/pom.xml +++ b/pom.xml @@ -225,6 +225,10 @@ dom4j-core 1.4-dev-8 + + org.springframework.boot + spring-boot-starter-data-redis + diff --git a/src/main/java/com/dispose/common/Constants.java b/src/main/java/com/dispose/common/Constants.java new file mode 100644 index 00000000..29c7272f --- /dev/null +++ b/src/main/java/com/dispose/common/Constants.java @@ -0,0 +1,93 @@ +package com.dispose.common; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * The emos constants. + */ +public class Constants { + /** + * DDoS具体攻击类型 + */ + public static Map ATTACK_TYPE; + + static { + Map attTypeMap = new HashMap<>(); + attTypeMap.put("hosttotaltraffic", "Host total traffic|1|2"); + + attTypeMap.put("RSTFlood", "RST Flood|3|4"); + attTypeMap.put("SYNFlood", "SYN Flood|5|6"); + attTypeMap.put("ACKFlood", "ACK Flood|7|8"); + attTypeMap.put("TCPnullFlood", "TCP null|9|10"); + attTypeMap.put("SYNACKAmplification", "SYN/ACK Amplification|11|12"); + attTypeMap.put("tcpmisuse", "TCP Misuse|13|14"); + attTypeMap.put("FINFlood", "FIN Flood|15|16"); + attTypeMap.put("TCPFragment", "TCP Fragment|17|18"); + attTypeMap.put("HTTPFlood", "HTTP Flood|19|20"); + attTypeMap.put("HTTPSFlood", "HTTPS Flood|21|22"); + + attTypeMap.put("SIPFlood", "SIP Flood|23|24"); + attTypeMap.put("DNS", "DNS|25|26"); + + attTypeMap.put("UDPFragment", "UDP Fragment|27|28"); + attTypeMap.put("chargenAmplification", "chargen Amplification|29|30"); + attTypeMap.put("L2TPAmplification", "L2TP Amplification|31|32"); + attTypeMap.put("mDNSAmplification", "mDNS Amplification|33|34"); + attTypeMap.put("MSSQLRSAmplification", "MS SQL RS Amplification|35|36"); + attTypeMap.put("NetBIOSAmplification", "NetBIOS Amplification|37|38"); + attTypeMap.put("NTPAmplification", "NTP Amplification|39|40"); + attTypeMap.put("RIPv1Amplification", "RIPv1 Amplification|41|42"); + attTypeMap.put("rpcbindAmplification", "rpcbind Amplification|43|44"); + attTypeMap.put("SNMPAmplification", "SNMP Amplification|45|46"); + attTypeMap.put("SSDPAmplification", "SSDP Amplification|47|48"); + attTypeMap.put("DNSAmplification", "DNS Amplification|49|50"); + attTypeMap.put("QOTDAmplification", "QOTD Amplification|51|52"); + attTypeMap.put("Quake3Amplification", "Quake3 Amplification|53|54"); + attTypeMap.put("SteamAmplification", "Steam Amplification|55|56"); + attTypeMap.put("CLADPAmplification", "CLADP Amplification|57|58"); + attTypeMap.put("MemcacheAmplification", "Memcache Amplification|59|60"); + attTypeMap.put("UDPFlood", "UDP Flood|61|62"); + + attTypeMap.put("smurf", "Smurf|63|64"); + attTypeMap.put("icmpfrgment", "ICMP Fragment|65|66"); + attTypeMap.put("ICMPFlood", "ICMP Flood|67|68"); + + attTypeMap.put("IPv4Protocol0", "IPv4 Protocol 0|69|70"); + attTypeMap.put("IPPrivate", "IP Private|71|72"); + attTypeMap.put("landflood", "Land flood|73|74"); + attTypeMap.put("IGMPFlood", "IGMP Flood|75|76"); + ATTACK_TYPE = Collections.unmodifiableMap(attTypeMap); + } + + /** + * 派单eoms模板 + */ + public static final String DISPATCH_TEMPLATE = "\nMsgSerial:{0}\nSDN:{1}\nNeName:{2}\nEquipmentClass:99236\n" + + "AlarmUniqueId:{3}\nAlarmUniqueClearId:{4}\nLocateNeName:{5}\nLocateNeType:99236\nLocateNeSDN:{6}\nLocateInfo:{7}\n" + + "EventTime:{8}\nCancelTime:{9}\nVendorAlarmType:{10}\nVendorSeverity:{11}\nVendorAlarmId:{12}\nAlarmTitle:{13}\n" + + "ProbableCauseTxt:{14}\nRLocateSDN: \nRLocateNeName: \nRLocateNeType: \nRate: \nAlarmLocation: \nAlarmCheck: \n" + + "HolderType: \nAlarmStatus:{15}\nCorrelateAlarmFlag: \nAlarmActCount: \nNeIp:\nEmsId: \nVendor:99083\nAlarmText:{16}\n" + + "NeAlias: \nVersion: \nRemoteNe: \nAlarmProvince:{17}\nAlarmRegion:{18}\nAlarmCounty: \nSite: \nSiteType: \nSiteProperty: \n" + + "MachineroomIDofZGTT: \nBusinessSystem:{19}\nCircuitNo: \nMac: \nSpecialty:9\nNetworkType:903\nNeSubType: \nEffectCircuitNum: \n" + + "CircuitLevel: \nAlarmSeverity:3\nNmsAlarmId:0903-083-056-10-900001\nStandardAlarmName:{21}\nAlarmLogicClass:{22}\n" + + "AlarmLogicSubClass:{23}\nEffectOnEquipment:5\nEffectOnBusiness:4\nNmsAlarmType:1\nSendGroupFlag: \nStandardFlag:2\n" + + "AlarmExplanation:{24}\nBusinessType: \nBusinessInfo:{25}\nIsRelatedRemote: \nLocateNeStatus:1300\nProjectNo: \n" + + "ProjectName: \nProjectStartTime: \nProjectEndTime: \nGroupCustomer: \nCustomerLevel: \nServiceType: \nServiceLevel: \n" + + "ServiceName: \nServiceCrossDomainType: \nInterruptCircuitState: \nCircuitLocateInfo: \nHomeClientNum: \nHomeCellNum: \n" + + "LinkOnuNum: \n"; + + /* * + 0：网元自动清除 --收到从采集源发送的清除告警 + */ + public static final int NE_AUTO_CLEARED_STATUS = 0; + /* * + 1：活动告警---告警当前为活动状态 + */ + public static final int ACTIVE_ALARM_STATUS = 1; + /* * + 2：同步清除---已采集活动告警，但采集平台从告警源同步时，发现已经没有对应的活动告警，由采集平台产生的清除告警 + */ + public static final int SYNCHRONIZATION_CLEAR_STATUS = 2; +} diff --git a/src/main/java/com/dispose/common/ErrorCode.java b/src/main/java/com/dispose/common/ErrorCode.java index 467c6dfb..7e2efb3a 100644 --- a/src/main/java/com/dispose/common/ErrorCode.java +++ b/src/main/java/com/dispose/common/ErrorCode.java @@ -293,6 +293,10 @@ public enum ErrorCode { * The Err huawei firewall error. */ ERR_HUAWEIFIREWALL_ERROR(305, "华为防火墙返回错误"), + /** + * The Err emos create message error. + */ + EMOS_CREATEMESSAGE_ERROR(306, "EMOS发送信息错误"), ; /** diff --git a/src/main/java/com/dispose/controller/kafkaController.java b/src/main/java/com/dispose/controller/kafkaController.java index 231a188a..9434b975 100644 --- a/src/main/java/com/dispose/controller/kafkaController.java +++ b/src/main/java/com/dispose/controller/kafkaController.java @@ -1,21 +1,22 @@ package com.dispose.controller; +import com.alibaba.fastjson.JSONObject; +import com.dispose.common.Constants; import com.dispose.common.ErrorCode; import com.dispose.config.KafkaConfiguration; import com.dispose.pojo.dto.protocol.base.BaseRespStatus; import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO; import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; -import com.dispose.pojo.dto.protocol.kafka.AlarmInfo; +import com.dispose.pojo.dto.protocol.kafka.EmosAlarmInfo; import com.dispose.pojo.dto.protocol.kafka.AlarmInfoReq; import com.dispose.security.annotation.Decryption; import com.dispose.security.annotation.Encryption; import com.dispose.validation.group.ValidGroups; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.kafka.support.SendResult; import org.springframework.stereotype.Component; import org.springframework.stereotype.Controller; @@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.text.MessageFormat; import java.util.Objects; /** @@ -43,18 +45,15 @@ import java.util.Objects; @Encryption @Decryption public class kafkaController { - /** - * The Object mapper. - */ - @Resource - private ObjectMapper objectMapper; - /** * The Kafka configuration. */ @Resource private KafkaConfiguration kafkaConfiguration; + @Resource + private StringRedisTemplate stringRedisTemplate; + /** * Dispatch command sent to kafka. * @@ -66,28 +65,150 @@ public class kafkaController { @ApiOperation("发送消息") public ProtocolRespDTO dispatchCommand( @Validated(ValidGroups.ProtocolCommonValid.class) - @RequestBody ProtocolReqDTO mr) throws JsonProcessingException { - //获取入参信息，进行所需数据格式拼接 - log.info("alarm message information :{}", mr.getMsgContent().getAlarmInfo()); - AlarmInfo alarmInfo = objectMapper.readValue(mr.getMsgContent().getAlarmInfo(), new TypeReference() { - }); + @RequestBody ProtocolReqDTO mr) { + //获取入参信息 + BaseRespStatus rspInfo = new BaseRespStatus(); + log.info("emos alarm is:{}", mr.getMsgContent().getAlarmInfo()); + EmosAlarmInfo alarmInfo = JSONObject.parseObject(mr.getMsgContent().getAlarmInfo(), EmosAlarmInfo.class); + //拼接emos据格式 + String content = createSendContent(alarmInfo); + if (content == null) { + rspInfo.setStatus(ErrorCode.EMOS_CREATEMESSAGE_ERROR.getCode()); + rspInfo.setMessage(new String[]{ErrorCode.EMOS_CREATEMESSAGE_ERROR.getMsg()}); + return ProtocolRespDTO.result(ErrorCode.EMOS_CREATEMESSAGE_ERROR, rspInfo); + } //推动数据格式到kafka - log.info("send alarm message :{}", alarmInfo.toString()); - String sendMessage = mr.getMsgContent().getAlarmInfo(); + log.info("send alarm :{}", content); ListenableFuture> sendResult = kafkaConfiguration .kafkaTemplate() - .sendDefault(0, System.currentTimeMillis(), "dispose", sendMessage); + .sendDefault(0, System.currentTimeMillis(), "dispose", content); - sendResult.addCallback(v -> log.info("Kafka send {} to {} at {}", sendMessage, + sendResult.addCallback(v -> log.info("Kafka send {} to {} at {}", content, Objects.requireNonNull(v) .getRecordMetadata() .topic(), v.getRecordMetadata().partition()), ex -> log.error("Kafka send error: {}", ex.getMessage())); - BaseRespStatus rspInfo = new BaseRespStatus(); + //保存数据格式到数据库 rspInfo.setStatus(ErrorCode.ERR_OK.getCode()); rspInfo.setMessage(new String[]{ErrorCode.ERR_OK.getMsg()}); return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspInfo); } + + /** + * @param alarmInfo emos告警信息 + * @return 发送的消息 + */ + private String createSendContent(EmosAlarmInfo alarmInfo) { + try { + //编号从1开始，以实时消息发布通道为单位进行编号。如果编号超过最大正整数(2^32-1)，重新从1开始编号。 + Long increment = stringRedisTemplate.opsForValue().increment("SEND_KAFKA_INCREMENT", 1); + String dstIp = alarmInfo.getDstIp(); + String alarmId = alarmInfo.getAlarmId(); + //LocateInfo: 192.168.11.6 ddos attack alarm，Memcache , 2019-08-01 12:31, 2.1Gbps, 1.01Mpps + String locateInfo = getAlarmEvent(alarmInfo); + + String eventTime = alarmInfo.getStartTime(); + String cancelTime = alarmInfo.getEndTime(); + + //告警类型vendorAlarmType、告警级别vendorSeverity、告警号vendorAlarmId、告警标题AlarmTitle、告警可能原因ProbableCauseTxt + String type = Constants.ATTACK_TYPE.get(alarmInfo.getAttackType()); + String vendorSeverity = changeCharacatorCode("一级"); + String vendorAlarmType; + String vendorAlarmId; + if (type != null) { + String[] arr = type.split("\\|"); + vendorAlarmType = arr[0]; + if (alarmInfo.getBpspps().compareTo("bps") == 0) { + vendorAlarmId = arr[1]; + } else { + vendorAlarmId = arr[2]; + } + } else { + vendorAlarmType = alarmInfo.getAttackType(); + vendorAlarmId = "0"; + log.info("get unKnow attack type:" + vendorAlarmType); + } + String alarmStatus = String.valueOf(Constants.ACTIVE_ALARM_STATUS); + String alarmText = changeCharacatorCode(getAlarmText(alarmInfo)); + String alarmExplanation = changeCharacatorCode(getAlarmExplanation(alarmInfo)); + + String content = MessageFormat.format(Constants.DISPATCH_TEMPLATE, increment, dstIp, + dstIp, alarmId, alarmId, dstIp, dstIp, locateInfo, eventTime, cancelTime, + vendorAlarmType, vendorSeverity, vendorAlarmId, changeCharacatorCode("重保攻击事件告警"), + changeCharacatorCode("DDos攻击事件"), alarmStatus, alarmText, + changeCharacatorCode(alarmInfo.getDstProvince()), changeCharacatorCode(alarmInfo.getDstCity()), + changeCharacatorCode("网络部集中抗D系统"), changeCharacatorCode("DDOS攻击事件告警"), + changeCharacatorCode("安全告警"), changeCharacatorCode("DDOS告警"), + alarmExplanation, changeCharacatorCode("集中抗D")); + return content; + + } catch (Exception e) { + log.error("createSendContent告警消息异常，详细信息：{}", ExceptionUtils.getStackTrace(e)); + return null; + } + } + + private String getAlarmEvent(EmosAlarmInfo a) { + return a.getDstIp() + " ddos attack alarm, " + a.getAttackType() + ", " + a.getStartTime() + + ", " + a.getMaxBps() + ", " + a.getMaxPps(); + } + + private String changeCharacatorCode(String con) { + try { + return new String(con.getBytes("GBK"), "GBK"); + } catch (Exception e) { + log.info("change failed:" + e.getMessage()); + return con; + } + } + + private String getAreaDes(String province, String city) { + if (province.compareTo("北京") == 0) { + return "北京市"; + } + if (province.compareTo("上海") == 0) { + return "上海市"; + } + if (province.compareTo("天津") == 0) { + return "天津市"; + } + if (province.compareTo("重庆") == 0) { + return "重庆市"; + } + return province + "省" + city + "市"; + } + + private String getAlarmText(EmosAlarmInfo a) { + String area = getAreaDes(a.getDstProvince(), a.getDstCity()); + String op = ""; + if (a.getDisposeType() == 1) { + op = "清洗"; + } else if (a.getDisposeType() == 2) { + op = "流控"; + } else if (a.getDisposeType() == 3) { + op = "黑洞"; + } + return "攻击目的IP：" + a.getDstIp() + "," + area + "," + "处置操作:" + op + "," + "处置时长：" + a.getDisposeTime() + "分钟"; + } + + private String getAlarmExplanation(EmosAlarmInfo a) { + String op = ""; + if (a.getDisposeType() == 1) { + op = "清洗"; + } else if (a.getDisposeType() == 2) { + op = "流控"; + } else if (a.getDisposeType() == 3) { + op = "黑洞"; + } + String srcIp = ""; + for (String ip : a.getSrcIpLs()) { + srcIp = srcIp + ip + ","; + } + if (!srcIp.isEmpty()) { + srcIp = srcIp.substring(0, srcIp.length() - 1); + } + return "攻击目的IP：" + a.getDstIp() + "," + "攻击源地址：(" + srcIp + ")," + "处置操作:" + op + "," + "处置时长：" + a.getDisposeTime() + "分钟"; + } } diff --git a/src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfo.java b/src/main/java/com/dispose/pojo/dto/protocol/kafka/EmosAlarmInfo.java similarity index 98% rename from src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfo.java rename to src/main/java/com/dispose/pojo/dto/protocol/kafka/EmosAlarmInfo.java index 8bb85b0e..bc2f88c9 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/kafka/AlarmInfo.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/kafka/EmosAlarmInfo.java @@ -16,7 +16,7 @@ import java.util.List; @JsonPropertyOrder({"alarmId", "dstIp", "attackType", "bpspps", "dstProvince", "dstCity", "srcIpLs", "startTime", "endTime", "disposeType", "disposeTime", "maxBps", "maxPps"}) @JsonInclude(JsonInclude.Include.NON_NULL) -public class AlarmInfo { +public class EmosAlarmInfo { /** * 告警id. */ diff --git a/src/main/java/com/dispose/setup/SpringBootBeanUtil.java b/src/main/java/com/dispose/setup/SpringBootBeanUtil.java deleted file mode 100644 index f34424a4..00000000 --- a/src/main/java/com/dispose/setup/SpringBootBeanUtil.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.dispose.setup; - -import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; - -/** - * The type Spring boot bean util. - */ -@Component -@Slf4j -public class SpringBootBeanUtil implements ApplicationContextAware { - /** - * The constant applicationContext. - */ - private static ApplicationContext applicationContext; - - /** - * Sets application context. - * - * @param applicationContext the application context - * @throws BeansException the beans exception - */ - @Override - public void setApplicationContext(@NotNull ApplicationContext applicationContext) throws BeansException { - if (SpringBootBeanUtil.applicationContext == null) { - SpringBootBeanUtil.applicationContext = applicationContext; - } - - log.debug("========ApplicationContext配置成功========"); - log.debug("========在普通类可以通过调用SpringUtils.getAppContext()获取applicationContext对象========"); - log.debug("========applicationContext=" + SpringBootBeanUtil.applicationContext + "========"); - } - - /** - * Gets application context. - * - * @return the application context - */ - public static ApplicationContext getApplicationContext() { - return applicationContext; - } - - /** - * Gets bean. - * - * @param name the name - * @return the bean - */ - public static Object getBean(String name) { - return getApplicationContext().getBean(name); - } - - /** - * Gets bean. - * - * @param the type parameter - * @param clazz the clazz - * @return the bean - */ - public static T getBean(Class clazz) { - return getApplicationContext().getBean(clazz); - } - - /** - * Gets bean. - * - * @param the type parameter - * @param name the name - * @param clazz the clazz - * @return the bean - */ - public static T getBean(String name, Class clazz) { - return getApplicationContext().getBean(name, clazz); - } -} diff --git a/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java b/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java index 566c5600..83a52d64 100644 --- a/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java +++ b/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java @@ -83,7 +83,7 @@ public class KafkaControllerTest extends InitTestEnvironment { // 1清洗，2流控，3黑洞 disposeParam.set("disposeType", 1); disposeParam.set("disposeTime", 30); - disposeParam.set("endTime", new Date()); + disposeParam.set("endTime", sdf.format(new Date())); List srcIp = new ArrayList<>(); srcIp.add("192.168.10.1"); srcIp.add("192.168.10.2"); From 39531233a266ffbf142c64d6048219a652b9176c Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Mon, 13 Sep 2021 17:35:51 +0800 Subject: [PATCH 05/17] =?UTF-8?q?OCT=20REM:=201.=20=E6=96=B0=E5=A2=9EMsgSe?= =?UTF-8?q?rial=E6=95=B0=E6=8D=AE=E5=BA=93=202.=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=98=E5=82=A8MsgSerial=E5=AD=97=E6=AE=B5=E5=92=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=9C=80=E5=A4=A7MsgSerial=E5=80=BC=E6=96=B9=E6=B3=95?= =?UTF-8?q?=203.=20=E4=BF=AE=E6=94=B9MsgSerial=E5=AD=97=E6=AE=B5=E9=80=92?= =?UTF-8?q?=E5=A2=9E=E6=96=B9=E5=BC=8F=EF=BC=88=E4=B8=8D=E9=87=87=E7=94=A8?= =?UTF-8?q?redis=E8=87=AA=E5=A2=9E=E9=95=BF=E6=96=B9=E5=BC=8F=EF=BC=89=204?= =?UTF-8?q?.=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D=E4=BD=9C=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application-dispose.properties | 5 - config/application-test.properties | 17 ++- pom.xml | 4 - .../dispose/controller/kafkaController.java | 30 +++- .../com/dispose/manager/MsgSerialManager.java | 19 +++ .../manager/impl/MsgSerialManagerImpl.java | 36 +++++ .../com/dispose/mapper/MsgSerialMapper.java | 21 +++ .../com/dispose/pojo/entity/MsgSerial.java | 48 +++++++ .../com/dispose/service/MsgSerialService.java | 20 +++ .../service/impl/MsgSerialServiceImpl.java | 34 +++++ src/main/resources/db/data.sql | 8 ++ src/main/resources/db/schema.sql | 133 ++++++++++-------- src/main/resources/mappers/MsgSerial.xml | 23 +++ .../test/dev/mapper/MsgSerialMapperTest.java | 60 ++++++++ 14 files changed, 373 insertions(+), 85 deletions(-) create mode 100644 src/main/java/com/dispose/manager/MsgSerialManager.java create mode 100644 src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java create mode 100644 src/main/java/com/dispose/mapper/MsgSerialMapper.java create mode 100644 src/main/java/com/dispose/pojo/entity/MsgSerial.java create mode 100644 src/main/java/com/dispose/service/MsgSerialService.java create mode 100644 src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java create mode 100644 src/main/resources/mappers/MsgSerial.xml create mode 100644 src/test/java/com/dispose/test/dev/mapper/MsgSerialMapperTest.java diff --git a/config/application-dispose.properties b/config/application-dispose.properties index 26d9b602..4753ff1d 100644 --- a/config/application-dispose.properties +++ b/config/application-dispose.properties @@ -47,11 +47,6 @@ kafka.producer.linger=1 kafka.producer.buffer.memory=33554432 kafka.producer.servers=172.21.44.189:9092,172.21.44.9:9092,172.21.44.244:9092,172.21.44.236:9092,172.21.44.80:9092 kafka.dispose.topic=ddos-vip-customer-ck -#redis config -spring.redis.database=0 -spring.redis.host=172.21.48.211 -spring.redis.port=6379 -spring.redis.password=!Q2w3e4r #信任主机配置 # 白名单开关 trust.auth-white-list-check=true diff --git a/config/application-test.properties b/config/application-test.properties index 6b114a84..19a8dd44 100644 --- a/config/application-test.properties +++ b/config/application-test.properties @@ -4,17 +4,16 @@ server.tomcat.basedir=./basedir # 多个项目放在nginx下同个端口，通过该配置区分 server.servlet.context-path=/dispose # 配置数据源 -#spring.datasource.url=jdbc:mysql://10.88.77.65:33061/ci_dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ -# =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true -#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.username=root -#spring.datasource.password=h0K0_8u -spring.datasource.url=jdbc:mysql://172.21.48.75:3306/ci_dispose_v1?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ - =convertToNull&useUnicode=true +spring.datasource.url=jdbc:mysql://10.88.77.65:33061/ci_dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ + =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=root -spring.datasource.password=BCcf6Dd7&8 - +spring.datasource.password=h0K0_8u +#spring.datasource.url=jdbc:mysql://172.21.48.75:3306/ci_dispose_v1?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ +# =convertToNull&useUnicode=true +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.username=root +#spring.datasource.password=BCcf6Dd7&8 # 配置连接池 spring.datasource.schema=classpath:test_db/unit_test.sql spring.datasource.initialization-mode=always diff --git a/pom.xml b/pom.xml index d78177dd..626c9ace 100644 --- a/pom.xml +++ b/pom.xml @@ -225,10 +225,6 @@ dom4j-core 1.4-dev-8 - - org.springframework.boot - spring-boot-starter-data-redis - diff --git a/src/main/java/com/dispose/controller/kafkaController.java b/src/main/java/com/dispose/controller/kafkaController.java index 9434b975..7923c019 100644 --- a/src/main/java/com/dispose/controller/kafkaController.java +++ b/src/main/java/com/dispose/controller/kafkaController.java @@ -9,14 +9,15 @@ import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO; import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; import com.dispose.pojo.dto.protocol.kafka.EmosAlarmInfo; import com.dispose.pojo.dto.protocol.kafka.AlarmInfoReq; +import com.dispose.pojo.entity.MsgSerial; import com.dispose.security.annotation.Decryption; import com.dispose.security.annotation.Encryption; +import com.dispose.service.MsgSerialService; import com.dispose.validation.group.ValidGroups; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.springframework.data.redis.core.StringRedisTemplate; +import org.apache.commons.lang.exception.ExceptionUtils; import org.springframework.kafka.support.SendResult; import org.springframework.stereotype.Component; import org.springframework.stereotype.Controller; @@ -51,8 +52,11 @@ public class kafkaController { @Resource private KafkaConfiguration kafkaConfiguration; + /** + * The message serial service. + */ @Resource - private StringRedisTemplate stringRedisTemplate; + private MsgSerialService msgSerialService; /** * Dispatch command sent to kafka. @@ -78,8 +82,11 @@ public class kafkaController { rspInfo.setMessage(new String[]{ErrorCode.EMOS_CREATEMESSAGE_ERROR.getMsg()}); return ProtocolRespDTO.result(ErrorCode.EMOS_CREATEMESSAGE_ERROR, rspInfo); } - //推动数据格式到kafka + + //保存数据格式到数据库 log.info("send alarm :{}", content); + + //推动数据格式到kafka ListenableFuture> sendResult = kafkaConfiguration .kafkaTemplate() .sendDefault(0, System.currentTimeMillis(), "dispose", content); @@ -90,7 +97,6 @@ public class kafkaController { .topic(), v.getRecordMetadata().partition()), ex -> log.error("Kafka send error: {}", ex.getMessage())); - //保存数据格式到数据库 rspInfo.setStatus(ErrorCode.ERR_OK.getCode()); rspInfo.setMessage(new String[]{ErrorCode.ERR_OK.getMsg()}); return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspInfo); @@ -102,13 +108,23 @@ public class kafkaController { */ private String createSendContent(EmosAlarmInfo alarmInfo) { try { + //告警序号的最大值2^32-1 + long indexEnd = 4294967296L; + //告警序号的最大值 + long indexStart = 1L; //编号从1开始，以实时消息发布通道为单位进行编号。如果编号超过最大正整数(2^32-1)，重新从1开始编号。 - Long increment = stringRedisTemplate.opsForValue().increment("SEND_KAFKA_INCREMENT", 1); + long increment = msgSerialService.getMaxMessageSerial(); + increment = increment + 1; + if (increment > (indexEnd - 1)) { + increment = indexStart; + } + MsgSerial msgSerial = MsgSerial.builder().msgSerial(increment).build(); + msgSerialService.addMessageSerial(msgSerial); + String dstIp = alarmInfo.getDstIp(); String alarmId = alarmInfo.getAlarmId(); //LocateInfo: 192.168.11.6 ddos attack alarm，Memcache , 2019-08-01 12:31, 2.1Gbps, 1.01Mpps String locateInfo = getAlarmEvent(alarmInfo); - String eventTime = alarmInfo.getStartTime(); String cancelTime = alarmInfo.getEndTime(); diff --git a/src/main/java/com/dispose/manager/MsgSerialManager.java b/src/main/java/com/dispose/manager/MsgSerialManager.java new file mode 100644 index 00000000..b279c41b --- /dev/null +++ b/src/main/java/com/dispose/manager/MsgSerialManager.java @@ -0,0 +1,19 @@ +package com.dispose.manager; + +import com.dispose.pojo.entity.MsgSerial; + +public interface MsgSerialManager { + /** + * Add user business error code. + * + * @param msgSerial the message serial + */ + void addMsgSerialNumber(MsgSerial msgSerial); + + /** + * get new max message serial. + * + * @return the long + */ + Long getMaxMsgSerial(); +} diff --git a/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java b/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java new file mode 100644 index 00000000..1e4a787a --- /dev/null +++ b/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java @@ -0,0 +1,36 @@ +package com.dispose.manager.impl; + +import com.dispose.manager.MsgSerialManager; +import com.dispose.mapper.MsgSerialMapper; +import com.dispose.pojo.entity.MsgSerial; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +@Component +@Slf4j +public class MsgSerialManagerImpl implements MsgSerialManager { + /** + * The message serial mapper. + */ + @Resource + private MsgSerialMapper msgSerialMapper; + + + @Override + public void addMsgSerialNumber(MsgSerial msgSerial) { + msgSerialMapper.addMsgSerial(msgSerial); + } + + /** + * get new max message serial. + * + * @return the long + */ + @Override + public Long getMaxMsgSerial() { + return msgSerialMapper.getMaxMsgSerial(); + } +} + diff --git a/src/main/java/com/dispose/mapper/MsgSerialMapper.java b/src/main/java/com/dispose/mapper/MsgSerialMapper.java new file mode 100644 index 00000000..6dd62148 --- /dev/null +++ b/src/main/java/com/dispose/mapper/MsgSerialMapper.java @@ -0,0 +1,21 @@ +package com.dispose.mapper; + +import com.dispose.pojo.entity.MsgSerial; + +public interface MsgSerialMapper { + + /** + * Add new task int. + * + * @param msgSerial the msgSerial number + * @return the int + */ + int addMsgSerial(MsgSerial msgSerial); + + /** + * get new max message serial. + * + * @return the long + */ + long getMaxMsgSerial(); +} diff --git a/src/main/java/com/dispose/pojo/entity/MsgSerial.java b/src/main/java/com/dispose/pojo/entity/MsgSerial.java new file mode 100644 index 00000000..4f89bfa3 --- /dev/null +++ b/src/main/java/com/dispose/pojo/entity/MsgSerial.java @@ -0,0 +1,48 @@ +package com.dispose.pojo.entity; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import tk.mybatis.mapper.annotation.KeySql; +import tk.mybatis.mapper.annotation.NameStyle; +import tk.mybatis.mapper.code.Style; + +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * The type Dispose capacity. + * + * @author + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +@Table(name = "msg_serial") +@NameStyle(Style.normal) +public class MsgSerial implements Serializable { + + /** + * The constant serialVersionUID. + */ + private static final long serialVersionUID = 1L; + + /** + * The Id. + */ + @Id + @KeySql(useGeneratedKeys = true) + private Long id; + + /** + * The Device id. + */ + private Long msgSerial; + + +} diff --git a/src/main/java/com/dispose/service/MsgSerialService.java b/src/main/java/com/dispose/service/MsgSerialService.java new file mode 100644 index 00000000..f36dee2b --- /dev/null +++ b/src/main/java/com/dispose/service/MsgSerialService.java @@ -0,0 +1,20 @@ +package com.dispose.service; + +import com.dispose.pojo.entity.MsgSerial; + +public interface MsgSerialService { + /** + * add message serial. + * + * @param msgSerial the message serial + */ + void addMessageSerial(MsgSerial msgSerial); + + /** + * get new max message serial. + * + * @return the long + */ + Long getMaxMessageSerial(); + +} diff --git a/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java b/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java new file mode 100644 index 00000000..b3c19d2b --- /dev/null +++ b/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java @@ -0,0 +1,34 @@ +package com.dispose.service.impl; + +import com.dispose.manager.MsgSerialManager; +import com.dispose.pojo.entity.MsgSerial; +import com.dispose.service.MsgSerialService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class MsgSerialServiceImpl implements MsgSerialService { + @Resource + private MsgSerialManager msgSerialManager; + + /** + * add message serial. + * + * @param msgSerial the message serial + */ + @Override + public void addMessageSerial(MsgSerial msgSerial) { + msgSerialManager.addMsgSerialNumber(msgSerial); + } + + /** + * get new max message serial. + * + * @return the long + */ + @Override + public Long getMaxMessageSerial() { + return msgSerialManager.getMaxMsgSerial(); + } +} diff --git a/src/main/resources/db/data.sql b/src/main/resources/db/data.sql index fb23a65a..2ec968d8 100644 --- a/src/main/resources/db/data.sql +++ b/src/main/resources/db/data.sql @@ -9,3 +9,11 @@ INSERT INTO `user_account` VALUES (1, 'admin', 'c3855e6b6bb120450f160ba91134522868f89d36062f2061ebeefd80817e1d58', '2020-11-13 09:25:19', '', '2021-01-20 10:18:56', '1db9ddc47de514eb16b7ec07d7f7f96f7a714ae00e1209755bab30d543a0a2c3', '2021-01-20 10:20:57', '1970-01-02 00:00:00', 0, 0); + +-- ---------------------------- +-- Records of msg_serial +-- ---------------------------- +INSERT INTO `msg_serial` VALUES ('1', '1'); + + + diff --git a/src/main/resources/db/schema.sql b/src/main/resources/db/schema.sql index 6f40efdb..587e8229 100644 --- a/src/main/resources/db/schema.sql +++ b/src/main/resources/db/schema.sql @@ -15,7 +15,8 @@ */ SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; +SET +FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for device_task @@ -23,23 +24,23 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `device_task`; CREATE TABLE `device_task` ( - `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '任务信息唯一标识符', - `taskId` bigint(11) NOT NULL COMMENT '处置任务唯一标识符', - `deviceId` bigint(11) NOT NULL COMMENT '处置设备唯一标识符', - `beginTime` timestamp(0) NULL DEFAULT NULL COMMENT '任务开始时间', - `endTime` timestamp(0) NULL DEFAULT NULL COMMENT '任务结束时间', - `taskAttackType` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '需要处置的攻击类型', - `execAttackTypeIn` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '已经执行处置的攻击类型(Input)', - `attackTypeStatusIn` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '执行的攻击类型状态(Input)', - `execAttackTypeOut` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '已经执行处置的攻击类型(Output)', - `attackTypeStatusOut` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '执行的攻击类型状态(Input)', - `externId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '扩展任务ID', - `errRetry` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '调用失败重试次数', - `status` int(11) NOT NULL DEFAULT 0 COMMENT '任务状态', - `devStatus` int(11) NOT NULL DEFAULT 0 COMMENT '设备任务状态', + `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '任务信息唯一标识符', + `taskId` bigint(11) NOT NULL COMMENT '处置任务唯一标识符', + `deviceId` bigint(11) NOT NULL COMMENT '处置设备唯一标识符', + `beginTime` timestamp(0) NULL DEFAULT NULL COMMENT '任务开始时间', + `endTime` timestamp(0) NULL DEFAULT NULL COMMENT '任务结束时间', + `taskAttackType` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '需要处置的攻击类型', + `execAttackTypeIn` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '已经执行处置的攻击类型(Input)', + `attackTypeStatusIn` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '执行的攻击类型状态(Input)', + `execAttackTypeOut` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '已经执行处置的攻击类型(Output)', + `attackTypeStatusOut` bigint(255) UNSIGNED NOT NULL DEFAULT 0 COMMENT '执行的攻击类型状态(Input)', + `externId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '扩展任务ID', + `errRetry` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '调用失败重试次数', + `status` int(11) NOT NULL DEFAULT 0 COMMENT '任务状态', + `devStatus` int(11) NOT NULL DEFAULT 0 COMMENT '设备任务状态', PRIMARY KEY (`id`) USING BTREE, - INDEX `task_info_ibfk_1` (`taskId`) USING BTREE, - INDEX `task_info_ibfk_2` (`deviceId`) USING BTREE, + INDEX `task_info_ibfk_1` (`taskId`) USING BTREE, + INDEX `task_info_ibfk_2` (`deviceId`) USING BTREE, CONSTRAINT `device_task_ibfk_1` FOREIGN KEY (`taskId`) REFERENCES `dispose_task` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `device_task_ibfk_2` FOREIGN KEY (`deviceId`) REFERENCES `dispose_device` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE = InnoDB @@ -54,15 +55,15 @@ CREATE TABLE `device_task` DROP TABLE IF EXISTS `dispose_capacity`; CREATE TABLE `dispose_capacity` ( - `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '设备处置能力唯一标识符', - `deviceId` bigint(11) NOT NULL COMMENT '设备ID', - `capacityType` int(11) NOT NULL COMMENT '处置能力：\r\n0：清洗\r\n1：高防 \r\n2：路由黑洞 \r\n3：检测\r\n4：WAF封堵\r\n', - `objectType` int(11) NOT NULL COMMENT '处置对象类型：\r\n0：IP\r\n1：域名 \r\n2：URL', - `ipType` int(11) NOT NULL DEFAULT 3 COMMENT 'IP 地址类型：\r\n1 << 0：支持IPV4\r\n1 << 1：支持IPV6', + `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '设备处置能力唯一标识符', + `deviceId` bigint(11) NOT NULL COMMENT '设备ID', + `capacityType` int(11) NOT NULL COMMENT '处置能力：\r\n0：清洗\r\n1：高防 \r\n2：路由黑洞 \r\n3：检测\r\n4：WAF封堵\r\n', + `objectType` int(11) NOT NULL COMMENT '处置对象类型：\r\n0：IP\r\n1：域名 \r\n2：URL', + `ipType` int(11) NOT NULL DEFAULT 3 COMMENT 'IP 地址类型：\r\n1 << 0：支持IPV4\r\n1 << 1：支持IPV6', `protectIp` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '该处置能力能够处置的IP', - `reserveNetflow` int(11) NULL DEFAULT NULL COMMENT '清洗能力储备流量值，单位(G)', + `reserveNetflow` int(11) NULL DEFAULT NULL COMMENT '清洗能力储备流量值，单位(G)', PRIMARY KEY (`id`) USING BTREE, - INDEX `id` (`deviceId`) USING BTREE, + INDEX `id` (`deviceId`) USING BTREE, CONSTRAINT `dispose_capacity_ibfk_1` FOREIGN KEY (`deviceId`) REFERENCES `dispose_device` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION ) ENGINE = InnoDB AUTO_INCREMENT = 1 @@ -76,23 +77,23 @@ CREATE TABLE `dispose_capacity` DROP TABLE IF EXISTS `dispose_device`; CREATE TABLE `dispose_device` ( - `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '设备唯一标识符', - `ipAddr` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备IP地址, IPv4/IPv6', - `ipPort` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '端口', - `deviceType` int(11) NOT NULL DEFAULT 0 COMMENT '能力节点类型，0：迪普UMC平台，1：浩瀚设备', - `areaCode` int(11) NOT NULL COMMENT '设备物理位置区域码', - `deviceName` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备名称', - `manufacturer` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生产厂商', - `model` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '型号', - `version` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '软件版本', - `userName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '系统管理用户名', - `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '系统管理密码', - `urlPath` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'URL路径', - `urlType` int(11) NOT NULL DEFAULT 0 COMMENT 'URL类型: 0: HTTP, 1: HTTPS', - `readme` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '备注', - `status` int(11) NOT NULL DEFAULT 0 COMMENT '状态，0：正常，1：锁定，2：禁用， 3：删除', + `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '设备唯一标识符', + `ipAddr` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备IP地址, IPv4/IPv6', + `ipPort` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '端口', + `deviceType` int(11) NOT NULL DEFAULT 0 COMMENT '能力节点类型，0：迪普UMC平台，1：浩瀚设备', + `areaCode` int(11) NOT NULL COMMENT '设备物理位置区域码', + `deviceName` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备名称', + `manufacturer` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生产厂商', + `model` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '型号', + `version` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '软件版本', + `userName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '系统管理用户名', + `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '系统管理密码', + `urlPath` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'URL路径', + `urlType` int(11) NOT NULL DEFAULT 0 COMMENT 'URL类型: 0: HTTP, 1: HTTPS', + `readme` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '备注', + `status` int(11) NOT NULL DEFAULT 0 COMMENT '状态，0：正常，1：锁定，2：禁用， 3：删除', PRIMARY KEY (`id`) USING BTREE, - INDEX `ipAddr` (`ipAddr`) USING BTREE + INDEX `ipAddr` (`ipAddr`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 @@ -105,23 +106,23 @@ CREATE TABLE `dispose_device` DROP TABLE IF EXISTS `dispose_task`; CREATE TABLE `dispose_task` ( - `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '处置任务唯一标识符', - `deviceId` bigint(11) NOT NULL COMMENT '处置设备唯一标识符', - `accountId` bigint(11) NOT NULL COMMENT '用户唯一标识符', - `areaCode` int(11) NOT NULL DEFAULT -1 COMMENT '设备物理位置区域码', - `disposeCapacity` int(11) NOT NULL COMMENT '处置能力类型：0：清洗 1：高防 2：黑洞 3：检测', + `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '处置任务唯一标识符', + `deviceId` bigint(11) NOT NULL COMMENT '处置设备唯一标识符', + `accountId` bigint(11) NOT NULL COMMENT '用户唯一标识符', + `areaCode` int(11) NOT NULL DEFAULT -1 COMMENT '设备物理位置区域码', + `disposeCapacity` int(11) NOT NULL COMMENT '处置能力类型：0：清洗 1：高防 2：黑洞 3：检测', `disposeObject` varchar(4096) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '处置对象', - `objectType` int(8) NOT NULL COMMENT '处置对象类型：\r\n0：IP\r\n1：域名 \r\n2：URL', + `objectType` int(8) NOT NULL COMMENT '处置对象类型：\r\n0：IP\r\n1：域名 \r\n2：URL', `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '开始时间', `planEndTime` timestamp(0) NOT NULL DEFAULT '1970-01-02 00:00:00' COMMENT '计划结束时间', - `endTime` timestamp(0) NULL DEFAULT '1970-01-02 00:00:00' COMMENT '实际结束时间', - `flowDirection` int(11) NOT NULL DEFAULT 2 COMMENT '流量方向, 0：流入；1：流出；2：双向', - `attackType` bigint(20) NOT NULL DEFAULT 0 COMMENT '攻击类型，默认0， 全部攻击', - `flowBandWidth` int(11) UNSIGNED NULL DEFAULT 1024 COMMENT '攻击流量占用带宽(MB)', - `currentStatus` int(11) NOT NULL DEFAULT 0 COMMENT '状态，0：停止。1：启动', + `endTime` timestamp(0) NULL DEFAULT '1970-01-02 00:00:00' COMMENT '实际结束时间', + `flowDirection` int(11) NOT NULL DEFAULT 2 COMMENT '流量方向, 0：流入；1：流出；2：双向', + `attackType` bigint(20) NOT NULL DEFAULT 0 COMMENT '攻击类型，默认0， 全部攻击', + `flowBandWidth` int(11) UNSIGNED NULL DEFAULT 1024 COMMENT '攻击流量占用带宽(MB)', + `currentStatus` int(11) NOT NULL DEFAULT 0 COMMENT '状态，0：停止。1：启动', PRIMARY KEY (`id`) USING BTREE, - INDEX `dispose_task_device_capacity_id_fk` (`disposeCapacity`) USING BTREE, - INDEX `dispose_task_user_account_id_fk` (`accountId`) USING BTREE + INDEX `dispose_task_device_capacity_id_fk` (`disposeCapacity`) USING BTREE, + INDEX `dispose_task_user_account_id_fk` (`accountId`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 @@ -134,10 +135,10 @@ CREATE TABLE `dispose_task` DROP TABLE IF EXISTS `service_group`; CREATE TABLE `service_group` ( - `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '业务ID唯一标识符', + `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '业务ID唯一标识符', `serviceId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务ID', `serviceType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务类型：SERVER,WEB,DNS,GAME', - `serviceBandwidth` int(11) NOT NULL DEFAULT 1 COMMENT '业务带宽，单位M', + `serviceBandwidth` int(11) NOT NULL DEFAULT 1 COMMENT '业务带宽，单位M', `serviceIp` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务IP地址，逗号分割', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB @@ -152,17 +153,17 @@ CREATE TABLE `service_group` DROP TABLE IF EXISTS `user_account`; CREATE TABLE `user_account` ( - `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '账户唯一编号', + `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '账户唯一编号', `username` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户名', `password` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码', `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间', `operators` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '操作员', `lastLoginTime` timestamp(0) NOT NULL DEFAULT '1970-01-02 00:00:00' COMMENT '最后一次成功登录时间', - `token` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '用户token', + `token` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '用户token', `lastAccess` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '最后一次访问时间戳', `lockTime` timestamp(0) NOT NULL DEFAULT '1970-01-02 00:00:00' COMMENT '账户锁定时间', - `pwdErrTimes` int(11) NOT NULL DEFAULT 0 COMMENT '密码错误次数', - `status` int(11) NULL DEFAULT 0 COMMENT '账户状态', + `pwdErrTimes` int(11) NOT NULL DEFAULT 0 COMMENT '密码错误次数', + `status` int(11) NULL DEFAULT 0 COMMENT '账户状态', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `USERNAME` (`username`) USING BTREE ) ENGINE = InnoDB @@ -171,4 +172,16 @@ CREATE TABLE `user_account` COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; -SET FOREIGN_KEY_CHECKS = 1; +SET +FOREIGN_KEY_CHECKS = 1; + +-- ---------------------------- +-- Table structure for msg_serial +-- ---------------------------- +DROP TABLE IF EXISTS `msg_serial`; +CREATE TABLE `msg_serial` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `msgSerial` bigint(20) NOT NULL DEFAULT '1', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; diff --git a/src/main/resources/mappers/MsgSerial.xml b/src/main/resources/mappers/MsgSerial.xml new file mode 100644 index 00000000..4e9ceaa8 --- /dev/null +++ b/src/main/resources/mappers/MsgSerial.xml @@ -0,0 +1,23 @@ + + + + + + + + + + INSERT + IGNORE INTO msg_serial(msgSerial) + VALUES ( + #{msgSerial} + ) + + + + \ No newline at end of file diff --git a/src/test/java/com/dispose/test/dev/mapper/MsgSerialMapperTest.java b/src/test/java/com/dispose/test/dev/mapper/MsgSerialMapperTest.java new file mode 100644 index 00000000..c64b40db --- /dev/null +++ b/src/test/java/com/dispose/test/dev/mapper/MsgSerialMapperTest.java @@ -0,0 +1,60 @@ +package com.dispose.test.dev.mapper; + +import com.dispose.mapper.MsgSerialMapper; +import com.dispose.pojo.entity.MsgSerial; +import com.dispose.test.dev.Global.InitTestEnvironment; +import lombok.extern.slf4j.Slf4j; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +/** + * The message serial test. + */ +@RunWith(SpringRunner.class) +@SpringBootTest +@Slf4j +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Transactional +public class MsgSerialMapperTest extends InitTestEnvironment { + + /** + * The message serial mapper. + */ + @Resource + MsgSerialMapper msgSerialMapper; + + /** + * A 1 add new message serial. + */ + @Test + public void a1_addMsgSerial() { + for (long i = 1L; i <= 10L; i++) { + MsgSerial msgSerial = MsgSerial.builder() + .msgSerial(i) + .build(); + log.info("++++++++++++++++++MsgSerial {}", msgSerial.toString()); + msgSerialMapper.addMsgSerial(msgSerial); + } + } + + @Test + public void a2_getMaxMsgSerial() { + for (long i = 1L; i <= 16L; i++) { + MsgSerial msgSerial = MsgSerial.builder() + .msgSerial(i) + .build(); + msgSerialMapper.addMsgSerial(msgSerial); + } + long maxMsgSerial = msgSerialMapper.getMaxMsgSerial(); + log.info("+++++++++++++++++++ max MsgSerial {}", maxMsgSerial); + Assert.assertEquals(maxMsgSerial, 16); + } +} From 99d8f668be0b541781f71ccb47c45784981634d8 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Tue, 14 Sep 2021 15:08:12 +0800 Subject: [PATCH 06/17] =?UTF-8?q?OCT=20REM:=201.=20=E4=BC=98=E5=8C=96contr?= =?UTF-8?q?oller=E5=B1=82=E4=BB=A3=E7=A0=81=202.=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=98=E5=82=A8MsgSerial=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=92=8C=E8=8E=B7=E5=8F=96=E6=9C=80=E5=A4=A7MsgSerial?= =?UTF-8?q?=E5=80=BC=E6=96=B9=E6=B3=95=204.=20=E4=BF=AE=E6=94=B9=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dispose/common/Constants.java | 24 +++- .../dispose/controller/kafkaController.java | 136 ++++++++++-------- .../com/dispose/manager/MsgSerialManager.java | 4 +- .../manager/impl/MsgSerialManagerImpl.java | 16 ++- .../com/dispose/service/MsgSerialService.java | 5 +- .../service/impl/MsgSerialServiceImpl.java | 20 ++- .../dev/controller/KafkaControllerTest.java | 6 +- 7 files changed, 137 insertions(+), 74 deletions(-) diff --git a/src/main/java/com/dispose/common/Constants.java b/src/main/java/com/dispose/common/Constants.java index 29c7272f..39f1a00b 100644 --- a/src/main/java/com/dispose/common/Constants.java +++ b/src/main/java/com/dispose/common/Constants.java @@ -6,6 +6,8 @@ import java.util.Map; /** * The emos constants. + * + * @author */ public class Constants { /** @@ -62,6 +64,22 @@ public class Constants { } /** + * 各省份城市 + */ + public static final String REGION_BEIJING = "北京"; + public static final String REGION_SHANGHAI = "上海"; + public static final String REGION_TIANJIN = "天津"; + public static final String REGION_CHONGQING = "重庆"; + + /** + * 处置类型(1:清洗,2:黑洞,3:高防) + */ + public static final int CLEANUP = 1; + public static final int BLACKHOOL = 2; + public static final int HIDEPEND = 3; + + /** + * /** * 派单eoms模板 */ public static final String DISPATCH_TEMPLATE = "\nMsgSerial:{0}\nSDN:{1}\nNeName:{2}\nEquipmentClass:99236\n" + @@ -71,9 +89,9 @@ public class Constants { "HolderType: \nAlarmStatus:{15}\nCorrelateAlarmFlag: \nAlarmActCount: \nNeIp:\nEmsId: \nVendor:99083\nAlarmText:{16}\n" + "NeAlias: \nVersion: \nRemoteNe: \nAlarmProvince:{17}\nAlarmRegion:{18}\nAlarmCounty: \nSite: \nSiteType: \nSiteProperty: \n" + "MachineroomIDofZGTT: \nBusinessSystem:{19}\nCircuitNo: \nMac: \nSpecialty:9\nNetworkType:903\nNeSubType: \nEffectCircuitNum: \n" + - "CircuitLevel: \nAlarmSeverity:3\nNmsAlarmId:0903-083-056-10-900001\nStandardAlarmName:{21}\nAlarmLogicClass:{22}\n" + - "AlarmLogicSubClass:{23}\nEffectOnEquipment:5\nEffectOnBusiness:4\nNmsAlarmType:1\nSendGroupFlag: \nStandardFlag:2\n" + - "AlarmExplanation:{24}\nBusinessType: \nBusinessInfo:{25}\nIsRelatedRemote: \nLocateNeStatus:1300\nProjectNo: \n" + + "CircuitLevel: \nAlarmSeverity:3\nNmsAlarmId:0903-083-056-10-900001\nStandardAlarmName:{20}\nAlarmLogicClass:{21}\n" + + "AlarmLogicSubClass:{22}\nEffectOnEquipment:5\nEffectOnBusiness:4\nNmsAlarmType:1\nSendGroupFlag: \nStandardFlag:2\n" + + "AlarmExplanation:{23}\nBusinessType: \nBusinessInfo:{24}\nIsRelatedRemote: \nLocateNeStatus:1300\nProjectNo: \n" + "ProjectName: \nProjectStartTime: \nProjectEndTime: \nGroupCustomer: \nCustomerLevel: \nServiceType: \nServiceLevel: \n" + "ServiceName: \nServiceCrossDomainType: \nInterruptCircuitState: \nCircuitLocateInfo: \nHomeClientNum: \nHomeCellNum: \n" + "LinkOnuNum: \n"; diff --git a/src/main/java/com/dispose/controller/kafkaController.java b/src/main/java/com/dispose/controller/kafkaController.java index 7923c019..a955473f 100644 --- a/src/main/java/com/dispose/controller/kafkaController.java +++ b/src/main/java/com/dispose/controller/kafkaController.java @@ -10,6 +10,7 @@ import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; import com.dispose.pojo.dto.protocol.kafka.EmosAlarmInfo; import com.dispose.pojo.dto.protocol.kafka.AlarmInfoReq; import com.dispose.pojo.entity.MsgSerial; +import com.dispose.pojo.po.MulReturnType; import com.dispose.security.annotation.Decryption; import com.dispose.security.annotation.Encryption; import com.dispose.service.MsgSerialService; @@ -35,7 +36,7 @@ import java.util.Objects; /** * The type Auth controller. * - * @author + * @author */ @Controller @RequestMapping(value = "/kafka") @@ -108,18 +109,15 @@ public class kafkaController { */ private String createSendContent(EmosAlarmInfo alarmInfo) { try { - //告警序号的最大值2^32-1 - long indexEnd = 4294967296L; - //告警序号的最大值 - long indexStart = 1L; - //编号从1开始，以实时消息发布通道为单位进行编号。如果编号超过最大正整数(2^32-1)，重新从1开始编号。 - long increment = msgSerialService.getMaxMessageSerial(); - increment = increment + 1; - if (increment > (indexEnd - 1)) { - increment = indexStart; - } + long dbIncrement = msgSerialService.getMaxMessageSerial(); + long increment = dbIncrement + 1; MsgSerial msgSerial = MsgSerial.builder().msgSerial(increment).build(); - msgSerialService.addMessageSerial(msgSerial); + MulReturnType returnType = msgSerialService.addMessageSerial(msgSerial); + if (returnType.getFirstParam() == ErrorCode.ERR_OK) { + increment = returnType.getSecondParam(); + } else { + increment = dbIncrement; + } String dstIp = alarmInfo.getDstIp(); String alarmId = alarmInfo.getAlarmId(); @@ -130,7 +128,7 @@ public class kafkaController { //告警类型vendorAlarmType、告警级别vendorSeverity、告警号vendorAlarmId、告警标题AlarmTitle、告警可能原因ProbableCauseTxt String type = Constants.ATTACK_TYPE.get(alarmInfo.getAttackType()); - String vendorSeverity = changeCharacatorCode("一级"); + String vendorSeverity = characterEncode("一级"); String vendorAlarmType; String vendorAlarmId; if (type != null) { @@ -144,87 +142,103 @@ public class kafkaController { } else { vendorAlarmType = alarmInfo.getAttackType(); vendorAlarmId = "0"; - log.info("get unKnow attack type:" + vendorAlarmType); + log.info("unKnown attack type:" + vendorAlarmType); } String alarmStatus = String.valueOf(Constants.ACTIVE_ALARM_STATUS); - String alarmText = changeCharacatorCode(getAlarmText(alarmInfo)); - String alarmExplanation = changeCharacatorCode(getAlarmExplanation(alarmInfo)); + String alarmText = characterEncode(getAlarmText(alarmInfo)); + String alarmExplanation = characterEncode(getAlarmExplanation(alarmInfo)); String content = MessageFormat.format(Constants.DISPATCH_TEMPLATE, increment, dstIp, dstIp, alarmId, alarmId, dstIp, dstIp, locateInfo, eventTime, cancelTime, - vendorAlarmType, vendorSeverity, vendorAlarmId, changeCharacatorCode("重保攻击事件告警"), - changeCharacatorCode("DDos攻击事件"), alarmStatus, alarmText, - changeCharacatorCode(alarmInfo.getDstProvince()), changeCharacatorCode(alarmInfo.getDstCity()), - changeCharacatorCode("网络部集中抗D系统"), changeCharacatorCode("DDOS攻击事件告警"), - changeCharacatorCode("安全告警"), changeCharacatorCode("DDOS告警"), - alarmExplanation, changeCharacatorCode("集中抗D")); + vendorAlarmType, vendorSeverity, vendorAlarmId, characterEncode("重保攻击事件告警"), + characterEncode("DDos攻击事件"), alarmStatus, alarmText, + characterEncode(alarmInfo.getDstProvince()), characterEncode(alarmInfo.getDstCity()), + characterEncode("网络部集中抗D系统"), characterEncode("DDOS攻击事件告警"), + characterEncode("安全告警"), characterEncode("DDOS告警"), + alarmExplanation, characterEncode("集中抗D")); return content; - } catch (Exception e) { log.error("createSendContent告警消息异常，详细信息：{}", ExceptionUtils.getStackTrace(e)); return null; } } + /** + * 获取告警事件AlarmEvent + */ private String getAlarmEvent(EmosAlarmInfo a) { return a.getDstIp() + " ddos attack alarm, " + a.getAttackType() + ", " + a.getStartTime() + ", " + a.getMaxBps() + ", " + a.getMaxPps(); } - private String changeCharacatorCode(String con) { + /** + * 数据编码都采用GBK编码方式 + */ + private String characterEncode(String character) { try { - return new String(con.getBytes("GBK"), "GBK"); + return new String(character.getBytes("GBK"), "GBK"); } catch (Exception e) { - log.info("change failed:" + e.getMessage()); - return con; + log.info("character encoding failed:" + e.getMessage()); + return character; } } + /** + * 获取告警区域 + */ private String getAreaDes(String province, String city) { - if (province.compareTo("北京") == 0) { - return "北京市"; + String areaDes; + if (Constants.REGION_BEIJING.equals(province)) { + areaDes = "北京市"; + } else if (Constants.REGION_SHANGHAI.equals(province)) { + areaDes = "上海市"; + } else if (Constants.REGION_TIANJIN.equals(province)) { + areaDes = "天津市"; + } else if (Constants.REGION_CHONGQING.equals(province)) { + areaDes = "重庆市"; + } else { + areaDes = province + "省" + city + "市"; } - if (province.compareTo("上海") == 0) { - return "上海市"; - } - if (province.compareTo("天津") == 0) { - return "天津市"; - } - if (province.compareTo("重庆") == 0) { - return "重庆市"; - } - return province + "省" + city + "市"; + + return areaDes; } + /** + * 获取处置类型(1:清洗,2:黑洞,3:高防) + */ + private String getOperateType(Integer disposeType) { + String operateType = null; + if (Constants.CLEANUP == disposeType) { + operateType = "清洗"; + } else if (Constants.BLACKHOOL == disposeType) { + operateType = "流控"; + } else if (Constants.HIDEPEND == disposeType) { + operateType = "黑洞"; + } + return operateType; + } + + /** + * 获取告警正文AlarmText + */ private String getAlarmText(EmosAlarmInfo a) { String area = getAreaDes(a.getDstProvince(), a.getDstCity()); - String op = ""; - if (a.getDisposeType() == 1) { - op = "清洗"; - } else if (a.getDisposeType() == 2) { - op = "流控"; - } else if (a.getDisposeType() == 3) { - op = "黑洞"; - } - return "攻击目的IP：" + a.getDstIp() + "," + area + "," + "处置操作:" + op + "," + "处置时长：" + a.getDisposeTime() + "分钟"; + String operateType = getOperateType(a.getDisposeType()); + return "攻击目的IP：" + a.getDstIp() + "," + area + "," + "处置操作:" + operateType + "," + "处置时长：" + a.getDisposeTime() + "分钟"; } + /** + * 获取告警解释AlarmExplanation + */ private String getAlarmExplanation(EmosAlarmInfo a) { - String op = ""; - if (a.getDisposeType() == 1) { - op = "清洗"; - } else if (a.getDisposeType() == 2) { - op = "流控"; - } else if (a.getDisposeType() == 3) { - op = "黑洞"; - } - String srcIp = ""; + String operateType = getOperateType(a.getDisposeType()); + StringBuilder srcIp = new StringBuilder(); for (String ip : a.getSrcIpLs()) { - srcIp = srcIp + ip + ","; + srcIp.append(ip).append(","); } - if (!srcIp.isEmpty()) { - srcIp = srcIp.substring(0, srcIp.length() - 1); + if (srcIp.length() > 0) { + srcIp = new StringBuilder(srcIp.substring(0, srcIp.length() - 1)); } - return "攻击目的IP：" + a.getDstIp() + "," + "攻击源地址：(" + srcIp + ")," + "处置操作:" + op + "," + "处置时长：" + a.getDisposeTime() + "分钟"; + return "攻击目的IP：" + a.getDstIp() + "," + "攻击源地址：(" + srcIp + ")," + "处置操作:" + operateType + "," + "处置时长：" + a.getDisposeTime() + "分钟"; } } diff --git a/src/main/java/com/dispose/manager/MsgSerialManager.java b/src/main/java/com/dispose/manager/MsgSerialManager.java index b279c41b..bebda584 100644 --- a/src/main/java/com/dispose/manager/MsgSerialManager.java +++ b/src/main/java/com/dispose/manager/MsgSerialManager.java @@ -1,5 +1,6 @@ package com.dispose.manager; +import com.dispose.common.ErrorCode; import com.dispose.pojo.entity.MsgSerial; public interface MsgSerialManager { @@ -7,8 +8,9 @@ public interface MsgSerialManager { * Add user business error code. * * @param msgSerial the message serial + * @return the error code */ - void addMsgSerialNumber(MsgSerial msgSerial); + ErrorCode addMsgSerialNumber(MsgSerial msgSerial); /** * get new max message serial. diff --git a/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java b/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java index 1e4a787a..ab26b187 100644 --- a/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java @@ -1,5 +1,6 @@ package com.dispose.manager.impl; +import com.dispose.common.ErrorCode; import com.dispose.manager.MsgSerialManager; import com.dispose.mapper.MsgSerialMapper; import com.dispose.pojo.entity.MsgSerial; @@ -17,10 +18,19 @@ public class MsgSerialManagerImpl implements MsgSerialManager { @Resource private MsgSerialMapper msgSerialMapper; - + /** + * Add user business error code. + * + * @param msgSerial the message serial + * @return the error code + */ @Override - public void addMsgSerialNumber(MsgSerial msgSerial) { - msgSerialMapper.addMsgSerial(msgSerial); + public ErrorCode addMsgSerialNumber(MsgSerial msgSerial) { + if (msgSerialMapper.addMsgSerial(msgSerial) == 1) { + return ErrorCode.ERR_OK; + } else { + return ErrorCode.ERR_DATABASE; + } } /** diff --git a/src/main/java/com/dispose/service/MsgSerialService.java b/src/main/java/com/dispose/service/MsgSerialService.java index f36dee2b..6d6af602 100644 --- a/src/main/java/com/dispose/service/MsgSerialService.java +++ b/src/main/java/com/dispose/service/MsgSerialService.java @@ -1,14 +1,17 @@ package com.dispose.service; +import com.dispose.common.ErrorCode; import com.dispose.pojo.entity.MsgSerial; +import com.dispose.pojo.po.MulReturnType; public interface MsgSerialService { /** * add message serial. * * @param msgSerial the message serial + * @return the mul return type */ - void addMessageSerial(MsgSerial msgSerial); + MulReturnType addMessageSerial(MsgSerial msgSerial); /** * get new max message serial. diff --git a/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java b/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java index b3c19d2b..63be8481 100644 --- a/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java @@ -1,7 +1,9 @@ package com.dispose.service.impl; +import com.dispose.common.ErrorCode; import com.dispose.manager.MsgSerialManager; import com.dispose.pojo.entity.MsgSerial; +import com.dispose.pojo.po.MulReturnType; import com.dispose.service.MsgSerialService; import org.springframework.stereotype.Service; @@ -16,10 +18,24 @@ public class MsgSerialServiceImpl implements MsgSerialService { * add message serial. * * @param msgSerial the message serial + * @return the mul return type */ @Override - public void addMessageSerial(MsgSerial msgSerial) { - msgSerialManager.addMsgSerialNumber(msgSerial); + public MulReturnType addMessageSerial(MsgSerial msgSerial) { + //告警序号的最大值2^32-1 + long indexEnd = 4294967295L; + long indexStart = 1L; + long currentSerial = msgSerial.getMsgSerial(); + //编号从1开始，以实时消息发布通道为单位进行编号。如果编号超过最大正整数(2^32-1)，重新从1开始编号。 + if (currentSerial > indexEnd) { + currentSerial = indexStart; + } + + if (msgSerialManager.addMsgSerialNumber(msgSerial) == ErrorCode.ERR_OK) { + return new MulReturnType<>(ErrorCode.ERR_OK, currentSerial); + } else { + return new MulReturnType<>(ErrorCode.ERR_DATABASE, null); + } } /** diff --git a/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java b/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java index 83a52d64..6521d0c3 100644 --- a/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java +++ b/src/test/java/com/dispose/test/dev/controller/KafkaControllerTest.java @@ -75,10 +75,10 @@ public class KafkaControllerTest extends InitTestEnvironment { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); disposeParam.set("alarmId", "1"); disposeParam.set("dstIp", "192.168.1.1"); - disposeParam.set("attackType", "1"); + disposeParam.set("attackType", "RSTFlood"); disposeParam.set("bpspps", "bps"); - disposeParam.set("dstProvince", "ZHEJIANG"); - disposeParam.set("dstCity", "HANGZHOU"); + disposeParam.set("dstProvince", "浙江"); + disposeParam.set("dstCity", "杭州"); disposeParam.set("startTime", sdf.format(new Date())); // 1清洗，2流控，3黑洞 disposeParam.set("disposeType", 1); From 7c89c400bffbaea644a3a7bde0d62378b9778872 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Wed, 15 Sep 2021 15:52:49 +0800 Subject: [PATCH 07/17] =?UTF-8?q?OCT=20REM:=201.=20emos=E6=B4=BE=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispose/controller/kafkaController.java | 10 ++++ .../com/dispose/manager/AlarmInfoManager.java | 17 +++++++ .../manager/impl/AlarmInfoManagerImpl.java | 34 +++++++++++++ .../manager/impl/MsgSerialManagerImpl.java | 5 ++ .../mapper/AlarmInformationMapper.java | 18 +++++++ .../com/dispose/mapper/MsgSerialMapper.java | 5 ++ .../dispose/pojo/entity/AlarmInformation.java | 51 +++++++++++++++++++ .../com/dispose/pojo/entity/MsgSerial.java | 10 ++-- src/main/resources/db/schema.sql | 18 ++++++- .../resources/mappers/AlarmInformation.xml | 19 +++++++ 10 files changed, 179 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/dispose/manager/AlarmInfoManager.java create mode 100644 src/main/java/com/dispose/manager/impl/AlarmInfoManagerImpl.java create mode 100644 src/main/java/com/dispose/mapper/AlarmInformationMapper.java create mode 100644 src/main/java/com/dispose/pojo/entity/AlarmInformation.java create mode 100644 src/main/resources/mappers/AlarmInformation.xml diff --git a/src/main/java/com/dispose/controller/kafkaController.java b/src/main/java/com/dispose/controller/kafkaController.java index a955473f..113d7aed 100644 --- a/src/main/java/com/dispose/controller/kafkaController.java +++ b/src/main/java/com/dispose/controller/kafkaController.java @@ -4,11 +4,13 @@ import com.alibaba.fastjson.JSONObject; import com.dispose.common.Constants; import com.dispose.common.ErrorCode; import com.dispose.config.KafkaConfiguration; +import com.dispose.manager.AlarmInfoManager; import com.dispose.pojo.dto.protocol.base.BaseRespStatus; import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO; import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; import com.dispose.pojo.dto.protocol.kafka.EmosAlarmInfo; import com.dispose.pojo.dto.protocol.kafka.AlarmInfoReq; +import com.dispose.pojo.entity.AlarmInformation; import com.dispose.pojo.entity.MsgSerial; import com.dispose.pojo.po.MulReturnType; import com.dispose.security.annotation.Decryption; @@ -59,6 +61,12 @@ public class kafkaController { @Resource private MsgSerialService msgSerialService; + /** + * The alarm information manager. + */ + @Resource + private AlarmInfoManager alarmInfoManager; + /** * Dispatch command sent to kafka. * @@ -86,6 +94,8 @@ public class kafkaController { //保存数据格式到数据库 log.info("send alarm :{}", content); + AlarmInformation alarmInformation = AlarmInformation.builder().alarmInfo(content).build(); + alarmInfoManager.addAlarmInfo(alarmInformation); //推动数据格式到kafka ListenableFuture> sendResult = kafkaConfiguration diff --git a/src/main/java/com/dispose/manager/AlarmInfoManager.java b/src/main/java/com/dispose/manager/AlarmInfoManager.java new file mode 100644 index 00000000..65bb579d --- /dev/null +++ b/src/main/java/com/dispose/manager/AlarmInfoManager.java @@ -0,0 +1,17 @@ +package com.dispose.manager; + +import com.dispose.pojo.entity.AlarmInformation; + +/** + * The interface alarm information manager. + * + * @author + */ +public interface AlarmInfoManager { + /** + * Add alarm information. + * + * @param alarmInformation the alarm information + */ + void addAlarmInfo(AlarmInformation alarmInformation); +} diff --git a/src/main/java/com/dispose/manager/impl/AlarmInfoManagerImpl.java b/src/main/java/com/dispose/manager/impl/AlarmInfoManagerImpl.java new file mode 100644 index 00000000..d953f3a7 --- /dev/null +++ b/src/main/java/com/dispose/manager/impl/AlarmInfoManagerImpl.java @@ -0,0 +1,34 @@ +package com.dispose.manager.impl; + +import com.dispose.manager.AlarmInfoManager; +import com.dispose.mapper.AlarmInformationMapper; +import com.dispose.pojo.entity.AlarmInformation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * The interface alarm information manager. + * + * @author + */ +@Component +@Slf4j +public class AlarmInfoManagerImpl implements AlarmInfoManager { + /** + * The alarm information mapper. + */ + @Resource + private AlarmInformationMapper alarmInformationMapper; + + /** + * Add alarm information. + * + * @param alarmInformation the alarm information + */ + @Override + public void addAlarmInfo(AlarmInformation alarmInformation) { + alarmInformationMapper.addAlarmInfo(alarmInformation); + } +} diff --git a/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java b/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java index ab26b187..2c70f843 100644 --- a/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java @@ -9,6 +9,11 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; +/** + * The interface message serial manager. + * + * @author + */ @Component @Slf4j public class MsgSerialManagerImpl implements MsgSerialManager { diff --git a/src/main/java/com/dispose/mapper/AlarmInformationMapper.java b/src/main/java/com/dispose/mapper/AlarmInformationMapper.java new file mode 100644 index 00000000..78335ee4 --- /dev/null +++ b/src/main/java/com/dispose/mapper/AlarmInformationMapper.java @@ -0,0 +1,18 @@ +package com.dispose.mapper; + +import com.dispose.pojo.entity.AlarmInformation; + +/** + * The interface alarm information mapper. + * + * @author + */ +public interface AlarmInformationMapper { + /** + * Add alarm information. + * + * @param alarmInformation the alarm information + * @return the int + */ + int addAlarmInfo(AlarmInformation alarmInformation); +} diff --git a/src/main/java/com/dispose/mapper/MsgSerialMapper.java b/src/main/java/com/dispose/mapper/MsgSerialMapper.java index 6dd62148..46402b16 100644 --- a/src/main/java/com/dispose/mapper/MsgSerialMapper.java +++ b/src/main/java/com/dispose/mapper/MsgSerialMapper.java @@ -2,6 +2,11 @@ package com.dispose.mapper; import com.dispose.pojo.entity.MsgSerial; +/** + * The interface message serial mapper. + * + * @author + */ public interface MsgSerialMapper { /** diff --git a/src/main/java/com/dispose/pojo/entity/AlarmInformation.java b/src/main/java/com/dispose/pojo/entity/AlarmInformation.java new file mode 100644 index 00000000..8606acbe --- /dev/null +++ b/src/main/java/com/dispose/pojo/entity/AlarmInformation.java @@ -0,0 +1,51 @@ +package com.dispose.pojo.entity; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import tk.mybatis.mapper.annotation.KeySql; +import tk.mybatis.mapper.annotation.NameStyle; +import tk.mybatis.mapper.code.Style; + +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * The emos alarm information. + * + * @author + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +@Table(name = "alarm_information") +@NameStyle(Style.normal) +public class AlarmInformation implements Serializable { + + /** + * The constant serialVersionUID. + */ + private static final long serialVersionUID = 1L; + + /** + * The id. + */ + @Id + @KeySql(useGeneratedKeys = true) + private Long id; + + /** + * The alarm information. + */ + private String alarmInfo; + + /** + * The creating time. + */ + private String createTime; +} diff --git a/src/main/java/com/dispose/pojo/entity/MsgSerial.java b/src/main/java/com/dispose/pojo/entity/MsgSerial.java index 4f89bfa3..f779b04c 100644 --- a/src/main/java/com/dispose/pojo/entity/MsgSerial.java +++ b/src/main/java/com/dispose/pojo/entity/MsgSerial.java @@ -14,9 +14,9 @@ import javax.persistence.Table; import java.io.Serializable; /** - * The type Dispose capacity. + * The message serial. * - * @author + * @author */ @Data @NoArgsConstructor @@ -33,16 +33,14 @@ public class MsgSerial implements Serializable { private static final long serialVersionUID = 1L; /** - * The Id. + * The id. */ @Id @KeySql(useGeneratedKeys = true) private Long id; /** - * The Device id. + * The message serial. */ private Long msgSerial; - - } diff --git a/src/main/resources/db/schema.sql b/src/main/resources/db/schema.sql index 587e8229..e2eda18c 100644 --- a/src/main/resources/db/schema.sql +++ b/src/main/resources/db/schema.sql @@ -182,6 +182,20 @@ DROP TABLE IF EXISTS `msg_serial`; CREATE TABLE `msg_serial` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, - `msgSerial` bigint(20) NOT NULL DEFAULT '1', + `msgSerial` bigint(20) NOT NULL DEFAULT '1' COMMENT '连续消息序号', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8; + + +-- ---------------------------- +-- Table structure for alarm_information +-- ---------------------------- +DROP TABLE IF EXISTS `alarm_information`; +CREATE TABLE `alarm_information` +( + `id` bigint(11) NOT NULL AUTO_INCREMENT, + `alarmInfo` varchar(255) NOT NULL COMMENT 'emos告警内容', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8; + diff --git a/src/main/resources/mappers/AlarmInformation.xml b/src/main/resources/mappers/AlarmInformation.xml new file mode 100644 index 00000000..fadf3d36 --- /dev/null +++ b/src/main/resources/mappers/AlarmInformation.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + INSERT + IGNORE INTO alarm_information(alarmInfo) + VALUES ( + #{alarmInfo} + ) + + + \ No newline at end of file From 61dee2a42b79003944aad8158147f4adc47a00b4 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Wed, 15 Sep 2021 16:24:41 +0800 Subject: [PATCH 08/17] =?UTF-8?q?OCT=20REM:=201.=20=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=8E=A5=E5=8F=A3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthConfigureFilter.java} | 141 +++++++++--------- 1 file changed, 70 insertions(+), 71 deletions(-) rename src/main/java/com/dispose/{config/AuthConfigure.java => interceptor/AuthConfigureFilter.java} (90%) diff --git a/src/main/java/com/dispose/config/AuthConfigure.java b/src/main/java/com/dispose/interceptor/AuthConfigureFilter.java similarity index 90% rename from src/main/java/com/dispose/config/AuthConfigure.java rename to src/main/java/com/dispose/interceptor/AuthConfigureFilter.java index a0d58ae6..aaa63764 100644 --- a/src/main/java/com/dispose/config/AuthConfigure.java +++ b/src/main/java/com/dispose/interceptor/AuthConfigureFilter.java @@ -1,71 +1,70 @@ -package com.dispose.config; - -import com.dispose.common.AuthConfigValue; -import com.dispose.interceptor.TokenInterceptor; -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import javax.annotation.PostConstruct; -import java.util.Optional; - -/** - * The type Auth configure. - * - * @author - */ -@Getter -@Setter -@Component -@ConfigurationProperties(prefix = "auth") -@Configuration -public class AuthConfigure implements WebMvcConfigurer { - /** - * The Token timeout minute. - */ - private Long tokenTimeoutMinute; - - /** - * The Verify request token. - */ - private Boolean verifyRequestToken; - - /** - * Init global value. - */ - @PostConstruct - private void initGlobalValue() { - AuthConfigValue.TOKEN_EXPIRED_TIME_MS = - Optional.of(tokenTimeoutMinute * 60 * 1000).orElse((long) 30 * 60 * 1000); - AuthConfigValue.VERIFY_REQUEST_TOKEN = Optional.ofNullable(verifyRequestToken).orElse(true); - } - - /** - * Init auth interceptor token interceptor. - * - * @return the token interceptor - */ - @Bean - public TokenInterceptor initAuthInterceptor() { - return new TokenInterceptor(); - } - - /** - * Add interceptors. - * - * @param registry the registry - */ - @Override - public void addInterceptors(InterceptorRegistry registry) { - // 注册需要检查token的控制器接口 - registry.addInterceptor(initAuthInterceptor()).addPathPatterns("/auth/logout"); - registry.addInterceptor(initAuthInterceptor()).addPathPatterns("/manager/**"); - registry.addInterceptor(initAuthInterceptor()).addPathPatterns("/task/**"); - registry.addInterceptor(initAuthInterceptor()).addPathPatterns("/info/**"); - } -} +package com.dispose.interceptor; + +import com.dispose.common.AuthConfigValue; +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import javax.annotation.PostConstruct; +import java.util.Optional; + +/** + * The type Auth configure. + * + * @author + */ +@Getter +@Setter +@Component +@ConfigurationProperties(prefix = "auth") +@Configuration +public class AuthConfigureFilter implements WebMvcConfigurer { + /** + * The Token timeout minute. + */ + private Long tokenTimeoutMinute; + + /** + * The Verify request token. + */ + private Boolean verifyRequestToken; + + /** + * Init global value. + */ + @PostConstruct + private void initGlobalValue() { + AuthConfigValue.TOKEN_EXPIRED_TIME_MS = + Optional.of(tokenTimeoutMinute * 60 * 1000).orElse((long) 30 * 60 * 1000); + AuthConfigValue.VERIFY_REQUEST_TOKEN = Optional.ofNullable(verifyRequestToken).orElse(true); + } + + /** + * Init auth interceptor token interceptor. + * + * @return the token interceptor + */ + @Bean + public TokenInterceptor initAuthInterceptor() { + return new TokenInterceptor(); + } + + /** + * Add interceptors. + * + * @param registry the registry + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + // 注册需要检查token的控制器接口 + registry.addInterceptor(initAuthInterceptor()).addPathPatterns("/auth/logout"); + registry.addInterceptor(initAuthInterceptor()).addPathPatterns("/manager/**"); + registry.addInterceptor(initAuthInterceptor()).addPathPatterns("/task/**"); + registry.addInterceptor(initAuthInterceptor()).addPathPatterns("/info/**"); + } +} From 4e8389df01937319776a6b880a0db2db63f4e8fe Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Wed, 15 Sep 2021 16:45:43 +0800 Subject: [PATCH 09/17] =?UTF-8?q?OCT=20REM:=201.=20=E4=BC=98=E5=8C=96MsgSe?= =?UTF-8?q?rial=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dispose/controller/kafkaController.java | 4 +--- .../com/dispose/manager/MsgSerialManager.java | 3 +-- .../manager/impl/MsgSerialManagerImpl.java | 5 ++--- .../com/dispose/mapper/MsgSerialMapper.java | 6 ++---- .../com/dispose/service/MsgSerialService.java | 5 ++--- .../service/impl/MsgSerialServiceImpl.java | 12 +++++------- src/main/resources/mappers/MsgSerial.xml | 14 ++++++-------- .../test/dev/mapper/MsgSerialMapperTest.java | 17 +++++------------ 8 files changed, 24 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/dispose/controller/kafkaController.java b/src/main/java/com/dispose/controller/kafkaController.java index 113d7aed..39454035 100644 --- a/src/main/java/com/dispose/controller/kafkaController.java +++ b/src/main/java/com/dispose/controller/kafkaController.java @@ -11,7 +11,6 @@ import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; import com.dispose.pojo.dto.protocol.kafka.EmosAlarmInfo; import com.dispose.pojo.dto.protocol.kafka.AlarmInfoReq; import com.dispose.pojo.entity.AlarmInformation; -import com.dispose.pojo.entity.MsgSerial; import com.dispose.pojo.po.MulReturnType; import com.dispose.security.annotation.Decryption; import com.dispose.security.annotation.Encryption; @@ -121,8 +120,7 @@ public class kafkaController { try { long dbIncrement = msgSerialService.getMaxMessageSerial(); long increment = dbIncrement + 1; - MsgSerial msgSerial = MsgSerial.builder().msgSerial(increment).build(); - MulReturnType returnType = msgSerialService.addMessageSerial(msgSerial); + MulReturnType returnType = msgSerialService.updateMessageSerial(increment); if (returnType.getFirstParam() == ErrorCode.ERR_OK) { increment = returnType.getSecondParam(); } else { diff --git a/src/main/java/com/dispose/manager/MsgSerialManager.java b/src/main/java/com/dispose/manager/MsgSerialManager.java index bebda584..308c9bca 100644 --- a/src/main/java/com/dispose/manager/MsgSerialManager.java +++ b/src/main/java/com/dispose/manager/MsgSerialManager.java @@ -1,7 +1,6 @@ package com.dispose.manager; import com.dispose.common.ErrorCode; -import com.dispose.pojo.entity.MsgSerial; public interface MsgSerialManager { /** @@ -10,7 +9,7 @@ public interface MsgSerialManager { * @param msgSerial the message serial * @return the error code */ - ErrorCode addMsgSerialNumber(MsgSerial msgSerial); + ErrorCode updateMsgSerialNumber(Long msgSerial); /** * get new max message serial. diff --git a/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java b/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java index 2c70f843..f00941a2 100644 --- a/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/MsgSerialManagerImpl.java @@ -3,7 +3,6 @@ package com.dispose.manager.impl; import com.dispose.common.ErrorCode; import com.dispose.manager.MsgSerialManager; import com.dispose.mapper.MsgSerialMapper; -import com.dispose.pojo.entity.MsgSerial; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -30,8 +29,8 @@ public class MsgSerialManagerImpl implements MsgSerialManager { * @return the error code */ @Override - public ErrorCode addMsgSerialNumber(MsgSerial msgSerial) { - if (msgSerialMapper.addMsgSerial(msgSerial) == 1) { + public ErrorCode updateMsgSerialNumber(Long msgSerial) { + if (msgSerialMapper.updateMsgSerial(msgSerial) == 1) { return ErrorCode.ERR_OK; } else { return ErrorCode.ERR_DATABASE; diff --git a/src/main/java/com/dispose/mapper/MsgSerialMapper.java b/src/main/java/com/dispose/mapper/MsgSerialMapper.java index 46402b16..33a63047 100644 --- a/src/main/java/com/dispose/mapper/MsgSerialMapper.java +++ b/src/main/java/com/dispose/mapper/MsgSerialMapper.java @@ -1,7 +1,5 @@ package com.dispose.mapper; -import com.dispose.pojo.entity.MsgSerial; - /** * The interface message serial mapper. * @@ -10,12 +8,12 @@ import com.dispose.pojo.entity.MsgSerial; public interface MsgSerialMapper { /** - * Add new task int. + * Update new task int. * * @param msgSerial the msgSerial number * @return the int */ - int addMsgSerial(MsgSerial msgSerial); + int updateMsgSerial(Long msgSerial); /** * get new max message serial. diff --git a/src/main/java/com/dispose/service/MsgSerialService.java b/src/main/java/com/dispose/service/MsgSerialService.java index 6d6af602..26a3599f 100644 --- a/src/main/java/com/dispose/service/MsgSerialService.java +++ b/src/main/java/com/dispose/service/MsgSerialService.java @@ -1,17 +1,16 @@ package com.dispose.service; import com.dispose.common.ErrorCode; -import com.dispose.pojo.entity.MsgSerial; import com.dispose.pojo.po.MulReturnType; public interface MsgSerialService { /** - * add message serial. + * update message serial. * * @param msgSerial the message serial * @return the mul return type */ - MulReturnType addMessageSerial(MsgSerial msgSerial); + MulReturnType updateMessageSerial(Long msgSerial); /** * get new max message serial. diff --git a/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java b/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java index 63be8481..8d1eb472 100644 --- a/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/MsgSerialServiceImpl.java @@ -2,7 +2,6 @@ package com.dispose.service.impl; import com.dispose.common.ErrorCode; import com.dispose.manager.MsgSerialManager; -import com.dispose.pojo.entity.MsgSerial; import com.dispose.pojo.po.MulReturnType; import com.dispose.service.MsgSerialService; import org.springframework.stereotype.Service; @@ -21,18 +20,17 @@ public class MsgSerialServiceImpl implements MsgSerialService { * @return the mul return type */ @Override - public MulReturnType addMessageSerial(MsgSerial msgSerial) { + public MulReturnType updateMessageSerial(Long msgSerial) { //告警序号的最大值2^32-1 long indexEnd = 4294967295L; long indexStart = 1L; - long currentSerial = msgSerial.getMsgSerial(); //编号从1开始，以实时消息发布通道为单位进行编号。如果编号超过最大正整数(2^32-1)，重新从1开始编号。 - if (currentSerial > indexEnd) { - currentSerial = indexStart; + if (msgSerial > indexEnd) { + msgSerial = indexStart; } - if (msgSerialManager.addMsgSerialNumber(msgSerial) == ErrorCode.ERR_OK) { - return new MulReturnType<>(ErrorCode.ERR_OK, currentSerial); + if (msgSerialManager.updateMsgSerialNumber(msgSerial) == ErrorCode.ERR_OK) { + return new MulReturnType<>(ErrorCode.ERR_OK, msgSerial); } else { return new MulReturnType<>(ErrorCode.ERR_DATABASE, null); } diff --git a/src/main/resources/mappers/MsgSerial.xml b/src/main/resources/mappers/MsgSerial.xml index 4e9ceaa8..14aa6d8e 100644 --- a/src/main/resources/mappers/MsgSerial.xml +++ b/src/main/resources/mappers/MsgSerial.xml @@ -6,14 +6,12 @@ - - INSERT - IGNORE INTO msg_serial(msgSerial) - VALUES ( - #{msgSerial} - ) - + + UPDATE + msg_serial + SET msgSerial = #{msgSerial} + WHERE id = 1; + \ No newline at end of file