OCT

REM:
1. 解决checkstyle告警问题
2. 修改华为防火墙启动处置任务

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

@@ -13,6 +13,7 @@ import com.dispose.pojo.po.MulReturnType;
 import com.dispose.pojo.vo.DeviceFirewareInfo;
 import com.dispose.security.arithmetic.CryptoHelper;
 import com.huaweifirewall.dispose.common.HuaWeiFireWallCreatePolicyReq;
+import com.huaweifirewall.dispose.common.SourceIp;
 import com.huaweifirewall.dispose.protocol.HuaWeiFireWallInterface;
 import inet.ipaddr.IPAddress;
 import inet.ipaddr.IPAddressString;
@@ -118,8 +119,11 @@ public class HuaWeiFireWallAbilityImpl implements DisposeAbility {
             return new MulReturnType<>(ErrorCode.ERR_LOGOUT, "");
         }
 
+        SourceIp sourceIp = new SourceIp();
+        sourceIp.setAddressIpv4(disposeObj);
+
         HuaWeiFireWallCreatePolicyReq policyReq = HuaWeiFireWallCreatePolicyReq.builder()
-                .sourceIp(disposeObj).action(false).build();
+                .sourceIp(sourceIp).action(false).build();
 
         try {
             log.info("++++Begging HuaWei FireWall Start Cleanup Task: {}", disposeObject);

src/main/java/com/huaweifirewall/dispose/protocol/HuaWeiFireWallInterface.java

@@ -118,7 +118,7 @@ public class HuaWeiFireWallInterface {
     /**
      * 将string类型的XML转换成对象
      */
-    public static Object convertXmlStrToObject(Class clazz, String xmlStr) {
+    public static <T> Object convertXmlStrToObject(Class<T> clazz, String xmlStr) {
         Object xmlObject = null;
         try {
             JAXBContext context = JAXBContext.newInstance(clazz);

src/test/java/com/dispose/test/common/HttpBodyXmlTest.java

@@ -92,7 +92,7 @@ public class HttpBodyXmlTest {
     /**
      * 将string类型的XML转换成对象
      */
-    public static Object convertXmlStrToObject(Class clazz, String xmlStr) {
+    public static <T> Object convertXmlStrToObject(Class<T> clazz, String xmlStr) {
         Object xmlObject = null;
         try {
             JAXBContext context = JAXBContext.newInstance(clazz);