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

Merge pull request #2889 from winlans/v5-dev

Browse Source 
fix DateUtil.parseUTC
This commit is contained in:
Golden Looly 2023-02-09 20:33:44 +08:00 committed by GitHub
commit 2169e33e61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -874,6 +874,7 @@ public class DateUtil extends CalendarUtil {
if (StrUtil.contains(utcString, CharUtil.DOT)) {
// 带毫秒，格式类似：2018-09-13T05:34:31.999+08:00
utcString = normalizeMillSeconds(utcString, ".", "+");
return parse(utcString, DatePattern.UTC_MS_WITH_XXX_OFFSET_FORMAT);
} else {
// 格式类似：2018-09-13T05:34:31+08:00
@ -890,6 +891,7 @@ public class DateUtil extends CalendarUtil {
if (StrUtil.contains(utcString, CharUtil.DOT)) {
// 带毫秒，格式类似：2018-09-13T05:34:31.999-08:00
utcString = normalizeMillSeconds(utcString, ".", "-");
return new DateTime(utcString, DatePattern.UTC_MS_WITH_XXX_OFFSET_FORMAT);
} else {
// 格式类似：2018-09-13T05:34:31-08:00
@ -904,6 +906,7 @@ public class DateUtil extends CalendarUtil {
return parse(utcString + ":00", DatePattern.UTC_SIMPLE_FORMAT);
} else if (StrUtil.contains(utcString, CharUtil.DOT)) {
// 可能为： 2021-03-17T06:31:33.99
utcString = normalizeMillSeconds(utcString, ".", null);
return parse(utcString, DatePattern.UTC_SIMPLE_MS_FORMAT);
}
}
@ -2349,4 +2352,23 @@ public class DateUtil extends CalendarUtil {
return builder.toString();
}
// ------------------------------------------------------------------------ Private method end
/**
* 如果日期中的毫秒部分超出3位，会导致秒数增加，因此只保留前三位
*
* @param dateStr 日期字符串
* @param before 毫秒部分的前一个字符
* @param after 毫秒部分的后一个字符
* @return 规范之后的毫秒部分
*/
private static String normalizeMillSeconds(String dateStr, CharSequence before, CharSequence after) {
if (StrUtil.isBlank(after)) {
String millOrNaco = StrUtil.subPre(StrUtil.subAfter(dateStr, before, true), 3);
return StrUtil.subBefore(dateStr, before, true) + before + millOrNaco;
}
String millOrNaco = StrUtil.subPre(StrUtil.subBetween(dateStr, before, after), 3);
return StrUtil.subBefore(dateStr, before, true)
+ before
+ millOrNaco + after + StrUtil.subAfter(dateStr, after, true);
}
}

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

@ -1101,10 +1101,33 @@ public class DateUtilTest {
}
@Test
public void isLastDayTest(){
public void isLastDayTest() {
DateTime dateTime = DateUtil.parse("2022-09-30");
int dayOfMonth = DateUtil.getLastDayOfMonth(dateTime);
Assert.assertEquals(dayOfMonth,dateTime.dayOfMonth());
Assert.assertTrue("not is last day of this month !!",DateUtil.isLastDayOfMonth(dateTime));
int dayOfMonth = DateUtil.getLastDayOfMonth(dateTime);
Assert.assertEquals(dayOfMonth, dateTime.dayOfMonth());
Assert.assertTrue("not is last day of this month !!", DateUtil.isLastDayOfMonth(dateTime));
}
/**
* issue#2887 由于UTC时间的毫秒部分超出3位导致的秒数增加的问题
*/
@Test
public void parseUTCTest4() {
final String dateStr = "2023-02-07T00:02:16.12345+08:00";
final DateTime dateTime = DateUtil.parse(dateStr);
Assert.assertNotNull(dateTime);
Assert.assertEquals("2023-02-07 00:02:16", dateTime.toString());
final String dateStr2 = "2023-02-07T00:02:16.12345-08:00";
final DateTime dateTime2 = DateUtil.parse(dateStr2);
Assert.assertNotNull(dateTime2);
Assert.assertEquals("2023-02-07 00:02:16", dateTime2.toString());
final String dateStr3 = "2021-03-17T06:31:33.9999";
final DateTime dateTime3 = DateUtil.parse(dateStr3);
Assert.assertNotNull(dateTime3);
Assert.assertEquals("2021-03-17 06:31:33", dateTime3.toString());
}
}