diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/GitProjectResponse.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/GitProjectResponse.java index 93b33330..70c1fafd 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/GitProjectResponse.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/GitProjectResponse.java @@ -3,7 +3,7 @@ package com.qqchen.deploy.backend.deploy.integration.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import java.time.LocalDateTime; +import java.time.OffsetDateTime; import java.util.List; import java.util.Map; @@ -36,7 +36,7 @@ public class GitProjectResponse { private String httpUrlToRepo; @JsonProperty("last_activity_at") - private LocalDateTime lastActivityAt; + private OffsetDateTime lastActivityAt; @JsonProperty("name_with_namespace") private String nameWithNamespace; @@ -45,7 +45,7 @@ public class GitProjectResponse { private String pathWithNamespace; @JsonProperty("created_at") - private LocalDateTime createdAt; + private OffsetDateTime createdAt; @JsonProperty("tag_list") private List tagList; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryProjectServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryProjectServiceImpl.java index b76ff263..0c20e6bd 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryProjectServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryProjectServiceImpl.java @@ -28,6 +28,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.orm.ObjectOptimisticLockingFailureException; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.time.ZoneId; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -211,10 +213,14 @@ public class RepositoryProjectServiceImpl extends BaseServiceImpl