From f2ae96af22992e53f563891fd67398cfaaf8fdb0 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 7 Aug 2023 11:07:39 +0800 Subject: [PATCH] fix bug --- .../dromara/hutool/core/date/DatePattern.java | 2 +- .../date/format/parser/NormalDateParser.java | 1 + .../hutool/core/date/IssueI7QI6RTest.java | 25 +++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100755 hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI7QI6RTest.java diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DatePattern.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DatePattern.java index a0bb9b755..5d55831f3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DatePattern.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DatePattern.java @@ -99,7 +99,7 @@ public class DatePattern { * * @since 5.3.6 */ - public static final Pattern REGEX_NORM = Pattern.compile("\\d{4}-\\d{1,2}-\\d{1,2}(\\s\\d{1,2}:\\d{1,2}(:\\d{1,2})?)?(.\\d{1,6})?"); + public static final Pattern REGEX_NORM = Pattern.compile("\\d{4}-\\d{1,2}-\\d{1,2}(\\s\\d{1,2}:\\d{1,2}(:\\d{1,2})?(.\\d{1,6})?)?"); // region Normal //================================================== Normal ================================================== diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java index 9c5cd9194..05b91bd59 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java @@ -16,6 +16,7 @@ import org.dromara.hutool.core.date.DateException; import org.dromara.hutool.core.date.DatePattern; import org.dromara.hutool.core.date.DateTime; import org.dromara.hutool.core.date.format.DefaultDateBasic; +import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.CharUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI7QI6RTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI7QI6RTest.java new file mode 100755 index 000000000..60482522b --- /dev/null +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI7QI6RTest.java @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.core.date; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class IssueI7QI6RTest { + + @Test + void parseTest() { + Assertions.assertThrows(DateException.class, ()-> DateUtil.parse("2023-8-4-1")); + Assertions.assertThrows(DateException.class, ()-> DateUtil.parse("2023-8-4 1")); + } +}