diff --git a/README.md b/README.md index f0f1a8a1..7996e7a5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ - ![gitee头图 java.png](https://resource.likeshop.cn/gitee/mddai.png)
+ + ![likeshop全开源商城](https://server.likeshop.cn/uploads/gitad/likeshop.png)
+![码多多AI](https://server.likeshop.cn/uploads/gitad/mdd.png)

likeadmin通用管理后台(Java)

⚡️快速开发、🛠️ 一键生成代码、✅后台多端自适应、📱手机端、🖥️PC(电脑)端前台

diff --git a/server/like-common/src/main/java/com/mdd/common/util/TimeUtils.java b/server/like-common/src/main/java/com/mdd/common/util/TimeUtils.java index ce91e18a..d526a38a 100644 --- a/server/like-common/src/main/java/com/mdd/common/util/TimeUtils.java +++ b/server/like-common/src/main/java/com/mdd/common/util/TimeUtils.java @@ -5,6 +5,10 @@ import java.lang.management.ManagementFactory; import java.text.DateFormat; import java.text.ParsePosition; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; import java.util.*; import java.util.regex.Pattern; @@ -212,12 +216,10 @@ public class TimeUtils { public static List today() { List list = new ArrayList<>(); // 开始时间 - Calendar todayStart = Calendar.getInstance(); - todayStart.set(Calendar.HOUR, 0); - todayStart.set(Calendar.MINUTE, 0); - todayStart.set(Calendar.SECOND, 0); - todayStart.set(Calendar.MILLISECOND, 0); - list.add(todayStart.getTime().getTime() / 1000 - 43200); + LocalDateTime startOfDay = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS); + ZonedDateTime zonedDateTimeStart = startOfDay.atZone(ZoneId.systemDefault()); + long startTimestamp = Date.from(zonedDateTimeStart.toInstant()).getTime() / 1000; + list.add(startTimestamp); // 结束时间 Calendar todayEnd = Calendar.getInstance();