From fdbb8d1d091524727456bf63d86b9612d39f822d Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 21 八月 2023 17:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 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 14acb4d..99dae26 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
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.utils.forest.UavClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
@@ -29,12 +30,12 @@
     public static final String PASSWORD = "ardkj12345";//瀵嗙爜
     public static final String SALT = "0123456789012345";//鐩�
 
-    //token 鐧婚檰鍚庢瘡娆¤姹�,鍦╤eader涓惡甯�
-    private String token;//鐧诲綍鎴愬姛杩斿洖鐨則oken
     private Map uavUser;//鐧诲綍鐨勭敤鎴蜂俊鎭�
     private ObjectMapper om = new ObjectMapper();
     @Autowired
     private UavClient uavClient;
+    @Autowired
+    private RedisCache redisCache;
 
     @PostConstruct
     public void created() {
@@ -51,32 +52,40 @@
             e.printStackTrace();
         }
         //鎵цmethod
+        this.getToken();//鑾峰彇token楠岃瘉,楠岃瘉token鏈夋晥鎬�
         try {
-            res = (String) requestMethod.invoke(this.uavClient, url, this.token, data);
-        } catch (InvocationTargetException e) {
-            ForestNetworkException fe = (ForestNetworkException) e.getCause();
-            if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
-                this.login();
-            }
-            try {//鍐嶆璋冪敤鎺ュ彛
-                res = (String) requestMethod.invoke(this.uavClient, url, this.token, data);
-            } catch (IllegalAccessException ex) {
-                ex.printStackTrace();
-            } catch (InvocationTargetException ex) {
-                ex.printStackTrace();
-            }
+            res = (String) requestMethod.invoke(this.uavClient, url, this.getToken(), data);
         } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
+            System.out.println("doUavRequest 璁块棶澶辫触" + e.getMessage());
+        } catch (InvocationTargetException e) {
+            System.out.println("doUavRequest 鎵ц澶辫触" + e.getMessage());
+            e.printStackTrace();
         }
 
         return res;
     }
 
     public Map getUavUser() {
-        if (this.uavUser == null) {
-            this.login();
+        return redisCache.getCacheMap("uav:uavUser");
+    }
+
+    public String getToken() {
+        //鑾峰彇uav鐢ㄦ埛淇℃伅
+        Map uavUser = redisCache.getCacheMap("uav:uavUser");
+        String token = (String) uavUser.get("access_token");
+        //楠岃瘉token鏈夋晥鎬�
+        try {
+            String res = uavClient.GET("manage/api/v1/devices", token, "{}");
+        } catch (ForestNetworkException fe) {
+            if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
+                this.login();
+                //鍐嶆鑾峰彇token
+                uavUser = redisCache.getCacheMap("uav:uavUser");
+                token = (String) uavUser.get("access_token");
+                return token;
+            }
         }
-        return this.uavUser;
+        return token;
     }
 
     public void login() {
@@ -84,11 +93,11 @@
         String codedPassword = this.Encrypt(PASSWORD, SALT);
         String body = "{\"username\":\"" + USERNAME + "\",\"password\":\"" + codedPassword + "\"}";
         try {
+            //uavClient.GET("logout", null, "{}");
             String res = uavClient.POST("login", null, body);
             Map resMap = om.readValue(res, Map.class);
-            this.uavUser = (Map) resMap.get("data");
-            if (this.uavUser != null) {
-                this.token = (String) this.uavUser.get("access_token");
+            if (resMap != null) {
+                redisCache.setCacheMap("uav:uavUser", (Map) resMap.get("data"));
             }
         } catch (ForestRuntimeException e) {
             log.error("鏃犱汉鏈鸿繛鎺ヨ秴鏃�" + e.getMessage());

--
Gitblit v1.9.3