From c9c7c345062a126e802f5d92d06710f503e8f733 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 18 Mar 2025 20:42:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starter/core/validation/Validator.java | 22 +++++++++---------- .../data/core/util/SqlInjectionUtils.java | 6 ++--- .../data/mf/util/QueryWrapperHelper.java | 2 +- .../data/mp/util/QueryWrapperHelper.java | 2 +- .../extension/crud/model/query/SortQuery.java | 4 ++-- .../messaging/mail/core/MailConfig.java | 2 +- .../messaging/mail/core/MailConfigurer.java | 10 ++++----- .../storage/strategy/OssStorageStrategy.java | 3 ++- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/validation/Validator.java b/continew-starter-core/src/main/java/top/continew/starter/core/validation/Validator.java index dba74a48..061facd7 100644 --- a/continew-starter-core/src/main/java/top/continew/starter/core/validation/Validator.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/validation/Validator.java @@ -44,7 +44,7 @@ public class Validator { * 如果为空，抛出异常 * * @param obj 被检测的对象 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfNull(Object obj, String message, Class exceptionType) { @@ -55,7 +55,7 @@ public class Validator { * 如果不为空，抛出异常 * * @param obj 被检测的对象 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfNotNull(Object obj, String message, Class exceptionType) { @@ -66,7 +66,7 @@ public class Validator { * 如果为空，抛出异常 * * @param obj 被检测的对象 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfEmpty(Object obj, String message, Class exceptionType) { @@ -77,7 +77,7 @@ public class Validator { * 如果不为空，抛出异常 * * @param obj 被检测的对象 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfNotEmpty(Object obj, String message, Class exceptionType) { @@ -88,7 +88,7 @@ public class Validator { * 如果为空，抛出异常 * * @param str 被检测的字符串 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfBlank(CharSequence str, @@ -101,7 +101,7 @@ public class Validator { * 如果不为空，抛出异常 * * @param str 被检测的字符串 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfNotBlank(CharSequence str, @@ -115,7 +115,7 @@ public class Validator { * * @param obj1 要比较的对象1 * @param obj2 要比较的对象2 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfEqual(Object obj1, @@ -130,7 +130,7 @@ public class Validator { * * @param obj1 要比较的对象1 * @param obj2 要比较的对象2 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfNotEqual(Object obj1, @@ -145,7 +145,7 @@ public class Validator { * * @param str1 要比较的字符串1 * @param str2 要比较的字符串2 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfEqualIgnoreCase(CharSequence str1, @@ -160,7 +160,7 @@ public class Validator { * * @param str1 要比较的字符串1 * @param str2 要比较的字符串2 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIfNotEqualIgnoreCase(CharSequence str1, @@ -174,7 +174,7 @@ public class Validator { * 如果条件成立，抛出异常 * * @param condition 条件 - * @param message 错误信息 + * @param message 提示信息 * @param exceptionType 异常类型 */ protected static void throwIf(boolean condition, String message, Class exceptionType) { diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java index 6d1ffd06..6fd922e8 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java @@ -67,7 +67,7 @@ public class SqlInjectionUtils { * 检查参数是否存在 SQL 注入 * * @param value 检查参数 - * @return true：非法；false：合法 + * @return true：存在；false：不存在 */ public static boolean check(String value) { return check(value, null); @@ -78,7 +78,7 @@ public class SqlInjectionUtils { * * @param value 检查参数 * @param customKeyword 自定义关键字 - * @return true：非法；false：合法 + * @return true：存在；false：不存在 */ public static boolean check(String value, String customKeyword) { if (CharSequenceUtil.isBlank(value)) { @@ -114,7 +114,7 @@ public class SqlInjectionUtils { * * @param value 检查参数 * @param keywords 关键字列表 - * @return true：非法；false：合法 + * @return true：存在；false：不存在 */ private static boolean checkKeyword(String value, String[] keywords) { for (String keyword : keywords) { diff --git a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java index f76b219f..059dd443 100644 --- a/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java @@ -92,7 +92,7 @@ public class QueryWrapperHelper { if (sort != null && sort.isSorted()) { for (Sort.Order order : sort) { String field = CharSequenceUtil.toUnderlineCase(order.getProperty()); - ValidationUtils.throwIf(SqlInjectionUtils.check(field), "排序字段包含非法字符"); + ValidationUtils.throwIf(SqlInjectionUtils.check(field), "排序字段包含无效字符"); queryWrapper.orderBy(field, order.isAscending()); } } diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java index f88232ef..1557fccf 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java @@ -104,7 +104,7 @@ public class QueryWrapperHelper { if (sort != null && sort.isSorted()) { for (Sort.Order order : sort) { String field = CharSequenceUtil.toUnderlineCase(order.getProperty()); - ValidationUtils.throwIf(SqlInjectionUtils.check(field), "排序字段包含非法字符"); + ValidationUtils.throwIf(SqlInjectionUtils.check(field), "排序字段包含无效字符"); queryWrapper.orderBy(true, order.isAscending(), field); } } diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java index 14ba9713..ac69f913 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java @@ -56,7 +56,7 @@ public class SortQuery implements Serializable { if (ArrayUtil.isEmpty(sort)) { return Sort.unsorted(); } - ValidationUtils.throwIf(sort.length < 2, "排序条件非法"); + ValidationUtils.throwIf(sort.length < 2, "排序条件无效"); List orders = new ArrayList<>(sort.length); if (CharSequenceUtil.contains(sort[0], StringConstants.COMMA)) { // e.g "sort=createTime,desc&sort=name,asc" @@ -83,7 +83,7 @@ public class SortQuery implements Serializable { * @return 排序条件 */ private Sort.Order getOrder(String field, String direction) { - ValidationUtils.throwIf(SqlInjectionUtils.check(field), "排序字段包含非法字符"); + ValidationUtils.throwIf(SqlInjectionUtils.check(field), "排序字段包含无效字符"); return new Sort.Order(Sort.Direction.valueOf(direction.toUpperCase()), field); } } diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfig.java b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfig.java index 1ab813a9..d1d0bc79 100644 --- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfig.java +++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfig.java @@ -174,7 +174,7 @@ public class MailConfig { javaMailProperties.put("mail.smtp.auth", true); javaMailProperties.put("mail.smtp.ssl.enable", this.isSslEnabled()); if (this.isSslEnabled()) { - ValidationUtils.throwIfNull(this.getSslPort(), "邮件配置错误：SSL端口不能为空"); + ValidationUtils.throwIfNull(this.getSslPort(), "邮件配置不正确：SSL端口不能为空"); javaMailProperties.put("mail.smtp.socketFactory.port", this.sslPort); javaMailProperties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); } diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigurer.java b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigurer.java index fd85f541..678c400d 100644 --- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigurer.java +++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigurer.java @@ -42,20 +42,20 @@ public interface MailConfigurer { */ default void apply(MailConfig mailConfig, JavaMailSenderImpl sender) { String protocolLowerCase = mailConfig.getProtocol().toLowerCase(); - ValidationUtils.throwIfNotEqual(MailConfig.DEFAULT_PROTOCOL, protocolLowerCase, "邮件配置错误：不支持的邮件发送协议: %s" + ValidationUtils.throwIfNotEqual(MailConfig.DEFAULT_PROTOCOL, protocolLowerCase, "邮件配置不正确：不支持的邮件发送协议: %s" .formatted(mailConfig.getProtocol())); sender.setProtocol(mailConfig.getProtocol()); - ValidationUtils.throwIfBlank(mailConfig.getHost(), "邮件配置错误：服务器地址不能为空"); + ValidationUtils.throwIfBlank(mailConfig.getHost(), "邮件配置不正确：服务器地址不能为空"); sender.setHost(mailConfig.getHost()); - ValidationUtils.throwIfNull(mailConfig.getPort(), "邮件配置错误：服务器端口不能为空"); + ValidationUtils.throwIfNull(mailConfig.getPort(), "邮件配置不正确：服务器端口不能为空"); sender.setPort(mailConfig.getPort()); - ValidationUtils.throwIfBlank(mailConfig.getUsername(), "邮件配置错误：用户名不能为空"); + ValidationUtils.throwIfBlank(mailConfig.getUsername(), "邮件配置不正确：用户名不能为空"); sender.setUsername(mailConfig.getUsername()); - ValidationUtils.throwIfBlank(mailConfig.getPassword(), "邮件配置错误：密码不能为空"); + ValidationUtils.throwIfBlank(mailConfig.getPassword(), "邮件配置不正确：密码不能为空"); sender.setPassword(mailConfig.getPassword()); if (mailConfig.getDefaultEncoding() != null) { 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 1369b0e0..3ce98d5f 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 @@ -374,7 +374,8 @@ public class OssStorageStrategy implements StorageStrategy { } catch (Exception e) { // 如果 getBucketAcl 失败，可能是权限或连接问题 log.error("获取桶 ACL 失败: {}", e.getMessage()); - return true; // 出现错误时，默认认为桶是私有的 + // 出现错误时，默认认为桶是私有的 + return true; } }