diff --git a/k8s/template-yaml/k8s-7management.yaml b/k8s/template-yaml/k8s-7management.yaml index a6b4b3a2..d4c17efc 100644 --- a/k8s/template-yaml/k8s-7management.yaml +++ b/k8s/template-yaml/k8s-7management.yaml @@ -16,6 +16,9 @@ spec: containers: - name: ci4s-management-platform image: ${k8s-7management-image} + env: + - name: TZ + value: Asia/Shanghai ports: - containerPort: 9213 volumeMounts: diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index bcb1f512..137eccb5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -9,8 +9,6 @@ import java.time.LocalTime; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Date; -import java.util.TimeZone; - import org.apache.commons.lang3.time.DateFormatUtils; /** @@ -77,9 +75,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static final String parseDateToStr(final String format, final Date date) { - SimpleDateFormat sdf = new SimpleDateFormat(format); - sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); - return sdf.format(date); + return new SimpleDateFormat(format).format(date); } public static final Date dateTime(final String format, final String ts)