cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2.0.8.2_release' into 'master' 

OCT

See merge request DDOSAQ/phoenix_ddos_handle!20
This commit is contained in:
黄昕 2021-10-15 16:40:58 +08:00
parent 2e956f94d5 9895b35be9
commit 5c11f53992
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -17,7 +17,7 @@
</parent> </parent>
<groupId>com.dispose</groupId> <groupId>com.dispose</groupId>
<artifactId>dispose_platform</artifactId> <artifactId>dispose_platform</artifactId>
<version>2.0.8</version> <version>2.0.8.2</version>
<name>dispose_platform</name> <name>dispose_platform</name>
<description>Dispose Platform</description> <description>Dispose Platform</description>
<dependencies> <dependencies>

5
src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
View File

@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
@ -388,7 +389,9 @@ public class PengXinAbilityImpl implements DisposeAbility {
protectIpV6.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) { String [] allIpAddr = {null, "0.0.0.0", "0.0.0.0,::"};
if(Arrays.asList(allIpAddr).contains(v.getDisposeIp())) {
protectIpV4.add(""); protectIpV4.add("");
protectIpV6.add(""); protectIpV6.add("");
} }

6
src/main/java/com/dispose/restful/RestfulInterface.java
View File

@ -189,9 +189,9 @@ public class RestfulInterface {
*/ */
public static <T, E> ProtocolRespDTO<T> baseProRun(String url, String token, E obj, Class<T> subClass, public static <T, E> ProtocolRespDTO<T> baseProRun(String url, String token, E obj, Class<T> subClass,
RequestMethod reqType) { RequestMethod reqType) {
try { String svrResp = null;
String svrResp = null;
try {
Map<String, String> httpHeadMap = new HashMap<>(2); Map<String, String> httpHeadMap = new HashMap<>(2);
httpHeadMap.put(String.valueOf(Header.CONNECTION), "keep-alive"); httpHeadMap.put(String.valueOf(Header.CONNECTION), "keep-alive");
httpHeadMap.put(String.valueOf(Header.ACCEPT), "*/*"); httpHeadMap.put(String.valueOf(Header.ACCEPT), "*/*");
@ -231,7 +231,7 @@ public class RestfulInterface {
} }
}); });
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
log.debug("System exception: ", e); log.error("System exception: \nRequest:{}, {}\nException{}", url, svrResp, e);
return null; return null;
} }
} }