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

优化MAC地址正则（issue#IB95X4@Gitee）

Browse Source
This commit is contained in:
Looly 2024-12-05 10:39:13 +08:00
parent ae1a18cd20
commit b8f681fef1
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,11 +2,12 @@
# 🚀Changelog # 🚀Changelog
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.8.35(2024-12-04) # 5.8.35(2024-12-05)
### 🐣新特性 ### 🐣新特性
* 【poi 】 优化ExcelWriter中使用比较器writer的方法，只对第一条数据进行排序（pr#3807@Github） * 【poi 】 优化ExcelWriter中使用比较器writer的方法，只对第一条数据进行排序（pr#3807@Github）
* 【extra 】 优化Ftp.download，返回false抛出异常（issue#3805@Github） * 【extra 】 优化Ftp.download，返回false抛出异常（issue#3805@Github）
* 【core 】 优化MAC地址正则（issue#IB95X4@Gitee）
### 🐞Bug修复 ### 🐞Bug修复
* 【crypto 】 修复JWTSignerUtil.createSigner中algorithmId未转换问题（issue#3806@Github） * 【crypto 】 修复JWTSignerUtil.createSigner中algorithmId未转换问题（issue#3806@Github）

3
hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java
View File

@ -132,7 +132,8 @@ public interface RegexPool {
/** /**
* MAC地址正则 * MAC地址正则
*/ */
String MAC_ADDRESS = "((?:[a-fA-F0-9]{1,2}[:-]){5}[a-fA-F0-9]{1,2})|0x(\\d{12}).+ETHER"; //String MAC_ADDRESS = "((?:[a-fA-F0-9]{1,2}[:-]){5}[a-fA-F0-9]{1,2})|0x(\\d{12}).+ETHER";
String MAC_ADDRESS = "((?:[a-fA-F0-9]{1,2}[:-]){5}[a-fA-F0-9]{1,2})|((?:[a-fA-F0-9]{1,4}[.]){2}[a-fA-F0-9]{1,4})|[a-fA-F0-9]{12}|0x(\\d{12}).+ETHER";
/** /**
* 16进制字符串 * 16进制字符串
*/ */

16
hutool-core/src/test/java/cn/hutool/core/util/IssueIB95X4Test.java Normal file
View File

@ -0,0 +1,16 @@
package cn.hutool.core.util;
import cn.hutool.core.lang.PatternPool;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class IssueIB95X4Test {
@Test
void isMacTest() {
Assertions.assertTrue(ReUtil.isMatch(PatternPool.MAC_ADDRESS, "ab1c.2d3e.f468"));
Assertions.assertTrue(ReUtil.isMatch(PatternPool.MAC_ADDRESS, "ab:1c:2d:3e:f4:68"));
Assertions.assertTrue(ReUtil.isMatch(PatternPool.MAC_ADDRESS, "ab-1c-2d-3e-f4-68"));
Assertions.assertTrue(ReUtil.isMatch(PatternPool.MAC_ADDRESS, "ab1c2d3ef468"));
}
}