From 0ee44e75029923734744628a8b059fa41ff3ef55 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期六, 05 八月 2023 10:48:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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..783e0c0 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.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 +22,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 +72,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 {
--
Gitblit v1.9.3