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

---
 ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 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 dec574f..1f91fd8 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
@@ -41,7 +41,7 @@
 
     private String salt; //鐩�
 
-    private String host;//uav鏈嶅姟鍣�
+    private String host;//uav鏈嶅姟鍣�11
 
 
     private Map uavUser;//鐧诲綍鐨勭敤鎴蜂俊鎭�
@@ -60,8 +60,6 @@
 
     private void getUavConfig() {
         this.host = ConfigUtils.getConfigValue("uav_host");
-        this.username = ConfigUtils.getConfigValue("uav_username");
-        this.password = ConfigUtils.getConfigValue("uav_password");
         this.salt = ConfigUtils.getConfigValue("uav_salt");
         if (StringUtils.isEmpty(this.host) || StringUtils.isEmpty(this.username) || StringUtils.isEmpty(this.password) || StringUtils.isEmpty(this.salt)) {
             throw new RuntimeException("鏃犱汉鏈哄弬鏁伴厤缃己澶�:");
@@ -69,6 +67,8 @@
     }
 
     public String doUavRequest(HttpMethod method, String url, String data) {
+
+        getUavConfig();
         String res = null;
         Method requestMethod = null;
         //鑾峰彇method
@@ -78,14 +78,14 @@
             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);
         } catch (IllegalAccessException e) {
-            System.out.println("doUavRequest 璁块棶澶辫触" + e.getMessage());
+            log.error("doUavRequest 璁块棶澶辫触" + e.getMessage());
         } catch (InvocationTargetException e) {
-            System.out.println("doUavRequest 鎵ц澶辫触" + e.getMessage());
+            log.error("doUavRequest 鎵ц澶辫触" + e.getMessage());
             e.printStackTrace();
         }
 
@@ -103,7 +103,8 @@
         //楠岃瘉token鏈夋晥鎬�
         try {
             String res = uavClient.GET(this.host+"manage/api/v1/devices", token, "{}");
-            System.out.println(res);
+            res+="";
+            //System.out.println(res);
         } catch (ForestNetworkException fe) {
             if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
                 this.login();
@@ -122,7 +123,7 @@
         log.debug("鐧诲綍鏃犱汉鏈哄閮ㄦ帴鍙�");
         String codedPassword = this.Encrypt(password, salt);
         String body = "{\"username\":\"" + username + "\",\"password\":\"" + codedPassword + "\"}";
-        System.out.println("body:" + body);
+        log.debug("body:" + body);
         try {
             //uavClient.GET("logout", null, "{}");
             String res = uavClient.POST(this.host+"login", null, body);

--
Gitblit v1.9.3