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

DateUtil.parse支持毫秒时间戳

Browse Source
This commit is contained in:
Looly 2023-12-12 13:34:54 +08:00
parent 32f2d0bd55
commit c45de2b7f4
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@
* 【core 】 修复CharSequenceUtil注释和引用，避免循环引用
* 【extra 】 SpringUtil增加getProperty重载（pr#1122@Gitee）
* 【core 】 FileTypeUtil增加null判断（issue#3419@Github）
* 【core 】 DateUtil.parse支持毫秒时间戳（issue#I8NMP7@Gitee）
### 🐞Bug修复
* 【core 】 修复LocalDateTime#parseDate未判断空问题问题（issue#I8FN7F@Gitee）

3
hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
View File

@ -981,6 +981,9 @@ public class DateUtil extends CalendarUtil {
return parse(dateStr, DatePattern.PURE_DATE_FORMAT);
} else if (length == DatePattern.PURE_TIME_PATTERN.length()) {
return parse(dateStr, DatePattern.PURE_TIME_FORMAT);
}else if(length == 13){
// 时间戳
return date(NumberUtil.parseLong(dateStr));
}
} else if (ReUtil.isMatch(PatternPool.TIME, dateStr)) {
// HH:mm:ss 或者 HH:mm 时间格式匹配单独解析

2
hutool-core/src/test/java/cn/hutool/core/annotation/TestIssueI8CLBJ.java
View File

@ -30,7 +30,7 @@ public class TestIssueI8CLBJ {
Thread thread = new Thread(() -> {
try {
String valueFieldName = annotation.valueFieldName();
System.out.println("valueFieldName:" + valueFieldName);
//Console.log("valueFieldName:" + valueFieldName);
} catch (Exception e) {
e.printStackTrace();
}

11
hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
View File

@ -1126,8 +1126,8 @@ public class DateUtilTest {
@Test
public void isLastDayTest() {
DateTime dateTime = DateUtil.parse("2022-09-30");
int dayOfMonth = DateUtil.getLastDayOfMonth(dateTime);
final DateTime dateTime = DateUtil.parse("2022-09-30");
final int dayOfMonth = DateUtil.getLastDayOfMonth(dateTime);
Assert.assertEquals(dayOfMonth, dateTime.dayOfMonth());
Assert.assertTrue("not is last day of this month !!", DateUtil.isLastDayOfMonth(dateTime));
}
@ -1167,4 +1167,11 @@ public class DateUtilTest {
Assert.assertNotNull(parse);
Assert.assertEquals("2019-10-22 09:56:03", parse.toString());
}
@Test
public void issueI8NMP7Test() {
final String str = "1702262524444";
final DateTime parse = DateUtil.parse(str);
Assert.assertEquals("2023-12-11 10:42:04", Objects.requireNonNull(parse).toString());
}
}