From 2cf8b2bd062983498b90d0835f939ae03110896e Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 14:50:22 +0800
Subject: [PATCH] 时区修改
---
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-common/src/main/java/com/yami/trading/common/util/MarketOpenChecker.java | 2 +-
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 | 6 +++---
trading-order-admin/src/main/java/com/yami/trading/WebApplication.java | 4 ++--
10 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 7d3e0f9..2e66836 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/Shanghai"));
- System.setProperty("user.timezone", "Asia/Shanghai");
+ TimeZone.setDefault(TimeZone.getTimeZone("Asia/Tokyo"));
+ System.setProperty("user.timezone", "Asia/Tokyo");
}
@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 236097c..cea8c1d 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/Shanghai");
+ market.setTime_zone( "Asia/Tokyo");
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 2725b7b..89f09e1 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/Shanghai&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/Shanghai&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=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
username: root
password: REbZZEBRfGect48X
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -21,9 +21,9 @@
properties:
hibernate:
jdbc:
- time_zone: Asia/Shanghai
+ time_zone: Asia/Tokyo
jackson:
- time-zone: Asia/Shanghai
+ time-zone: Asia/Tokyo
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 cf997bd..b090880 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/Shanghai
+ time-zone: Asia/Tokyo
mvc:
pathmatch:
matching-strategy: ANT_PATH_MATCHER
@@ -18,7 +18,7 @@
properties:
hibernate:
jdbc:
- time_zone: Asia/Shanghai
+ time_zone: Asia/Tokyo
# 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 43fe1e6..dd6dbaa 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/Shanghai")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
private Date startDate;
@ApiModelProperty("申购结束时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
private Date endDate;
@ApiModelProperty("上市开始时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
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 9ca13cf..a99555f 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/Shanghai")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
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 8ebc988..21a480f 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/Shanghai")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Tokyo")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -38,7 +38,7 @@
/**
* 更新日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Tokyo")
@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 7b5471d..ef6e6be 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/Shanghai";
+ public static final String DEFAULT_TIME_ZONE = "Asia/Tokyo";
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/Shanghai");
+ TimeZone timeZone = TimeZone.getTimeZone("Asia/Tokyo");
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/Shanghai");
+ TimeZone timeZone = TimeZone.getTimeZone("Asia/Tokyo");
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-common/src/main/java/com/yami/trading/common/util/MarketOpenChecker.java b/trading-order-common/src/main/java/com/yami/trading/common/util/MarketOpenChecker.java
index f5b87e5..8bc1b44 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/util/MarketOpenChecker.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/util/MarketOpenChecker.java
@@ -261,7 +261,7 @@
public static List<OpenCloseTime> listAOpenCloseDateTime(){
int year = 2023;
List<OpenCloseTime> times = Lists.newArrayList();
- ZoneId nyseZone = ZoneId.of("Asia/Shanghai"); // 纽约时区
+ ZoneId nyseZone = ZoneId.of("America/New_York"); // 纽约时区
ZoneId beijingZone = ZoneId.of("Asia/Shanghai"); // 北京时区
LocalDateTime startDate = LocalDateTime.of(year, 1, 1, 0, 0);
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 e5aee0b..38f9362 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
@@ -109,11 +109,11 @@
// 1. 确定时间戳单位（假设ts是毫秒级，若为秒级需用ofEpochSecond()）
Instant instant = Instant.ofEpochMilli(ts);
- // 2. 将时间戳转换为当地时区的日期（指定时区更准确，如Asia/Shanghai）
- LocalDate tsDate = instant.atZone(ZoneId.of("Asia/Shanghai")).toLocalDate();
+ // 2. 将时间戳转换为当地时区的日期（指定时区更准确，如Asia/Tokyo）
+ LocalDate tsDate = instant.atZone(ZoneId.of("Asia/Tokyo")).toLocalDate();
// 3. 获取“昨天的日期”（当前日期减1天）
- LocalDate yesterday = LocalDate.now(ZoneId.of("Asia/Shanghai")).minusDays(1);
+ LocalDate yesterday = LocalDate.now(ZoneId.of("Asia/Tokyo")).minusDays(1);
// 4. 判断是否为昨天
boolean isYesterday = tsDate.equals(yesterday);
--
Gitblit v1.9.3