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

DateUtil.parseUTC支持只有时分的格式

Browse Source
This commit is contained in:
Looly 2022-08-15 09:11:53 +08:00
parent 993f94f9f3
commit 92ca87a8fc
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,10 +3,11 @@
-------------------------------------------------------------------------------------------------------------
# 5.8.6.M1 (2022-08-11)
# 5.8.6.M1 (2022-08-15)
### 🐣新特性
* 【core 】 CollUtil新增addIfAbsent方法（pr#750@Gitee）
* 【core 】 DateUtil.parseUTC支持只有时分的格式（issue#I5M6DP@Gitee）
*
### 🐞Bug修复
* 【http 】 修复https下可能的Patch、Get请求失效问题（issue#I3Z3DH@Gitee）

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

@ -834,7 +834,7 @@ public class DateUtil extends CalendarUtil {
if (utcString == null) {
return null;
}
int length = utcString.length();
final int length = utcString.length();
if (StrUtil.contains(utcString, 'Z')) {
if (length == DatePattern.UTC_PATTERN.length() - 4) {
// 格式类似：2018-09-13T05:34:31Z，-4表示减去4个单引号的长度
@ -871,6 +871,9 @@ public class DateUtil extends CalendarUtil {
if (length == DatePattern.UTC_SIMPLE_PATTERN.length() - 2) {
// 格式类似：2018-09-13T05:34:31
return parse(utcString, DatePattern.UTC_SIMPLE_FORMAT);
} else if (length == DatePattern.UTC_SIMPLE_PATTERN.length() - 5) {
// 格式类似：2018-09-13T05:34
return parse(utcString + ":00", DatePattern.UTC_SIMPLE_FORMAT);
} else if (StrUtil.contains(utcString, CharUtil.DOT)) {
// 可能为： 2021-03-17T06:31:33.99
return parse(utcString, DatePattern.UTC_SIMPLE_MS_FORMAT);

7
hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
View File

@ -990,4 +990,11 @@ public class CollUtilTest {
super(name, age);
}
}
@Test
public void getFirstTest(){
final List<?> nullList = null;
final Object first = CollUtil.getFirst(nullList);
Assert.assertNull(first);
}
}

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

@ -695,6 +695,15 @@ public class DateUtilTest {
Assert.assertEquals("2021-03-30 12:56:51", parse.toString());
}
@Test
public void parseUTCTest3() {
// issue#I5M6DP
final String dateStr = "2022-08-13T09:30";
final DateTime dateTime = DateUtil.parse(dateStr);
Assert.assertNotNull(dateTime);
Assert.assertEquals("2022-08-13 09:30:00", dateTime.toString());
}
@Test
public void parseCSTTest() {
final String dateStr = "Wed Sep 16 11:26:23 CST 2009";