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 552a3cc38..979e4ef94 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 @@ -636,7 +636,7 @@ public class RandomUtil { * @return 随机字符串 */ public static String randomString(final int length) { - return randomStringLower(BASE_CHAR_NUMBER, length); + return randomString(BASE_CHAR_NUMBER, length); } /** @@ -646,7 +646,7 @@ public class RandomUtil { * @return 随机字符串 */ public static String randomStringLower(final int length) { - return randomStringLower(BASE_CHAR_NUMBER_LOWER, length); + return randomString(BASE_CHAR_NUMBER_LOWER, length); } /** @@ -657,7 +657,7 @@ public class RandomUtil { * @since 4.0.13 */ public static String randomStringUpper(final int length) { - return randomStringLower(BASE_CHAR_NUMBER_LOWER, length).toUpperCase(); + return randomString(BASE_CHAR_NUMBER_LOWER, length).toUpperCase(); } /** @@ -670,7 +670,7 @@ public class RandomUtil { public static String randomStringWithoutStr(final int length, final String elemData) { String baseStr = BASE_CHAR_NUMBER_LOWER; baseStr = StrUtil.removeAll(baseStr, elemData.toLowerCase().toCharArray()); - return randomStringLower(baseStr, length); + return randomString(baseStr, length); } /** @@ -680,7 +680,7 @@ public class RandomUtil { * @return 随机字符串 */ public static String randomNumbers(final int length) { - return randomStringLower(BASE_NUMBER, length); + return randomString(BASE_NUMBER, length); } /** @@ -690,7 +690,7 @@ public class RandomUtil { * @param length 字符串的长度 * @return 随机字符串 */ - public static String randomStringLower(final String baseString, int length) { + public static String randomString(final String baseString, int length) { if (StrUtil.isEmpty(baseString)) { return StrUtil.EMPTY; } 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 6f26c3785..a8b5a32c5 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 @@ -89,7 +89,7 @@ public class RandomUtilTest { @Test public void randomStringOfLengthTest(){ - final String s = RandomUtil.randomStringLower("123", -1); + final String s = RandomUtil.randomString("123", -1); Assertions.assertNotNull(s); } 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 f7e84b733..02fcb8bd7 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 @@ -205,7 +205,7 @@ public class RSATest { final byte[] keyBytes = Base64.decode(publicKeyStr); final PublicKey publicKey = KeyUtil.generateRSAPublicKey(keyBytes); - final byte[] data = RandomUtil.randomStringLower("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", 16).getBytes(); + final byte[] data = RandomUtil.randomString("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/fpe/FPETest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java index 4b08a0cff..6587234fa 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 @@ -30,7 +30,7 @@ public class FPETest { final FPE fpe = new FPE(FPE.FPEMode.FF1, keyBytes, numberMapper, null); // 原始数据 - final String phone = RandomUtil.randomStringLower("A0123456789", 13); + final String phone = RandomUtil.randomString("A0123456789", 13); final String encrypt = fpe.encrypt(phone); // 加密后与原密文长度一致 Assertions.assertEquals(phone.length(), encrypt.length()); @@ -49,7 +49,7 @@ public class FPETest { final FPE fpe = new FPE(FPE.FPEMode.FF3_1, keyBytes, numberMapper, null); // 原始数据 - final String phone = RandomUtil.randomStringLower("A0123456789", 13); + final String phone = RandomUtil.randomString("A0123456789", 13); final String encrypt = fpe.encrypt(phone); // 加密后与原密文长度一致 Assertions.assertEquals(phone.length(), encrypt.length()); 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 e17b8ba5c..5fbf73b24 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.randomStringLower(this.baseStr, this.length); + return RandomUtil.randomString(this.baseStr, this.length); } @Override