diff --git a/Dockerfile-dev b/Dockerfile-dev index 5d085ee..bb81b76 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -47,4 +47,4 @@ COPY --from=builder /app/sa-admin/target/*.jar app.jar EXPOSE 5477 # 启动应用 -ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "app.jar"] diff --git a/Dockerfile-prod b/Dockerfile-prod index 2c93f2c..6d45393 100644 --- a/Dockerfile-prod +++ b/Dockerfile-prod @@ -47,4 +47,4 @@ COPY --from=builder /app/sa-admin/target/*.jar app.jar EXPOSE 5477 # 启动应用 -ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "app.jar"] \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java b/sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java index 8297564..0612bd8 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java @@ -10,6 +10,9 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableScheduling; +import javax.annotation.PostConstruct; +import java.util.TimeZone; + /** * SmartAdmin 项目启动类 * diff --git a/sa-admin/src/main/resources/dev/application.yaml b/sa-admin/src/main/resources/dev/application.yaml index 2ced62f..dff70ca 100644 --- a/sa-admin/src/main/resources/dev/application.yaml +++ b/sa-admin/src/main/resources/dev/application.yaml @@ -69,4 +69,4 @@ jackson: fail-on-unknown-properties: false default-property-inclusion: always date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 \ No newline at end of file + time-zone: Asia/Shanghai \ No newline at end of file diff --git a/sa-admin/src/main/resources/prod/application.yaml b/sa-admin/src/main/resources/prod/application.yaml index 35fa14a..c0fb6ef 100644 --- a/sa-admin/src/main/resources/prod/application.yaml +++ b/sa-admin/src/main/resources/prod/application.yaml @@ -61,4 +61,4 @@ jackson: fail-on-unknown-properties: false default-property-inclusion: always date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 \ No newline at end of file + time-zone: Asia/Shanghai \ No newline at end of file diff --git a/sa-common/src/main/resources/dev/sa-common.yaml b/sa-common/src/main/resources/dev/sa-common.yaml index 730ab4e..ec22e69 100644 --- a/sa-common/src/main/resources/dev/sa-common.yaml +++ b/sa-common/src/main/resources/dev/sa-common.yaml @@ -55,7 +55,7 @@ spring: fail-on-unknown-properties: false default-property-inclusion: always date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 + time-zone: Asia/Shanghai # 缓存实现类型 cache: diff --git a/sa-common/src/main/resources/prod/sa-common.yaml b/sa-common/src/main/resources/prod/sa-common.yaml index 84b3d91..972e1d5 100644 --- a/sa-common/src/main/resources/prod/sa-common.yaml +++ b/sa-common/src/main/resources/prod/sa-common.yaml @@ -55,7 +55,7 @@ spring: fail-on-unknown-properties: false default-property-inclusion: always date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 + time-zone: Asia/Shanghai # 缓存实现类型 cache: