From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/Base64Util.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/Base64Util.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/Base64Util.java
index 10aa301..38c133f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/Base64Util.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/Base64Util.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.utils;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;
import org.apache.commons.codec.binary.Base64;
public class Base64Util {
@@ -30,20 +31,19 @@
}
}
- public static void main(String[] args) {
- byte[] bytes = "/qUBAAv+AQAD//8yjUBF9xgeI0U=".getBytes();
- byte[] bytes1 = Base64.decodeBase64(bytes);
- System.out.println(HexStrConvertUtil.bytesToHexString(bytes1));
- }
+// public static void main(String[] args) {
+// byte[] bytes = "/qUBAAv+AQAD//8yjUBF9xgeI0U=".getBytes();
+// byte[] bytes1 = Base64.decodeBase64(bytes);
+// System.out.println(SupplementUtils.bytesToHexString(bytes1));
+// }
public static String toBase64Frame (String hexStr) {
// BigInteger bigInteger = new BigInteger(hexStr, 16); // 姝ゆ柟寮忎細浜х敓澶撮儴澶氬嚭绌虹殑涓�瀛楄妭
// byte[] bytes = bigInteger.toByteArray();
// System.out.println("origin:"+hexStr);
- byte[] bytes = HexStrConvertUtil.hexStringToBytes(hexStr);
+ byte[] bytes = SupplementUtils.hexStringToBytes(hexStr);
String base64 = encode(bytes);
return base64;
}
-}
-
+}
\ No newline at end of file
--
Gitblit v1.9.3