From 1a4792fdff667d3b9590c6ab4c085a08cdca1399 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 24 Oct 2024 14:07:18 +0800
Subject: [PATCH] 修改端口

---
 src/main/java/org/springblade/common/utils/Base64Util.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springblade/common/utils/Base64Util.java b/src/main/java/org/springblade/common/utils/Base64Util.java
index 15e44ac..26cb22c 100644
--- a/src/main/java/org/springblade/common/utils/Base64Util.java
+++ b/src/main/java/org/springblade/common/utils/Base64Util.java
@@ -1,12 +1,13 @@
 package org.springblade.common.utils;
 
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+//import sun.misc.BASE64Decoder;
+//import sun.misc.BASE64Encoder;
 
 import javax.imageio.stream.FileImageInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.util.Base64;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -18,12 +19,11 @@
 	 */
 	public static byte[] decode(String base64Str){
 		byte[] b = null;
-		BASE64Decoder decoder = new BASE64Decoder();
-		try {
-			b = decoder.decodeBuffer(replaceEnter(base64Str));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		// jdk8
+//		BASE64Decoder decoder = new BASE64Decoder();
+		// jdk11
+		Base64.Decoder decoder = Base64.getMimeDecoder();
+		b = decoder.decode(replaceEnter(base64Str));
 		return b;
 	}
 
@@ -33,13 +33,19 @@
 	 * @return
 	 */
 	public static String encode(byte[] image){
-		BASE64Encoder decoder = new BASE64Encoder();
-		return replaceEnter(decoder.encode(image));
+		// jdk8
+//		BASE64Encoder decoder = new BASE64Encoder();
+		// jdk11
+		Base64.Encoder encoder = Base64.getMimeEncoder();
+		return replaceEnter(encoder.encodeToString(image));
 	}
 
 	public static String encode(String uri){
-		BASE64Encoder encoder = new BASE64Encoder();
-		return replaceEnter(encoder.encode(uri.getBytes()));
+		// jdk8
+//		BASE64Encoder encoder = new BASE64Encoder();
+		// jdk11
+		Base64.Encoder encoder = Base64.getMimeEncoder();
+		return replaceEnter(encoder.encodeToString(uri.getBytes()));
 	}
 
 	/**

--
Gitblit v1.9.3