From 38ed0fac97cdb872d26e250ae7990d7031987bc0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 6 Feb 2023 17:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=BC=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E7=A7=92=E5=90=8E=E5=A2=9E=E5=8A=A0=E6=AF=AB=E7=A7=92=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E8=A1=A5=E5=85=A8=E6=98=BE=E7=A4=BA=E5=A4=A9?=
 =?UTF-8?q?=E6=97=B6=E5=88=86=E3=80=81=E6=97=B6=E5=88=86=E7=A7=92=E6=AF=AB?=
 =?UTF-8?q?=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/lang/TimeUtils.java    | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/lang/TimeUtils.java b/common/src/main/java/com/jeesite/common/lang/TimeUtils.java
index f801fd31..36ed3eee 100644
--- a/common/src/main/java/com/jeesite/common/lang/TimeUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/TimeUtils.java
@@ -14,19 +14,11 @@ import java.util.Date;
 public class TimeUtils {
 	
 	public static final String[] CN = new String[] {"毫秒", "秒", "分", "时", "天"};
-	public static final String[] EN = new String[] {" millisecond ", " second", " minute", " hour", " day"};
+	public static final String[] EN = new String[] {" millisecond ", " second ", " minute ", " hour ", " day "};
 	
 	public static final String[] AGO_CN = new String[] {"刚刚", "秒前", "分钟前", "小时前", "天前"};
 	public static final String[] AGO_EN = new String[] {"just now", " seconds ago", " minutes ago", " hours ago", " days ago"};
 
-	/**
-	 * 将毫秒数转换为：xx天，xx时，xx分，xx秒（v5.1 替换为 formatTime）
-	 */
-	@Deprecated
-	public static String formatDateAgo(long millisecond) {
-		return formatTime(millisecond, CN);
-	}
-	
 	/**
 	 * 将毫秒数转换为：xx天，xx时，xx分，xx秒
 	 */
@@ -52,21 +44,33 @@ public class TimeUtils {
 			sb.append(ms).append(lang[0]);
 		} else {
 			if (day > 0) {
+				ms -= day * dd;
 				sb.append(day).append(lang[4]);
 			}
-			if (hour > 0) {
+			if (day > 0 || hour > 0) {
+				ms -= hour * hh;
 				sb.append(hour).append(lang[3]);
 			}
-			if (minute > 0) {
+			if (day > 0 || hour > 0 || minute > 0) {
+				ms -= minute * mi;
 				sb.append(minute).append(lang[2]);
 			}
-			if (second > 0) {
-				sb.append(second).append(lang[1]);
+			if (hour > 0 || minute > 0 || second > 0) {
+				ms -= second * ss;
+				sb.append(second).append(".").append(ms).append(lang[1]);
 			}
 		}
 		return sb.toString();
 	}
 
+//	/**
+//	 * 将毫秒数转换为：xx天，xx时，xx分，xx秒（v5.1 替换为 formatTime）
+//	 */
+//	@Deprecated
+//	public static String formatDateAgo(long millisecond) {
+//		return formatTime(millisecond, CN);
+//	}
+
 	/**
 	 * 将过去的时间转为为，刚刚，xx秒，xx分钟，xx小时前、xx天前，大于3天的显示日期
 	 */