From c5f35dbebeaab155fc4ec3489eb4a739fbc4af90 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Sun, 24 Aug 2025 12:27:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/mini/capi/utils/docker.java | 2 +- src/main/java/com/mini/capi/utils/vDate.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/mini/capi/utils/docker.java b/src/main/java/com/mini/capi/utils/docker.java index 8a93153..19f8260 100644 --- a/src/main/java/com/mini/capi/utils/docker.java +++ b/src/main/java/com/mini/capi/utils/docker.java @@ -92,7 +92,7 @@ public class docker { container.setContainerId(matcher.group(1).trim()); container.setImageName(matcher.group(2).trim()); container.setCommand(matcher.group(3).trim()); - container.setCreatedAt(matcher.group(4).trim()); + container.setCreatedAt( vDate.getDockerCreate(matcher.group(4).trim())); container.setStatus(getStatus(matcher.group(5).trim())); container.setPorts(matcher.group(6).trim()); container.setNames(matcher.group(7).trim()); diff --git a/src/main/java/com/mini/capi/utils/vDate.java b/src/main/java/com/mini/capi/utils/vDate.java index 16645b5..1dd181d 100644 --- a/src/main/java/com/mini/capi/utils/vDate.java +++ b/src/main/java/com/mini/capi/utils/vDate.java @@ -1,10 +1,12 @@ package com.mini.capi.utils; + import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; +import java.util.Locale; public class vDate { @@ -15,6 +17,8 @@ public class vDate { private static final SimpleDateFormat DEFAULT_SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", Locale.ENGLISH); + public static String toStr(LocalDateTime dateTime) { return dateTime.format(DEFAULT_FMT); } @@ -32,4 +36,16 @@ public class vDate { return DEFAULT_SDF.format(date); } + + public static String getDockerCreate(String createAt) { + try { + String cleaned = createAt.replace(" CST", ""); + // 定义格式 + Date date = sdf.parse(cleaned); + return DEFAULT_SDF.format(date); + } catch (Exception e) { + System.out.println(e.getMessage()); + return getNow(); + } + } }