lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复HexUtil.isHexNumber()判断逻辑超出long的精度问题

Browse Source
This commit is contained in:
Looly 2022-11-24 13:33:12 +08:00
parent 26771b2853
commit 4e06f02610
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
### 🐞Bug修复 ### 🐞Bug修复
* 【json 】 修复普通byte数组转JSONArray时的异常（pr#875@Gitee） * 【json 】 修复普通byte数组转JSONArray时的异常（pr#875@Gitee）
* 【core 】 修复ArrayUtil.insert()不支持原始类型数组的问题（pr#874@Gitee） * 【core 】 修复ArrayUtil.insert()不支持原始类型数组的问题（pr#874@Gitee）
* 【core 】 修复HexUtil.isHexNumber()判断逻辑超出long的精度问题（issue#I62H7K@Gitee）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

22
hutool-core/src/main/java/cn/hutool/core/util/HexUtil.java
View File

@ -27,18 +27,18 @@ public class HexUtil {
* @return 是否为16进制 * @return 是否为16进制
*/ */
public static boolean isHexNumber(String value) { public static boolean isHexNumber(String value) {
final int index = (value.startsWith("-") ? 1 : 0); int index = (value.startsWith("-") ? 1 : 0);
if (value.startsWith("0x", index) || value.startsWith("0X", index) || value.startsWith("#", index)) { if (value.startsWith("0x", index) || value.startsWith("0X", index)) {
try { index += 2;
//noinspection ResultOfMethodCallIgnored } else if (value.startsWith("#", index)) {
Long.decode(value); index ++;
} catch (NumberFormatException e) {
return false;
}
return true;
} }
try {
return false; new BigInteger(value.substring(index), 16);
} catch (final NumberFormatException e) {
return false;
}
return true;
} }
// ---------------------------------------------------------------------------------------------------- encode // ---------------------------------------------------------------------------------------------------- encode

27
hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
View File

@ -14,17 +14,17 @@ public class HexUtilTest {
@Test @Test
public void hexStrTest(){ public void hexStrTest(){
String str = "我是一个字符串"; final String str = "我是一个字符串";
String hex = HexUtil.encodeHexStr(str, CharsetUtil.CHARSET_UTF_8); final String hex = HexUtil.encodeHexStr(str, CharsetUtil.CHARSET_UTF_8);
String decodedStr = HexUtil.decodeHexStr(hex); final String decodedStr = HexUtil.decodeHexStr(hex);
Assert.assertEquals(str, decodedStr); Assert.assertEquals(str, decodedStr);
} }
@Test @Test
public void issueI50MI6Test(){ public void issueI50MI6Test(){
String s = HexUtil.encodeHexStr("烟".getBytes(StandardCharsets.UTF_16BE)); final String s = HexUtil.encodeHexStr("烟".getBytes(StandardCharsets.UTF_16BE));
Assert.assertEquals("70df", s); Assert.assertEquals("70df", s);
} }
@ -40,27 +40,34 @@ public class HexUtilTest {
@Test @Test
public void isHexNumberTest() { public void isHexNumberTest() {
String a = "0x3544534F444"; String a = "0x3544534F444";
boolean isHex = HexUtil.isHexNumber(a); Assert.assertTrue(HexUtil.isHexNumber(a));
Assert.assertTrue(isHex);
// https://gitee.com/dromara/hutool/issues/I62H7K
a = "0x0000000000000001158e460913d00000";
Assert.assertTrue(HexUtil.isHexNumber(a));
// 错误的
a = "0x0000001000T00001158e460913d00000";
Assert.assertFalse(HexUtil.isHexNumber(a));
} }
@Test @Test
public void decodeTest(){ public void decodeTest(){
String str = "e8c670380cb220095268f40221fc748fa6ac39d6e930e63c30da68bad97f885d"; final String str = "e8c670380cb220095268f40221fc748fa6ac39d6e930e63c30da68bad97f885d";
Assert.assertArrayEquals(HexUtil.decodeHex(str), Assert.assertArrayEquals(HexUtil.decodeHex(str),
HexUtil.decodeHex(str.toUpperCase())); HexUtil.decodeHex(str.toUpperCase()));
} }
@Test @Test
public void formatHexTest(){ public void formatHexTest(){
String hex = "e8c670380cb220095268f40221fc748fa6ac39d6e930e63c30da68bad97f885d"; final String hex = "e8c670380cb220095268f40221fc748fa6ac39d6e930e63c30da68bad97f885d";
String formatHex = HexUtil.format(hex); final String formatHex = HexUtil.format(hex);
Assert.assertEquals("e8 c6 70 38 0c b2 20 09 52 68 f4 02 21 fc 74 8f a6 ac 39 d6 e9 30 e6 3c 30 da 68 ba d9 7f 88 5d", formatHex); Assert.assertEquals("e8 c6 70 38 0c b2 20 09 52 68 f4 02 21 fc 74 8f a6 ac 39 d6 e9 30 e6 3c 30 da 68 ba d9 7f 88 5d", formatHex);
} }
@Test @Test
public void decodeHexTest(){ public void decodeHexTest(){
String s = HexUtil.encodeHexStr("6"); final String s = HexUtil.encodeHexStr("6");
final String s1 = HexUtil.decodeHexStr(s); final String s1 = HexUtil.decodeHexStr(s);
Assert.assertEquals("6", s1); Assert.assertEquals("6", s1);
} }