From 65a938d5bb43674ddc8fd0fd1f7bac17e60f6df4 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Sun, 26 Sep 2021 15:49:11 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=AF=86=E7=A0=81=E8=A7=A3=E5=AF=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../java/com/dispose/ability/impl/DpTechAbilityImpl.java | 3 +-- .../java/com/dispose/ability/impl/HuaWeiAbilityImpl.java | 3 +-- .../com/dispose/ability/impl/HuaWeiFireWallAbilityImpl.java | 2 +- .../java/com/dispose/ability/impl/PengXinAbilityImpl.java | 3 +-- src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java | 3 +-- .../com/dispose/manager/impl/DisposeDeviceManagerImpl.java | 6 +++--- .../service/impl/DisposeAbilityRouterServiceImpl.java | 2 ++ 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 08e5fd11..7e19f224 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ com.dispose dispose_platform - 2.0.8 + 2.0.9 dispose_platform Dispose Platform diff --git a/src/main/java/com/dispose/ability/impl/DpTechAbilityImpl.java b/src/main/java/com/dispose/ability/impl/DpTechAbilityImpl.java index 582b72fb..94261130 100644 --- a/src/main/java/com/dispose/ability/impl/DpTechAbilityImpl.java +++ b/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 ctx = ((BindingProvider) this.cleanTypePort).getRequestContext(); - ctx.put("password", new String(CryptoHelper.base64Decryption(password))); + ctx.put("password", password); ctx.put("username", username); // 配置连接，访问超时时间 diff --git a/src/main/java/com/dispose/ability/impl/HuaWeiAbilityImpl.java b/src/main/java/com/dispose/ability/impl/HuaWeiAbilityImpl.java index d044131e..c23b140c 100644 --- a/src/main/java/com/dispose/ability/impl/HuaWeiAbilityImpl.java +++ b/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(); } diff --git a/src/main/java/com/dispose/ability/impl/HuaWeiFireWallAbilityImpl.java b/src/main/java/com/dispose/ability/impl/HuaWeiFireWallAbilityImpl.java index 091fb029..469f3565 100644 --- a/src/main/java/com/dispose/ability/impl/HuaWeiFireWallAbilityImpl.java +++ b/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(); } diff --git a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java index 764db468..65175e3f 100644 --- a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java +++ b/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(); diff --git a/src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java b/src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java index c31a4086..7874d393 100644 --- a/src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java +++ b/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(); diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java index b073adc4..7bdb2172 100644 --- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java @@ -57,7 +57,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager { @Override public MulReturnType addDisposeDevice(DisposeDevice dev) { List 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 devList = disposeDeviceMapper.getDeviceByIpAndType(dev.getIpAddr(), - dev.getDeviceType().getValue()); + dev.getDeviceType().getValue()); if (devList == null || devList.size() == 0) { return new MulReturnType<>(ErrorCode.ERR_NOSUCHDEVICE, -1L); diff --git a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java index 37d4a8c3..a9353163 100644 --- a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java +++ b/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();