From ca5732e6dffde592d0deaa2f9bfa036d6461b57e Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Sun, 20 Mar 2022 14:21:10 +0800
Subject: [PATCH] fix Base32

---
 CHANGELOG.md                                      |  3 ++-
 .../main/java/cn/hutool/core/codec/Base32.java    |  7 ++++++-
 .../java/cn/hutool/core/codec/Base62Codec.java    | 10 +++++-----
 .../java/cn/hutool/core/codec/Base32Test.java     | 15 ++++++++++++++-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb6ac30ff..469cfb88e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,14 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.8.0 (2022-03-19)
+# 5.8.0 (2022-03-20)
 
 ### ❌不兼容特性
 * 【db     】     【不向下兼容】增加MongoDB4.x支持（pr#568@Gitee）
 * 【json   】     【可能兼容问题】修改JSONObject结构，继承自MapWrapper
 * 【core   】     【可能兼容问题】BeanCopier重构，新建XXXCopier，删除XXXValueProvider
 * 【core   】     【可能兼容问题】URLEncoder废弃，URLEncoderUtil使用RFC3986
+* 【core   】     【可能兼容问题】增加Base32.encode不足位数补=
 
 ### 🐣新特性
 * 【http   】     HttpRequest.form采用TableMap方式（issue#I4W427@Gitee）
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base32.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base32.java
index f98619138..1fa7db4cb 100644
--- a/hutool-core/src/main/java/cn/hutool/core/codec/Base32.java
+++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base32.java
@@ -79,7 +79,12 @@ public class Base32 {
 			base32.append(BASE32_CHARS.charAt(digit));
 		}
 
-		return StrUtil.fillAfter(base32.toString(), '=', encodeLen);
+		// 末尾补充不足长度的
+		while(base32.length() < encodeLen){
+			base32.append('=');
+		}
+
+		return base32.toString();
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base62Codec.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base62Codec.java
index 0561e0a70..1272406ac 100644
--- a/hutool-core/src/main/java/cn/hutool/core/codec/Base62Codec.java
+++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base62Codec.java
@@ -104,7 +104,7 @@ public class Base62Codec implements Encoder<byte[], byte[]>, Decoder<byte[], byt
 		return convert(prepared, TARGET_BASE, STANDARD_BASE);
 	}
 
-	// --------------------------------------------------------------------------------------------------------------- Private method start
+	// region Private Methods
 	/**
 	 * 按照字典转换bytes
 	 *
@@ -112,7 +112,7 @@ public class Base62Codec implements Encoder<byte[], byte[]>, Decoder<byte[], byt
 	 * @param dictionary 字典
 	 * @return 转换值
 	 */
-	private byte[] translate(byte[] indices, byte[] dictionary) {
+	private static byte[] translate(byte[] indices, byte[] dictionary) {
 		final byte[] translation = new byte[indices.length];
 
 		for (int i = 0; i < indices.length; i++) {
@@ -130,7 +130,7 @@ public class Base62Codec implements Encoder<byte[], byte[]>, Decoder<byte[], byt
 	 * @param targetBase 目标基准长度
 	 * @return 计算结果
 	 */
-	private byte[] convert(byte[] message, int sourceBase, int targetBase) {
+	private static byte[] convert(byte[] message, int sourceBase, int targetBase) {
 		// 计算结果长度，算法来自：http://codegolf.stackexchange.com/a/21672
 		final int estimatedLength = estimateOutputLength(message.length, sourceBase, targetBase);
 
@@ -175,8 +175,8 @@ public class Base62Codec implements Encoder<byte[], byte[]>, Decoder<byte[], byt
 	 * @param targetBase 目标基准长度
 	 * @return 估算长度
 	 */
-	private int estimateOutputLength(int inputLength, int sourceBase, int targetBase) {
+	private static int estimateOutputLength(int inputLength, int sourceBase, int targetBase) {
 		return (int) Math.ceil((Math.log(sourceBase) / Math.log(targetBase)) * inputLength);
 	}
-	// --------------------------------------------------------------------------------------------------------------- Private method end
+	// endregion
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
index ebbe40aba..a17f2e4ab 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
@@ -1,5 +1,6 @@
 package cn.hutool.core.codec;
 
+import cn.hutool.core.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -13,8 +14,20 @@ public class Base32Test {
 
 		String decodeStr = Base32.decodeStr(encode);
 		Assert.assertEquals(a, decodeStr);
+	}
 
-		decodeStr = Base32.decodeStr("4S6KNZNOW3TJRL7EXCAOJOFK5GOZ5ZNYXDUZLP7HTKCOLLMX46WKNZFYWI");
+	@Test
+	public void encodeAndDecodeRandomTest(){
+		String a = RandomUtil.randomString(RandomUtil.randomInt(1000));
+		String encode = Base32.encode(a);
+		String decodeStr = Base32.decodeStr(encode);
+		Assert.assertEquals(a, decodeStr);
+	}
+
+	@Test
+	public void decodeTest(){
+		String a = "伦家是一个非常长的字符串";
+		String decodeStr = Base32.decodeStr("4S6KNZNOW3TJRL7EXCAOJOFK5GOZ5ZNYXDUZLP7HTKCOLLMX46WKNZFYWI");
 		Assert.assertEquals(a, decodeStr);
 	}
 }