fenghp/RuoYi-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: unify backend timezone to Asia/Shanghai

Browse Source
This commit is contained in:
fenghp
2026-05-21 19:36:42 +08:00
parent ee66491a25
commit 3e0f503a0d
4 changed files with 79 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+59 -50
View File
@@ -3,22 +3,27 @@ package com.ruoyi.common.utils;
import java.lang.management.ManagementFactory;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.TimeZone;
import org.apache.commons.lang3.time.DateFormatUtils;
/**
* 时间工具类
*
* @author ruoyi
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
{
public static String YYYY = "yyyy";
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
{
private static final ZoneId BEIJING_ZONE_ID = ZoneId.of("Asia/Shanghai");
private static final TimeZone BEIJING_TIME_ZONE = TimeZone.getTimeZone(BEIJING_ZONE_ID);
public static String YYYY = "yyyy";
public static String YYYY_MM = "yyyy-MM";
@@ -38,10 +43,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
*
* @return Date() 当前日期
*/
public static Date getNowDate()
{
return new Date();
}
public static Date getNowDate()
{
return Date.from(ZonedDateTime.now(BEIJING_ZONE_ID).toInstant());
}
/**
* 获取当前日期, 默认格式为yyyy-MM-dd
@@ -63,27 +68,31 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
return dateTimeNow(YYYYMMDDHHMMSS);
}
public static final String dateTimeNow(final String format)
{
return parseDateToStr(format, new Date());
}
public static final String dateTimeNow(final String format)
{
return parseDateToStr(format, getNowDate());
}
public static final String dateTime(final Date date)
{
return parseDateToStr(YYYY_MM_DD, date);
}
public static final String parseDateToStr(final String format, final Date date)
{
return new SimpleDateFormat(format).format(date);
}
public static final String parseDateToStr(final String format, final Date date)
{
SimpleDateFormat formatter = new SimpleDateFormat(format);
formatter.setTimeZone(BEIJING_TIME_ZONE);
return formatter.format(date);
}
public static final Date dateTime(final String format, final String ts)
{
try
{
return new SimpleDateFormat(format).parse(ts);
}
public static final Date dateTime(final String format, final String ts)
{
try
{
SimpleDateFormat formatter = new SimpleDateFormat(format);
formatter.setTimeZone(BEIJING_TIME_ZONE);
return formatter.parse(ts);
}
catch (ParseException e)
{
throw new RuntimeException(e);
@@ -93,20 +102,20 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 日期路径 即年/月/日 如2018/08/08
*/
public static final String datePath()
{
Date now = new Date();
return DateFormatUtils.format(now, "yyyy/MM/dd");
}
public static final String datePath()
{
Date now = getNowDate();
return DateFormatUtils.format(now, "yyyy/MM/dd");
}
/**
* 日期路径 即年/月/日 如20180808
*/
public static final String dateTime()
{
Date now = new Date();
return DateFormatUtils.format(now, "yyyyMMdd");
}
public static final String dateTime()
{
Date now = getNowDate();
return DateFormatUtils.format(now, "yyyyMMdd");
}
/**
* 日期型字符串转化为日期 格式
@@ -173,19 +182,19 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 增加 LocalDateTime ==> Date
*/
public static Date toDate(LocalDateTime temporalAccessor)
{
ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
return Date.from(zdt.toInstant());
}
public static Date toDate(LocalDateTime temporalAccessor)
{
ZonedDateTime zdt = temporalAccessor.atZone(BEIJING_ZONE_ID);
return Date.from(zdt.toInstant());
}
/**
* 增加 LocalDate ==> Date
*/
public static Date toDate(LocalDate temporalAccessor)
{
LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
return Date.from(zdt.toInstant());
}
}
public static Date toDate(LocalDate temporalAccessor)
{
LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
ZonedDateTime zdt = localDateTime.atZone(BEIJING_ZONE_ID);
return Date.from(zdt.toInstant());
}
}