diff --git a/src/main/java/org/ssssssss/script/functions/ObjectConvertExtension.java b/src/main/java/org/ssssssss/script/functions/ObjectConvertExtension.java index 68e35459835f5854a103c99a7ff2e44989930292..ddb95aba99f3425fef7f6c7b30d71db65d5de884 100644 --- a/src/main/java/org/ssssssss/script/functions/ObjectConvertExtension.java +++ b/src/main/java/org/ssssssss/script/functions/ObjectConvertExtension.java @@ -107,17 +107,19 @@ public class ObjectConvertExtension { */ @Comment("将对象转为Date类型,支持String、10位、13位时间戳") public static Date asDate(Object val, - @Comment(name = "format", value = "日期格式,如yyyy-MM-dd HH:mm:ss") String format) { + @Comment(name = "format", value = "日期格式,如yyyy-MM-dd HH:mm:ss") String... formats) { if (val == null) { return null; } if (val instanceof String) { - try { - return new SimpleDateFormat(format).parse(val.toString()); - } catch (ParseException e) { - long longVal = asLong(val, -1); - if (longVal > 0) { - return asDate(longVal, format); + for (String format : formats) { + try { + return new SimpleDateFormat(format).parse(val.toString()); + } catch (ParseException e) { + long longVal = asLong(val, -1); + if (longVal > 0) { + return asDate(longVal, format); + } } } } else if (val instanceof Date) {