OCT

REM:
1.优化设备密码解密功能

pom.xml

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

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

@@ -14,7 +14,6 @@ import com.dispose.common.NetflowDirection;
 import com.dispose.pojo.entity.ServiceInfo;
 import com.dispose.pojo.po.MulReturnType;
 import com.dispose.pojo.vo.DeviceFirewareInfo;
-import com.dispose.security.arithmetic.CryptoHelper;
 import com.dptech.dispose.AbnormalFlowCleaningServicePortType;
 import com.dptech.dispose.ArrayOfProtectionObjectDataForService;
 import com.dptech.dispose.NtcRequestResultInfo;
@@ -102,7 +101,7 @@ public class DpTechAbilityImpl implements DisposeAbility {
         this.cleanTypePort = (AbnormalFlowCleaningServicePortType) jaxWsProxyFactoryBean.create();
 
         Map<String, Object> ctx = ((BindingProvider) this.cleanTypePort).getRequestContext();
-        ctx.put("password", new String(CryptoHelper.base64Decryption(password)));
+        ctx.put("password", password);
         ctx.put("username", username);
 
         // 配置连接，访问超时时间

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

@@ -10,7 +10,6 @@ import com.dispose.common.NetflowDirection;
 import com.dispose.pojo.entity.ServiceInfo;
 import com.dispose.pojo.po.MulReturnType;
 import com.dispose.pojo.vo.DeviceFirewareInfo;
-import com.dispose.security.arithmetic.CryptoHelper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huawei.dispose.common.HuaWeiLoginResp;
 import com.huawei.dispose.protocol.HuaWeiInterface;
@@ -86,7 +85,7 @@ public class HuaWeiAbilityImpl implements DisposeAbility {
     public void initDeviceEnv(String urlPath, String username, String password) {
         this.urlRootPath = urlPath;
         this.username = username;
-        this.password = new String(CryptoHelper.base64Decryption(password));
+        this.password = password;
 
         upgradeToken();
     }

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

@@ -85,7 +85,7 @@ public class HuaWeiFireWallAbilityImpl implements DisposeAbility {
     public void initDeviceEnv(String urlPath, String username, String password) {
         this.urlRootPath = urlPath;
         this.username = username;
-        this.password = new String(CryptoHelper.base64Decryption(password));
+        this.password = password;
 
         upgradeToken();
     }

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

@@ -12,7 +12,6 @@ import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
 import com.dispose.pojo.entity.ServiceInfo;
 import com.dispose.pojo.po.MulReturnType;
 import com.dispose.pojo.vo.DeviceFirewareInfo;
-import com.dispose.security.arithmetic.CryptoHelper;
 import com.pengxin.dispose.common.PengXinDisposeAbilityRsp;
 import com.pengxin.dispose.common.PengXinLoginRsp;
 import com.pengxin.dispose.common.PengXinStartTaskItem;
@@ -128,7 +127,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
     public void initDeviceEnv(String urlPath, String username, String password) {
         this.urlRootPath = urlPath;
         this.username = username;
-        this.password = new String(CryptoHelper.base64Decryption(password));
+        this.password = password;
         restfulInterface.setParams(1, 0);
 
         upgradeToken();

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

@@ -8,7 +8,6 @@ import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
 import com.dispose.pojo.entity.ServiceInfo;
 import com.dispose.pojo.po.MulReturnType;
 import com.dispose.pojo.vo.DeviceFirewareInfo;
-import com.dispose.security.arithmetic.CryptoHelper;
 import com.pengxin.dispose.common.PengXinStartTaskItem;
 import com.pengxin.dispose.common.PengXinStartTaskRsp;
 import com.pengxin.dispose.common.PengXinStopTaskRsp;
@@ -103,7 +102,7 @@ public class UpfAbilityImpl extends PengXinAbilityImpl {
     public void initDeviceEnv(String urlPath, String username, String password) {
         this.urlRootPath = urlPath;
         this.username = username;
-        this.password = new String(CryptoHelper.base64Decryption(password));
+        this.password = password;
         restfulInterface.setParams(1, 0);
         //获取token值
         upgradeToken();

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

@@ -57,7 +57,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
     @Override
     public MulReturnType<ErrorCode, Long> addDisposeDevice(DisposeDevice dev) {
         List<DisposeDevice> tmpDev = disposeDeviceMapper.getDeviceByIpAndType(dev.getIpAddr(),
-                                                                              dev.getDeviceType().getValue());
+                dev.getDeviceType().getValue());
 
         for (DisposeDevice v : tmpDev) {
             if (dev.getIpPort().equals(HttpType.getDefaultPort(v.getUrlType())) || dev.getIpPort()
@@ -112,7 +112,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
                     fdDest.setAccessible(true);
                     if (!obj.equals(fdDest.get(destDev))) {
                         log.debug("Upgrade field [{}] value form [{}] to [{}]", fdSrc.getName(), fdDest.get(destDev),
-                                  obj);
+                                obj);
                         fdDest.set(destDev, obj);
                     }
                     fdDest.setAccessible(false);
@@ -135,7 +135,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
         DisposeDevice tDev = null;
         // 根据Ip和设备类型获取设备
         List<DisposeDevice> devList = disposeDeviceMapper.getDeviceByIpAndType(dev.getIpAddr(),
-                                                                               dev.getDeviceType().getValue());
+                dev.getDeviceType().getValue());
 
         if (devList == null || devList.size() == 0) {
             return new MulReturnType<>(ErrorCode.ERR_NOSUCHDEVICE, -1L);

src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java

@@ -17,6 +17,7 @@ import com.dispose.manager.DisposeDeviceManager;
 import com.dispose.mapper.ServiceGroupMapper;
 import com.dispose.pojo.entity.DisposeDevice;
 import com.dispose.pojo.po.AbilityInfo;
+import com.dispose.security.arithmetic.CryptoHelper;
 import com.dispose.service.DisposeAbilityRouterService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
@@ -182,6 +183,7 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
         }
 
         // 初始化设备
+        dev.setPassword(new String(CryptoHelper.base64Decryption(dev.getPassword())));
         db.initDeviceEnv(url, dev.getUserName(), dev.getPassword());
         db.getDisposeDeviceProtectObject();