From bcd499b4bc951aeb638726842d43c8d4105f715f Mon Sep 17 00:00:00 2001 From: tim Date: Mon, 11 Aug 2025 10:43:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20UTC=20=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/com/openisle/service/PostService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/com/openisle/service/PostService.java b/backend/src/main/java/com/openisle/service/PostService.java index 69c071a92..56bb82650 100644 --- a/backend/src/main/java/com/openisle/service/PostService.java +++ b/backend/src/main/java/com/openisle/service/PostService.java @@ -110,7 +110,7 @@ public class PostService { for (LotteryPost lp : lotteryPostRepository.findByEndTimeAfterAndWinnersIsEmpty(now)) { ScheduledFuture future = taskScheduler.schedule( () -> finalizeLottery(lp.getId()), - java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).toInstant())); + java.util.Date.from(lp.getEndTime().atZone(java.time.ZoneOffset.UTC).toInstant())); scheduledFinalizations.put(lp.getId(), future); } for (LotteryPost lp : lotteryPostRepository.findByEndTimeBeforeAndWinnersIsEmpty(now)) { @@ -210,8 +210,7 @@ public class PostService { if (post instanceof LotteryPost lp && lp.getEndTime() != null) { ScheduledFuture future = taskScheduler.schedule( () -> finalizeLottery(lp.getId()), - java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).toInstant())); - scheduledFinalizations.put(lp.getId(), future); + java.util.Date.from(lp.getEndTime().atZone(java.time.ZoneOffset.UTC).toInstant())); scheduledFinalizations.put(lp.getId(), future); } return post; } From 86ef6f9ce7cf57fe826275b531b5ae5e9ef85522 Mon Sep 17 00:00:00 2001 From: tim Date: Mon, 11 Aug 2025 10:50:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"fix:=20UTC=20=E6=97=B6=E9=97=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bcd499b4bc951aeb638726842d43c8d4105f715f. --- backend/src/main/java/com/openisle/service/PostService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/openisle/service/PostService.java b/backend/src/main/java/com/openisle/service/PostService.java index 56bb82650..69c071a92 100644 --- a/backend/src/main/java/com/openisle/service/PostService.java +++ b/backend/src/main/java/com/openisle/service/PostService.java @@ -110,7 +110,7 @@ public class PostService { for (LotteryPost lp : lotteryPostRepository.findByEndTimeAfterAndWinnersIsEmpty(now)) { ScheduledFuture future = taskScheduler.schedule( () -> finalizeLottery(lp.getId()), - java.util.Date.from(lp.getEndTime().atZone(java.time.ZoneOffset.UTC).toInstant())); + java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).toInstant())); scheduledFinalizations.put(lp.getId(), future); } for (LotteryPost lp : lotteryPostRepository.findByEndTimeBeforeAndWinnersIsEmpty(now)) { @@ -210,7 +210,8 @@ public class PostService { if (post instanceof LotteryPost lp && lp.getEndTime() != null) { ScheduledFuture future = taskScheduler.schedule( () -> finalizeLottery(lp.getId()), - java.util.Date.from(lp.getEndTime().atZone(java.time.ZoneOffset.UTC).toInstant())); scheduledFinalizations.put(lp.getId(), future); + java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).toInstant())); + scheduledFinalizations.put(lp.getId(), future); } return post; } From 2280a16a833fab43dad21f4a1c9348f6b6377a46 Mon Sep 17 00:00:00 2001 From: tim Date: Mon, 11 Aug 2025 10:55:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Reapply=20"fix:=20UTC=20=E6=97=B6=E9=97=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 86ef6f9ce7cf57fe826275b531b5ae5e9ef85522. --- backend/src/main/java/com/openisle/service/PostService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/com/openisle/service/PostService.java b/backend/src/main/java/com/openisle/service/PostService.java index 69c071a92..56bb82650 100644 --- a/backend/src/main/java/com/openisle/service/PostService.java +++ b/backend/src/main/java/com/openisle/service/PostService.java @@ -110,7 +110,7 @@ public class PostService { for (LotteryPost lp : lotteryPostRepository.findByEndTimeAfterAndWinnersIsEmpty(now)) { ScheduledFuture future = taskScheduler.schedule( () -> finalizeLottery(lp.getId()), - java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).toInstant())); + java.util.Date.from(lp.getEndTime().atZone(java.time.ZoneOffset.UTC).toInstant())); scheduledFinalizations.put(lp.getId(), future); } for (LotteryPost lp : lotteryPostRepository.findByEndTimeBeforeAndWinnersIsEmpty(now)) { @@ -210,8 +210,7 @@ public class PostService { if (post instanceof LotteryPost lp && lp.getEndTime() != null) { ScheduledFuture future = taskScheduler.schedule( () -> finalizeLottery(lp.getId()), - java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).toInstant())); - scheduledFinalizations.put(lp.getId(), future); + java.util.Date.from(lp.getEndTime().atZone(java.time.ZoneOffset.UTC).toInstant())); scheduledFinalizations.put(lp.getId(), future); } return post; }