From a867020070981b86ef728013682957746f5c33f6 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 19 May 2025 10:38:33 +0800
Subject: [PATCH] =?UTF-8?q?DateUtils=20=E5=A2=9E=E5=8A=A0=20yyyy-MM-dd'T'H?=
 =?UTF-8?q?H:mm:ss'Z'=20=E6=A0=BC=E5=BC=8F=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/lang/DateUtils.java    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/lang/DateUtils.java b/common/src/main/java/com/jeesite/common/lang/DateUtils.java
index 3051036e..55daff2d 100644
--- a/common/src/main/java/com/jeesite/common/lang/DateUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/DateUtils.java
@@ -17,14 +17,14 @@ import java.util.Date;
  * @version 2017-1-4
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
-	
+
 	private static final String[] parsePatterns = {
 		"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM",
 		"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH", "yyyy/MM",
 		"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM.dd HH", "yyyy.MM", 
 		"yyyy年MM月dd日", "yyyy年MM月dd日 HH时mm分ss秒", "yyyy年MM月dd日 HH时mm分", "yyyy年MM月dd日 HH时", "yyyy年MM月",
-		"yyyyMMdd", "yyyyMM", "yyyy"};
-	
+		"yyyyMMdd", "yyyyMM", "yyyy", "yyyy-MM-dd'T'HH:mm:ss'Z'"};
+
 	/**
 	 * 得到日期字符串 ，转换格式（yyyy-MM-dd）
 	 */
@@ -138,14 +138,25 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	}
 	
 	/**
-	 * 日期型字符串转化为日期 格式   see to DateUtils#parsePatterns
+	 * 日期型字符串转化为日期对象，使用默认格式集
 	 */
 	public static Date parseDate(Object str) {
 		if (str == null){
 			return null;
 		}
+		String dateStr = str.toString();
+		if (StringUtils.isBlank(dateStr)){
+			return null;
+		}
+		return parseDate(dateStr, parsePatterns);
+	}
+
+	/**
+	 * 日期型字符串转化为日期对象，指定日期解析格式
+	 */
+	public static Date parseDate(final String str, final String... parsePatterns) {
 		try {
-			return parseDate(str.toString(), parsePatterns);
+			return parseDate(str, null, parsePatterns);
 		} catch (ParseException e) {
 			return null;
 		}