Merge branch 'master' of http://git.komect.net/DDOSAQ/phoenix_ddos_handle

src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java

@@ -9,6 +9,8 @@ import com.dispose.pojo.vo.DeviceFirewareInfo;
 import com.haohan.dispose.common.HaoHanStartCleanResp;
 import com.haohan.dispose.common.HaoHanStopCleanResp;
 import com.haohan.dispose.protocol.RestfulInterface;
+import inet.ipaddr.IPAddress;
+import inet.ipaddr.IPAddressString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -179,6 +181,7 @@ public class HaoHanAbilityImpl implements DisposeAbility {
      */
     @Override
     public boolean isCarryProtectIp(String ipAddr) {
-        return true;
+        IPAddress addr = new IPAddressString(ipAddr).getAddress();
+        return addr.isIPv4();
     }
 }

src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java

@@ -62,7 +62,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
             if (tDev.getStatus() == ObjectStatus.DELETED) {
                 // 重置状态
                 tDev.setStatus(ObjectStatus.NORMAL);
-                return upgradeDisposeDevice(tDev);
+                return upgradeDisposeDevice(dev);
             }
 
             return new MulReturnType<>(ErrorCode.ERR_DEVICEEXISTS, tDev.getId());

src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java

@@ -29,7 +29,7 @@ public class P2TaskList {
     private static final QATestItem[] testItemArray = new QATestItem[]{
         QATestItem.builder()
             .id(BASE_P2_TASK_LIST_ID)
-            .name("获取第二页20个设备信息")
+            .name("获取第二页20个处置任务信息")
             .priority(TestPriority.P2_PRIORITY)
             .urlPath("/task/taskList")
             .method(RequestMethod.POST)

src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java

@@ -93,7 +93,7 @@ public class P2TaskStart {
             .priority(TestPriority.P2_PRIORITY)
             .urlPath("/task/start")
             .method(RequestMethod.POST)
-            .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":1," +
+            .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":2," +
                                "\"disposeIp\":\"192.168.50.3\",\"disposeTime\":10,\"flowDirection\":2," +
                                "\"attackType\":[-1]}}")
             .rspClass(TaskStartRsp.class)
@@ -108,7 +108,7 @@ public class P2TaskStart {
             .priority(TestPriority.P2_PRIORITY)
             .urlPath("/task/start")
             .method(RequestMethod.POST)
-            .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":2," +
+            .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":1," +
                                "\"disposeIp\":\"192.168.50.2\",\"disposeTime\":10,\"flowDirection\":2," +
                                "\"attackType\":[-1]}}")
             .rspClass(TaskStartRsp.class)

src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java

@@ -30,7 +30,7 @@ public class P2TaskStartMulIp {
     private static final QATestItem[] testItemArray = new QATestItem[]{
         QATestItem.builder()
             .id(BASE_P2_TASK_START_MUL_ID)
-            .name("对一个IP全部攻击类型进行清洗")
+            .name("对多个IP指定攻击类型进行清洗")
             .priority(TestPriority.P2_PRIORITY)
             .urlPath("/task/startMulIp")
             .method(RequestMethod.POST)
@@ -173,7 +173,7 @@ public class P2TaskStartMulIp {
             .priority(TestPriority.P2_PRIORITY)
             .urlPath("/task/startMulIp")
             .method(RequestMethod.POST)
-            .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":1," +
+            .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":2," +
                                "\"mulDisposeIp\":[\"192.168.50.4\",\"192.168.50.3\"],\"disposeTime\":10," +
                                "\"flowDirection\":2,\"attackType\":[-1]}}")
             .rspClass(TaskStartMulRsp.class)
@@ -190,7 +190,7 @@ public class P2TaskStartMulIp {
             .priority(TestPriority.P2_PRIORITY)
             .urlPath("/task/startMulIp")
             .method(RequestMethod.POST)
-            .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":2," +
+            .caseJsonValue("{\"ver\":3,\"cryptoType\":0,\"timeStamp\":1598597142580,\"msgContent\":{\"type\":1," +
                                "\"mulDisposeIp\":[\"192.168.50.4\",\"192.168.50.3\"],\"disposeTime\":10," +
                                "\"flowDirection\":2,\"attackType\":[-1]}}")
             .rspClass(TaskStartMulRsp.class)

src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStop.java

@@ -50,7 +50,6 @@ public class P2TaskStop {
                         Assert.assertNotEquals(k.getDisposeIp().length(), 0);
                         Assert.assertNotNull(k.getLeftTime());
                     }
-
                 });
 
             })