From 667855cf3de2a0a49f4c8847b3483649cf27ea1a Mon Sep 17 00:00:00 2001 From: HuangXin Date: Tue, 7 Jul 2020 20:02:36 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=AD=A3CheckStyle?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dispose/common/IPAddrType.java | 2 +- src/main/java/com/dispose/dispose/impl/DpTechImpl.java | 7 +++++-- .../com/dispose/pojo/vo/haohan/CleanTaskStatusRsp.java | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dispose/common/IPAddrType.java b/src/main/java/com/dispose/common/IPAddrType.java index dc8faa99..a3254f6c 100644 --- a/src/main/java/com/dispose/common/IPAddrType.java +++ b/src/main/java/com/dispose/common/IPAddrType.java @@ -112,7 +112,7 @@ public enum IPAddrType { return ipv4.matches(ipv4Regex); default: // Ip v6 + port - if (ipAddr.contains("[")) { + if (ipAddr.contains(ipv6PortChar)) { String ipv6 = ipAddr.substring(1, ipAddr.lastIndexOf(ipv6PortChar)); return ipv6.matches(ipv6Regex); } else { diff --git a/src/main/java/com/dispose/dispose/impl/DpTechImpl.java b/src/main/java/com/dispose/dispose/impl/DpTechImpl.java index 2c8a70fc..298bc8e5 100644 --- a/src/main/java/com/dispose/dispose/impl/DpTechImpl.java +++ b/src/main/java/com/dispose/dispose/impl/DpTechImpl.java @@ -1,6 +1,10 @@ package com.dispose.dispose.impl; -import com.dispose.common.*; +import com.dispose.common.CleanTaskStatus; +import com.dispose.common.DeviceCapacity; +import com.dispose.common.DpTechAttackType; +import com.dispose.common.ErrorCode; +import com.dispose.common.GlobalVar; import com.dispose.config.DisposeConfigure; import com.dispose.dispose.DisposeEntryManager; import com.dispose.dispose.po.DeviceInfo; @@ -9,7 +13,6 @@ import com.dispose.pojo.po.DisposeDeviceCapacity; import com.dispose.pojo.po.MulReturnType; import com.dptech.dispose.AbnormalFlowCleaningServicePortType; import com.dptech.dispose.ArrayOfProtectionObjectDataForService; -import com.dptech.dispose.NtcRequestResultInfo; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.cxf.endpoint.Client; diff --git a/src/main/java/com/dispose/pojo/vo/haohan/CleanTaskStatusRsp.java b/src/main/java/com/dispose/pojo/vo/haohan/CleanTaskStatusRsp.java index c5a35841..bdbffbe7 100644 --- a/src/main/java/com/dispose/pojo/vo/haohan/CleanTaskStatusRsp.java +++ b/src/main/java/com/dispose/pojo/vo/haohan/CleanTaskStatusRsp.java @@ -1,7 +1,11 @@ package com.dispose.pojo.vo.haohan; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * The type Clean rsp.