diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java index 8f7b1bfe..39862987 100644 --- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java +++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java @@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.util.JSONPObject; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; import com.jeesite.common.collect.ListUtils; +import com.jeesite.common.io.PropertiesUtils; /** * 简单封装Jackson,实现JSON String<->Java Object的Mapper. @@ -55,8 +56,9 @@ public class JsonMapper extends ObjectMapper { this.configure(Feature.ALLOW_SINGLE_QUOTES, true); // 允许不带引号的字段名称 this.configure(Feature.ALLOW_UNQUOTED_FIELD_NAMES, true); - // 设置时区 - this.setTimeZone(TimeZone.getTimeZone("GMT+8:00")); + // 设置默认时区 + this.setTimeZone(TimeZone.getTimeZone(PropertiesUtils.getInstance() + .getProperty("lang.defaultTimeZone", "GMT+08:00"))); // 设置输入时忽略在JSON字符串中存在但Java对象实际没有的属性 this.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); // 遇到空值处理为空串 diff --git a/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java b/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java index 999aef60..a0c0870a 100644 --- a/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java +++ b/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java @@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import com.fasterxml.jackson.databind.JavaType; +import com.jeesite.common.io.PropertiesUtils; /** * XML <-> Map、Object @@ -49,8 +50,9 @@ public class XmlMapper extends com.fasterxml.jackson.dataformat.xml.XmlMapper{ public XmlMapper() { // Spring ObjectMapper 初始化配置,支持 @JsonView new Jackson2ObjectMapperBuilder().configure(this); - // 设置时区 - this.setTimeZone(TimeZone.getTimeZone("GMT+8:00")); + // 设置默认时区 + this.setTimeZone(TimeZone.getTimeZone(PropertiesUtils.getInstance() + .getProperty("lang.defaultTimeZone", "GMT+08:00"))); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 6fd99678..839fcf66 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 54f08f0d..461c93d8 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -203,7 +203,12 @@ menu: # 国际化管理(专业版) lang: enabled: false - + + # 默认语言 + defaultLocale: zh_CN + # 默认时区 + defaultTimeZone: GMT+08:00 + # 任务调度(个人版) job: enabled: false diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 506417cc..3d51f870 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -256,6 +256,11 @@ logging: # 国际化管理(专业版) #lang: # enabled: false +# +# # 默认语言 +# defaultLocale: zh_CN +# # 默认时区 +# defaultTimeZone: GMT+08:00 # 任务调度(个人版) #job: