From ddd4e38dca4c5f64b9fc999d57a13d827d29d474 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 20 Jul 2025 08:45:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20CharSequenceUt?= =?UTF-8?q?il=20=E6=9B=BF=E6=8D=A2=E9=83=A8=E5=88=86=20StrUtil=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BB=A5=E8=A7=A3=E5=86=B3=20Sonar=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starter/json/jackson/util/JSONUtils.java | 10 +++++----- .../starter/license/util/ServerInfoUtils.java | 13 ++++++------- .../continew/starter/storage/enums/FileType.java | 4 ++-- .../continew/starter/storage/util/StorageUtils.java | 4 ++-- .../storage/strategy/LocalStorageStrategy.java | 4 ++-- .../storage/strategy/OssStorageStrategy.java | 4 ++-- .../top/continew/starter/storage/util/OssUtils.java | 6 +++--- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/util/JSONUtils.java b/continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/util/JSONUtils.java index 53559fe1..c11ca319 100644 --- a/continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/util/JSONUtils.java +++ b/continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/util/JSONUtils.java @@ -16,7 +16,7 @@ package top.continew.starter.json.jackson.util; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.extra.spring.SpringUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -168,7 +168,7 @@ public class JSONUtils { * @return 解析后的 Java 对象 */ public static T parseObject(String str, Class clazz) { - if (StrUtil.isEmpty(str)) { + if (CharSequenceUtil.isEmpty(str)) { return null; } try { @@ -186,7 +186,7 @@ public class JSONUtils { * @return 解析后的 List */ public static List parseArray(String str, Class clazz) { - if (StrUtil.isEmpty(str)) { + if (CharSequenceUtil.isEmpty(str)) { return new ArrayList<>(); } try { @@ -204,7 +204,7 @@ public class JSONUtils { * @return 是否为 JSON 格式 */ public static boolean isTypeJSON(String str) { - if (StrUtil.isEmpty(str)) { + if (CharSequenceUtil.isEmpty(str)) { return false; } try { @@ -223,7 +223,7 @@ public class JSONUtils { * @return 解析后的 Java 对象 */ public static T toBean(String str, Class clazz) { - if (StrUtil.isEmpty(str)) { + if (CharSequenceUtil.isEmpty(str)) { return null; } try { diff --git a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ServerInfoUtils.java b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ServerInfoUtils.java index d87e7e26..bbc30392 100644 --- a/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ServerInfoUtils.java +++ b/continew-starter-license/continew-starter-license-core/src/main/java/top/continew/starter/license/util/ServerInfoUtils.java @@ -20,9 +20,9 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.StrUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.CollUtils; import top.continew.starter.license.exception.LicenseException; import top.continew.starter.license.model.LicenseExtraModel; @@ -128,7 +128,7 @@ public class ServerInfoUtils { * @return {@link String} */ private static String getLinuxCpuSerial() { - String result = StrUtil.EMPTY; + String result = StringConstants.EMPTY; String cpuIdCmd = "dmidecode"; BufferedReader bufferedReader = null; try { @@ -160,8 +160,7 @@ public class ServerInfoUtils { * @return {@link String} */ private static String getWindowCpuSerial() { - - StringBuilder result = new StringBuilder(StrUtil.EMPTY); + StringBuilder result = new StringBuilder(StringConstants.EMPTY); File file = null; BufferedReader input = null; try { @@ -205,11 +204,11 @@ public class ServerInfoUtils { try { Process process = new ProcessBuilder("sh", "-c", command).start(); try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) { - return reader.lines().findFirst().orElse(StrUtil.EMPTY); + return reader.lines().findFirst().orElse(StringConstants.EMPTY); } } catch (IOException e) { log.error("获取 Linux 主板序列号失败: {}", e.getMessage()); - return StrUtil.EMPTY; + return StringConstants.EMPTY; } } @@ -219,7 +218,7 @@ public class ServerInfoUtils { * @return {@link String} */ private static String getWindowMainBoardSerial() { - StringBuilder result = new StringBuilder(StrUtil.EMPTY); + StringBuilder result = new StringBuilder(StringConstants.EMPTY); File file = null; BufferedReader input = null; try { diff --git a/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/enums/FileType.java b/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/enums/FileType.java index a8934edc..888bb414 100644 --- a/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/enums/FileType.java +++ b/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/enums/FileType.java @@ -16,7 +16,7 @@ package top.continew.starter.storage.enums; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.CharSequenceUtil; import top.continew.starter.core.enums.BaseEnum; import java.util.Arrays; @@ -69,7 +69,7 @@ public enum FileType implements BaseEnum { */ public static FileType getByExtension(String extension) { return Arrays.stream(FileType.values()) - .filter(t -> t.getExtensions().contains(StrUtil.emptyIfNull(extension).toLowerCase())) + .filter(t -> t.getExtensions().contains(CharSequenceUtil.emptyIfNull(extension).toLowerCase())) .findFirst() .orElse(FileType.UNKNOWN); } diff --git a/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/util/StorageUtils.java b/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/util/StorageUtils.java index 7e262e49..565c15d3 100644 --- a/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/util/StorageUtils.java +++ b/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/util/StorageUtils.java @@ -19,7 +19,7 @@ package top.continew.starter.storage.util; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.CharSequenceUtil; import top.continew.starter.core.constant.StringConstants; import java.io.ByteArrayInputStream; @@ -121,7 +121,7 @@ public class StorageUtils { // 获取文件的扩展名 String extName = FileNameUtil.extName(fileName); // 去掉扩展名 - String baseName = StrUtil.subBefore(fileName, StringConstants.DOT, true); + String baseName = CharSequenceUtil.subBefore(fileName, StringConstants.DOT, true); // 拼接新的路径：原始路径 + .缩略图后缀 + .扩展名 return baseName + "." + suffix + "." + extName; } diff --git a/continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/strategy/LocalStorageStrategy.java b/continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/strategy/LocalStorageStrategy.java index 39a1523d..42b5d05f 100644 --- a/continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/strategy/LocalStorageStrategy.java +++ b/continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/strategy/LocalStorageStrategy.java @@ -19,8 +19,8 @@ package top.continew.starter.storage.strategy; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.file.FileNameUtil; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; @@ -123,7 +123,7 @@ public class LocalStorageStrategy implements StorageStrategy { // 格式化文件名 防止上传后重复 String formatFileName = StorageUtils.formatFileName(fileName); // 判断文件路径是否为空 为空给默认路径 格式 2024/12/30/ - if (StrUtil.isEmpty(path)) { + if (CharSequenceUtil.isEmpty(path)) { path = StorageUtils.localDefaultPath(); } // 判断文件夹是否存在 不存在则创建 diff --git a/continew-starter-storage/continew-starter-storage-oss/src/main/java/top/continew/starter/storage/strategy/OssStorageStrategy.java b/continew-starter-storage/continew-starter-storage-oss/src/main/java/top/continew/starter/storage/strategy/OssStorageStrategy.java index 2a71782c..39a2edcd 100644 --- a/continew-starter-storage/continew-starter-storage-oss/src/main/java/top/continew/starter/storage/strategy/OssStorageStrategy.java +++ b/continew-starter-storage/continew-starter-storage-oss/src/main/java/top/continew/starter/storage/strategy/OssStorageStrategy.java @@ -19,8 +19,8 @@ package top.continew.starter.storage.strategy; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.file.FileNameUtil; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -156,7 +156,7 @@ public class OssStorageStrategy implements StorageStrategy { // 格式化文件名 防止上传后重复 String formatFileName = StorageUtils.formatFileName(fileName); // 判断文件路径是否为空 为空给默认路径 格式 2024/12/30/ - if (StrUtil.isEmpty(path)) { + if (CharSequenceUtil.isEmpty(path)) { path = StorageUtils.ossDefaultPath(); } ThumbnailResp thumbnailResp = null; diff --git a/continew-starter-storage/continew-starter-storage-oss/src/main/java/top/continew/starter/storage/util/OssUtils.java b/continew-starter-storage/continew-starter-storage-oss/src/main/java/top/continew/starter/storage/util/OssUtils.java index bdbd2667..ebdcf0f2 100644 --- a/continew-starter-storage/continew-starter-storage-oss/src/main/java/top/continew/starter/storage/util/OssUtils.java +++ b/continew-starter-storage/continew-starter-storage-oss/src/main/java/top/continew/starter/storage/util/OssUtils.java @@ -16,7 +16,7 @@ package top.continew.starter.storage.util; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.CharSequenceUtil; import software.amazon.awssdk.regions.Region; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.storage.constant.StorageConstant; @@ -39,7 +39,7 @@ public class OssUtils { * @return {@link Region } */ public static Region getRegion(String region) { - return StrUtil.isEmpty(region) ? Region.US_EAST_1 : Region.of(region); + return CharSequenceUtil.isEmpty(region) ? Region.US_EAST_1 : Region.of(region); } /** @@ -51,7 +51,7 @@ public class OssUtils { */ public static String getUrl(String endpoint, String bucketName) { // 如果是云服务商，直接返回域名或终端点 - if (StrUtil.containsAny(endpoint, StorageConstant.CLOUD_SERVICE_PREFIX)) { + if (CharSequenceUtil.containsAny(endpoint, StorageConstant.CLOUD_SERVICE_PREFIX)) { return "http://" + bucketName + StringConstants.DOT + endpoint; } else { return "http://" + endpoint + StringConstants.SLASH + bucketName;