【7.0.1】【validator】规范api包结构

kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java

@@ -23,8 +23,8 @@ import cn.stylefeng.roses.kernel.system.api.UserServiceApi;
 import cn.stylefeng.roses.kernel.system.api.enums.UserStatusEnum;
 import cn.stylefeng.roses.kernel.system.api.expander.SystemConfigExpander;
 import cn.stylefeng.roses.kernel.system.api.pojo.user.UserLoginInfoDTO;
-import cn.stylefeng.roses.kernel.validator.CaptchaApi;
-import cn.stylefeng.roses.kernel.validator.exception.enums.ValidatorExceptionEnum;
+import cn.stylefeng.roses.kernel.validator.api.CaptchaApi;
+import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/param/SysConfigParam.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.roses.kernel.config.modular.param;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.flag.FlagValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.flag.FlagValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.roses.kernel.dsctn.api.pojo.request;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/service/impl/SysSmsInfoServiceImpl.java

@@ -19,8 +19,8 @@ import cn.stylefeng.roses.kernel.sms.modular.param.SysSmsSendParam;
 import cn.stylefeng.roses.kernel.sms.modular.param.SysSmsVerifyParam;
 import cn.stylefeng.roses.kernel.sms.modular.service.SysSmsInfoService;
 import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException;
-import cn.stylefeng.roses.kernel.validator.CaptchaApi;
-import cn.stylefeng.roses.kernel.validator.exception.enums.ValidatorExceptionEnum;
+import cn.stylefeng.roses.kernel.validator.api.CaptchaApi;
+import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/BlackListApi.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator;
+package cn.stylefeng.roses.kernel.validator.api;
 
 
 import java.util.Collection;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/CaptchaApi.java

@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.validator;
+package cn.stylefeng.roses.kernel.validator.api;
 
-import cn.stylefeng.roses.kernel.validator.pojo.EasyCaptcha;
+import cn.stylefeng.roses.kernel.validator.api.pojo.EasyCaptcha;
 
 /**
  * 图形验证码Api

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/CountValidatorApi.java

@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kernel.validator;
+package cn.stylefeng.roses.kernel.validator.api;
 
 
-import cn.stylefeng.roses.kernel.validator.exception.CountValidateException;
+import cn.stylefeng.roses.kernel.validator.api.exception.CountValidateException;
 
 /**
  * 计数and校验API

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/WhiteListApi.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator;
+package cn.stylefeng.roses.kernel.validator.api;
 
 
 import java.util.Collection;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/constants/CaptchaConstants.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.constants;
+package cn.stylefeng.roses.kernel.validator.api.constants;
 
 /**
  * 图形验证码模块的常量

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/constants/ValidatorConstants.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.constants;
+package cn.stylefeng.roses.kernel.validator.api.constants;
 
 /**
  * 校验器模块的常量

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/context/RequestGroupContext.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.context;
+package cn.stylefeng.roses.kernel.validator.api.context;
 
 /**
  * 保存控制器的方法上的校验组，group class

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/context/RequestParamContext.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.context;
+package cn.stylefeng.roses.kernel.validator.api.context;
 
 import cn.hutool.core.lang.Dict;
 

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/exception/CountValidateException.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.validator.exception;
+package cn.stylefeng.roses.kernel.validator.api.exception;
 
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
-import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
 
 /**
  * 计数器校验异常

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/exception/ParamValidateException.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.validator.exception;
+package cn.stylefeng.roses.kernel.validator.api.exception;
 
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
-import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
 
 /**
  * 参数校验异常

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/exception/XssFilterException.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.validator.exception;
+package cn.stylefeng.roses.kernel.validator.api.exception;
 
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
-import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
 
 /**
  * XSS过滤异常

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/exception/enums/CountValidateExceptionEnum.java

@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.validator.exception.enums;
+package cn.stylefeng.roses.kernel.validator.api.exception.enums;
 
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
-import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
 import lombok.Getter;
 
 /**

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/exception/enums/ValidatorExceptionEnum.java

@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.validator.exception.enums;
+package cn.stylefeng.roses.kernel.validator.api.exception.enums;
 
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
-import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
 import lombok.Getter;
 
 /**

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/exception/enums/XssFilterExceptionEnum.java

@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.validator.exception.enums;
+package cn.stylefeng.roses.kernel.validator.api.exception.enums;
 
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
-import cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
 import lombok.Getter;
 
 /**

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/expander/XssConfigExpander.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.expander;
+package cn.stylefeng.roses.kernel.validator.api.expander;
 
 /**
  * XSS相关配置

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/pojo/EasyCaptcha.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.pojo;
+package cn.stylefeng.roses.kernel.validator.api.pojo;
 
 import lombok.Builder;
 import lombok.Data;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/pojo/UniqueValidateParam.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.pojo;
+package cn.stylefeng.roses.kernel.validator.api.pojo;
 
 import lombok.Builder;
 import lombok.Data;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/utils/ValidatorUtil.java

@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.validator.utils;
+package cn.stylefeng.roses.kernel.validator.api.utils;
 
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.roses.kernel.validator.exception.ParamValidateException;
-import cn.stylefeng.roses.kernel.validator.exception.enums.ValidatorExceptionEnum;
+import cn.stylefeng.roses.kernel.validator.api.exception.ParamValidateException;
+import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/date/DateValue.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.validators.date;
+package cn.stylefeng.roses.kernel.validator.api.validators.date;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/date/DateValueValidator.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.validators.date;
+package cn.stylefeng.roses.kernel.validator.api.validators.date;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/flag/FlagValue.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.validators.flag;
+package cn.stylefeng.roses.kernel.validator.api.validators.flag;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/flag/FlagValueValidator.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.validators.flag;
+package cn.stylefeng.roses.kernel.validator.api.validators.flag;
 
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/status/StatusValue.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.validators.status;
+package cn.stylefeng.roses.kernel.validator.api.validators.status;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/status/StatusValueValidator.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.validator.validators.status;
+package cn.stylefeng.roses.kernel.validator.api.validators.status;
 
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
 

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/TableUniqueValue.java

@@ -1,11 +1,11 @@
-package cn.stylefeng.roses.kernel.validator.validators.unique;
+package cn.stylefeng.roses.kernel.validator.api.validators.unique;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
 import java.lang.annotation.*;
 
-import static cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants.DEFAULT_LOGIC_DELETE_FIELD_NAME;
-import static cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants.DEFAULT_LOGIC_DELETE_FIELD_VALUE;
+import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.DEFAULT_LOGIC_DELETE_FIELD_NAME;
+import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.DEFAULT_LOGIC_DELETE_FIELD_VALUE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/TableUniqueValueValidator.java

@@ -1,13 +1,13 @@
-package cn.stylefeng.roses.kernel.validator.validators.unique;
+package cn.stylefeng.roses.kernel.validator.api.validators.unique;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.context.RequestGroupContext;
-import cn.stylefeng.roses.kernel.validator.context.RequestParamContext;
-import cn.stylefeng.roses.kernel.validator.pojo.UniqueValidateParam;
-import cn.stylefeng.roses.kernel.validator.validators.unique.service.TableUniqueValueService;
+import cn.stylefeng.roses.kernel.validator.api.context.RequestGroupContext;
+import cn.stylefeng.roses.kernel.validator.api.context.RequestParamContext;
+import cn.stylefeng.roses.kernel.validator.api.pojo.UniqueValidateParam;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.service.TableUniqueValueService;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;

kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/service/TableUniqueValueService.java

@@ -1,11 +1,11 @@
-package cn.stylefeng.roses.kernel.validator.validators.unique.service;
+package cn.stylefeng.roses.kernel.validator.api.validators.unique.service;
 
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.db.api.DbOperatorApi;
 import cn.stylefeng.roses.kernel.db.api.context.DbOperatorContext;
-import cn.stylefeng.roses.kernel.validator.exception.ParamValidateException;
-import cn.stylefeng.roses.kernel.validator.exception.enums.ValidatorExceptionEnum;
-import cn.stylefeng.roses.kernel.validator.pojo.UniqueValidateParam;
+import cn.stylefeng.roses.kernel.validator.api.exception.ParamValidateException;
+import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
+import cn.stylefeng.roses.kernel.validator.api.pojo.UniqueValidateParam;
 
 /**
  * 判断表中字段是否是唯一值的业务封装

kernel-d-validator/validator-sdk-black-white/src/main/java/cn/stylefeng/roses/kemel/validator/blackwhite/BlackListService.java

@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kemel.blackwhite;
+package cn.stylefeng.roses.kemel.validator.blackwhite;
 
 import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
-import cn.stylefeng.roses.kernel.validator.BlackListApi;
+import cn.stylefeng.roses.kernel.validator.api.BlackListApi;
 
 import java.util.Collection;
 

kernel-d-validator/validator-sdk-black-white/src/main/java/cn/stylefeng/roses/kemel/validator/blackwhite/WhiteListService.java

@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kemel.blackwhite;
+package cn.stylefeng.roses.kemel.validator.blackwhite;
 
 import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
-import cn.stylefeng.roses.kernel.validator.WhiteListApi;
+import cn.stylefeng.roses.kernel.validator.api.WhiteListApi;
 
 import java.util.Collection;
 

kernel-d-validator/validator-sdk-black-white/src/main/java/cn/stylefeng/roses/kemel/validator/blackwhite/cache/BlackListMemoryCache.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.blackwhite.cache;
+package cn.stylefeng.roses.kemel.validator.blackwhite.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.AbstractMemoryCacheOperator;
 
-import static cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants.BLACK_LIST_CACHE_KEY_PREFIX;
+import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.BLACK_LIST_CACHE_KEY_PREFIX;
 
 /**
  * 黑名单用户的缓存

kernel-d-validator/validator-sdk-black-white/src/main/java/cn/stylefeng/roses/kemel/validator/blackwhite/cache/BlackListRedisCache.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.blackwhite.cache;
+package cn.stylefeng.roses.kemel.validator.blackwhite.cache;
 
 import cn.stylefeng.roses.kernel.cache.AbstractRedisCacheOperator;
 import org.springframework.data.redis.core.RedisTemplate;
 
-import static cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants.BLACK_LIST_CACHE_KEY_PREFIX;
+import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.BLACK_LIST_CACHE_KEY_PREFIX;
 
 /**
  * 黑名单用户的缓存

kernel-d-validator/validator-sdk-black-white/src/main/java/cn/stylefeng/roses/kemel/validator/blackwhite/cache/WhiteListMemoryCache.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.blackwhite.cache;
+package cn.stylefeng.roses.kemel.validator.blackwhite.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.AbstractMemoryCacheOperator;
 
-import static cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants.WHITE_LIST_CACHE_KEY_PREFIX;
+import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.WHITE_LIST_CACHE_KEY_PREFIX;
 
 /**
  * 白名单的缓存

kernel-d-validator/validator-sdk-black-white/src/main/java/cn/stylefeng/roses/kemel/validator/blackwhite/cache/WhiteListRedisCache.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.blackwhite.cache;
+package cn.stylefeng.roses.kemel.validator.blackwhite.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.AbstractMemoryCacheOperator;
 
-import static cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants.WHITE_LIST_CACHE_KEY_PREFIX;
+import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.WHITE_LIST_CACHE_KEY_PREFIX;
 
 /**
  * 白名单的缓存

kernel-d-validator/validator-sdk-captcha/src/main/java/cn/stylefeng/roses/kemel/validator/captcha/CaptchaService.java

@@ -1,10 +1,10 @@
-package cn.stylefeng.roses.kemel.captcha;
+package cn.stylefeng.roses.kemel.validator.captcha;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
-import cn.stylefeng.roses.kernel.validator.CaptchaApi;
-import cn.stylefeng.roses.kernel.validator.pojo.EasyCaptcha;
+import cn.stylefeng.roses.kernel.validator.api.CaptchaApi;
+import cn.stylefeng.roses.kernel.validator.api.pojo.EasyCaptcha;
 import com.wf.captcha.SpecCaptcha;
 
 /**

kernel-d-validator/validator-sdk-captcha/src/main/java/cn/stylefeng/roses/kemel/validator/captcha/cache/CaptchaMemoryCache.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.captcha.cache;
+package cn.stylefeng.roses.kemel.validator.captcha.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.AbstractMemoryCacheOperator;
 
-import static cn.stylefeng.roses.kernel.validator.constants.CaptchaConstants.CAPTCHA_CACHE_KEY_PREFIX;
+import static cn.stylefeng.roses.kernel.validator.api.constants.CaptchaConstants.CAPTCHA_CACHE_KEY_PREFIX;
 
 /**
  * 图形验证码缓存

kernel-d-validator/validator-sdk-captcha/src/main/java/cn/stylefeng/roses/kemel/validator/captcha/cache/CaptchaRedisCache.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.captcha.cache;
+package cn.stylefeng.roses.kemel.validator.captcha.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.AbstractMemoryCacheOperator;
 
-import static cn.stylefeng.roses.kernel.validator.constants.CaptchaConstants.CAPTCHA_CACHE_KEY_PREFIX;
+import static cn.stylefeng.roses.kernel.validator.api.constants.CaptchaConstants.CAPTCHA_CACHE_KEY_PREFIX;
 
 /**
  * 图形验证码缓存

kernel-d-validator/validator-sdk-count/src/main/java/cn/stylefeng/roses/kemel/validator/count/DefaultCountValidator.java

@@ -1,13 +1,12 @@
-package cn.stylefeng.roses.kemel.count;
+package cn.stylefeng.roses.kemel.validator.count;
 
 import cn.hutool.core.convert.Convert;
 import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
-import cn.stylefeng.roses.kernel.validator.CountValidatorApi;
-import cn.stylefeng.roses.kernel.validator.exception.CountValidateException;
-import cn.stylefeng.roses.kernel.validator.exception.enums.CountValidateExceptionEnum;
+import cn.stylefeng.roses.kernel.validator.api.CountValidatorApi;
+import cn.stylefeng.roses.kernel.validator.api.exception.CountValidateException;
+import cn.stylefeng.roses.kernel.validator.api.exception.enums.CountValidateExceptionEnum;
 
 import static cn.stylefeng.roses.kernel.cache.api.constants.CacheConstants.CACHE_DELIMITER;
-import static cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants.*;
 
 /**
  * 默认的计数校验器

kernel-d-validator/validator-sdk-count/src/main/java/cn/stylefeng/roses/kemel/validator/count/cache/DefaultCountValidateCache.java

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.count.cache;
+package cn.stylefeng.roses.kemel.validator.count.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.AbstractMemoryCacheOperator;
 
-import static cn.stylefeng.roses.kernel.validator.constants.ValidatorConstants.COUNT_VALIDATE_CACHE_KEY_PREFIX;
+import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.COUNT_VALIDATE_CACHE_KEY_PREFIX;
 
 /**
  * 计数用的缓存

kernel-d-validator/validator-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/validator/starter/ValidatorAutoConfiguration.java

@@ -2,18 +2,18 @@ package cn.stylefeng.roses.kernel.validator.starter;
 
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.TimedCache;
-import cn.stylefeng.roses.kemel.blackwhite.BlackListService;
-import cn.stylefeng.roses.kemel.blackwhite.WhiteListService;
-import cn.stylefeng.roses.kemel.blackwhite.cache.BlackListMemoryCache;
-import cn.stylefeng.roses.kemel.blackwhite.cache.WhiteListMemoryCache;
-import cn.stylefeng.roses.kemel.captcha.CaptchaService;
-import cn.stylefeng.roses.kemel.captcha.cache.CaptchaMemoryCache;
-import cn.stylefeng.roses.kemel.count.DefaultCountValidator;
-import cn.stylefeng.roses.kemel.count.cache.DefaultCountValidateCache;
-import cn.stylefeng.roses.kernel.validator.BlackListApi;
-import cn.stylefeng.roses.kernel.validator.CaptchaApi;
-import cn.stylefeng.roses.kernel.validator.CountValidatorApi;
-import cn.stylefeng.roses.kernel.validator.WhiteListApi;
+import cn.stylefeng.roses.kemel.validator.blackwhite.BlackListService;
+import cn.stylefeng.roses.kemel.validator.blackwhite.WhiteListService;
+import cn.stylefeng.roses.kemel.validator.blackwhite.cache.BlackListMemoryCache;
+import cn.stylefeng.roses.kemel.validator.blackwhite.cache.WhiteListMemoryCache;
+import cn.stylefeng.roses.kemel.validator.captcha.CaptchaService;
+import cn.stylefeng.roses.kemel.validator.captcha.cache.CaptchaMemoryCache;
+import cn.stylefeng.roses.kemel.validator.count.DefaultCountValidator;
+import cn.stylefeng.roses.kemel.validator.count.cache.DefaultCountValidateCache;
+import cn.stylefeng.roses.kernel.validator.api.BlackListApi;
+import cn.stylefeng.roses.kernel.validator.api.CaptchaApi;
+import cn.stylefeng.roses.kernel.validator.api.CountValidatorApi;
+import cn.stylefeng.roses.kernel.validator.api.WhiteListApi;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

kernel-d-validator/validator-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/validator/starter/mvc/GunsValidator.java

@@ -1,6 +1,6 @@
 package cn.stylefeng.roses.kernel.validator.starter.mvc;
 
-import cn.stylefeng.roses.kernel.validator.context.RequestGroupContext;
+import cn.stylefeng.roses.kernel.validator.api.context.RequestGroupContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.Errors;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;

kernel-d-validator/validator-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/validator/starter/mvc/GunsValidatorRequestResponseBodyMethodProcessor.java

@@ -1,6 +1,6 @@
 package cn.stylefeng.roses.kernel.validator.starter.mvc;
 
-import cn.stylefeng.roses.kernel.validator.context.RequestParamContext;
+import cn.stylefeng.roses.kernel.validator.api.context.RequestParamContext;
 import org.springframework.core.Conventions;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.converter.HttpMessageConverter;

kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictRequest.java

@@ -1,8 +1,8 @@
 package cn.stylefeng.roses.kernel.dict.modular.pojo.request;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictTypeRequest.java

@@ -1,8 +1,8 @@
 package cn.stylefeng.roses.kernel.dict.modular.pojo.request;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/app/SysAppRequest.java

@@ -1,8 +1,8 @@
 package cn.stylefeng.roses.kernel.system.api.pojo.app;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuButtonRequest.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.roses.kernel.system.api.pojo.menu;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/SysMenuRequest.java

@@ -1,8 +1,8 @@
 package cn.stylefeng.roses.kernel.system.api.pojo.menu;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.flag.FlagValue;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.flag.FlagValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java

@@ -1,8 +1,8 @@
 package cn.stylefeng.roses.kernel.system.api.pojo.organization;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrPositionRequest.java

@@ -1,8 +1,8 @@
 package cn.stylefeng.roses.kernel.system.api.pojo.organization;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.roses.kernel.system.api.pojo.role.request;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/request/SysUserRequest.java

@@ -1,9 +1,9 @@
 package cn.stylefeng.roses.kernel.system.api.pojo.user.request;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.validator.validators.date.DateValue;
-import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;
-import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.date.DateValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
+import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java

@@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
-import cn.stylefeng.roses.kernel.validator.CaptchaApi;
+import cn.stylefeng.roses.kernel.validator.api.CaptchaApi;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;