diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java
index f59aa6cab..2ffc710c2 100644
--- a/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java
+++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java
@@ -217,7 +217,7 @@ public class Base64 {
 	 * @since 5.7.2
 	 */
 	public static String encodeStr(byte[] arr, boolean isMultiLine, boolean isUrlSafe) {
-		return Base64Encoder.encodeStr(arr, isMultiLine, isUrlSafe);
+		return StrUtil.str(encode(arr, isMultiLine, isUrlSafe), DEFAULT_CHARSET);
 	}
 
 	/**
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/HMac.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/HMac.java
index e6c916b6c..7625b9444 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/HMac.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/HMac.java
@@ -163,7 +163,8 @@ public class HMac implements Serializable {
 	 * @return 摘要
 	 */
 	public String digestBase64(String data, Charset charset, boolean isUrlSafe) {
-		return Base64.encodeStr(digest(data, charset), false, isUrlSafe);
+		final byte[] digest = digest(data, charset);
+		return isUrlSafe ? Base64.encodeUrlSafe(digest) : Base64.encode(digest);
 	}
 
 	/**