diff --git a/pom.xml b/pom.xml
index 3bf505df..7d4df5e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
com.dispose
dispose_platform
- 2.0.8.4
+ 2.0.8.5
dispose_platform
Dispose Platform
diff --git a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
index 77f7c6f5..a3682eb3 100644
--- a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
+++ b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
@@ -170,12 +170,12 @@ public class PengXinAbilityImpl implements DisposeAbility {
}
reqItems.add(PengXinStartTaskItem.builder()
- .type(getPengXinTaskType(capType))
- .disposeObject(disposeObject)
- .objectType(getPengXinObjectType(objectType))
- .disposeTime(duration)
- .taskReqId(String.valueOf(taskReqId++))
- .build());
+ .type(getPengXinTaskType(capType))
+ .disposeObject(disposeObject)
+ .objectType(getPengXinObjectType(objectType))
+ .disposeTime(duration)
+ .taskReqId(String.valueOf(taskReqId++))
+ .build());
ProtocolRespDTO rspInfo = restfulInterface.startDisposeTask(url, token, reqItems);
@@ -243,7 +243,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
}
ProtocolRespDTO rspInfo = restfulInterface.stopDisposeTask(url, token,
- new String[]{taskId});
+ new String[]{taskId});
// 判断是否token过期
if (rspInfo != null && reLogin(rspInfo, rspInfo.getMsgContent().getItems().get(0).getStatus())) {
@@ -283,18 +283,18 @@ public class PengXinAbilityImpl implements DisposeAbility {
@Override
public MulReturnType getAbilityDeviceFireware() {
return new MulReturnType<>(ErrorCode.ERR_OK,
- DeviceFirewareInfo.builder()
- .vendor("PengXin")
- .model("Unknown")
- .firmware("Unknown")
- .os("Linux Server")
- .kernel("Linux")
- .arch("x86_64")
- .version("Unknown")
- .memory(-1)
- .freeMemory(-1)
- .cpuUsed(-1)
- .build());
+ DeviceFirewareInfo.builder()
+ .vendor("PengXin")
+ .model("Unknown")
+ .firmware("Unknown")
+ .os("Linux Server")
+ .kernel("Linux")
+ .arch("x86_64")
+ .version("Unknown")
+ .memory(-1)
+ .freeMemory(-1)
+ .cpuUsed(-1)
+ .build());
}
/**
@@ -463,7 +463,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
String url = urlRootPath + "dispose_device/task/get";
ProtocolRespDTO rspInfo = restfulInterface.getDeviceTaskStatus(url, token,
- new String[]{taskId});
+ new String[]{taskId});
// 判断是否token过期
if (rspInfo != null && reLogin(rspInfo, rspInfo.getMsgContent().getItems().get(0).getStatus())) {
@@ -478,7 +478,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
}
return new MulReturnType<>(ErrorCode.ERR_OK,
- rspInfo.getMsgContent().getItems().get(0).getTaskStatus());
+ rspInfo.getMsgContent().getItems().get(0).getTaskStatus());
} else {
return new MulReturnType<>(ErrorCode.ERR_CALLDEVICE, -1L);
}
@@ -491,14 +491,15 @@ public class PengXinAbilityImpl implements DisposeAbility {
* Upgrade token.
*/
private void upgradeToken() {
+ String url = urlRootPath + "dispose_device/auth/login";
try {
- 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();
}
- } catch (Exception ignored) {
+ } catch (Exception ex) {
+ log.error("Exception: {}, {}", url, ex.getMessage());
}
}
diff --git a/src/main/java/com/dispose/restful/RestfulInterface.java b/src/main/java/com/dispose/restful/RestfulInterface.java
index ce60346e..4b8ce62b 100644
--- a/src/main/java/com/dispose/restful/RestfulInterface.java
+++ b/src/main/java/com/dispose/restful/RestfulInterface.java
@@ -36,7 +36,7 @@ public class RestfulInterface {
/**
* The constant timeOutValue.
*/
- private static int timeOutValue = 1000;
+ private static int timeOutValue = 3000;
/**
* Instantiates a new Restful interface.