From 80381c2eb2c1da68cfe185a210babf58fda7086d Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 11 Jun 2018 17:10:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=85=8D=E7=BD=AE=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E6=97=B6=E5=8C=BA=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=94=B1=E5=86=99=E6=AD=BB=E6=94=B9=E6=88=90=E6=8F=90=E5=88=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/Constants.java          | 4 ++++
 src/main/java/com/nis/web/service/BaseService.java | 2 +-
 src/main/resources/nis.properties                  | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

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