From 026afb641f4247dba8fc3562dc1d886ee186818d Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Sat, 25 Jul 2020 18:06:08 +0800
Subject: [PATCH] add method

---
 .../java/cn/hutool/core/date/DatePattern.java |  9 ++++++++
 .../java/cn/hutool/core/date/DateUtil.java    |  2 +-
 .../hutool/core/date/LocalDateTimeUtil.java   | 22 +++++++++++++++++++
 .../main/java/cn/hutool/core/img/ImgUtil.java |  2 +-
 .../core/date/LocalDateTimeUtilTest.java      | 10 +++++++--
 hutool-crypto/pom.xml                         |  4 ++--
 6 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java b/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java
index 7f9cd1a41..1f54dc1de 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java
@@ -2,6 +2,7 @@ package cn.hutool.core.date;
 
 import cn.hutool.core.date.format.FastDateFormat;
 
+import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
@@ -35,6 +36,10 @@ public class DatePattern {
 	 * 标准日期格式 {@link FastDateFormat}：yyyy-MM-dd
 	 */
 	public static final FastDateFormat NORM_DATE_FORMAT = FastDateFormat.getInstance(NORM_DATE_PATTERN);
+	/**
+	 * 标准日期格式 {@link FastDateFormat}：yyyy-MM-dd
+	 */
+	public static final DateTimeFormatter NORM_DATE_FORMATTER = DateTimeFormatter.ofPattern(NORM_DATE_PATTERN);
 
 	/**
 	 * 标准时间格式：HH:mm:ss
@@ -62,6 +67,10 @@ public class DatePattern {
 	 * 标准日期时间格式，精确到秒 {@link FastDateFormat}：yyyy-MM-dd HH:mm:ss
 	 */
 	public static final FastDateFormat NORM_DATETIME_FORMAT = FastDateFormat.getInstance(NORM_DATETIME_PATTERN);
+	/**
+	 * 标准日期时间格式，精确到秒 {@link FastDateFormat}：yyyy-MM-dd HH:mm:ss
+	 */
+	public static final DateTimeFormatter NORM_DATETIME_FORMATTER = DateTimeFormatter.ofPattern(NORM_DATETIME_PATTERN);
 
 	/**
 	 * 标准日期时间格式，精确到毫秒：yyyy-MM-dd HH:mm:ss.SSS
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
index 91cdae363..ac725c4dc 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
@@ -482,7 +482,7 @@ public class DateUtil extends CalendarUtil {
 	 * @return 格式化后的字符串
 	 */
 	public static String formatLocalDateTime(LocalDateTime localDateTime) {
-		return format(localDateTime, DatePattern.NORM_DATETIME_PATTERN);
+		return LocalDateTimeUtil.formatNormal(localDateTime);
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java
index 3562e85ff..e22ddf2cd 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java
@@ -292,6 +292,17 @@ public class LocalDateTimeUtil {
 		return parseDate(text, DateTimeFormatter.ofPattern(format));
 	}
 
+	/**
+	 * 格式化日期时间为yyyy-MM-dd HH:mm:ss格式
+	 *
+	 * @param time      {@link LocalDateTime}
+	 * @return 格式化后的字符串
+	 * @since 5.3.11
+	 */
+	public static String formatNormal(LocalDateTime time) {
+		return format(time, DatePattern.NORM_DATETIME_FORMATTER);
+	}
+
 	/**
 	 * 格式化日期时间为指定格式
 	 *
@@ -317,6 +328,17 @@ public class LocalDateTimeUtil {
 		return format(time, DateTimeFormatter.ofPattern(format));
 	}
 
+	/**
+	 * 格式化日期时间为yyyy-MM-dd格式
+	 *
+	 * @param date      {@link LocalDate}
+	 * @return 格式化后的字符串
+	 * @since 5.3.11
+	 */
+	public static String formatNormal(LocalDate date) {
+		return format(date, DatePattern.NORM_DATE_FORMATTER);
+	}
+
 	/**
 	 * 格式化日期时间为指定格式
 	 *
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java b/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java
index 165f5dea7..5419cfba5 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java
@@ -1269,7 +1269,7 @@ public class ImgUtil {
 	 * @return Base64的字符串表现形式
 	 * @since 5.3.6
 	 */
-	public static String toBase64DateUri(Image image, String imageType) {
+	public static String toBase64DataUri(Image image, String imageType) {
 		return URLUtil.getDataUri(
 				"image/" + imageType, "base64",
 				toBase64(image, imageType));
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java
index 32ddd03b9..b0ac3c906 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java
@@ -74,14 +74,20 @@ public class LocalDateTimeUtilTest {
 		String format = LocalDateTimeUtil.format(localDateTime, DatePattern.NORM_DATETIME_PATTERN);
 		Assert.assertEquals("2020-01-23 12:23:56", format);
 
+		format = LocalDateTimeUtil.formatNormal(localDateTime);
+		Assert.assertEquals("2020-01-23 12:23:56", format);
+
 		format = LocalDateTimeUtil.format(localDateTime, DatePattern.NORM_DATE_PATTERN);
 		Assert.assertEquals("2020-01-23", format);
 	}
 
 	@Test
 	public void formatLocalDateTest() {
-		final LocalDate localDateTime = LocalDate.parse("2020-01-23");
-		String format = LocalDateTimeUtil.format(localDateTime, DatePattern.NORM_DATE_PATTERN);
+		final LocalDate date = LocalDate.parse("2020-01-23");
+		String format = LocalDateTimeUtil.format(date, DatePattern.NORM_DATE_PATTERN);
+		Assert.assertEquals("2020-01-23", format);
+
+		format = LocalDateTimeUtil.formatNormal(date);
 		Assert.assertEquals("2020-01-23", format);
 	}
 
diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index 9c660d05f..709f62444 100644
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<!-- versions -->
-		<bouncycastle.version>1.65.01</bouncycastle.version>
+		<bouncycastle.version>1.66</bouncycastle.version>
 	</properties>
 
 	<dependencies>
@@ -29,7 +29,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
+			<artifactId>bcprov-jdk15to18</artifactId>
 			<version>${bouncycastle.version}</version>
 			<scope>compile</scope>
 			<optional>true</optional>