From 516e341ee555f64d081b85f20d102f4c47f061a5 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 21 八月 2023 17:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java | 4 ++--
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java b/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
index ea8ad38..f6f979e 100644
--- a/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
@@ -37,8 +37,8 @@
@GetMapping("/")
@ApiOperation("鏃犱汉鏈篻et鎺ュ彛")
- public Object get(@RequestParam String url, @RequestParam String data) {
- return this.uavService.doUavRequest(GET, url, data);
+ public Object get(@RequestParam String url) {
+ return this.uavService.doUavRequest(GET, url, "{}");
}
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..d09c55b 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
@@ -76,6 +76,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();
--
Gitblit v1.9.3