refactor(kotlin): 重构 AES 工具类并优化 Base64 编解码方法

- 重构 AesUtils.kt,使用 Kotlin 标准库的 encode 和 decode 方法替代自定义实现- 删除 Java 版本的 Base64Utils 类,迁移到 Kotlin 实现
- 重命名 ByteUtil.kt 为 ByteUtils.kt,统一命名风格
- 删除 Java 版本的 CloneUtil 类和 Factory 类,使用 Kotlin 实现
- 新增 Kotlin 版本的 SpringBeanUtils 工具类
This commit is contained in:
2025-09-14 21:47:04 +08:00
parent fb4e103da8
commit 1fab0b02be
17 changed files with 571 additions and 1015 deletions
+3 -1
View File
@@ -16,7 +16,7 @@
* ProjectName mingli-utils
* ModuleName mingli-utils.main
* CurrentFile Main.kt
* LastUpdate 2025-09-12 17:11:48
* LastUpdate 2025-09-14 20:08:44
* UpdateUser MingLiPro
*/
@@ -29,4 +29,6 @@ import com.mingliqiye.utils.springboot.autoconfigure.AutoConfiguration
fun main() {
AutoConfiguration.printBanner()
0..10
}
@@ -16,7 +16,7 @@
* ProjectName mingli-utils
* ModuleName mingli-utils.main
* CurrentFile AesUtils.kt
* LastUpdate 2025-09-14 18:19:29
* LastUpdate 2025-09-14 18:43:04
* UpdateUser MingLiPro
*/
@@ -25,7 +25,8 @@
package com.mingliqiye.utils.aes
import com.mingliqiye.utils.base64.Base64Utils
import com.mingliqiye.utils.base64.decode
import com.mingliqiye.utils.base64.encode
import java.nio.charset.StandardCharsets
import java.security.GeneralSecurityException
import java.security.MessageDigest
@@ -71,8 +72,8 @@ fun encrypt(sSrc: String, sKey: String?): String? {
val encrypted = cipher.doFinal(
sSrc.toByteArray(StandardCharsets.UTF_8)
)
return Base64Utils.encode(
"${Base64Utils.encode(iv)}:${Base64Utils.encode(encrypted)}".toByteArray()
return encode(
"${encode(iv)}:${encode(encrypted)}".toByteArray()
)
}
@@ -85,13 +86,13 @@ fun encrypt(sSrc: String, sKey: String?): String? {
fun decrypt(sSrc: String, sKey: String): String? {
try {
// 分割IV和加密数据
val sSrcs = String(Base64Utils.decode(sSrc))
val sSrcs = String(decode(sSrc))
val parts: Array<String?> = sSrcs.split(":".toRegex(), limit = 2).toTypedArray()
if (parts.size != 2) {
return null
}
val iv = Base64Utils.decode(parts[0])
val encryptedData = Base64Utils.decode(parts[1])
val iv = decode(parts[0]!!)
val encryptedData = decode(parts[1]!!)
if (iv.size != GCM_IV_LENGTH) {
return null
}
@@ -114,7 +115,7 @@ fun decrypt(sSrc: String, sKey: String): String? {
* @return SecretKeySpec对象
* @throws Exception 可能抛出的异常
*/
@Throws(GeneralSecurityException::class)
@Throws(Exception::class)
private fun createSecretKey(sKey: String): SecretKeySpec {
val key = sKey.toByteArray(StandardCharsets.UTF_8)
val md = MessageDigest.getInstance("MD5")
@@ -0,0 +1,160 @@
/*
* Copyright 2025 mingliqiye
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ProjectName mingli-utils
* ModuleName mingli-utils.main
* CurrentFile Base64Utils.kt
* LastUpdate 2025-09-14 18:44:22
* UpdateUser MingLiPro
*/
@file:JvmName("Base64Utils")
package com.mingliqiye.utils.base64
import java.io.File
import java.io.IOException
import java.nio.file.Path
import java.util.*
val BASE_64_ENCODER: Base64.Encoder = Base64.getEncoder()
val BASE_64_DECODER: Base64.Decoder = Base64.getDecoder()
/**
* 将字节数组编码为Base64字符串
*
* @param bytes 需要编码的字节数组
* @return 编码后的Base64字符串
*/
fun encode(bytes: ByteArray): String {
return BASE_64_ENCODER.encodeToString(bytes)
}
/**
* 将Base64字符串解码为字节数组
*
* @param string 需要解码的Base64字符串
* @return 解码后的字节数组
*/
fun decode(string: String): ByteArray {
return BASE_64_DECODER.decode(string)
}
/**
* 将文件内容编码为Base64字符串
*
* @param file 需要编码的文件
* @return 文件内容的Base64编码字符串
* @throws IOException 当文件读取失败时抛出
*/
@Throws(IOException::class)
fun encode(file: File): String {
return encode(file.readBytes())
}
/**
* 将Base64字符串解码并写入文件
*
* @param file 目标文件
* @param string 需要解码的Base64字符串
* @throws IOException 当文件写入失败时抛出
*/
@Throws(IOException::class)
fun decode(file: File, string: String) {
file.writeBytes(decode(string))
}
/**
* 安全地将文件内容编码为Base64字符串,出现异常时返回null
*
* @param file 需要编码的文件
* @return 文件内容的Base64编码字符串,失败时返回null
*/
fun encodeSafe(file: File): String? {
return try {
encode(file)
} catch (_: Exception) {
null
}
}
/**
* 安全地将Base64字符串解码并写入文件,返回操作是否成功
*
* @param file 目标文件
* @param string 需要解码的Base64字符串
* @return 操作成功返回true,失败返回false
*/
fun decodeSafe(file: File, string: String): Boolean {
return try {
decode(file, string)
true
} catch (_: Exception) {
false
}
}
/**
* 将路径对应的文件内容编码为Base64字符串
*
* @param path 需要编码的文件路径
* @return 文件内容的Base64编码字符串
* @throws IOException 当文件读取失败时抛出
*/
@Throws(IOException::class)
fun encode(path: Path): String {
return encode(path.toFile().readBytes())
}
/**
* 将Base64字符串解码并写入路径指定的文件
*
* @param path 目标文件路径
* @param string 需要解码的Base64字符串
* @throws IOException 当文件写入失败时抛出
*/
@Throws(IOException::class)
fun decode(path: Path, string: String) {
path.toFile().writeBytes(decode(string))
}
/**
* 安全地将路径对应的文件内容编码为Base64字符串,出现异常时返回null
*
* @param path 需要编码的文件路径
* @return 文件内容的Base64编码字符串,失败时返回null
*/
fun encodeSafe(path: Path): String? {
return try {
encode(path)
} catch (_: Exception) {
null
}
}
/**
* 安全地将Base64字符串解码并写入路径指定的文件,返回操作是否成功
*
* @param path 目标文件路径
* @param string 需要解码的Base64字符串
* @return 操作成功返回true,失败返回false
*/
fun decodeSafe(path: Path, string: String): Boolean {
return try {
decode(path, string)
true
} catch (_: Exception) {
false
}
}
@@ -0,0 +1,96 @@
/*
* Copyright 2025 mingliqiye
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ProjectName mingli-utils
* ModuleName mingli-utils.main
* CurrentFile SpringBeanUtils.kt
* LastUpdate 2025-09-14 20:01:26
* UpdateUser MingLiPro
*/
package com.mingliqiye.utils.bean.annotation.springboot
import org.springframework.beans.BeansException
import org.springframework.context.ApplicationContext
import org.springframework.context.ApplicationContextAware
import org.springframework.stereotype.Component
/**
* Spring Bean工具类,用于获取Spring容器中的Bean实例
* 实现ApplicationContextAware接口以获取Spring的应用上下文
*/
@Component
class SpringBeanUtils : ApplicationContextAware {
companion object {
@JvmStatic
private var applicationContext: ApplicationContext? = null
/**
* 根据Bean名称获取Bean实例
*
* @param name Bean的名称
* @return 指定名称的Bean实例
* @throws BeansException 当获取Bean失败时抛出
* @throws ClassCastException 当类型转换失败时抛出
*/
@JvmStatic
@Throws(BeansException::class, ClassCastException::class)
@Suppress("UNCHECKED_CAST")
fun <T> getBean(name: String): T {
return applicationContext!!.getBean(name) as T
}
/**
* 根据Bean类型获取Bean实例
*
* @param clazz Bean的类型
* @return 指定类型的Bean实例
* @throws BeansException 当获取Bean失败时抛出
*/
@JvmStatic
@Throws(BeansException::class)
fun <T> getBean(clazz: Class<T>): T {
return applicationContext!!.getBean(clazz)
}
/**
* 根据Bean名称和类型获取Bean实例
*
* @param name Bean的名称
* @param clazz Bean的类型
* @return 指定名称和类型的Bean实例
* @throws BeansException 当获取Bean失败时抛出
*/
@JvmStatic
@Throws(BeansException::class)
fun <T> getBean(name: String, clazz: Class<T>): T {
return applicationContext!!.getBean<T>(name, clazz)
}
}
/**
* 设置Spring的应用上下文
*
* @param applicationContext Spring的应用上下文
* @throws BeansException 当设置应用上下文失败时抛出
*/
@Throws(BeansException::class)
override fun setApplicationContext(applicationContext: ApplicationContext) {
SpringBeanUtils.applicationContext = applicationContext
}
}
@@ -15,11 +15,11 @@
*
* ProjectName mingli-utils
* ModuleName mingli-utils.main
* CurrentFile ByteUtil.kt
* LastUpdate 2025-09-14 18:19:29
* CurrentFile ByteUtils.kt
* LastUpdate 2025-09-14 19:28:38
* UpdateUser MingLiPro
*/
@file:JvmName("ByteUtil")
@file:JvmName("ByteUtils")
package com.mingliqiye.utils.bytes
@@ -39,13 +39,11 @@ const val ESC_RESERVED: Byte = 0x06
/**
* 将字节数组转换为十六进制字符串列表
*
* @param bytes 输入的字节数组
* @return 包含每个字节对应十六进制字符串的列表
*/
fun getByteArrayString(bytes: ByteArray): MutableList<String> {
return SuperStream.of(Lists.toList(bytes))
.map { a -> String.format("%02x", a!!.toInt() and 0xFF) }
fun ByteArray.getByteArrayString(): MutableList<String> {
return Lists.toList(this)!!.stream()
.map { a -> String.format("0X%02X", a!!.toInt() and 0xFF) }
.collect(SuperStream.Collectors.toList())
}
@@ -0,0 +1,63 @@
/*
* Copyright 2025 mingliqiye
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ProjectName mingli-utils
* ModuleName mingli-utils.main
* CurrentFile CloneUtil.kt
* LastUpdate 2025-09-14 19:53:41
* UpdateUser MingLiPro
*/
@file:JvmName("CloneUtils")
package com.mingliqiye.utils.clone
import com.mingliqiye.utils.json.JsonApi
import com.mingliqiye.utils.json.JsonException
import java.io.*
inline fun <reified T> Serializable.deepClone(): T {
return deepClone(this) as T
}
inline fun <reified T> T.deepJsonClone(jsonApi: JsonApi): T {
try {
return jsonApi.convert(this, this!!.javaClass) as T
} catch (e: Exception) {
throw JsonException(
"Failed to deep clone object using JSON",
e
)
}
}
@Suppress("UNCHECKED_CAST")
fun <T : Serializable?> deepClone(obj: T): T {
try {
val bao = ByteArrayOutputStream()
val oos = ObjectOutputStream(bao)
oos.writeObject(obj)
val bis = ByteArrayInputStream(
bao.toByteArray()
)
val ois = ObjectInputStream(bis)
return ois.readObject() as T
} catch (e: IOException) {
throw RuntimeException(e)
} catch (e: ClassNotFoundException) {
throw RuntimeException(e)
}
}
@@ -0,0 +1,174 @@
/*
* Copyright 2025 mingliqiye
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ProjectName mingli-utils
* ModuleName mingli-utils.main
* CurrentFile StringUtils.kt
* LastUpdate 2025-09-14 21:46:14
* UpdateUser MingLiPro
*/
@file:JvmName("StringUtils")
package com.mingliqiye.utils.string
import com.mingliqiye.utils.logger.mingLiLoggerFactory
val log = mingLiLoggerFactory.getLogger("StringUtils")
/**
* 判断`字符串`是否为空
*
* @param str 待判断的字符串
* @return `true`: 空 `false`: 非空
*/
fun isEmpty(str: String?): Boolean {
return str?.isEmpty() != null
}
/**
* 格式化字符串,将字符串中的占位符{}替换为对应的参数值
*
* `Kotlin`语言给我老老实实用`$`啊
*
* @param str 需要格式化的字符串,包含{}占位符 \\{} 代表一个{}
* @param args 要替换占位符的参数列表
* @return 格式化后的字符串
*/
fun format(str: String, vararg args: Any?): String {
var argIndex = 0
val result = StringBuilder()
var lastIndex = 0
// 匹配所有非转义的 {}
val pattern = Regex("(?<!\\\\)\\{}")
val matches = pattern.findAll(str)
for (match in matches) {
// 添加匹配前的文本
result.append(str, lastIndex, match.range.first)
// 替换占位符
if (argIndex < args.size) {
result.append(args[argIndex].toString())
argIndex++
}
lastIndex = match.range.last + 1
}
// 添加剩余文本
if (lastIndex < str.length) {
result.append(str, lastIndex, str.length)
}
// 处理转义的 \\{}(替换为 {})
val finalResult = result.toString().replace("\\{}", "{}")
// 检查参数数量
val placeholderCount = matches.count()
if (argIndex != args.size) {
log.warn("Placeholder count: $placeholderCount, Argument count: ${args.size}")
}
return finalResult
}
/**
* 将字符串转换为Unicode编码格式
*
* @param str 待转换的字符串
* @return 转换后的Unicode编码字符串,每个字符都以\\u开头的十六进制形式表示
*/
fun stringToUnicode(str: String): String {
val sb = java.lang.StringBuilder()
val c = str.toCharArray()
for (value in c) {
sb.append(stringToUnicode(value))
}
return sb.toString()
}
/**
* 将字符转换为Unicode转义字符串
*
* @param c 需要转换的字符
* @return 返回格式为"\\uXXXX"的Unicode转义字符串,其中XXXX为字符的十六进制Unicode码点
*/
fun stringToUnicode(c: Char): String {
return "\\u" + String.format("%04x", c.code)
}
/**
* 将整数转换为Unicode字符串表示形式
*
* @param c 要转换的整数,表示Unicode码点
* @return 返回格式为"\\uXXXX"的Unicode字符串,其中XXXX是参数c的十六进制表示
*/
fun stringToUnicode(c: Int): String {
return "\\u" + Integer.toHexString(c)
}
/**
* 将Unicode编码字符串转换为普通字符串
*
* 该函数接收一个包含Unicode转义序列的字符串,将其解析并转换为对应的字符序列
*
* @param unicode 包含Unicode转义序列的字符串,格式如"\\uXXXX",其中XXXX为十六进制数
* @return 转换后的普通字符串,包含对应的Unicode字符
*/
fun unicodeToString(unicode: String): String {
val sb = java.lang.StringBuilder()
// 按照Unicode转义符分割字符串,得到包含十六进制编码的数组
val hex: Array<String?> = unicode.split("\\\\u".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
// 从索引1开始遍历,因为分割后的第一个元素是转义符前面的内容(可能为空)
for (i in 1..<hex.size) {
// 将十六进制字符串转换为整数,作为字符的Unicode码点
val index = hex[i]!!.toInt(16)
// 将Unicode码点转换为对应字符并添加到结果中
sb.append(index.toChar())
}
return sb.toString()
}
/**
* 创建一个指定初始容量的StringBuilder实例
*
* @param i StringBuilder的初始容量
* @return 指定初始容量的StringBuilder实例
*/
fun stringBuilder(i: Int): java.lang.StringBuilder {
return StringBuilder(i)
}
/**
* 根据当前字符串创建一个StringBuilder实例
*
* @return 包含当前字符串内容的StringBuilder实例
*/
fun String.stringBuilder(): java.lang.StringBuilder {
return StringBuilder(this)
}
fun split(str: String, separator: String): List<String> {
return str.split(separator)
}
fun List<String>.join(separator: String): String {
return this.joinToString(separator)
}
@@ -16,10 +16,9 @@
* ProjectName mingli-utils
* ModuleName mingli-utils.main
* CurrentFile UUID.kt
* LastUpdate 2025-09-12 16:57:52
* LastUpdate 2025-09-14 19:55:47
* UpdateUser MingLiPro
*/
package com.mingliqiye.utils.uuid
import com.github.f4b6a3.uuid.UuidCreator
@@ -84,6 +83,16 @@ class UUID : Serializable {
return UUID(uuid)
}
/**
* 从Java的UUID
* @param uuid 字符串
* @return UUID
*/
@JvmStatic
fun of(uuid: JUUID): UUID {
return UUID(uuid)
}
/**
* 从字节码转换到UUID
* @param array 16字节
@@ -93,6 +102,10 @@ class UUID : Serializable {
fun of(array: ByteArray): UUID {
return UUID(array)
}
fun JUUID.toMlUUID(): UUID {
return of(this)
}
}
internal constructor(msb: Long, lsb: Long) {
@@ -108,10 +121,11 @@ class UUID : Serializable {
this.uuid = JUUID(bb.getLong(), bb.getLong())
}
internal constructor(uuid: String) {
constructor(uuid: String) {
this.uuid = JUUID.fromString(uuid)
}
/**
* 获取对应的字节码
* @return 字节码
@@ -242,3 +256,5 @@ class UUID : Serializable {
return uuid.hashCode()
}
}