From 843c148251b49e577c20854c375e9519b8c59210 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 22 Sep 2025 18:53:05 +0800
Subject: [PATCH] 时区修改
---
trading-order-common/src/main/java/com/yami/trading/common/util/DateUtils.java | 6 +++---
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-admin/src/main/java/com/yami/trading/WebApplication.java | 4 ++--
7 files changed, 17 insertions(+), 17 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 c93ce11..d942c37 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
@@ -43,8 +43,8 @@
@PostConstruct
void init() {
// 强制设置默认时区（影响整个JVM）
- TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
- System.setProperty("user.timezone", "Europe/Paris");
+ TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
+ System.setProperty("user.timezone", "Asia/Shanghai");
}
@Override
diff --git a/trading-order-admin/src/main/resources/application-prod.yml b/trading-order-admin/src/main/resources/application-prod.yml
index 3de392a..2351112 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=Europe/Paris&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=Europe/Paris&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/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
username: root
password: eca8e8e65acfaacf
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -18,9 +18,9 @@
properties:
hibernate:
jdbc:
- time_zone: Europe/Paris
+ time_zone: Asia/Shanghai
jackson:
- time-zone: Europe/Paris
+ time-zone: Asia/Shanghai
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 2edbc6b..cf997bd 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: Europe/Paris
+ time-zone: Asia/Shanghai
mvc:
pathmatch:
matching-strategy: ANT_PATH_MATCHER
@@ -18,7 +18,7 @@
properties:
hibernate:
jdbc:
- time_zone: Europe/Paris
+ time_zone: Asia/Shanghai
# 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 fb594f2..43fe1e6 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="GMT+8")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
private Date startDate;
@ApiModelProperty("申购结束时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
private Date endDate;
@ApiModelProperty("上市开始时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
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 49b4a13..9ca13cf 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="GMT+8")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
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 6ee44e5..8ebc988 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 = "Europe/Paris")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -38,7 +38,7 @@
/**
* 更新日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Europe/Paris")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
@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 6e553a9..7b5471d 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 = "Europe/Paris";
+ public static final String DEFAULT_TIME_ZONE = "Asia/Shanghai";
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("GMT+8");
+ TimeZone timeZone = TimeZone.getTimeZone("Asia/Shanghai");
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("GMT+8");
+ TimeZone timeZone = TimeZone.getTimeZone("Asia/Shanghai");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
sdf.setTimeZone(timeZone);
return sdf.format(new Date(Long.valueOf(millisecond)));
--
Gitblit v1.9.3