mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' 

# Conflicts:
#	README.md
This commit is contained in:
linrun 2025-02-28 00:10:08 +08:00
parent 6a2ca7a674 562e59dc96
commit c41a21df8d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,4 +1,6 @@
<a href="https://gitee.likeshop.cn/giteemddai">![gitee头图 java.png](https://resource.likeshop.cn/gitee/mddai.png)</a><br>
<a href="https://www.likeshop.cn">![likeshop全开源商城](https://server.likeshop.cn/uploads/gitad/likeshop.png)</a><br>
<a href="https://www.mddai.cn">![码多多AI](https://server.likeshop.cn/uploads/gitad/mdd.png)</a><br>
<h1 align="center">likeadmin通用管理后台（Java）</h1> <h1 align="center">likeadmin通用管理后台（Java）</h1>
<h4 align="center">⚡️快速开发、🛠️ 一键生成代码、✅后台多端自适应、📱手机端、🖥️PC（电脑）端前台</h4> <h4 align="center">⚡️快速开发、🛠️ 一键生成代码、✅后台多端自适应、📱手机端、🖥️PC（电脑）端前台</h4>
<p align="center"> <p align="center">

14
server/like-common/src/main/java/com/mdd/common/util/TimeUtils.java
View File

@ -5,6 +5,10 @@ import java.lang.management.ManagementFactory;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParsePosition; import java.text.ParsePosition;
import java.text.SimpleDateFormat; 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.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -212,12 +216,10 @@ public class TimeUtils {
public static List<Long> today() { public static List<Long> today() {
List<Long> list = new ArrayList<>(); List<Long> list = new ArrayList<>();
// 开始时间 // 开始时间
Calendar todayStart = Calendar.getInstance(); LocalDateTime startOfDay = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
todayStart.set(Calendar.HOUR, 0); ZonedDateTime zonedDateTimeStart = startOfDay.atZone(ZoneId.systemDefault());
todayStart.set(Calendar.MINUTE, 0); long startTimestamp = Date.from(zonedDateTimeStart.toInstant()).getTime() / 1000;
todayStart.set(Calendar.SECOND, 0); list.add(startTimestamp);
todayStart.set(Calendar.MILLISECOND, 0);
list.add(todayStart.getTime().getTime() / 1000 - 43200);
// 结束时间 // 结束时间
Calendar todayEnd = Calendar.getInstance(); Calendar todayEnd = Calendar.getInstance();