From 78a7904c2fba7c18869afb3f089b23b79666a3a7 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 4 Jul 2025 21:06:28 +0800 Subject: [PATCH] =?UTF-8?q?chore(core):=20=E8=B0=83=E6=95=B4=20CheckUtils?= =?UTF-8?q?=20=E7=AD=89=E6=A0=A1=E9=AA=8C=E7=B1=BB=E5=88=B0=20util.validat?= =?UTF-8?q?ion=20=E5=8C=85=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starter/core/util/{ => validation}/CheckUtils.java | 2 +- .../starter/core/util/{ => validation}/ValidationUtils.java | 2 +- .../starter/core/util/{ => validation}/Validator.java | 2 +- .../top/continew/starter/data/mf/util/QueryWrapperHelper.java | 2 +- .../continew/starter/data/mp/service/impl/ServiceImpl.java | 2 +- .../top/continew/starter/data/mp/util/QueryWrapperHelper.java | 2 +- .../extension/crud/autoconfigure/CrudTreeProperties.java | 2 +- .../starter/extension/crud/model/query/SortQuery.java | 2 +- .../starter/extension/crud/service/CrudServiceImpl.java | 2 +- .../starter/extension/crud/service/CrudServiceImpl.java | 4 ++-- .../top/continew/starter/messaging/mail/core/MailConfig.java | 2 +- .../continew/starter/messaging/mail/core/MailConfigurer.java | 2 +- .../autoconfigure/PasswordEncoderAutoConfiguration.java | 2 +- .../top/continew/starter/storage/manger/StorageManager.java | 2 +- .../starter/storage/strategy/LocalStorageStrategy.java | 4 ++-- .../continew/starter/storage/strategy/OssStorageStrategy.java | 4 ++-- 16 files changed, 19 insertions(+), 19 deletions(-) rename continew-starter-core/src/main/java/top/continew/starter/core/util/{ => validation}/CheckUtils.java (99%) rename continew-starter-core/src/main/java/top/continew/starter/core/util/{ => validation}/ValidationUtils.java (99%) rename continew-starter-core/src/main/java/top/continew/starter/core/util/{ => validation}/Validator.java (99%) diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/CheckUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/validation/CheckUtils.java similarity index 99% rename from continew-starter-core/src/main/java/top/continew/starter/core/util/CheckUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/validation/CheckUtils.java index d52265cf..bc848697 100644 --- a/continew-starter-core/src/main/java/top/continew/starter/core/util/CheckUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/validation/CheckUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.core.util; +package top.continew.starter.core.util.validation; import cn.hutool.core.text.CharSequenceUtil; import top.continew.starter.core.constant.StringConstants; diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/ValidationUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/validation/ValidationUtils.java similarity index 99% rename from continew-starter-core/src/main/java/top/continew/starter/core/util/ValidationUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/validation/ValidationUtils.java index 67a950fb..32fb1d51 100644 --- a/continew-starter-core/src/main/java/top/continew/starter/core/util/ValidationUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/validation/ValidationUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.core.util; +package top.continew.starter.core.util.validation; import cn.hutool.core.text.CharSequenceUtil; import top.continew.starter.core.exception.BadRequestException; diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/Validator.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/validation/Validator.java similarity index 99% rename from continew-starter-core/src/main/java/top/continew/starter/core/util/Validator.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/validation/Validator.java index e4cebcf7..206ca00a 100644 --- a/continew-starter-core/src/main/java/top/continew/starter/core/util/Validator.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/validation/Validator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.core.util; +package top.continew.starter.core.util.validation; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; 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 d9b69e8b..f6aef178 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 @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import org.springframework.data.domain.Sort; import top.continew.starter.core.exception.BadRequestException; import top.continew.starter.core.util.ReflectUtils; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.annotation.QueryIgnore; import top.continew.starter.data.core.enums.QueryType; diff --git a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java index 0848780d..7ec8e9d6 100644 --- a/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java +++ b/continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java @@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.repository.CrudRepository; import top.continew.starter.core.util.ReflectUtils; import top.continew.starter.data.mp.service.IService; -import top.continew.starter.core.util.CheckUtils; +import top.continew.starter.core.util.validation.CheckUtils; import java.io.Serializable; import java.lang.reflect.Field; 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 dc8446a3..a9846c94 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 @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import org.springframework.data.domain.Sort; import top.continew.starter.core.exception.BadRequestException; import top.continew.starter.core.util.ReflectUtils; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.annotation.QueryIgnore; import top.continew.starter.data.core.enums.QueryType; diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudTreeProperties.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudTreeProperties.java index bd498e54..280c215c 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudTreeProperties.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudTreeProperties.java @@ -17,7 +17,7 @@ package top.continew.starter.extension.crud.autoconfigure; import cn.hutool.core.lang.tree.TreeNodeConfig; -import top.continew.starter.core.util.CheckUtils; +import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.crud.annotation.TreeField; /** 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 c5a50bca..e10c49d5 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 @@ -21,7 +21,7 @@ import cn.hutool.core.util.ArrayUtil; import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.data.domain.Sort; import top.continew.starter.core.constant.StringConstants; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.data.core.util.SqlInjectionUtils; import java.io.Serial; diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java index f87c9894..ecaa99ca 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java @@ -33,7 +33,7 @@ import org.springframework.data.domain.Sort; import org.springframework.transaction.annotation.Transactional; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ReflectUtils; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.data.mf.base.BaseMapper; import top.continew.starter.data.mf.service.impl.ServiceImpl; import top.continew.starter.data.mf.util.QueryWrapperHelper; diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java index 67c17b15..ff00119f 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java @@ -50,8 +50,8 @@ import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.excel.util.ExcelUtils; -import top.continew.starter.core.util.CheckUtils; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.lang.reflect.Field; import java.util.*; 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 ece764ae..fafb97ca 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 @@ -17,7 +17,7 @@ package top.continew.starter.messaging.mail.core; import cn.hutool.core.map.MapUtil; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; 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 983d5f53..1c086066 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 @@ -17,7 +17,7 @@ package top.continew.starter.messaging.mail.core; import org.springframework.mail.javamail.JavaMailSenderImpl; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; /** * 邮件配置 diff --git a/continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java b/continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java index 2b139904..52560516 100644 --- a/continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java +++ b/continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder; import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder; import top.continew.starter.core.constant.PropertiesConstants; -import top.continew.starter.core.util.CheckUtils; +import top.continew.starter.core.util.validation.CheckUtils; import java.util.HashMap; import java.util.List; diff --git a/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/manger/StorageManager.java b/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/manger/StorageManager.java index 629de73f..e09096f7 100644 --- a/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/manger/StorageManager.java +++ b/continew-starter-storage/continew-starter-storage-core/src/main/java/top/continew/starter/storage/manger/StorageManager.java @@ -17,7 +17,7 @@ package top.continew.starter.storage.manger; import top.continew.starter.cache.redisson.util.RedisUtils; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.storage.constant.StorageConstant; import top.continew.starter.storage.strategy.StorageStrategy; 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 9114ab00..39a1523d 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 @@ -24,8 +24,8 @@ 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; -import top.continew.starter.core.util.CheckUtils; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.storage.client.LocalClient; import top.continew.starter.storage.constant.StorageConstant; import top.continew.starter.storage.dao.StorageDao; 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 953df72c..2a71782c 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 @@ -36,8 +36,8 @@ import software.amazon.awssdk.transfer.s3.model.Upload; import software.amazon.awssdk.transfer.s3.progress.LoggingTransferListener; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; -import top.continew.starter.core.util.CheckUtils; -import top.continew.starter.core.util.ValidationUtils; +import top.continew.starter.core.util.validation.CheckUtils; +import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.storage.client.OssClient; import top.continew.starter.storage.constant.StorageConstant; import top.continew.starter.storage.dao.StorageDao;