From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
index 99dae26..079d5c8 100644
--- a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
@@ -26,8 +26,8 @@
 @Service
 @Slf4j(topic = "uav")
 public class UavService {
-    public static final String USERNAME = "ardbailu";//鐢ㄦ埛鍚�
-    public static final String PASSWORD = "ardkj12345";//瀵嗙爜
+    public static final String USERNAME = "kaifabailu";//鐢ㄦ埛鍚�
+    public static final String PASSWORD = "ardkj@2014";//瀵嗙爜
     public static final String SALT = "0123456789012345";//鐩�
 
     private Map uavUser;//鐧诲綍鐨勭敤鎴蜂俊鎭�
@@ -54,7 +54,8 @@
         //鎵цmethod
         this.getToken();//鑾峰彇token楠岃瘉,楠岃瘉token鏈夋晥鎬�
         try {
-            res = (String) requestMethod.invoke(this.uavClient, url, this.getToken(), data);
+            String token = this.getToken();
+            res = (String) requestMethod.invoke(this.uavClient, url, token, data);
         } catch (IllegalAccessException e) {
             System.out.println("doUavRequest 璁块棶澶辫触" + e.getMessage());
         } catch (InvocationTargetException e) {
@@ -76,6 +77,7 @@
         //楠岃瘉token鏈夋晥鎬�
         try {
             String res = uavClient.GET("manage/api/v1/devices", token, "{}");
+            System.out.println(res);
         } catch (ForestNetworkException fe) {
             if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
                 this.login();
@@ -102,11 +104,8 @@
         } catch (ForestRuntimeException e) {
             log.error("鏃犱汉鏈鸿繛鎺ヨ秴鏃�" + e.getMessage());
         } catch (JsonMappingException e) {
-            e.printStackTrace();
         } catch (JsonProcessingException e) {
-            e.printStackTrace();
         } catch (IOException e) {
-            e.printStackTrace();
         }
     }
 

--
Gitblit v1.9.3