From 341062cef5cd34fd161c1d601d2b3c78697c3eca Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Mon, 10 Nov 2025 11:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BA=86JENKINS=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integration/response/GitProjectResponse.java       |  6 +++---
 .../service/impl/RepositoryProjectServiceImpl.java     | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

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<String> 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<RepositoryProj
                             project.setWebUrl(projectResponse.getWebUrl());
                             project.setSshUrl(projectResponse.getSshUrlToRepo());
                             project.setHttpUrl(projectResponse.getHttpUrlToRepo());
-                            project.setLastActivityAt(projectResponse.getLastActivityAt());
+                            // 将OffsetDateTime转换为LocalDateTime
+                            project.setLastActivityAt(projectResponse.getLastActivityAt() != null ?
+                                projectResponse.getLastActivityAt().atZoneSameInstant(ZoneId.systemDefault()).toLocalDateTime() : null);
                             project.setNameWithNamespace(projectResponse.getNameWithNamespace());
                             project.setPathWithNamespace(projectResponse.getPathWithNamespace());
-                            project.setCreatedAt(projectResponse.getCreatedAt());
+                            // 将OffsetDateTime转换为LocalDateTime
+                            project.setCreatedAt(projectResponse.getCreatedAt() != null ?
+                                projectResponse.getCreatedAt().atZoneSameInstant(ZoneId.systemDefault()).toLocalDateTime() : null);
 
                             projectsToSave.add(project);
                             synchronized (existingProjects) {