From 7ee6e3feeda334e40da912f0e31898e08b59de46 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 04 八月 2023 17:28:48 +0800
Subject: [PATCH] 修复雷达引导相机为null的bug
---
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 18 +++++++++++++++---
1 files changed, 15 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 026c3bd..5af9367 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
@@ -15,6 +15,7 @@
import javax.annotation.PostConstruct;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
+import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
@@ -27,6 +28,7 @@
//token 鐧婚檰鍚庢瘡娆¤姹�,鍦╤eader涓惡甯�
private String token;//鐧诲綍鎴愬姛杩斿洖鐨則oken
+ private Map uavUser;//鐧诲綍鐨勭敤鎴蜂俊鎭�
private ObjectMapper om = new ObjectMapper();
@Autowired
private UavClient uavClient;
@@ -67,15 +69,23 @@
return res;
}
+ public Map getUavUser() {
+ if (this.uavUser==null){
+ this.login();
+ }
+ return this.uavUser;
+ }
+
public void login() {
+ System.out.println("鐧诲綍鏃犱汉鏈哄閮ㄦ帴鍙�");
String codedPassword = this.Encrypt(PASSWORD, SALT);
String body = "{\"username\":\"" + USERNAME + "\",\"password\":\"" + codedPassword + "\"}";
try {
String res = uavClient.POST("login", null, body);
Map resMap = om.readValue(res, Map.class);
- Map data = (Map) resMap.get("data");
- if (data != null) {
- this.token = (String) data.get("access_token");
+ this.uavUser = (Map) resMap.get("data");
+ if (this.uavUser != null) {
+ this.token = (String) this.uavUser.get("access_token");
}
} catch (ForestNetworkException e) {
e.printStackTrace();
@@ -83,6 +93,8 @@
e.printStackTrace();
} catch (JsonProcessingException e) {
e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
}
--
Gitblit v1.9.3