From 09adf46ef3a3981e1459a3e9115e56302cd77203 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Thu, 29 Oct 2020 14:29:29 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E8=AF=A5ipType?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dispose/ability/impl/PengXinAbilityImpl.java | 6 +++--- .../pengxin/dispose/common/PengXinDisposeAbilityInfo.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java index 4aa1cf47..be4433d0 100644 --- a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java @@ -350,14 +350,14 @@ public class PengXinAbilityImpl implements DisposeAbility { protectIpV4.clear(); protectIpV6.clear(); - if (v.getIPType() == null || v.getIPType().equals(IpAddrType.IPV4_IPV6.getValue())) { + if (v.getIpType() == null || v.getIpType().equals(IpAddrType.IPV4_IPV6.getValue())) { if (v.getDisposeIp() == null) { protectIpV4.add(""); protectIpV6.add(""); } - } else if (v.getIPType().equals(IpAddrType.IPV4.getValue())) { + } else if (v.getIpType().equals(IpAddrType.IPV4.getValue())) { protectIpV4.add(""); - } else if (v.getIPType().equals(IpAddrType.IPV6.getValue())) { + } else if (v.getIpType().equals(IpAddrType.IPV6.getValue())) { protectIpV6.add(""); } } diff --git a/src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityInfo.java b/src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityInfo.java index addfbf3d..1611cd3f 100644 --- a/src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityInfo.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityInfo.java @@ -1,6 +1,7 @@ package com.pengxin.dispose.common; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -28,7 +29,8 @@ public class PengXinDisposeAbilityInfo { /** * The Ip type. */ - private Integer IPType; + @JsonProperty("IPType") + private Integer ipType; /** * The Dispose ip.