remove org.springframework.util.Base64Utils

Author: xlorne

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/crypto/MyAES.java

@@ -2,9 +2,9 @@
 
 import com.codingapi.springboot.framework.crypto.AES;
 import lombok.SneakyThrows;
-import org.springframework.util.Base64Utils;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 public class MyAES {
 
@@ -25,12 +25,12 @@ public static MyAES getInstance() {
 
     @SneakyThrows
     public String encode(String input)  {
-        return Base64Utils.encodeToString(aes.encrypt(input.getBytes(StandardCharsets.UTF_8)));
+        return Base64.getEncoder().encodeToString(aes.encrypt(input.getBytes(StandardCharsets.UTF_8)));
     }
 
     @SneakyThrows
     public String decode(String input)  {
-        return new String(aes.decrypt(Base64Utils.decodeFromString(input)),StandardCharsets.UTF_8);
+        return new String(aes.decrypt(Base64.getDecoder().decode(input)),StandardCharsets.UTF_8);
     }
 
     @SneakyThrows

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/crypto/MyCryptoConfiguration.java

@@ -5,15 +5,17 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.Base64Utils;
+
+import java.util.Base64;
 
 @Configuration
 public class MyCryptoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
     public AES aes(SecurityJwtProperties properties) throws Exception {
-        AES aes = new AES(Base64Utils.decodeFromString(properties.getAseKey()), Base64Utils.decodeFromString(properties.getAseIv()));
+        AES aes = new AES(Base64.getDecoder().decode(properties.getAseKey().getBytes()),
+                Base64.getDecoder().decode(properties.getAseIv()));
         MyAES.getInstance().init(aes);
         return aes;
     }

springboot-starter/src/main/java/com/codingapi/springboot/framework/crypto/AESUtils.java

@@ -1,9 +1,9 @@
 package com.codingapi.springboot.framework.crypto;
 
 import lombok.SneakyThrows;
-import org.springframework.util.Base64Utils;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 public class AESUtils {
 
@@ -24,19 +24,19 @@ public class AESUtils {
 
     @SneakyThrows
     private AESUtils() {
-        this.aes = new AES(Base64Utils.decodeFromString(key),Base64Utils.decodeFromString(iv));
+        this.aes = new AES(Base64.getDecoder().decode(key),Base64.getDecoder().decode(iv));
     }
 
     public static AESUtils getInstance() {
         return instance;
     }
 
     public String encode(String input) throws Exception {
-        return Base64Utils.encodeToString(aes.encrypt(input.getBytes(StandardCharsets.UTF_8)));
+        return Base64.getEncoder().encodeToString(aes.encrypt(input.getBytes(StandardCharsets.UTF_8)));
     }
 
     public String decode(String input) throws Exception {
-        return new String(aes.decrypt(Base64Utils.decodeFromString(input)),StandardCharsets.UTF_8);
+        return new String(aes.decrypt(Base64.getDecoder().decode(input)),StandardCharsets.UTF_8);
     }
 
     public byte[] encode(byte[] input) throws Exception {

springboot-starter/src/main/java/com/codingapi/springboot/framework/crypto/DESUtils.java

@@ -1,9 +1,9 @@
 package com.codingapi.springboot.framework.crypto;
 
 import lombok.SneakyThrows;
-import org.springframework.util.Base64Utils;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 public class DESUtils {
 
@@ -18,19 +18,21 @@ public class DESUtils {
 
     @SneakyThrows
     private DESUtils() {
-        this.des = new DES(Base64Utils.decodeFromString(key));
+        this.des = new DES(Base64.getDecoder().decode(key));
     }
 
     public static DESUtils getInstance() {
         return instance;
     }
 
     public String encode(String input) throws Exception {
-        return Base64Utils.encodeToString(des.encrypt(input.getBytes(StandardCharsets.UTF_8)));
+        return Base64.getEncoder().encodeToString(des.encrypt(input.getBytes(StandardCharsets.UTF_8)));
     }
 
+
     public String decode(String input) throws Exception {
-        return new String(des.decrypt(Base64Utils.decodeFromString(input)),StandardCharsets.UTF_8);
+        Base64.Decoder decoder = Base64.getDecoder();
+        return new String(des.decrypt(decoder.decode(input)),StandardCharsets.UTF_8);
     }
 
     public byte[] encode(byte[] input) throws Exception {

springboot-starter/src/main/java/com/codingapi/springboot/framework/crypto/RSAUtils.java

@@ -1,9 +1,9 @@
 package com.codingapi.springboot.framework.crypto;
 
 import lombok.SneakyThrows;
-import org.springframework.util.Base64Utils;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 public class RSAUtils {
 
@@ -22,19 +22,19 @@ public class RSAUtils {
 
     @SneakyThrows
     private RSAUtils() {
-        this.rsa = new RSA(Base64Utils.decodeFromString(privateKey),Base64Utils.decodeFromString(publicKey));
+        this.rsa = new RSA(Base64.getDecoder().decode(privateKey),Base64.getDecoder().decode(publicKey));
     }
 
     public static RSAUtils getInstance() {
         return instance;
     }
 
     public String encode(String input) throws Exception {
-        return Base64Utils.encodeToString(rsa.encrypt(input.getBytes(StandardCharsets.UTF_8)));
+        return Base64.getEncoder().encodeToString(rsa.encrypt(input.getBytes(StandardCharsets.UTF_8)));
     }
 
     public String decode(String input) throws Exception {
-        return new String(rsa.decrypt(Base64Utils.decodeFromString(input)),StandardCharsets.UTF_8);
+        return new String(rsa.decrypt(Base64.getDecoder().decode(input)),StandardCharsets.UTF_8);
     }
 
     public byte[] encode(byte[] input) throws Exception {

springboot-starter/src/test/java/com/codingapi/springboot/framework/crypto/AESTest.java

@@ -2,7 +2,8 @@
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.Base64Utils;
+
+import java.util.Base64;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -17,19 +18,22 @@ static void before() throws Exception {
         key = aes.getKey();
         iv = aes.getIv();
 
-        System.out.println("keys:" + Base64Utils.encodeToString(key));
-        System.out.println("ivs:" + Base64Utils.encodeToString(iv));
+        Base64.Encoder encoder = Base64.getEncoder();
+        System.out.println("keys:" + encoder.encodeToString(key));
+        System.out.println("ivs:" + encoder.encodeToString(iv));
 
     }
 
     @Test
     void aes1() throws Exception {
         AES aes = new AES();
         String content = "hello world";
-        String encrypt = Base64Utils.encodeToString(aes.encrypt(content.getBytes()));
+        Base64.Encoder encoder = Base64.getEncoder();
+        String encrypt = encoder.encodeToString(aes.encrypt(content.getBytes()));
         System.out.println("encrypt:" + encrypt);
 
-        String decrypt = new String(aes.decrypt(Base64Utils.decodeFromString(encrypt)));
+        Base64.Decoder decoder = Base64.getDecoder();
+        String decrypt = new String(aes.decrypt(decoder.decode(encrypt)));
         System.out.println("decrypt:" + decrypt);
 
         assertEquals(content, decrypt, "AES encrypt error");
@@ -39,7 +43,8 @@ void aes1() throws Exception {
     void aes2() throws Exception {
         AES aes = new AES(key, iv);
         String content = "hello world";
-        String encrypt = Base64Utils.encodeToString(aes.encrypt(content.getBytes()));
+        Base64.Encoder encoder = Base64.getEncoder();
+        String encrypt = encoder.encodeToString(aes.encrypt(content.getBytes()));
         System.out.println("encrypt:" + encrypt);
     }
 

springboot-starter/src/test/java/com/codingapi/springboot/framework/crypto/HmacSHA256Test.java

@@ -1,18 +1,18 @@
 package com.codingapi.springboot.framework.crypto;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.util.Base64Utils;
 
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class HmacSHA256Test {
 
     @Test
     void sha256() throws NoSuchAlgorithmException, InvalidKeyException {
-       String data = Base64Utils.encodeToString(HmacSHA256.sha256("123456".getBytes(),"123456".getBytes()));
+       String data = Base64.getEncoder().encodeToString(HmacSHA256.sha256("123456".getBytes(),"123456".getBytes()));
        assertEquals("uK0Io6VH41gpuCG3U3AwHdjEsGvdd3H5tUGnWRQGhxg=",data);
     }
 }