ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2024-03-01 15:53:23 +08:00
parent 5c1ffbcc0c
commit e3f4a6a20a
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java
View File

@ -636,7 +636,7 @@ public class RandomUtil {
* @return 随机字符串 * @return 随机字符串
*/ */
public static String randomString(final int length) { 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 随机字符串 * @return 随机字符串
*/ */
public static String randomStringLower(final int length) { 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 * @since 4.0.13
*/ */
public static String randomStringUpper(final int length) { 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) { public static String randomStringWithoutStr(final int length, final String elemData) {
String baseStr = BASE_CHAR_NUMBER_LOWER; String baseStr = BASE_CHAR_NUMBER_LOWER;
baseStr = StrUtil.removeAll(baseStr, elemData.toLowerCase().toCharArray()); baseStr = StrUtil.removeAll(baseStr, elemData.toLowerCase().toCharArray());
return randomStringLower(baseStr, length); return randomString(baseStr, length);
} }
/** /**
@ -680,7 +680,7 @@ public class RandomUtil {
* @return 随机字符串 * @return 随机字符串
*/ */
public static String randomNumbers(final int length) { 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 字符串的长度 * @param length 字符串的长度
* @return 随机字符串 * @return 随机字符串
*/ */
public static String randomStringLower(final String baseString, int length) { public static String randomString(final String baseString, int length) {
if (StrUtil.isEmpty(baseString)) { if (StrUtil.isEmpty(baseString)) {
return StrUtil.EMPTY; return StrUtil.EMPTY;
} }

2
hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java
View File

@ -89,7 +89,7 @@ public class RandomUtilTest {
@Test @Test
public void randomStringOfLengthTest(){ public void randomStringOfLengthTest(){
final String s = RandomUtil.randomStringLower("123", -1); final String s = RandomUtil.randomString("123", -1);
Assertions.assertNotNull(s); Assertions.assertNotNull(s);
} }

2
hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java
View File

@ -205,7 +205,7 @@ public class RSATest {
final byte[] keyBytes = Base64.decode(publicKeyStr); final byte[] keyBytes = Base64.decode(publicKeyStr);
final PublicKey publicKey = KeyUtil.generateRSAPublicKey(keyBytes); final PublicKey publicKey = KeyUtil.generateRSAPublicKey(keyBytes);
final byte[] data = RandomUtil.randomStringLower("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", 16).getBytes(); final byte[] data = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", 16).getBytes();
//长度不满足128补0 //长度不满足128补0
final byte[] finalData = ArrayUtil.resize(data, 128); final byte[] finalData = ArrayUtil.resize(data, 128);

4
hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java
View File

@ -30,7 +30,7 @@ public class FPETest {
final FPE fpe = new FPE(FPE.FPEMode.FF1, keyBytes, numberMapper, null); 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); final String encrypt = fpe.encrypt(phone);
// 加密后与原密文长度一致 // 加密后与原密文长度一致
Assertions.assertEquals(phone.length(), encrypt.length()); 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 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); final String encrypt = fpe.encrypt(phone);
// 加密后与原密文长度一致 // 加密后与原密文长度一致
Assertions.assertEquals(phone.length(), encrypt.length()); Assertions.assertEquals(phone.length(), encrypt.length());

2
hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java
View File

@ -46,7 +46,7 @@ public class RandomGenerator extends AbstractGenerator {
@Override @Override
public String generate() { public String generate() {
return RandomUtil.randomStringLower(this.baseStr, this.length); return RandomUtil.randomString(this.baseStr, this.length);
} }
@Override @Override