dev #9

Merged
minglipro merged 2 commits from dev into master 2025-09-15 22:33:56 +08:00
3 changed files with 13 additions and 9 deletions
Showing only changes of commit 7c3c13e28c - Show all commits

View File

@ -16,10 +16,10 @@
# ProjectName mingli-utils # ProjectName mingli-utils
# ModuleName mingli-utils # ModuleName mingli-utils
# CurrentFile gradle.properties # CurrentFile gradle.properties
# LastUpdate 2025-09-15 17:24:10 # LastUpdate 2025-09-15 18:03:04
# UpdateUser MingLiPro # UpdateUser MingLiPro
# #
JDKVERSIONS=1.8 JDKVERSIONS=1.8
GROUPSID=com.mingliqiye.utils GROUPSID=com.mingliqiye.utils
ARTIFACTID=mingli-utils ARTIFACTID=mingli-utils
VERSIONS=4.0.5 VERSIONS=4.0.6

View File

@ -16,18 +16,17 @@
* ProjectName mingli-utils * ProjectName mingli-utils
* ModuleName mingli-utils.main * ModuleName mingli-utils.main
* CurrentFile Main.kt * CurrentFile Main.kt
* LastUpdate 2025-09-15 09:53:43 * LastUpdate 2025-09-15 18:02:00
* UpdateUser MingLiPro * UpdateUser MingLiPro
*/ */
package com.mingliqiye.utils package com.mingliqiye.utils
import com.mingliqiye.utils.springboot.autoconfigure.AutoConfiguration import com.mingliqiye.utils.springboot.autoconfigure.AutoConfiguration
import com.mingliqiye.utils.time.DateTime import com.mingliqiye.utils.uuid.UUID
fun main() { fun main() {
AutoConfiguration.printBanner() 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())
} }

View File

@ -16,7 +16,7 @@
* ProjectName mingli-utils * ProjectName mingli-utils
* ModuleName mingli-utils.main * ModuleName mingli-utils.main
* CurrentFile UUID.kt * CurrentFile UUID.kt
* LastUpdate 2025-09-14 22:38:51 * LastUpdate 2025-09-15 18:01:30
* UpdateUser MingLiPro * UpdateUser MingLiPro
*/ */
package com.mingliqiye.utils.uuid package com.mingliqiye.utils.uuid
@ -247,7 +247,12 @@ class UUID : Serializable {
* @return 如果相等返回 true否则返回 false * @return 如果相等返回 true否则返回 false
*/ */
override fun equals(other: Any?): Boolean { 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
} }
/** /**