lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-30 20:57:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add method

Browse Source
This commit is contained in:
Looly 2020-07-25 18:06:08 +08:00
parent baa8ddd9ed
commit 026afb641f
6 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java
View File

@ -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

2
hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
View File

@ -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);
}
/**

22
hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java
View File

@ -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);
}
/**
* 格式化日期时间为指定格式
*

2
hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java
View File

@ -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));

10
hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java
View File

@ -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);
}

4
hutool-crypto/pom.xml
View File

@ -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>