🎨 #1610 换用guava的相应方法实现base64解码,避免因commons-codec版本问题导致解码异常

This commit is contained in:
Binary Wang
2020-06-11 18:16:30 +08:00
parent a81550f79f
commit 29b4dbd601
8 changed files with 45 additions and 37 deletions

View File

@@ -1,5 +1,7 @@
package com.github.binarywang.wxpay.v3.util;
import com.google.common.base.CharMatcher;
import com.google.common.io.BaseEncoding;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
@@ -41,7 +43,7 @@ public class AesUtils {
cipher.init(Cipher.DECRYPT_MODE, key, spec);
cipher.updateAAD(associatedData);
return new String(cipher.doFinal(Base64.getDecoder().decode(ciphertext)), "utf-8");
return new String(cipher.doFinal(BaseEncoding.base64().decode(CharMatcher.whitespace().removeFrom(ciphertext))), "utf-8");
} catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
throw new IllegalStateException(e);
} catch (InvalidKeyException | InvalidAlgorithmParameterException e) {