diff --git a/src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java b/src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java index 69298c65..7874d393 100644 --- a/src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java @@ -140,9 +140,7 @@ public class UpfAbilityImpl extends PengXinAbilityImpl { } // 适配处置时间参数, -1为不限制处置时间 - if (duration == null || duration < 0) { - duration = -1L; - } + duration = -1L; reqItems.add(PengXinStartTaskItem.builder() .type(getUpfTaskType(capType)) @@ -341,16 +339,8 @@ public class UpfAbilityImpl extends PengXinAbilityImpl { */ private void upgradeToken() { try { - //目前1.UPF不提供用户登录接口,使用随机生成的token值;2UPF登录接口不校验用户名和密码,返回值为REE_OK和token值 - //方案1: - this.token = RandomStringUtils.random(10); -// //方案2 -// String url = urlRootPath + "dispose_device/auth/login"; -// ProtocolRespDTO logInfo = restfulInterface.login(url, username, password); -// -// if (logInfo != null && logInfo.getMsgContent().getStatus() == ErrorCode.ERR_OK.getCode()) { -// this.token = logInfo.getMsgContent().getToken(); -// } + //目前1.UPF不提供用户登录接口,使用随机生成的token值;2.UPF登录接口不校验用户名和密码,返回值为REE_OK和token值 + this.token = RandomStringUtils.randomAlphabetic(10); } catch (Exception ignored) { } }