This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new b34c451cde [INLONG-9358][Manager] Supplement time zone information for
creation time (#9360)
b34c451cde is described below
commit b34c451cde15046727cd618a7005b1d369eeacd9
Author: fuweng11 <[email protected]>
AuthorDate: Thu Nov 30 10:45:44 2023 +0800
[INLONG-9358][Manager] Supplement time zone information for creation time
(#9360)
---
.../apache/inlong/common/pojo/agent/TaskSnapshotRequest.java | 2 +-
.../org/apache/inlong/manager/client/ut/Kafka2HiveTest.java | 12 +++++-------
.../org/apache/inlong/manager/client/cli/pojo/GroupInfo.java | 2 +-
.../org/apache/inlong/manager/client/cli/pojo/SinkInfo.java | 2 +-
.../apache/inlong/manager/client/cli/pojo/SourceInfo.java | 2 +-
.../apache/inlong/manager/client/cli/pojo/StreamInfo.java | 2 +-
.../apache/inlong/manager/client/cli/pojo/TenantInfo.java | 4 ++--
.../inlong/manager/client/cli/pojo/TenantRoleInfo.java | 4 ++--
.../org/apache/inlong/manager/client/cli/pojo/UserInfo.java | 2 +-
.../inlong/manager/client/api/impl/InlongGroupImplTest.java | 6 +++---
.../inlong/manager/client/api/inner/ClientFactoryTest.java | 7 -------
.../inlong/manager/pojo/audit/AuditSourceResponse.java | 4 ++--
.../org/apache/inlong/manager/pojo/cluster/ClusterInfo.java | 4 ++--
.../inlong/manager/pojo/cluster/ClusterNodeResponse.java | 4 ++--
.../inlong/manager/pojo/cluster/ClusterTagResponse.java | 4 ++--
.../inlong/manager/pojo/cluster/TenantClusterTagInfo.java | 4 ++--
.../inlong/manager/pojo/consume/InlongConsumeBriefInfo.java | 4 ++--
.../inlong/manager/pojo/consume/InlongConsumeInfo.java | 4 ++--
.../inlong/manager/pojo/group/InlongGroupBriefInfo.java | 4 ++--
.../apache/inlong/manager/pojo/group/InlongGroupInfo.java | 4 ++--
.../manager/pojo/heartbeat/ComponentHeartbeatResponse.java | 2 +-
.../manager/pojo/heartbeat/GroupHeartbeatResponse.java | 2 +-
.../manager/pojo/heartbeat/StreamHeartbeatResponse.java | 2 +-
.../org/apache/inlong/manager/pojo/node/DataNodeInfo.java | 4 ++--
.../manager/pojo/operationLog/OperationLogResponse.java | 2 +-
.../java/org/apache/inlong/manager/pojo/sink/StreamSink.java | 4 ++--
.../org/apache/inlong/manager/pojo/source/StreamSource.java | 4 ++--
.../inlong/manager/pojo/stream/InlongStreamBriefInfo.java | 4 ++--
.../apache/inlong/manager/pojo/stream/InlongStreamInfo.java | 4 ++--
.../apache/inlong/manager/pojo/tenant/InlongTenantInfo.java | 4 ++--
.../org/apache/inlong/manager/pojo/user/InlongRoleInfo.java | 4 ++--
.../org/apache/inlong/manager/pojo/user/TenantRoleInfo.java | 4 ++--
.../java/org/apache/inlong/manager/pojo/user/UserInfo.java | 6 +++---
.../inlong/manager/pojo/workflow/ApproverResponse.java | 4 ++--
34 files changed, 61 insertions(+), 70 deletions(-)
diff --git
a/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskSnapshotRequest.java
b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskSnapshotRequest.java
index 232a3fd327..c5f7b64f52 100644
---
a/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskSnapshotRequest.java
+++
b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskSnapshotRequest.java
@@ -42,7 +42,7 @@ public class TaskSnapshotRequest {
/**
* Report Time
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date reportTime;
/**
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
index 3503afb0c4..3ab6954dc4 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
@@ -115,8 +115,8 @@ class Kafka2HiveTest extends BaseTest {
+
"\"dailyStorage\":10000,\"peakRecords\":100000,\"maxLength\":10000,"
+
"\"inCharges\":\"test_inCharges,admin\",\"followers\":null,\"status\":101,"
+
"\"creator\":\"admin\",\"modifier\":\"admin\","
- + "\"createTime\":\"2022-06-06
09:59:10\","
- + "\"modifyTime\":\"2022-06-06
02:24:50\",\"extList\":[],\"tenant\":null,"
+ +
"\"createTime\":\"2023-11-29T18:23:36.000+0800\","
+ +
"\"modifyTime\":\"2023-11-29T18:23:36.000+0800\",\"extList\":[],\"tenant\":null,"
+
"\"adminUrl\":null,\"serviceUrl\":null,\"queueModule\":\"PARALLEL\","
+
"\"partitionNum\":3,\"ensemble\":3,\"writeQuorum\":3,\"ackQuorum\":2,"
+
"\"ttl\":24,\"ttlUnit\":\"hours\",\"retentionTime\":72,"
@@ -126,7 +126,7 @@ class Kafka2HiveTest extends BaseTest {
+
"\"name\":\"test_stream009\",\"sinkList\":[{\"id\":6,"
+
"\"inlongGroupId\":\"test_group009\",\"inlongStreamId\":\"test_stream009\","
+
"\"sinkType\":\"HIVE\",\"sinkName\":\"{hive.sink.name}\",\"clusterId\":null,"
- +
"\"clusterUrl\":null}],\"modifyTime\":\"2022-06-06 02:11:03\"}]}"))
+ +
"\"clusterUrl\":null}],\"modifyTime\":\"2023-11-29T18:23:36.000+0800\"}]}"))
.build());
initWorkflowResult.setNewTasks(
Lists.newArrayList(
@@ -166,7 +166,7 @@ class Kafka2HiveTest extends BaseTest {
+
"\"dailyRecords\":10000000,\"dailyStorage\":10000,\"peakRecords\":100000,"
+
"\"maxLength\":10000,\"inCharges\":\"test_inCharges,admin\",\"followers\":null,"
+
"\"status\":101,\"creator\":\"admin\",\"modifier\":\"admin\","
- + "\"createTime\":\"2022-06-06
16:36:35\",\"modifyTime\":\"2022-06-06 08:37:04\","
+ +
"\"createTime\":\"2023-11-29T18:23:36.000+0800\",\"modifyTime\":\"2023-11-29T18:23:36.000+0800\","
+
"\"extList\":[],\"tenant\":null,\"adminUrl\":null,\"serviceUrl\":null,"
+
"\"queueModule\":\"PARALLEL\",\"partitionNum\":3,\"ensemble\":3,\"writeQuorum\":3,"
+
"\"ackQuorum\":2,\"ttl\":24,\"ttlUnit\":\"hours\",\"retentionTime\":72,"
@@ -176,7 +176,7 @@ class Kafka2HiveTest extends BaseTest {
+
"\"sinkList\":[{\"id\":8,\"inlongGroupId\":\"test_group011\","
+
"\"inlongStreamId\":\"test_stream011\",\"sinkType\":\"HIVE\","
+
"\"sinkName\":\"{hive.sink.name}\",\"clusterId\":null,\"clusterUrl\":null}],"
- + "\"modifyTime\":\"2022-06-06 08:36:38\"}]}")
+ +
"\"modifyTime\":\"2023-11-29T18:23:36.000+0800\"}]}")
.build());
startWorkflowResult.setNewTasks(new ArrayList<>());
stubFor(
@@ -234,8 +234,6 @@ class Kafka2HiveTest extends BaseTest {
.status(110)
.creator("admin")
.modifier("admin")
- .createTime(new Date())
- .modifyTime(new Date())
.build());
ArrayList<StreamSink> hiveSinks = Lists.newArrayList(
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/GroupInfo.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/GroupInfo.java
index c0b3c762fd..669404a120 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/GroupInfo.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/GroupInfo.java
@@ -37,7 +37,7 @@ public class GroupInfo {
@ParseStatus(clazz = SimpleGroupStatus.class)
private String status;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
}
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SinkInfo.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SinkInfo.java
index 2e51b9e8f9..2c9e2b709e 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SinkInfo.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SinkInfo.java
@@ -39,6 +39,6 @@ public class SinkInfo {
@ParseStatus(clazz = SimpleGroupStatus.class)
private String status;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
}
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SourceInfo.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SourceInfo.java
index a1eec8af9e..8bbb472f5c 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SourceInfo.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SourceInfo.java
@@ -40,6 +40,6 @@ public class SourceInfo {
@ParseStatus(clazz = SimpleSourceStatus.class)
private String status;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
}
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/StreamInfo.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/StreamInfo.java
index 80f0ddb1f3..800dd9675a 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/StreamInfo.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/StreamInfo.java
@@ -40,6 +40,6 @@ public class StreamInfo {
@ParseStatus(clazz = SimpleGroupStatus.class)
private String status;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
}
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/TenantInfo.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/TenantInfo.java
index 1365bf0049..d94f774601 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/TenantInfo.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/TenantInfo.java
@@ -29,9 +29,9 @@ public class TenantInfo {
private String creator;
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
private Integer version;
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/TenantRoleInfo.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/TenantRoleInfo.java
index b7570dbd68..e6d7e8ecb1 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/TenantRoleInfo.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/TenantRoleInfo.java
@@ -31,9 +31,9 @@ public class TenantRoleInfo {
private String creator;
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
private Integer version;
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/UserInfo.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/UserInfo.java
index 17bb627f85..683aecd120 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/UserInfo.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/UserInfo.java
@@ -33,6 +33,6 @@ public class UserInfo {
private Integer accountType;
private String status;
private String creator;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
}
diff --git
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
index 5c6bc2e596..2feb517222 100644
---
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
+++
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
@@ -53,8 +53,8 @@ class InlongGroupImplTest {
+ " \"status\" : 101,\n"
+ " \"creator\" : \"admin\",\n"
+ " \"modifier\" : \"admin\",\n"
- + " \"createTime\" : \"2022-06-05 20:44:22\",\n"
- + " \"modifyTime\" : \"2022-06-05 12:44:28\",\n"
+ + " \"createTime\" : \"2023-11-29T18:23:36.000+0800\",\n"
+ + " \"modifyTime\" : \"2023-11-29T18:23:36.000+0800\",\n"
+ " \"extList\" : [ ],\n"
+ " \"tenant\" : null,\n"
+ " \"adminUrl\" : null,\n"
@@ -85,7 +85,7 @@ class InlongGroupImplTest {
+ " \"clusterId\" : null,\n"
+ " \"clusterUrl\" : null\n"
+ " } ],\n"
- + " \"modifyTime\" : \"2022-06-05 12:44:25\"\n"
+ + " \"modifyTime\" : \"2023-11-29T18:23:36.000+0800\"\n"
+ " } ]\n"
+ "}";
diff --git
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
index 2430e21602..fdfcff0ef4 100644
---
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
+++
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
@@ -96,7 +96,6 @@ import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -263,8 +262,6 @@ class ClientFactoryTest {
.name("name")
.inCharges("admin")
.status(1)
- .createTime(new Date())
- .modifyTime(new Date())
.streamSources(
Lists.newArrayList(
FileSource.builder()
@@ -303,8 +300,6 @@ class ClientFactoryTest {
.sourceType(SourceType.KAFKA)
.dataNodeName("dataNodeName")
.version(1)
- .createTime(new Date())
- .modifyTime(new Date())
.topic("topic")
.groupId("111")
.bootstrapServers("bootstrapServers")
@@ -560,8 +555,6 @@ class ClientFactoryTest {
.inlongStreamId("11")
.inlongGroupId("11")
.sourceType(SourceType.AUTO_PUSH)
- .createTime(new Date())
-
.dataProxyGroup("111")
.build(),
MySQLBinlogSource.builder()
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditSourceResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditSourceResponse.java
index 85125d4033..6d822842cc 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditSourceResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditSourceResponse.java
@@ -61,10 +61,10 @@ public class AuditSourceResponse {
@ApiModelProperty(value = "Modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterInfo.java
index 7e3819ea99..453c2b7e66 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterInfo.java
@@ -84,10 +84,10 @@ public abstract class ClusterInfo {
@ApiModelProperty(value = "Name of in modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterNodeResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterNodeResponse.java
index af8c797f7f..30587c1933 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterNodeResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterNodeResponse.java
@@ -76,10 +76,10 @@ public class ClusterNodeResponse {
@ApiModelProperty(value = "Name of in modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterTagResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterTagResponse.java
index 47c67117f7..20531da09e 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterTagResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterTagResponse.java
@@ -65,10 +65,10 @@ public class ClusterTagResponse {
@ApiModelProperty(value = "Name of in modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/TenantClusterTagInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/TenantClusterTagInfo.java
index 6406b57ef4..b6fcd11bc5 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/TenantClusterTagInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/TenantClusterTagInfo.java
@@ -52,10 +52,10 @@ public class TenantClusterTagInfo {
@ApiModelProperty(value = "Name of in modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/InlongConsumeBriefInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/InlongConsumeBriefInfo.java
index 70ae5f26c9..809ba8fcba 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/InlongConsumeBriefInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/InlongConsumeBriefInfo.java
@@ -64,10 +64,10 @@ public class InlongConsumeBriefInfo {
@ApiModelProperty(value = "Name of modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/InlongConsumeInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/InlongConsumeInfo.java
index dc395e0d9e..b5ffa96179 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/InlongConsumeInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/InlongConsumeInfo.java
@@ -81,10 +81,10 @@ public abstract class InlongConsumeInfo extends
BaseInlongConsume {
@ApiModelProperty(value = "Name of modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java
index 3a42e915e0..935fe9a5da 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java
@@ -73,10 +73,10 @@ public class InlongGroupBriefInfo {
@ApiModelProperty(value = "Name of modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Stream sources in the inlong group")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
index 2b1bee6ab2..1b01a9d3a5 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
@@ -114,10 +114,10 @@ public abstract class InlongGroupInfo extends
BaseInlongGroup {
@ApiModelProperty(value = "Name of modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Inlong group Extension properties")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/ComponentHeartbeatResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/ComponentHeartbeatResponse.java
index faa703cccf..4446dbf38f 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/ComponentHeartbeatResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/ComponentHeartbeatResponse.java
@@ -52,7 +52,7 @@ public class ComponentHeartbeatResponse {
@ApiModelProperty(value = "Report time of heartbeat")
private Long reportTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/GroupHeartbeatResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/GroupHeartbeatResponse.java
index 150cff1405..916cc52688 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/GroupHeartbeatResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/GroupHeartbeatResponse.java
@@ -58,7 +58,7 @@ public class GroupHeartbeatResponse {
@ApiModelProperty(value = "Report time of heartbeat")
private Long reportTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/StreamHeartbeatResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/StreamHeartbeatResponse.java
index 40f262091e..0fe3135d70 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/StreamHeartbeatResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/heartbeat/StreamHeartbeatResponse.java
@@ -61,7 +61,7 @@ public class StreamHeartbeatResponse {
@ApiModelProperty(value = "Report time of heartbeat")
private Long reportTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeInfo.java
index 32ead2ebfd..fb5e657f52 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeInfo.java
@@ -81,10 +81,10 @@ public abstract class DataNodeInfo {
@ApiModelProperty(value = "Version number")
private Integer version;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
public abstract DataNodeRequest genRequest();
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/operationLog/OperationLogResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/operationLog/OperationLogResponse.java
index 1e5050eb19..4db9184847 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/operationLog/OperationLogResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/operationLog/OperationLogResponse.java
@@ -58,7 +58,7 @@ public class OperationLogResponse {
@ApiModelProperty(value = "Name of operator")
private String operator;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date requestTime;
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/StreamSink.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/StreamSink.java
index f257c25f6f..68d1a38518 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/StreamSink.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/StreamSink.java
@@ -102,10 +102,10 @@ public abstract class StreamSink extends StreamNode {
@ApiModelProperty("Modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@Builder.Default
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/StreamSource.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/StreamSource.java
index 42b829de2f..edd7405b7f 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/StreamSource.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/StreamSource.java
@@ -98,10 +98,10 @@ public abstract class StreamSource extends StreamNode {
@ApiModelProperty("Modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@Builder.Default
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamBriefInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamBriefInfo.java
index 90197f9d32..b8d04fde85 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamBriefInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamBriefInfo.java
@@ -97,10 +97,10 @@ public class InlongStreamBriefInfo {
@ApiModelProperty(value = "Name of modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java
index 06a441336f..a8cb701748 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamInfo.java
@@ -109,10 +109,10 @@ public class InlongStreamInfo extends BaseInlongStream {
@ApiModelProperty(value = "Name of modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Field list")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/tenant/InlongTenantInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/tenant/InlongTenantInfo.java
index c880e0d775..407313ca27 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/tenant/InlongTenantInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/tenant/InlongTenantInfo.java
@@ -51,10 +51,10 @@ public class InlongTenantInfo {
@ApiModelProperty(value = "Name of in modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/InlongRoleInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/InlongRoleInfo.java
index 797b10709d..63cf368cd9 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/InlongRoleInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/InlongRoleInfo.java
@@ -54,10 +54,10 @@ public class InlongRoleInfo {
@ApiModelProperty(value = "Name of in modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/TenantRoleInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/TenantRoleInfo.java
index 4129f6110c..efe98b1a9c 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/TenantRoleInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/TenantRoleInfo.java
@@ -57,10 +57,10 @@ public class TenantRoleInfo {
@ApiModelProperty(value = "Name of in modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java
index 73892b2c8e..b32f1a21e1 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java
@@ -79,16 +79,16 @@ public class UserInfo {
@ApiModelProperty(value = "Name of modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "User status, valid or not")
private String status;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date dueDate;
@ApiModelProperty(value = "User roles")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/ApproverResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/ApproverResponse.java
index 10d09e9d6a..b43bb523fc 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/ApproverResponse.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/ApproverResponse.java
@@ -55,10 +55,10 @@ public class ApproverResponse {
@ApiModelProperty(value = "Name of modifier")
private String modifier;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "YYYY-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty(value = "Version number")
