From 0017dec8baea29062ccac94a15248a61f7bdf77d Mon Sep 17 00:00:00 2001
From: zhangjianrock@163.com <zhangjianrock@163.com>
Date: 星期一, 29 一月 2024 16:15:56 +0800
Subject: [PATCH] 无人机读取配置文件

---
 ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 5f3b443..2a009f9 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
@@ -80,7 +80,7 @@
             e.printStackTrace();
         }
         //鎵цmethod
-        this.getToken();//鑾峰彇token楠岃瘉,楠岃瘉token鏈夋晥鎬�
+       // this.getToken();//鑾峰彇token楠岃瘉,楠岃瘉token鏈夋晥鎬�
         try {
             String token = this.getToken();
             res = (String) requestMethod.invoke(this.uavClient, this.host + url, token, data);
@@ -105,6 +105,7 @@
         //楠岃瘉token鏈夋晥鎬�
         try {
             String res = uavClient.GET(this.host+"manage/api/v1/devices", token, "{}");
+            res+="";
             //System.out.println(res);
         } catch (ForestNetworkException fe) {
             if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
@@ -127,9 +128,9 @@
         log.debug("body:" + body);
         try {
             //uavClient.GET("logout", null, "{}");
-            String res = uavClient.POST(this.host+"/login", null, body);
+            String res = uavClient.POST(this.host+"login", null, body);
             Map resMap = om.readValue(res, Map.class);
-            if (resMap != null) {
+            if (resMap != null&& resMap.get("data") instanceof Map) {
                 redisCache.setCacheMap("uav:uavUser", (Map) resMap.get("data"));
             }
         } catch (ForestRuntimeException e) {

--
Gitblit v1.9.3