From ea1c49a93b2cec65a487fea08c06f38405156f2f Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 19 May 2023 22:28:39 +0800 Subject: [PATCH] fix code --- .../dromara/hutool/core/util/RandomUtil.java | 34 +++++++++++++------ .../hutool/core/cache/LRUCacheTest.java | 2 +- .../dromara/hutool/core/codec/Base32Test.java | 2 +- .../dromara/hutool/core/codec/Base62Test.java | 4 +-- .../dromara/hutool/core/codec/Base64Test.java | 2 +- .../core/codec/hash/metro/MetroHashTest.java | 2 +- .../MemorySafeLinkedBlockingQueueTest.java | 4 +-- .../hutool/core/func/FunctionPoolTest.java | 3 +- .../core/lang/intern/InternUtilTest.java | 2 +- .../hutool/core/map/TolerantMapTest.java | 2 +- .../dromara/hutool/core/text/StrUtilTest.java | 2 +- .../hutool/core/text/TextSimilarityTest.java | 6 ++-- .../hutool/core/util/RandomUtilTest.java | 3 +- .../org/dromara/hutool/crypto/KeyUtil.java | 2 +- .../org/dromara/hutool/crypto/SpecUtil.java | 2 +- .../hutool/crypto/asymmetric/RSATest.java | 2 +- .../crypto/symmetric/SymmetricTest.java | 4 +-- .../hutool/crypto/symmetric/ZucTest.java | 4 +-- .../hutool/crypto/symmetric/fpe/FPETest.java | 4 +-- .../hutool/db/dialect/DialectFactoryTest.java | 2 +- .../dromara/hutool/http/HttpGlobalConfig.java | 2 +- .../captcha/generator/AbstractGenerator.java | 2 +- .../captcha/generator/RandomGenerator.java | 2 +- 23 files changed, 53 insertions(+), 41 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java index 6031cd469..f34278d87 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java @@ -48,9 +48,13 @@ public class RandomUtil { */ public static final String BASE_CHAR = "abcdefghijklmnopqrstuvwxyz"; /** - * 用于随机选的字符和数字 + * 用于随机选的字符和数字（小写） */ - public static final String BASE_CHAR_NUMBER = BASE_CHAR + BASE_NUMBER; + public static final String BASE_CHAR_NUMBER_LOWER = BASE_CHAR + BASE_NUMBER; + /** + * 用于随机选的字符和数字（包括大写和小写字母） + */ + public static final String BASE_CHAR_NUMBER = BASE_CHAR.toUpperCase() + BASE_CHAR_NUMBER_LOWER; /** * 获取随机数生成器对象
@@ -528,13 +532,23 @@ public class RandomUtil { } /** - * 获得一个随机的字符串（只包含数字和字符） + * 获得一个随机的字符串（只包含数字和大小写字母） * * @param length 字符串的长度 * @return 随机字符串 */ public static String randomString(final int length) { - return randomString(BASE_CHAR_NUMBER, length); + return randomStringLower(BASE_CHAR_NUMBER, length); + } + + /** + * 获得一个随机的字符串（只包含数字和小写字母） + * + * @param length 字符串的长度 + * @return 随机字符串 + */ + public static String randomStringLower(final int length) { + return randomStringLower(BASE_CHAR_NUMBER_LOWER, length); } /** @@ -545,7 +559,7 @@ public class RandomUtil { * @since 4.0.13 */ public static String randomStringUpper(final int length) { - return randomString(BASE_CHAR_NUMBER, length).toUpperCase(); + return randomStringLower(BASE_CHAR_NUMBER_LOWER, length).toUpperCase(); } /** @@ -556,9 +570,9 @@ public class RandomUtil { * @return 随机字符串 */ public static String randomStringWithoutStr(final int length, final String elemData) { - String baseStr = BASE_CHAR_NUMBER; + String baseStr = BASE_CHAR_NUMBER_LOWER; baseStr = StrUtil.removeAll(baseStr, elemData.toLowerCase().toCharArray()); - return randomString(baseStr, length); + return randomStringLower(baseStr, length); } /** @@ -568,7 +582,7 @@ public class RandomUtil { * @return 随机字符串 */ public static String randomNumbers(final int length) { - return randomString(BASE_NUMBER, length); + return randomStringLower(BASE_NUMBER, length); } /** @@ -578,7 +592,7 @@ public class RandomUtil { * @param length 字符串的长度 * @return 随机字符串 */ - public static String randomString(final String baseString, int length) { + public static String randomStringLower(final String baseString, int length) { if (StrUtil.isEmpty(baseString)) { return StrUtil.EMPTY; } @@ -612,7 +626,7 @@ public class RandomUtil { * @since 3.1.2 */ public static char randomChar() { - return randomChar(BASE_CHAR_NUMBER); + return randomChar(BASE_CHAR_NUMBER_LOWER); } /** diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java index b8048fafe..24f08d431 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java @@ -25,7 +25,7 @@ public class LRUCacheTest { final LRUCache cache = CacheUtil.newLRUCache(100, 10); for (int i = 0; i < 10000; i++) { //ThreadUtil.execute(()-> cache.put(RandomUtil.randomString(5), "1243", 10)); - ThreadUtil.execute(()-> cache.get(RandomUtil.randomString(5), ()->RandomUtil.randomString(10))); + ThreadUtil.execute(()-> cache.get(RandomUtil.randomStringLower(5), ()->RandomUtil.randomStringLower(10))); } ThreadUtil.sleep(3000); } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java index a0f55902e..de8d5d3cc 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java @@ -38,7 +38,7 @@ public class Base32Test { @Test public void encodeAndDecodeRandomTest(){ - final String a = RandomUtil.randomString(RandomUtil.randomInt(1000)); + final String a = RandomUtil.randomStringLower(RandomUtil.randomInt(1000)); final String encode = Base32.encode(a); final String decodeStr = Base32.decodeStr(encode); Assertions.assertEquals(a, decodeStr); diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java index e92b2cc11..58709227d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java @@ -35,7 +35,7 @@ public class Base62Test { @Test public void encodeAndDecodeRandomTest() { - final String a = RandomUtil.randomString(RandomUtil.randomInt(1000)); + final String a = RandomUtil.randomStringLower(RandomUtil.randomInt(1000)); final String encode = Base62.encode(a); final String decodeStr = Base62.decodeStr(encode); Assertions.assertEquals(a, decodeStr); @@ -43,7 +43,7 @@ public class Base62Test { @Test public void encodeAndDecodeInvertedRandomTest() { - final String a = RandomUtil.randomString(RandomUtil.randomInt(1000)); + final String a = RandomUtil.randomStringLower(RandomUtil.randomInt(1000)); final String encode = Base62.encodeInverted(a); final String decodeStr = Base62.decodeStrInverted(encode); Assertions.assertEquals(a, decodeStr); diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java index cdb20bb31..70ddb77a2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java @@ -17,7 +17,7 @@ public class Base64Test { @Test public void isTypeBase64Test(){ - Assertions.assertTrue(Base64.isTypeBase64(Base64.encode(RandomUtil.randomString(1000)))); + Assertions.assertTrue(Base64.isTypeBase64(Base64.encode(RandomUtil.randomStringLower(1000)))); } @Test diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java index ef5bd756f..1a6479f42 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java @@ -97,7 +97,7 @@ public class MetroHashTest { final String[] result = new String[10000000]; int index = 0; while (index < 10000000) { - result[index++] = RandomUtil.randomString(RandomUtil.randomInt(64)); + result[index++] = RandomUtil.randomStringLower(RandomUtil.randomInt(64)); } return result; } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java index 2e19f3966..bad3048d7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java @@ -11,10 +11,10 @@ public class MemorySafeLinkedBlockingQueueTest { public void offerTest(){ // 设置初始值达到最大，这样任何时候元素都无法加入队列 final MemorySafeLinkedBlockingQueue queue = new MemorySafeLinkedBlockingQueue<>(Long.MAX_VALUE); - Assertions.assertFalse(queue.offer(RandomUtil.randomString(RandomUtil.randomInt(100)))); + Assertions.assertFalse(queue.offer(RandomUtil.randomStringLower(RandomUtil.randomInt(100)))); // 设定一个很小的值，可以成功加入 queue.setMaxFreeMemory(10); - Assertions.assertTrue(queue.offer(RandomUtil.randomString(RandomUtil.randomInt(100)))); + Assertions.assertTrue(queue.offer(RandomUtil.randomStringLower(RandomUtil.randomInt(100)))); } } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/func/FunctionPoolTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/func/FunctionPoolTest.java index 50e724c84..773446573 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/func/FunctionPoolTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/func/FunctionPoolTest.java @@ -15,7 +15,6 @@ package org.dromara.hutool.core.func; import org.dromara.hutool.core.collection.ListUtil; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.date.StopWatch; -import org.dromara.hutool.core.func.FunctionPool; import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Test; @@ -31,7 +30,7 @@ public class FunctionPoolTest { // 测试数据 final ArrayList list = ListUtil.of(); for (int i = 0; i < 100000; i++) { - list.add(RandomUtil.randomString(100).toCharArray()); + list.add(RandomUtil.randomStringLower(100).toCharArray()); } final StopWatch stopWatch = DateUtil.createStopWatch(); diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java index a42d52c55..bab7a5cb1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java @@ -13,7 +13,7 @@ public class InternUtilTest { @Test public void weakTest(){ final Intern intern = InternUtil.ofWeak(); - final String a1 = RandomUtil.randomString(RandomUtil.randomInt(100)); + final String a1 = RandomUtil.randomStringLower(RandomUtil.randomInt(100)); final String a2 = new String(a1); Assertions.assertNotSame(a1, a2); diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java index 923a16c4f..3bb03b002 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java @@ -39,6 +39,6 @@ public class TolerantMapTest { map.put("tuesday", "星期二"); assert "星期二".equals(map.get("tuesday")); - assert "default".equals(map.get(RandomUtil.randomString(6))); + assert "default".equals(map.get(RandomUtil.randomStringLower(6))); } } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java index 5a79beec1..3f09b48f8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java @@ -461,7 +461,7 @@ public class StrUtilTest { @Test public void briefTest() { // case: 1 至 str.length - 1 - final String str = RandomUtil.randomString(RandomUtil.randomInt(1, 100)); + final String str = RandomUtil.randomStringLower(RandomUtil.randomInt(1, 100)); for (int maxLength = 1; maxLength < str.length(); maxLength++) { final String brief = StrUtil.brief(str, maxLength); Assertions.assertEquals(brief.length(), maxLength); diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java index dc99e8dde..6aa7aa01d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java @@ -47,9 +47,9 @@ public class TextSimilarityTest { @Disabled void longestCommonSubstringLengthTest() { // https://github.com/dromara/hutool/issues/3045 - final String strCommon = RandomUtil.randomString(1024 * 32); - final String strA = RandomUtil.randomString(1024 * 32) + strCommon; - final String strB = RandomUtil.randomString(1024 * 32) + strCommon; + final String strCommon = RandomUtil.randomStringLower(1024 * 32); + final String strA = RandomUtil.randomStringLower(1024 * 32) + strCommon; + final String strB = RandomUtil.randomStringLower(1024 * 32) + strCommon; final int i = TextSimilarity.longestCommonSubstringLength(strA, strB); Console.log(i); diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java index e9e6a65a0..f83876005 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java @@ -16,7 +16,6 @@ import org.dromara.hutool.core.collection.ListUtil; import org.dromara.hutool.core.convert.Convert; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.math.NumberUtil; -import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -90,7 +89,7 @@ public class RandomUtilTest { @Test public void randomStringOfLengthTest(){ - final String s = RandomUtil.randomString("123", -1); + final String s = RandomUtil.randomStringLower("123", -1); Assertions.assertNotNull(s); } diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java index 7f49f91a1..b3d675d30 100644 --- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java +++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java @@ -174,7 +174,7 @@ public class KeyUtil { } if (null == password) { - password = RandomUtil.randomString(32).toCharArray(); + password = RandomUtil.randomStringLower(32).toCharArray(); } return generateKey(algorithm, SpecUtil.createPBEKeySpec(password)); } diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SpecUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SpecUtil.java index f8fbf8f05..e40773d3c 100644 --- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SpecUtil.java +++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SpecUtil.java @@ -72,7 +72,7 @@ public class SpecUtil { */ public static PBEKeySpec createPBEKeySpec(char[] password) { if (null == password) { - password = RandomUtil.randomString(32).toCharArray(); + password = RandomUtil.randomStringLower(32).toCharArray(); } return new PBEKeySpec(password); } diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java index 0c731a48b..105c23f2e 100644 --- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java +++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java @@ -193,7 +193,7 @@ public class RSATest { final byte[] keyBytes = Base64.decode(publicKeyStr); final PublicKey publicKey = KeyUtil.generateRSAPublicKey(keyBytes); - final byte[] data = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", 16).getBytes(); + final byte[] data = RandomUtil.randomStringLower("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", 16).getBytes(); //长度不满足128补0 final byte[] finalData = ArrayUtil.resize(data, 128); diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java index a46361019..25acdd44d 100644 --- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java +++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java @@ -134,7 +134,7 @@ public class SymmetricTest { @Test public void aesZeroPaddingTest() { - final String content = RandomUtil.randomString(RandomUtil.randomInt(200)); + final String content = RandomUtil.randomStringLower(RandomUtil.randomInt(200)); final AES aes = new AES(Mode.CBC, Padding.ZeroPadding, "0123456789ABHAEQ".getBytes(), "DYgjCEIMVrj2W9xN".getBytes()); // 加密为16进制表示 @@ -160,7 +160,7 @@ public class SymmetricTest { @Test public void aesPkcs7PaddingTest() { - final String content = RandomUtil.randomString(RandomUtil.randomInt(200)); + final String content = RandomUtil.randomStringLower(RandomUtil.randomInt(200)); final AES aes = new AES("CBC", "PKCS7Padding", RandomUtil.randomBytes(32), "DYgjCEIMVrj2W9xN".getBytes()); diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java index 15dc19145..29496f068 100644 --- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java +++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java @@ -13,7 +13,7 @@ public class ZucTest { final byte[] iv = RandomUtil.randomBytes(16); final ZUC zuc = new ZUC(ZUC.ZUCAlgorithm.ZUC_128, secretKey, iv); - final String msg = RandomUtil.randomString(500); + final String msg = RandomUtil.randomStringLower(500); final byte[] crypt2 = zuc.encrypt(msg); final String msg2 = zuc.decryptStr(crypt2, CharsetUtil.UTF_8); Assertions.assertEquals(msg, msg2); @@ -25,7 +25,7 @@ public class ZucTest { final byte[] iv = RandomUtil.randomBytes(25); final ZUC zuc = new ZUC(ZUC.ZUCAlgorithm.ZUC_256, secretKey, iv); - final String msg = RandomUtil.randomString(500); + final String msg = RandomUtil.randomStringLower(500); final byte[] crypt2 = zuc.encrypt(msg); final String msg2 = zuc.decryptStr(crypt2, CharsetUtil.UTF_8); Assertions.assertEquals(msg, msg2); diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java index a3c0c891d..40f73fd9d 100644 --- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java +++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java @@ -18,7 +18,7 @@ public class FPETest { final FPE fpe = new FPE(FPE.FPEMode.FF1, keyBytes, numberMapper, null); // 原始数据 - final String phone = RandomUtil.randomString("A0123456789", 13); + final String phone = RandomUtil.randomStringLower("A0123456789", 13); final String encrypt = fpe.encrypt(phone); // 加密后与原密文长度一致 Assertions.assertEquals(phone.length(), encrypt.length()); @@ -37,7 +37,7 @@ public class FPETest { final FPE fpe = new FPE(FPE.FPEMode.FF3_1, keyBytes, numberMapper, null); // 原始数据 - final String phone = RandomUtil.randomString("A0123456789", 13); + final String phone = RandomUtil.randomStringLower("A0123456789", 13); final String encrypt = fpe.encrypt(phone); // 加密后与原密文长度一致 Assertions.assertEquals(phone.length(), encrypt.length()); diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java index a3c3a6871..9dcd7985d 100644 --- a/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java +++ b/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java @@ -43,7 +43,7 @@ public class DialectFactoryTest { //map.put("hive",DRIVER_HIVE); map.forEach((k,v) -> Assertions.assertEquals(v, - DialectFactory.identifyDriver(k+ RandomUtil.randomString(2),null) )); + DialectFactory.identifyDriver(k+ RandomUtil.randomStringLower(2),null) )); } } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java b/hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java index 2601182bb..baca7f3da 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java @@ -37,7 +37,7 @@ public class HttpGlobalConfig implements Serializable { * 底层调用：{@link HttpURLConnection#setConnectTimeout(int)} 同时设置: 连接超时 */ private static int timeout = -1; - private static String boundary = "--------------------Hutool_" + RandomUtil.randomString(16); + private static String boundary = "--------------------Hutool_" + RandomUtil.randomStringLower(16); private static int maxRedirectCount = 0; private static boolean ignoreEOFError = true; private static boolean decodeUrl = false; diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java index 0e42c1fcc..5ef895268 100644 --- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java +++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java @@ -35,7 +35,7 @@ public abstract class AbstractGenerator implements CodeGenerator { * @param count 生成验证码长度 */ public AbstractGenerator(final int count) { - this(RandomUtil.BASE_CHAR_NUMBER, count); + this(RandomUtil.BASE_CHAR_NUMBER_LOWER, count); } /** diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java index 46590e7cf..40dee7554 100644 --- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java +++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java @@ -46,7 +46,7 @@ public class RandomGenerator extends AbstractGenerator { @Override public String generate() { - return RandomUtil.randomString(this.baseStr, this.length); + return RandomUtil.randomStringLower(this.baseStr, this.length); } @Override