From 01830e44921b187b448d8cce9c9a46b9ad55af43 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 02 May 2025 19:48:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bingx' into bingx
---
src/main/java/project/web/api/RealtimeController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/project/web/api/RealtimeController.java b/src/main/java/project/web/api/RealtimeController.java
index a293fb1..5530d9e 100644
--- a/src/main/java/project/web/api/RealtimeController.java
+++ b/src/main/java/project/web/api/RealtimeController.java
@@ -93,8 +93,8 @@
map.put("ts", realtime.getTs());
String currentTime = realtime.getCurrent_time();
// 设置时区为纽约的冬令时（Eastern Standard Time, EST）
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH);
- sdf.setTimeZone(TimeZone.getTimeZone("America/New_York"));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
Date parsedDate = sdf.parse(currentTime);
map.put("current_time",sdf.format(parsedDate));
map.put("name", realtime.getName());
--
Gitblit v1.9.3