✨ feat(工具类): 新增nextId方法生成ULID, 并调整依赖和配置文件

vnobo · Jun 4, 2024 · 4d06da1 · 4d06da1
1 parent a43e324
commit 4d06da1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 120 deletions.
diff --git a/boot/platform/build.gradle b/boot/platform/build.gradle
@@ -37,6 +37,7 @@ tasks.named("bootBuildImage") {
 dependencies {
 
     implementation("com.google.guava:guava:33.+")
+    implementation("com.github.f4b6a3:ulid-creator:5.+")
 
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")

diff --git a/boot/platform/src/main/java/com/platform/boot/commons/base/BaseEntity.java b/boot/platform/src/main/java/com/platform/boot/commons/base/BaseEntity.java
@@ -1,7 +1,7 @@
 package com.platform.boot.commons.base;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.platform.boot.commons.utils.Ulid;
+import com.platform.boot.commons.utils.ContextUtils;
 import com.platform.boot.commons.utils.query.CriteriaUtils;
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.relational.core.query.Criteria;
@@ -34,7 +34,7 @@ default void setCode(String code) {
     default boolean isNew() {
         boolean isNew = ObjectUtils.isEmpty(getId());
         if (isNew) {
-            setCode(Ulid.random());
+            setCode(ContextUtils.nextId());
         }
         return isNew;
     }

diff --git a/boot/platform/src/main/java/com/platform/boot/commons/utils/ContextUtils.java b/boot/platform/src/main/java/com/platform/boot/commons/utils/ContextUtils.java
@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.f4b6a3.ulid.Ulid;
+import com.github.f4b6a3.ulid.UlidCreator;
 import com.platform.boot.commons.exception.JsonException;
 import com.platform.boot.commons.exception.RestServerException;
 import com.platform.boot.security.SecurityDetails;
@@ -116,6 +118,11 @@ private static <T> Mono<String> handlePropertyDescriptor(T object, PropertyDescr
         }
     }
 
+    public static String nextId() {
+        Ulid ulid = UlidCreator.getMonotonicUlid();
+        return ulid.toString();
+    }
+
     @Override
     public void afterPropertiesSet() {
         log.info("Initializing utils [ContextUtils]...");

diff --git a/boot/platform/src/main/java/com/platform/boot/commons/utils/Ulid.java b/boot/platform/src/main/java/com/platform/boot/commons/utils/Ulid.java
diff --git a/boot/platform/src/main/resources/application-local.yml b/boot/platform/src/main/resources/application-local.yml
@@ -18,7 +18,7 @@ spring:
       max-idle-time: 10m
       validation-query: select 1
   sql.init:
-    mode: always
+    mode: never
     platform: postgres
     encoding: utf-8
   data.redis: