From 67737a48d7f363103c8fcf6727959573ac455022 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Thu, 25 Jan 2024 12:42:10 +0800
Subject: [PATCH] Parse date consider more pattern

---
 .../datetime/StringToDateConditionalConverter.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java
index e352b3f..7e9b157 100644
--- a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java
+++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.Date;
 
 /**
@@ -26,7 +27,11 @@ class StringToDateConditionalConverter extends DateTimeConditionalConverter<Date
 
     @Override
     protected Date doConvert(String source, DateTimeFormatter formatter) {
-        return DateUtil.parse(source, formatter);
+        try {
+            return DateUtil.parse(source, formatter);
+        } catch (DateTimeParseException e) {
+            return DateUtil.parse(source);
+        }
     }
 
 }
-- 
GitLab