zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2020-08-04 11:04:26 +08:00
parent b22dbac8f7
commit 34f49fc916
5 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java
View File

@@ -83,11 +83,11 @@ public class PatternPool {
/**
* UUID
*/
public final static Pattern UUID = Pattern.compile("^[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}$");
public final static Pattern UUID = Pattern.compile("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", Pattern.CASE_INSENSITIVE);
/**
* 不带横线的UUID
*/
public final static Pattern UUID_SIMPLE = Pattern.compile("^[0-9a-z]{32}$");
public final static Pattern UUID_SIMPLE = Pattern.compile("^[0-9a-f]{32}$", Pattern.CASE_INSENSITIVE);
/**
* MAC地址正则
*/

10
hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java
View File

@@ -1,6 +1,7 @@
package cn.hutool.core.lang;
import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.core.util.IdUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -142,4 +143,13 @@ public class ValidatorTest {
Assert.assertTrue(Validator.isChinese("全都是中文"));
Assert.assertFalse(Validator.isChinese("not全都是中文"));
}
@Test
public void isUUIDTest(){
Assert.assertTrue(Validator.isUUID(IdUtil.randomUUID()));
Assert.assertTrue(Validator.isUUID(IdUtil.fastSimpleUUID()));
Assert.assertTrue(Validator.isUUID(IdUtil.randomUUID().toUpperCase()));
Assert.assertTrue(Validator.isUUID(IdUtil.fastSimpleUUID().toUpperCase()));
}
}