diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index cf27b83d7..afccef2c4 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -7,6 +7,10 @@ import java.util.Map; import com.google.gson.GsonBuilder; public final class Constants { + /** + * 当前时区 + */ + public static final int TIME_ZONE = ConfigUtils.getIntProperty("time_zone", 8); /** * 区域GK类型 */ diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 47865576f..29f97b81e 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -255,7 +255,7 @@ public abstract class BaseService { public JsonElement serialize(Date src, Type type, JsonSerializationContext context) { String format = "yyyy-MM-dd'T'HH:mm:ss.SSS"; - long time= ((Date) src).getTime()-8*60*60*1000; + long time= ((Date) src).getTime()-Constants.TIME_ZONE*60*60*1000; SimpleDateFormat sdf = new SimpleDateFormat(format); return new JsonPrimitive(sdf.format(time)); } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 754df0d08..dc33e5343 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -278,4 +278,6 @@ ssl_san_region=ssl_san ssl_ca_region=ssl_ca ssl_ip_region=ssl_ip #存在与表达式的关键字特殊分隔符 -keyword_expr=***and*** \ No newline at end of file +keyword_expr=***and*** +#时区 +time_zone=8 \ No newline at end of file