From 5ad4e2b2e881204102cd0a5e96da936db19f39c7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 11 八月 2023 11:30:47 +0800
Subject: [PATCH] 删除

---
 ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java |   11 +++++++----
 1 files changed, 7 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 5af9367..14acb4d 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
@@ -1,10 +1,12 @@
 package com.ruoyi.device.uav.service;
 
 import com.dtflys.forest.exceptions.ForestNetworkException;
+import com.dtflys.forest.exceptions.ForestRuntimeException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.utils.forest.UavClient;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -21,6 +23,7 @@
 import java.util.Map;
 
 @Service
+@Slf4j(topic = "uav")
 public class UavService {
     public static final String USERNAME = "ardbailu";//鐢ㄦ埛鍚�
     public static final String PASSWORD = "ardkj12345";//瀵嗙爜
@@ -70,14 +73,14 @@
     }
 
     public Map getUavUser() {
-        if (this.uavUser==null){
+        if (this.uavUser == null) {
             this.login();
         }
         return this.uavUser;
     }
 
     public void login() {
-        System.out.println("鐧诲綍鏃犱汉鏈哄閮ㄦ帴鍙�");
+        log.debug("鐧诲綍鏃犱汉鏈哄閮ㄦ帴鍙�");
         String codedPassword = this.Encrypt(PASSWORD, SALT);
         String body = "{\"username\":\"" + USERNAME + "\",\"password\":\"" + codedPassword + "\"}";
         try {
@@ -87,8 +90,8 @@
             if (this.uavUser != null) {
                 this.token = (String) this.uavUser.get("access_token");
             }
-        } catch (ForestNetworkException e) {
-            e.printStackTrace();
+        } catch (ForestRuntimeException e) {
+            log.error("鏃犱汉鏈鸿繛鎺ヨ秴鏃�" + e.getMessage());
         } catch (JsonMappingException e) {
             e.printStackTrace();
         } catch (JsonProcessingException e) {

--
Gitblit v1.9.3