diff --git a/gradle.properties b/gradle.properties index 9ab28f1..7c86e05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,10 +16,10 @@ # ProjectName mingli-utils # ModuleName mingli-utils # CurrentFile gradle.properties -# LastUpdate 2025-09-15 17:24:10 +# LastUpdate 2025-09-15 18:03:04 # UpdateUser MingLiPro # JDKVERSIONS=1.8 GROUPSID=com.mingliqiye.utils ARTIFACTID=mingli-utils -VERSIONS=4.0.5 +VERSIONS=4.0.6 diff --git a/src/main/kotlin/com/mingliqiye/utils/Main.kt b/src/main/kotlin/com/mingliqiye/utils/Main.kt index d989b68..80ceff0 100644 --- a/src/main/kotlin/com/mingliqiye/utils/Main.kt +++ b/src/main/kotlin/com/mingliqiye/utils/Main.kt @@ -16,18 +16,17 @@ * ProjectName mingli-utils * ModuleName mingli-utils.main * CurrentFile Main.kt - * LastUpdate 2025-09-15 09:53:43 + * LastUpdate 2025-09-15 18:02:00 * UpdateUser MingLiPro */ package com.mingliqiye.utils import com.mingliqiye.utils.springboot.autoconfigure.AutoConfiguration -import com.mingliqiye.utils.time.DateTime +import com.mingliqiye.utils.uuid.UUID fun main() { AutoConfiguration.printBanner() - println(DateTime.now()) -} -fun test() { + println(UUID.of("b5c4579e-921a-11f0-ad12-d7949d0c61b8").equals(UUID.of("b5c4579e-921a-11f0-ad12-d7949d0c61b8"))) + println(UUID.getV1()) } diff --git a/src/main/kotlin/com/mingliqiye/utils/uuid/UUID.kt b/src/main/kotlin/com/mingliqiye/utils/uuid/UUID.kt index 041c6b1..f6cb42a 100644 --- a/src/main/kotlin/com/mingliqiye/utils/uuid/UUID.kt +++ b/src/main/kotlin/com/mingliqiye/utils/uuid/UUID.kt @@ -16,7 +16,7 @@ * ProjectName mingli-utils * ModuleName mingli-utils.main * CurrentFile UUID.kt - * LastUpdate 2025-09-14 22:38:51 + * LastUpdate 2025-09-15 18:01:30 * UpdateUser MingLiPro */ package com.mingliqiye.utils.uuid @@ -247,7 +247,12 @@ class UUID : Serializable { * @return 如果相等返回 true,否则返回 false */ override fun equals(other: Any?): Boolean { - return uuid == other + if (other is UUID) { + return uuid == other.uuid + } else if (other is JUUID) { + return uuid == other + } + return false } /**