From c8d8e75810b7777f2e2768082b6a3e19c7c99cd2 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 06 May 2026 16:03:34 +0800
Subject: [PATCH] 1
---
trading-order-common/src/main/java/com/yami/trading/common/util/DateUtils.java | 6 +++---
trading-order-admin/src/main/java/com/yami/trading/admin/task/RealtimePushJob.java | 2 +-
trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java | 4 ++--
trading-order-admin/src/main/resources/application.yml | 4 ++--
trading-order-admin/src/main/resources/application-prod.yml | 8 ++++----
trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java | 2 +-
trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/Ico.java | 6 +++---
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java | 8 ++++----
trading-order-admin/src/main/java/com/yami/trading/WebApplication.java | 4 ++--
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java b/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
index 2e66836..6b42344 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
@@ -46,8 +46,8 @@
@PostConstruct
void init() {
// 强制设置默认时区（影响整个JVM）
- TimeZone.setDefault(TimeZone.getTimeZone("Asia/Tokyo"));
- System.setProperty("user.timezone", "Asia/Tokyo");
+ TimeZone.setDefault(TimeZone.getTimeZone("America/New_York"));
+ System.setProperty("user.timezone", "America/New_York");
}
@Override
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/task/RealtimePushJob.java b/trading-order-admin/src/main/java/com/yami/trading/admin/task/RealtimePushJob.java
index cea8c1d..f56d53f 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/task/RealtimePushJob.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/task/RealtimePushJob.java
@@ -156,7 +156,7 @@
}
if(Item.forex.equalsIgnoreCase(bySymbol.getType())){
market = new StockMarket();
- market.setTime_zone( "Asia/Tokyo");
+ market.setTime_zone( "America/New_York");
if(MarketOpenChecker.isMarketOpenByItemCloseType(bySymbol.getOpenCloseType())){
market.setStatus("交易中");
}else{
diff --git a/trading-order-admin/src/main/resources/application-prod.yml b/trading-order-admin/src/main/resources/application-prod.yml
index 808ac13..0a372cb 100644
--- a/trading-order-admin/src/main/resources/application-prod.yml
+++ b/trading-order-admin/src/main/resources/application-prod.yml
@@ -2,8 +2,8 @@
port: 8235
spring:
datasource:
-# url: jdbc:mysql://127.0.0.1:6306/8.4?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&serverTimezone=Asia/Tokyo&useLegacyDatetimeCode=false
- url: jdbc:mysql://127.0.0.1:3306/trading_order?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&serverTimezone=Asia/Tokyo&useLegacyDatetimeCode=false
+# url: jdbc:mysql://127.0.0.1:6306/8.4?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&serverTimezone=America/New_York&useLegacyDatetimeCode=false
+ url: jdbc:mysql://127.0.0.1:3306/trading_order?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&serverTimezone=America/New_York&useLegacyDatetimeCode=false
username: trading_order
password: dzptt5sWi6y6p4Fs
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -21,9 +21,9 @@
properties:
hibernate:
jdbc:
- time_zone: Asia/Tokyo
+ time_zone: America/New_York
jackson:
- time-zone: Asia/Tokyo
+ time-zone: America/New_York
cache:
type: redis
redis:
diff --git a/trading-order-admin/src/main/resources/application.yml b/trading-order-admin/src/main/resources/application.yml
index b090880..d271547 100644
--- a/trading-order-admin/src/main/resources/application.yml
+++ b/trading-order-admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: true
jackson:
date-format: yyyy-MM-dd HH:mm:ss
- time-zone: Asia/Tokyo
+ time-zone: America/New_York
mvc:
pathmatch:
matching-strategy: ANT_PATH_MATCHER
@@ -18,7 +18,7 @@
properties:
hibernate:
jdbc:
- time_zone: Asia/Tokyo
+ time_zone: America/New_York
# mybaits-plus配置
mybatis-plus:
# MyBatis Mapper所对应的XML文件位置
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/Ico.java b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/Ico.java
index dd6dbaa..f61c613 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/Ico.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/Ico.java
@@ -82,15 +82,15 @@
private String whitepaperUrl;
@ApiModelProperty("申购开始时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "America/New_York")
private Date startDate;
@ApiModelProperty("申购结束时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "America/New_York")
private Date endDate;
@ApiModelProperty("上市开始时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "America/New_York")
private Date marketDate;
@ApiModelProperty("货币图片地址")
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
index a99555f..718e72a 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
@@ -45,7 +45,7 @@
@ApiModelProperty("中签时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "America/New_York")
private Date endTime;
@ApiModelProperty("备注")
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java b/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
index 21a480f..fd8f9b5 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
@@ -21,7 +21,7 @@
/**
* 创建日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Tokyo")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "America/New_York")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -38,7 +38,7 @@
/**
* 更新日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Tokyo")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "America/New_York")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/util/DateUtils.java b/trading-order-common/src/main/java/com/yami/trading/common/util/DateUtils.java
index ef6e6be..26432d1 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/util/DateUtils.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/util/DateUtils.java
@@ -20,7 +20,7 @@
public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
- public static final String DEFAULT_TIME_ZONE = "Asia/Tokyo";
+ public static final String DEFAULT_TIME_ZONE = "America/New_York";
public static final String NORMAL_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
@@ -644,7 +644,7 @@
if (format == null || format.isEmpty()) {
format = "yyyy-MM-dd HH:mm:ss";
}
- TimeZone timeZone = TimeZone.getTimeZone("Asia/Tokyo");
+ TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
SimpleDateFormat sdf = new SimpleDateFormat(format);
sdf.setTimeZone(timeZone);
// 类库使用时候，也保证有个正确结果
@@ -658,7 +658,7 @@
if (millisecond == null || millisecond.isEmpty() || millisecond.equals("null")) {
return "";
}
- TimeZone timeZone = TimeZone.getTimeZone("Asia/Tokyo");
+ TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
sdf.setTimeZone(timeZone);
return sdf.format(new Date(Long.valueOf(millisecond)));
diff --git a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java
index 9ec30ce..45112bb 100644
--- a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java
+++ b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java
@@ -112,11 +112,11 @@
// 1. 确定时间戳单位（假设ts是毫秒级，若为秒级需用ofEpochSecond()）
Instant instant = Instant.ofEpochMilli(ts);
- // 2. 将时间戳转换为当地时区的日期（指定时区更准确，如Asia/Tokyo）
- LocalDate tsDate = instant.atZone(ZoneId.of("Asia/Tokyo")).toLocalDate();
+ // 2. 将时间戳转换为当地时区的日期（指定时区更准确，如America/New_York）
+ LocalDate tsDate = instant.atZone(ZoneId.of("America/New_York")).toLocalDate();
// 3. 获取“昨天的日期”（当前日期减1天）
- LocalDate yesterday = LocalDate.now(ZoneId.of("Asia/Tokyo")).minusDays(1);
+ LocalDate yesterday = LocalDate.now(ZoneId.of("America/New_York")).minusDays(1);
// 4. 判断是否为昨天
boolean isYesterday = tsDate.equals(yesterday);
@@ -150,7 +150,7 @@
long currentTimeStamp = System.currentTimeMillis();
// 如果需要严格基于东京时区的当前时间戳（结果和上面一致，因为时间戳是UTC绝对时间）
- //long currentTokyoTimeStamp = Instant.now().atZone(ZoneId.of("Asia/Tokyo")).toInstant().toEpochMilli();
+ //long currentTokyoTimeStamp = Instant.now().atZone(ZoneId.of("America/New_York")).toInstant().toEpochMilli();
RequestDataHelper.set("symbol", symbol);
QueryWrapper<Realtime> queryWrapper = new QueryWrapper<Realtime>()
.eq("symbol", symbol) // 直接写数据库字段名（需和表字段一致）
--
Gitblit v1.9.3