xiongzhu 2 jaren geleden
bovenliggende
commit
b62eec50c8

+ 2 - 25
src/main/java/com/izouma/awesomeadmin/util/Base64.java

@@ -1,7 +1,5 @@
 package com.izouma.awesomeadmin.util;
 
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 
 import java.io.UnsupportedEncodingException;
 
@@ -10,32 +8,11 @@ import java.io.UnsupportedEncodingException;
  */
 public class Base64 {
     public static String getBase64(String str) {
-        byte[] b = null;
-        String s = null;
-        try {
-            b = str.getBytes("utf-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        if (b != null) {
-            s = new BASE64Encoder().encode(b);
-        }
-        return s;
+        return java.util.Base64.getEncoder().encodeToString(str.getBytes());
     }
 
     // 解密
     public static String getFromBase64(String s) {
-        byte[] b = null;
-        String result = null;
-        if (s != null) {
-            BASE64Decoder decoder = new BASE64Decoder();
-            try {
-                b = decoder.decodeBuffer(s);
-                result = new String(b, "utf-8");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return result;
+        return new String(java.util.Base64.getDecoder().decode(s.getBytes()));
     }
 }

+ 2 - 2
src/main/java/com/izouma/awesomeadmin/util/ImagesUtil.java

@@ -4,10 +4,10 @@ import java.awt.*;
 import java.awt.color.ColorSpace;
 import java.awt.image.*;
 import java.io.*;
+import java.util.Base64;
 import java.util.Iterator;
 
 import org.apache.commons.io.FileUtils;
-import sun.misc.BASE64Decoder;
 
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
@@ -35,7 +35,7 @@ public class ImagesUtil {
         try {
             //Base64解码
             // byte[] b = Base64.getDecoder().decode(imgStr);
-            byte[] b = new BASE64Decoder().decodeBuffer(imgStr);
+            byte[] b = Base64.getDecoder().decode(imgStr);
             for (int i = 0; i < b.length; ++i) {
                 if (b[i] < 0) {//调整异常数据
                     b[i] += 256;