From e9f67a375a12358326a1d37d8e7cb3ee7b2da565 Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期五, 04 八月 2023 17:28:03 +0800
Subject: [PATCH] 去掉uavauth注解
---
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 15 ++++++++++++---
1 files changed, 12 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 f2d3986..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
@@ -28,6 +28,7 @@
//token 鐧婚檰鍚庢瘡娆¤姹�,鍦╤eader涓惡甯�
private String token;//鐧诲綍鎴愬姛杩斿洖鐨則oken
+ private Map uavUser;//鐧诲綍鐨勭敤鎴蜂俊鎭�
private ObjectMapper om = new ObjectMapper();
@Autowired
private UavClient uavClient;
@@ -68,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();
--
Gitblit v1.9.3