From 1e6372b5a57ddcd11e6a85b472aa7dd545fb143f Mon Sep 17 00:00:00 2001
From: zhangjianrock@163.com <zhangjianrock@163.com>
Date: 星期六, 13 一月 2024 15:22:54 +0800
Subject: [PATCH] 无人机配置
---
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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 079d5c8..dec574f 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
@@ -6,10 +6,13 @@
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.ConfigUtils;
+import com.ruoyi.common.utils.StringUtils;
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.beans.factory.annotation.Value;
import org.springframework.http.HttpMethod;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,9 +29,20 @@
@Service
@Slf4j(topic = "uav")
public class UavService {
- public static final String USERNAME = "kaifabailu";//鐢ㄦ埛鍚�
- public static final String PASSWORD = "ardkj@2014";//瀵嗙爜
- public static final String SALT = "0123456789012345";//鐩�
+ /*uav:
+ host: http://112.98.126.2:6100/
+ username: kaifabailu
+ password: ardkj@2014
+ salt: 0123456789012345
+ */
+ private String username;//鐢ㄦ埛鍚�
+
+ private String password;//瀵嗙爜
+
+ private String salt; //鐩�
+
+ private String host;//uav鏈嶅姟鍣�
+
private Map uavUser;//鐧诲綍鐨勭敤鎴蜂俊鎭�
private ObjectMapper om = new ObjectMapper();
@@ -39,7 +53,19 @@
@PostConstruct
public void created() {
+
+ getUavConfig();
this.login();
+ }
+
+ private void getUavConfig() {
+ this.host = ConfigUtils.getConfigValue("uav_host");
+ this.username = ConfigUtils.getConfigValue("uav_username");
+ this.password = ConfigUtils.getConfigValue("uav_password");
+ this.salt = ConfigUtils.getConfigValue("uav_salt");
+ if (StringUtils.isEmpty(this.host) || StringUtils.isEmpty(this.username) || StringUtils.isEmpty(this.password) || StringUtils.isEmpty(this.salt)) {
+ throw new RuntimeException("鏃犱汉鏈哄弬鏁伴厤缃己澶�:");
+ }
}
public String doUavRequest(HttpMethod method, String url, String data) {
@@ -55,7 +81,7 @@
this.getToken();//鑾峰彇token楠岃瘉,楠岃瘉token鏈夋晥鎬�
try {
String token = this.getToken();
- res = (String) requestMethod.invoke(this.uavClient, url, token, data);
+ res = (String) requestMethod.invoke(this.uavClient, this.host + url, token, data);
} catch (IllegalAccessException e) {
System.out.println("doUavRequest 璁块棶澶辫触" + e.getMessage());
} catch (InvocationTargetException e) {
@@ -76,7 +102,7 @@
String token = (String) uavUser.get("access_token");
//楠岃瘉token鏈夋晥鎬�
try {
- String res = uavClient.GET("manage/api/v1/devices", token, "{}");
+ String res = uavClient.GET(this.host+"manage/api/v1/devices", token, "{}");
System.out.println(res);
} catch (ForestNetworkException fe) {
if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
@@ -91,12 +117,15 @@
}
public void login() {
+
+ getUavConfig();
log.debug("鐧诲綍鏃犱汉鏈哄閮ㄦ帴鍙�");
- String codedPassword = this.Encrypt(PASSWORD, SALT);
- String body = "{\"username\":\"" + USERNAME + "\",\"password\":\"" + codedPassword + "\"}";
+ String codedPassword = this.Encrypt(password, salt);
+ String body = "{\"username\":\"" + username + "\",\"password\":\"" + codedPassword + "\"}";
+ System.out.println("body:" + body);
try {
//uavClient.GET("logout", null, "{}");
- String res = uavClient.POST("login", null, body);
+ String res = uavClient.POST(this.host+"login", null, body);
Map resMap = om.readValue(res, Map.class);
if (resMap != null) {
redisCache.setCacheMap("uav:uavUser", (Map) resMap.get("data"));
--
Gitblit v1.9.3