refactor(bcrypt): 重构 BCrypt.kt 文件

- 将 BCrypt 对象中的函数转换为顶级函数
- 添加 @JvmName 注解以自定义 JVM 方法名
- 更新相关文件中的导入和引用
- 调整 DateTime 类的 parse 和 format 方法
- 优化 StringUtils 中的 isEmpty 方法

gradle.properties

@@ -16,13 +16,13 @@
 # ProjectName mingli-utils
 # ModuleName mingli-utils
 # CurrentFile gradle.properties
-# LastUpdate 2025-09-17 12:10:36
+# LastUpdate 2025-09-17 21:09:18
 # UpdateUser MingLiPro
 #
 JDKVERSIONS=1.8
 GROUPSID=com.mingliqiye.utils
 ARTIFACTID=mingli-utils
-VERSIONS=4.1.1
+VERSIONS=4.1.4
 signing.keyId=B22AA93B
 signing.password=
 signing.secretKeyRingFile=secret.gpg

src/main/kotlin/com/mingliqiye/utils/Main.kt

@@ -16,7 +16,7 @@
  * ProjectName mingli-utils
  * ModuleName mingli-utils.main
  * CurrentFile Main.kt
- * LastUpdate 2025-09-17 10:59:04
+ * LastUpdate 2025-09-17 19:07:01
  * UpdateUser MingLiPro
  */
 @file:JvmName("Main")

src/main/kotlin/com/mingliqiye/utils/bcrypt/BCrypt.kt

@@ -16,36 +16,45 @@
  * ProjectName mingli-utils
  * ModuleName mingli-utils.main
  * CurrentFile BCrypt.kt
- * LastUpdate 2025-09-17 11:57:26
+ * LastUpdate 2025-09-17 16:20:30
  * UpdateUser MingLiPro
  */
 
+@file:JvmName("BCrypt")
+
 package com.mingliqiye.utils.bcrypt
 
+
+import java.security.SecureRandom
 import org.mindrot.jbcrypt.BCrypt as JBCrypt
 
-object BCrypt {
-    fun hashpw(string: String): String {
+
+fun hashpw(string: String): String {
     return hashpw(string, gensalt())
-    }
-
-    fun hashpw(string: String, salt: String = gensalt()): String {
-        return JBCrypt.hashpw(string, salt)
-    }
-
-    fun checkpw(string: String, bcrypted: String): Boolean {
-        return JBCrypt.checkpw(string, bcrypted)
-    }
-
-    fun gensalt(): String {
-        return JBCrypt.gensalt()
-    }
-
-    fun gensalt(long: Int): String {
-        return JBCrypt.gensalt(long)
-    }
-
-    fun gensalt(long: Int, secureRandom: java.security.SecureRandom): String {
-        return JBCrypt.gensalt(long, secureRandom)
-    }
 }
+
+
+fun hashpw(string: String, salt: String = gensalt()): String {
+    return JBCrypt.hashpw(string, salt)
+}
+
+
+fun checkpw(string: String, bcrypted: String): Boolean {
+    return JBCrypt.checkpw(string, bcrypted)
+}
+
+
+fun gensalt(): String {
+    return JBCrypt.gensalt()
+}
+
+
+fun gensalt(long: Int): String {
+    return JBCrypt.gensalt(long)
+}
+
+
+fun gensalt(long: Int, secureRandom: SecureRandom): String {
+    return JBCrypt.gensalt(long, secureRandom)
+}
+

src/main/kotlin/com/mingliqiye/utils/hash/HashUtils.kt

@@ -16,7 +16,7 @@
  * ProjectName mingli-utils
  * ModuleName mingli-utils.main
  * CurrentFile HashUtils.kt
- * LastUpdate 2025-09-17 11:57:26
+ * LastUpdate 2025-09-17 16:20:57
  * UpdateUser MingLiPro
  */
 @file:JvmName("HashUtils")
@@ -24,7 +24,8 @@
 package com.mingliqiye.utils.hash
 
 
-import com.mingliqiye.utils.bcrypt.BCrypt
+import com.mingliqiye.utils.bcrypt.checkpw
+import com.mingliqiye.utils.bcrypt.hashpw
 import java.io.File
 import java.io.FileInputStream
 import java.io.IOException
@@ -87,7 +88,7 @@ private fun bytesToHex(bytes: ByteArray): String {
  * @return 加密后的 BCrypt 哈希字符串
  */
 fun bcrypt(string: String): String {
-    return BCrypt.hashpw(string)
+    return hashpw(string)
 }
 
 /**
@@ -98,5 +99,5 @@ fun bcrypt(string: String): String {
  * @return 如果匹配返回 true，否则返回 false
  */
 fun checkBcrypt(string: String, bcrypted: String): Boolean {
-    return BCrypt.checkpw(string, bcrypted)
+    return checkpw(string, bcrypted)
 }

src/main/kotlin/com/mingliqiye/utils/json/converters/JsonStringConverter.kt

@@ -16,7 +16,7 @@
  * ProjectName mingli-utils
  * ModuleName mingli-utils.main
  * CurrentFile JsonStringConverter.kt
- * LastUpdate 2025-09-15 11:03:53
+ * LastUpdate 2025-09-17 19:09:17
  * UpdateUser MingLiPro
  */
 
@@ -35,7 +35,6 @@ import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
 import com.mingliqiye.utils.time.DateTime
 import com.mingliqiye.utils.time.DateTime.Companion.parse
-import com.mingliqiye.utils.time.Formatter
 import com.mingliqiye.utils.uuid.UUID
 import com.mingliqiye.utils.uuid.UUID.Companion.of
 import java.io.IOException
@@ -219,7 +218,7 @@ class DateTimeJsonConverter : JsonStringConverter<DateTime>() {
         if (obj == null) {
             return null
         }
-        return obj.format(Formatter.STANDARD_DATETIME)
+        return obj.format()
     }
 
     override fun deConvert(obj: String?): DateTime? {
@@ -227,9 +226,7 @@ class DateTimeJsonConverter : JsonStringConverter<DateTime>() {
             return null
         }
         return parse(
-            obj,
-            Formatter.STANDARD_DATETIME_MILLISECOUND7,
-            true
+            obj
         )
     }
 }

src/main/kotlin/com/mingliqiye/utils/string/StringUtils.kt

@@ -16,7 +16,7 @@
  * ProjectName mingli-utils
  * ModuleName mingli-utils.main
  * CurrentFile StringUtils.kt
- * LastUpdate 2025-09-15 22:32:50
+ * LastUpdate 2025-09-17 21:09:10
  * UpdateUser MingLiPro
  */
 @file:JvmName("StringUtils")
@@ -28,14 +28,17 @@ import com.mingliqiye.utils.logger.mingLiLoggerFactory
 
 val log = mingLiLoggerFactory.getLogger("StringUtils")
 
+val NULLISH_STRINGS = setOf("null", "NaN", "undefined", "None", "none")
+
 /**
  * 判断`字符串`是否为空
  *
  * @param str 待判断的字符串
  * @return `true`: 空 `false`: 非空
  */
-fun isEmpty(str: String?): Boolean {
-    return str?.isEmpty() != null
+@JvmName("isEmpty")
+fun String?.isNullish(): Boolean {
+    return this == null || this.isBlank() || this in NULLISH_STRINGS
 }
 
 /**

src/main/kotlin/com/mingliqiye/utils/time/DateTime.kt

@@ -16,7 +16,7 @@
  * ProjectName mingli-utils
  * ModuleName mingli-utils.main
  * CurrentFile DateTime.kt
- * LastUpdate 2025-09-17 08:40:14
+ * LastUpdate 2025-09-17 19:06:39
  * UpdateUser MingLiPro
  */
 
@@ -95,6 +95,8 @@ enum class Formatter(private val value: String) {
      * 标准日期时间格式(7位毫秒)：yyyy-MM-dd HH:mm:ss.SSSSSSS
      */
     STANDARD_DATETIME_MILLISECOUND7("yyyy-MM-dd HH:mm:ss.SSSSSSS"),
+    STANDARD_DATETIME_MILLISECOUND8("yyyy-MM-dd HH:mm:ss.SSSSSSSS"),
+    STANDARD_DATETIME_MILLISECOUND9("yyyy-MM-dd HH:mm:ss.SSSSSSSSS"),
 
     /**
      * 标准日期时间格式(6位毫秒)：yyyy-MM-dd HH:mm:ss.SSSSSS
@@ -151,6 +153,7 @@ enum class Formatter(private val value: String) {
      */
     COMPACT_DATETIME("yyyyMMddHHmmss");
 
+
     private val len: Int = value.length
 
     fun getLen(): Int {
@@ -276,6 +279,20 @@ class DateTime private constructor(
             )
         }
 
+        @JvmStatic
+        fun parse(
+            timestr: String
+        ): DateTime {
+
+            val formatterString = Formatter.STANDARD_DATETIME_MILLISECOUND9.getValue()
+            return DateTime(
+                LocalDateTime.parse(
+                    getFillZeroByLen(timestr, formatterString),
+                    DateTimeFormatter.ofPattern(formatterString)
+                )
+            )
+        }
+
         /**
          * 使用 Formatter 枚举解析时间字符串并生成 DateTime 实例。
          *
@@ -332,7 +349,7 @@ class DateTime private constructor(
                     modifiedDstr += "."
                 }
                 val sb = StringBuilder(modifiedDstr)
-                for (i in 0 until formats.length - dstr.length) {
+                for (i in 0 until formats.length - sb.length) {
                     sb.append("0")
                 }
                 return sb.toString()
@@ -533,6 +550,10 @@ class DateTime private constructor(
         return format(formatter.getValue())
     }
 
+    fun format(): String {
+        return format(Formatter.STANDARD_DATETIME_MILLISECOUND9.getValue(), true)
+    }
+
     /**
      * 使用指定格式化模板将当前时间格式化为字符串，并可选择是否去除末尾多余的零。
      *
@@ -569,9 +590,7 @@ class DateTime private constructor(
      * @return 返回标准格式的时间字符串
      */
     override fun toString(): String {
-        return String.format(
-            "DateTime(%s)", format(Formatter.STANDARD_DATETIME_MILLISECOUND7, true)
-        )
+        return "DateTime(${format()})"
     }
 
     /**

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-17 11:04:08
+ * LastUpdate 2025-09-17 16:27:32
  * UpdateUser MingLiPro
  */
 
@@ -183,7 +183,6 @@ class UUID : Serializable {
         @JvmStatic
         fun getV7(): UUID {
             val instant = DateTime.now().toMillisecondTime()
-            println(instant.toString(16))
             val buffer = ByteBuffer.allocate(16)
             buffer.putInt((instant shr 16).toInt())
             buffer.putShort((instant).toShort())