From 8a4810082529e48259ec332e034c05f1eea2399b Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 14 一月 2024 12:24:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 05531f7..1861639 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
@@ -83,9 +83,9 @@
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,7 @@
//楠岃瘉token鏈夋晥鎬�
try {
String res = uavClient.GET(this.host+"manage/api/v1/devices", token, "{}");
- System.out.println(res);
+ //System.out.println(res);
} catch (ForestNetworkException fe) {
if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
this.login();
@@ -122,7 +122,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