Use default timezone instead of "GMT+8"

Davidhua1996 · Davidhua1996 · commit 505b006860d3 · 2020-06-02T15:55:31.000+08:00
diff --git a/modules/common/src/main/java/com/webank/wedatasphere/exchangis/datasource/domain/DataSourceBase.java b/modules/common/src/main/java/com/webank/wedatasphere/exchangis/datasource/domain/DataSourceBase.java
@@ -85,7 +85,7 @@ public class DataSourceBase {
     /**
      * Create time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -101,7 +101,7 @@ public class DataSourceBase {
     /**
      * Modify time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
     /**
diff --git a/modules/common/src/main/java/com/webank/wedatasphere/exchangis/job/domain/ExecutorNode.java b/modules/common/src/main/java/com/webank/wedatasphere/exchangis/job/domain/ExecutorNode.java
@@ -35,7 +35,7 @@ public class ExecutorNode {
     private Integer id;
     @NotBlank(message = "{udes.domain.executor.address.notBlank}")
     private String address;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date heartbeatTime;
     private Integer status;
     private Float memRate;
diff --git a/modules/common/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobReport.java b/modules/common/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobReport.java
@@ -44,7 +44,7 @@ public class JobReport {
     private Long transformerTotalRecords;
     private Long transformerFailedRecords;
     private Long transformerFilterRecords;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     public Long getId() {
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/datasource/domain/DataSourceModel.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/datasource/domain/DataSourceModel.java
@@ -69,7 +69,7 @@ public class DataSourceModel {
     /**
      * Create time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -90,7 +90,7 @@ public class DataSourceModel {
     /**
      * Modify time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
     private List<String> authScopes = new ArrayList<>();
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/datasource/domain/DataSourceOwner.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/datasource/domain/DataSourceOwner.java
@@ -54,7 +54,7 @@ public class DataSourceOwner {
     /**
      * Create time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -65,7 +65,7 @@ public class DataSourceOwner {
     /**
      * Modify time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
     public Integer getId() {
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/exec/domain/ExecNodeUser.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/exec/domain/ExecNodeUser.java
@@ -61,7 +61,7 @@ public class ExecNodeUser {
      */
     private boolean markDel;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     public Integer getExecNodeId() {
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/exec/domain/ExecUser.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/exec/domain/ExecUser.java
@@ -41,7 +41,7 @@ public class ExecUser {
     @Size(max = 200, message = "{udes.domain.exec.user.desc.max}")
     private String description;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     public Integer getId() {
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/group/domain/Group.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/group/domain/Group.java
@@ -55,7 +55,7 @@ public class Group {
     /**
      * Create time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -71,7 +71,7 @@ public class Group {
     /**
      * Modify time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
     @Valid
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobExecNode.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobExecNode.java
@@ -30,7 +30,7 @@ public class JobExecNode {
 
     private Integer execId;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     public Long getJobId() {
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobInfo.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobInfo.java
@@ -115,20 +115,20 @@ public class JobInfo {
     @JsonIgnore
     private String jobConfig;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     private String createUser;
 
     private String modifyUser;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
     /**
      * last trigger time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date lastTriggerTime;
     /**
      * Job status
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobInfoParams.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobInfoParams.java
@@ -33,7 +33,7 @@ public class JobInfoParams {
 
     private String paramVal;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     public JobInfoParams(Long jobId, String paramName, String paramVal){
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobTask.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobTask.java
@@ -47,7 +47,7 @@ public class JobTask {
      * Trigger type: scheduler or api
      */
     private String triggerType;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date triggerTime;
     private String triggerStatus;
     private String triggerMsg;
@@ -61,7 +61,7 @@ public class JobTask {
      */
     private Integer runTimes;
     private String executeMsg;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date completeTime;
     private String jobName;
     private String jobCreateUser;
@@ -70,7 +70,7 @@ public class JobTask {
     /**
      * Version date
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date version;
 
     private boolean disposable = false;
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobTaskParams.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/job/domain/JobTaskParams.java
@@ -35,7 +35,7 @@ public class JobTaskParams {
 
     private String paramVal;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     public JobTaskParams(String paramName, String paramVal){
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/project/domain/Project.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/project/domain/Project.java
@@ -53,7 +53,7 @@ public class Project {
     /**
      * Create time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     /**
      * Modify user
@@ -62,7 +62,7 @@ public class Project {
     /**
      * Modify time
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
     /**
      * Parent node
diff --git a/modules/service/src/main/java/com/webank/wedatasphere/exchangis/user/domain/UserInfo.java b/modules/service/src/main/java/com/webank/wedatasphere/exchangis/user/domain/UserInfo.java
@@ -38,9 +38,9 @@ public class UserInfo {
     private String orgCode;
     private String deptCode;
     private Integer userType;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     public UserInfo(String userName){
