From 9895b35be915e3e0fb7b93180723c62f46f9bacc Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Fri, 15 Oct 2021 15:11:28 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=AD=A3=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=98=B2=E6=8A=A4IP=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../java/com/dispose/ability/impl/PengXinAbilityImpl.java   | 5 ++++-
 src/main/java/com/dispose/restful/RestfulInterface.java     | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 612ded6a..3de9be41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>com.dispose</groupId>
     <artifactId>dispose_platform</artifactId>
-    <version>2.0.8</version>
+    <version>2.0.8.2</version>
     <name>dispose_platform</name>
     <description>Dispose Platform</description>
     <dependencies>
diff --git a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
index 764db468..f017599b 100644
--- a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
+++ b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
@@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -388,7 +389,9 @@ public class PengXinAbilityImpl implements DisposeAbility {
                             protectIpV6.clear();
 
                             if (v.getIpType() == null || v.getIpType().equals(IpAddrType.IPV4_IPV6.getValue())) {
-                                if (v.getDisposeIp() == null) {
+                                String [] allIpAddr = {null, "0.0.0.0", "0.0.0.0,::"};
+
+                                if(Arrays.asList(allIpAddr).contains(v.getDisposeIp())) {
                                     protectIpV4.add("");
                                     protectIpV6.add("");
                                 }
diff --git a/src/main/java/com/dispose/restful/RestfulInterface.java b/src/main/java/com/dispose/restful/RestfulInterface.java
index ef89344e..a3372bb5 100644
--- a/src/main/java/com/dispose/restful/RestfulInterface.java
+++ b/src/main/java/com/dispose/restful/RestfulInterface.java
@@ -189,9 +189,9 @@ public class RestfulInterface {
      */
     public static <T, E> ProtocolRespDTO<T> baseProRun(String url, String token, E obj, Class<T> subClass,
                                                        RequestMethod reqType) {
-        try {
-            String svrResp = null;
+        String svrResp = null;
 
+        try {
             Map<String, String> httpHeadMap = new HashMap<>(2);
             httpHeadMap.put(String.valueOf(Header.CONNECTION), "keep-alive");
             httpHeadMap.put(String.valueOf(Header.ACCEPT), "*/*");
@@ -231,7 +231,7 @@ public class RestfulInterface {
                         }
                     });
         } catch (JsonProcessingException e) {
-            log.debug("System exception: ", e);
+            log.error("System exception: \nRequest:{}, {}\nException{}", url, svrResp, e);
             return null;
         }
     }