From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java | 21 +++------------------
1 files changed, 3 insertions(+), 18 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 eaf4e6b..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
@@ -2,7 +2,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.Random;
/**
* ID鐢熸垚鍣ㄥ伐鍏风被
@@ -13,6 +12,7 @@
{
private final static SimpleDateFormat FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
+ private final static SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("yyyyMMdd");
/**
* 鑾峰彇闅忔満UUID
@@ -57,25 +57,10 @@
/**
* 鑾峰彇褰撳墠鏃堕棿+闅忔満鏁扮殑缂栧彿
*
- * @param numberNum 鏃堕棿鍚庣敓鎴愬嚑浣嶆暟瀛楋紝榛樿5
* @return 缂栧彿
*/
- public static String timeAddRandomNO(Integer numberNum)
+ public static String randomNO(Date now)
{
- if (numberNum == null || numberNum == 0 || numberNum < 3) {
- numberNum = 5;
- }
-
- Date now = new Date();
- String timeString = FORMAT.format(now);
-
- Random random = new Random();
- StringBuilder builder = new StringBuilder();
- builder.append(timeString);
- for (int i = 0; i < numberNum; i++) {
- // 鐢熸垚涓�涓�0鍒�9涔嬮棿鐨勯殢鏈烘暟锛堝寘鎷�0鍜�9锛�
- builder.append(random.nextInt(10));
- }
- return builder.toString();
+ return DAY_FORMAT.format(now) + UUID.randomUUID().toString().replaceAll("-","").substring(0, 18);
}
}
--
Gitblit v1.8.0