From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java b/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java
index 40a6840..29c88bf 100644
--- a/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java
@@ -1,6 +1,7 @@
package com.ycl.utils.uuid;
import java.text.SimpleDateFormat;
+import java.util.Date;
/**
* ID鐢熸垚鍣ㄥ伐鍏风被
@@ -11,6 +12,7 @@
{
private final static SimpleDateFormat FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
+ private final static SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("yyyyMMdd");
/**
* 鑾峰彇闅忔満UUID
@@ -57,8 +59,8 @@
*
* @return 缂栧彿
*/
- public static String randomNO()
+ public static String randomNO(Date now)
{
- return UUID.randomUUID().toString().replaceAll("-","").substring(0, 24);
+ return DAY_FORMAT.format(now) + UUID.randomUUID().toString().replaceAll("-","").substring(0, 18);
}
}
--
Gitblit v1.8.0