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

fix code

Browse Source
This commit is contained in:
Looly 2023-03-14 22:16:54 +08:00
parent 7adb2d610b
commit 9e73770ae2
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,12 +5,7 @@ import cn.hutool.core.comparator.CompareUtil;
import cn.hutool.core.date.format.DatePrinter; import cn.hutool.core.date.format.DatePrinter;
import cn.hutool.core.date.format.FastDateFormat; import cn.hutool.core.date.format.FastDateFormat;
import cn.hutool.core.date.format.GlobalCustomFormat; import cn.hutool.core.date.format.GlobalCustomFormat;
import cn.hutool.core.date.format.parser.CSTDateParser; import cn.hutool.core.date.format.parser.*;
import cn.hutool.core.date.format.parser.NormalDateParser;
import cn.hutool.core.date.format.parser.PositionDateParser;
import cn.hutool.core.date.format.parser.PureDateParser;
import cn.hutool.core.date.format.parser.TimeParser;
import cn.hutool.core.date.format.parser.UTCDateParser;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.math.NumberUtil; import cn.hutool.core.math.NumberUtil;
import cn.hutool.core.regex.PatternPool; import cn.hutool.core.regex.PatternPool;
@ -26,14 +21,7 @@ import java.time.LocalDateTime;
import java.time.Year; import java.time.Year;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAccessor;
import java.util.ArrayList; import java.util.*;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@ -825,8 +813,8 @@ public class DateUtil extends CalendarUtil {
// Wed Aug 01 00:00:00 CST 2012 // Wed Aug 01 00:00:00 CST 2012
return CSTDateParser.INSTANCE.parse(dateStr); return CSTDateParser.INSTANCE.parse(dateStr);
} else if (StrUtil.contains(dateStr, 'T')) { } else if (StrUtil.contains(dateStr, 'T')) {
// UTC时间 // ISO8601标准时间
return UTCDateParser.INSTANCE.parse(dateStr); return ISO8601DateParser.INSTANCE.parse(dateStr);
} }
//标准日期格式（包括单个数字的日期时间） //标准日期格式（包括单个数字的日期时间）

6
hutool-core/src/main/java/cn/hutool/core/date/format/parser/UTCDateParser.java → hutool-core/src/main/java/cn/hutool/core/date/format/parser/ISO8601DateParser.java
View File

@ -9,7 +9,7 @@ import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharUtil;
/** /**
* UTC日期字符串（JDK的Date对象toString默认格式）解析，支持格式； * ISO8601日期字符串（JDK的Date对象toString默认格式）解析，支持格式；
* <ol> * <ol>
* <li>yyyy-MM-dd'T'HH:mm:ss'Z'</li> * <li>yyyy-MM-dd'T'HH:mm:ss'Z'</li>
* <li>yyyy-MM-dd'T'HH:mm:ss.SSS'Z'</li> * <li>yyyy-MM-dd'T'HH:mm:ss.SSS'Z'</li>
@ -22,13 +22,13 @@ import cn.hutool.core.util.CharUtil;
* @author looly * @author looly
* @since 6.0.0 * @since 6.0.0
*/ */
public class UTCDateParser extends DefaultDateBasic implements DateParser { public class ISO8601DateParser extends DefaultDateBasic implements DateParser {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 单例对象 * 单例对象
*/ */
public static UTCDateParser INSTANCE = new UTCDateParser(); public static ISO8601DateParser INSTANCE = new ISO8601DateParser();
@Override @Override
public DateTime parse(String source) { public DateTime parse(String source) {