From eed53ba3886bd8aa560a57caf999a1ce6e32231f Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Fri, 22 Oct 2021 17:56:15 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=BC=82=E5=B8=B8=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=AE=9A=E4=BD=8D=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E8=AE=BE=E5=A4=87=202.=20=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E7=94=B11=E7=A7=92=E6=94=B9=E5=88=B03=E7=A7=92=203.=20?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E5=88=B0=202.0.8.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../ability/impl/PengXinAbilityImpl.java      | 47 ++++++++++---------
 .../com/dispose/restful/RestfulInterface.java |  2 +-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3bf505df..7d4df5e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>com.dispose</groupId>
     <artifactId>dispose_platform</artifactId>
-    <version>2.0.8.4</version>
+    <version>2.0.8.5</version>
     <name>dispose_platform</name>
     <description>Dispose Platform</description>
     <dependencies>
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<PengXinStartTaskRsp> rspInfo = restfulInterface.startDisposeTask(url, token, reqItems);
 
@@ -243,7 +243,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
             }
 
             ProtocolRespDTO<PengXinStopTaskRsp> 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<ErrorCode, DeviceFirewareInfo> 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<PengXinTaskStatusRsp> 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<PengXinLoginRsp> 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.