From dee2cf1591b135c9bf75dcaf81a96ee48435b5f9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 17:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 1950bfd..f2d3986 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
@@ -15,12 +15,13 @@
import javax.annotation.PostConstruct;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
+import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
@Service
-public class UavService implements IUavService {
+public class UavService {
public static final String USERNAME = "ardbailu";//鐢ㄦ埛鍚�
public static final String PASSWORD = "ardkj12345";//瀵嗙爜
public static final String SALT = "0123456789012345";//鐩�
@@ -36,7 +37,6 @@
this.login();
}
- @Override
public String doUavRequest(HttpMethod method, String url, String data) {
String res = null;
Method requestMethod = null;
@@ -57,9 +57,9 @@
try {//鍐嶆璋冪敤鎺ュ彛
res = (String) requestMethod.invoke(this.uavClient, url, this.token, data);
} catch (IllegalAccessException ex) {
- throw new RuntimeException(ex);
+ ex.printStackTrace();
} catch (InvocationTargetException ex) {
- throw new RuntimeException(ex);
+ ex.printStackTrace();
}
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
@@ -68,7 +68,6 @@
return res;
}
- @Override
public void login() {
String codedPassword = this.Encrypt(PASSWORD, SALT);
String body = "{\"username\":\"" + USERNAME + "\",\"password\":\"" + codedPassword + "\"}";
@@ -82,21 +81,21 @@
} catch (ForestNetworkException e) {
e.printStackTrace();
} catch (JsonMappingException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
} catch (JsonProcessingException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
}
public String Encrypt(String sSrc, String sKey) {
if (sKey == null) {
- System.out.print("Key涓虹┖null");
return null;
}
// 鍒ゆ柇Key鏄惁涓�16浣�
if (sKey.length() != 16) {
- System.out.print("Key闀垮害涓嶆槸16浣�");
return null;
}
byte[] encrypted = null;
@@ -108,7 +107,6 @@
encrypted = cipher.doFinal(sSrc.getBytes("utf-8"));
} catch (Exception e) {
e.printStackTrace();
- ;
}
return new Base64().encodeToString(encrypted);//姝ゅ浣跨敤BASE64鍋氳浆鐮佸姛鑳斤紝鍚屾椂鑳借捣鍒�2娆″姞瀵嗙殑浣滅敤銆�
}
--
Gitblit v1.9.3