【7.0.1】验证码，计数器放入security模块

kernel-d-auth/auth-sdk/pom.xml

@@ -32,6 +32,14 @@
             <version>7.0.1</version>
         </dependency>
 
+        <!--安全模块的api-->
+        <!--需要用到校验验证码的接口-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>security-api</artifactId>
+            <version>7.0.1</version>
+        </dependency>
+
         <!--system业务模块的api-->
         <!--登录和鉴权需要用到用户相关的接口-->
         <dependency>

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

@@ -18,12 +18,12 @@ import cn.stylefeng.roses.kernel.jwt.api.exception.enums.JwtExceptionEnum;
 import cn.stylefeng.roses.kernel.jwt.api.pojo.payload.DefaultJwtPayload;
 import cn.stylefeng.roses.kernel.message.api.expander.WebSocketConfigExpander;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
+import cn.stylefeng.roses.kernel.security.api.CaptchaApi;
 import cn.stylefeng.roses.kernel.system.api.LoginLogServiceApi;
 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.api.CaptchaApi;
 import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
 import org.springframework.stereotype.Service;
 

kernel-d-security/pom.xml

@@ -17,6 +17,9 @@
 
     <modules>
         <module>security-api</module>
+        <module>security-sdk-black-white</module>
+        <module>security-sdk-captcha</module>
+        <module>security-sdk-count</module>
         <module>security-sdk-xss</module>
         <module>security-spring-boot-starter</module>
     </modules>

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

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

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

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

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

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

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

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

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

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

kernel-d-security/security-api/src/main/java/cn/stylefeng/roses/kernel/security/api/constants/CounterConstants.java

@@ -0,0 +1,36 @@
+package cn.stylefeng.roses.kernel.security.api.constants;
+
+/**
+ * 黑白名单和计数器的常量
+ *
+ * @author fengshuonan
+ * @date 2021/3/14 17:29
+ */
+public interface CounterConstants {
+
+    /**
+     * 计数校验用的 缓存前缀标识
+     */
+    String COUNT_VALIDATE_CACHE_KEY_PREFIX = "COUNT_VALIDATE";
+
+    /**
+     * 黑名单 缓存前缀标识
+     */
+    String BLACK_LIST_CACHE_KEY_PREFIX = "BLACK_LIST";
+
+    /**
+     * 白名单 缓存前缀标识
+     */
+    String WHITE_LIST_CACHE_KEY_PREFIX = "WHITE_LIST";
+
+    /**
+     * 计数校验用的 计数当时的秒数
+     */
+    String RECORD_TIME_SECONDS = "RECORD_TIME_SECONDS";
+
+    /**
+     * 计数校验用的 时间窗内的次数
+     */
+    String COUNT_NUMBER = "COUNT_NUMBER";
+
+}

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

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.validator.api.exception;
+package cn.stylefeng.roses.kernel.security.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.api.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.security.api.constants.SecurityConstants;
 
 /**
  * 计数器校验异常
@@ -14,11 +14,11 @@ import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
 public class CountValidateException extends ServiceException {
 
     public CountValidateException(AbstractExceptionEnum exception, Object... params) {
-        super(ValidatorConstants.VALIDATOR_MODULE_NAME, exception.getErrorCode(), StrUtil.format(exception.getUserTip(), params));
+        super(SecurityConstants.SECURITY_MODULE_NAME, exception.getErrorCode(), StrUtil.format(exception.getUserTip(), params));
     }
 
     public CountValidateException(AbstractExceptionEnum exception) {
-        super(ValidatorConstants.VALIDATOR_MODULE_NAME, exception);
+        super(SecurityConstants.SECURITY_MODULE_NAME, exception);
     }
 
 }

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

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.validator.api.exception;
+package cn.stylefeng.roses.kernel.security.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.api.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.security.api.constants.SecurityConstants;
 
 /**
  * XSS过滤异常
@@ -14,11 +14,11 @@ import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
 public class XssFilterException extends ServiceException {
 
     public XssFilterException(AbstractExceptionEnum exception, Object... params) {
-        super(ValidatorConstants.VALIDATOR_MODULE_NAME, exception.getErrorCode(), StrUtil.format(exception.getUserTip(), params));
+        super(SecurityConstants.SECURITY_MODULE_NAME, exception.getErrorCode(), StrUtil.format(exception.getUserTip(), params));
     }
 
     public XssFilterException(AbstractExceptionEnum exception) {
-        super(ValidatorConstants.VALIDATOR_MODULE_NAME, exception);
+        super(SecurityConstants.SECURITY_MODULE_NAME, exception);
     }
 
 }

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

@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.validator.api.exception.enums;
+package cn.stylefeng.roses.kernel.security.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.api.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.security.api.constants.SecurityConstants;
 import lombok.Getter;
 
 /**
@@ -17,12 +17,12 @@ public enum CountValidateExceptionEnum implements AbstractExceptionEnum {
     /**
      * 中断执行
      */
-    INTERRUPT_EXECUTION(RuleConstants.BUSINESS_ERROR_TYPE_CODE + ValidatorConstants.VALIDATOR_EXCEPTION_STEP_CODE + "01", "满足自定义策略要求,程序已中断执行!"),
+    INTERRUPT_EXECUTION(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SecurityConstants.SECURITY_EXCEPTION_STEP_CODE + "01", "满足自定义策略要求,程序已中断执行!"),
 
     /**
      * 限流错误
      */
-    TRAFFIC_LIMIT_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + ValidatorConstants.VALIDATOR_EXCEPTION_STEP_CODE + "02", "已触发限流机制,请稍后重新访问!");
+    TRAFFIC_LIMIT_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SecurityConstants.SECURITY_EXCEPTION_STEP_CODE + "02", "已触发限流机制,请稍后重新访问!");
 
     /**
      * 错误编码

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

@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.validator.api.exception.enums;
+package cn.stylefeng.roses.kernel.security.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.api.constants.ValidatorConstants;
+import cn.stylefeng.roses.kernel.security.api.constants.SecurityConstants;
 import lombok.Getter;
 
 /**
@@ -17,7 +17,7 @@ public enum XssFilterExceptionEnum implements AbstractExceptionEnum {
     /**
      * XSS初始化配置为空
      */
-    CONFIG_IS_NULL(RuleConstants.BUSINESS_ERROR_TYPE_CODE + ValidatorConstants.VALIDATOR_EXCEPTION_STEP_CODE + "11", "XSS初始化配置为空，请检查XSS过滤器配置是否正确！");
+    CONFIG_IS_NULL(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SecurityConstants.SECURITY_EXCEPTION_STEP_CODE + "11", "XSS初始化配置为空，请检查XSS过滤器配置是否正确！");
 
     /**
      * 错误编码

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

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

kernel-d-security/security-sdk-black-white/pom.xml

@@ -6,18 +6,18 @@
 
     <parent>
         <groupId>cn.stylefeng.roses</groupId>
-        <artifactId>kernel-d-validator</artifactId>
+        <artifactId>kernel-d-security</artifactId>
         <version>7.0.1</version>
     </parent>
 
-    <artifactId>validator-sdk-black-white</artifactId>
+    <artifactId>security-sdk-black-white</artifactId>
 
     <dependencies>
 
-        <!--校验模块的api-->
+        <!--安全模块的api-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>validator-api</artifactId>
+            <artifactId>security-api</artifactId>
             <version>7.0.1</version>
         </dependency>
 

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

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

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

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

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

@@ -1,9 +1,8 @@
-package cn.stylefeng.roses.kemel.validator.blackwhite.cache;
+package cn.stylefeng.roses.kemel.security.blackwhite.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.memory.AbstractMemoryCacheOperator;
-
-import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.BLACK_LIST_CACHE_KEY_PREFIX;
+import cn.stylefeng.roses.kernel.security.api.constants.CounterConstants;
 
 /**
  * 黑名单用户的缓存
@@ -19,7 +18,7 @@ public class BlackListMemoryCache extends AbstractMemoryCacheOperator<String> {
 
     @Override
     public String getCommonKeyPrefix() {
-        return BLACK_LIST_CACHE_KEY_PREFIX;
+        return CounterConstants.BLACK_LIST_CACHE_KEY_PREFIX;
     }
 
 }

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

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.validator.blackwhite.cache;
+package cn.stylefeng.roses.kemel.security.blackwhite.cache;
 
 import cn.stylefeng.roses.kernel.cache.redis.AbstractRedisCacheOperator;
+import cn.stylefeng.roses.kernel.security.api.constants.CounterConstants;
 import org.springframework.data.redis.core.RedisTemplate;
 
-import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.BLACK_LIST_CACHE_KEY_PREFIX;
 
 /**
  * 黑名单用户的缓存
@@ -19,7 +19,7 @@ public class BlackListRedisCache extends AbstractRedisCacheOperator<String> {
 
     @Override
     public String getCommonKeyPrefix() {
-        return BLACK_LIST_CACHE_KEY_PREFIX;
+        return CounterConstants.BLACK_LIST_CACHE_KEY_PREFIX;
     }
 
 }

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

@@ -1,9 +1,8 @@
-package cn.stylefeng.roses.kemel.validator.blackwhite.cache;
+package cn.stylefeng.roses.kemel.security.blackwhite.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.memory.AbstractMemoryCacheOperator;
-
-import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.WHITE_LIST_CACHE_KEY_PREFIX;
+import cn.stylefeng.roses.kernel.security.api.constants.CounterConstants;
 
 /**
  * 白名单的缓存
@@ -19,7 +18,7 @@ public class WhiteListMemoryCache extends AbstractMemoryCacheOperator<String> {
 
     @Override
     public String getCommonKeyPrefix() {
-        return WHITE_LIST_CACHE_KEY_PREFIX;
+        return CounterConstants.WHITE_LIST_CACHE_KEY_PREFIX;
     }
 
 }

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

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.validator.blackwhite.cache;
+package cn.stylefeng.roses.kemel.security.blackwhite.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.memory.AbstractMemoryCacheOperator;
+import cn.stylefeng.roses.kernel.security.api.constants.CounterConstants;
 
-import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.WHITE_LIST_CACHE_KEY_PREFIX;
 
 /**
  * 白名单的缓存
@@ -19,7 +19,7 @@ public class WhiteListRedisCache extends AbstractMemoryCacheOperator<Long> {
 
     @Override
     public String getCommonKeyPrefix() {
-        return WHITE_LIST_CACHE_KEY_PREFIX;
+        return CounterConstants.WHITE_LIST_CACHE_KEY_PREFIX;
     }
 
 }

kernel-d-security/security-sdk-captcha/pom.xml

@@ -6,18 +6,18 @@
 
     <parent>
         <groupId>cn.stylefeng.roses</groupId>
-        <artifactId>kernel-d-validator</artifactId>
+        <artifactId>kernel-d-security</artifactId>
         <version>7.0.1</version>
     </parent>
 
-    <artifactId>validator-sdk-captcha</artifactId>
+    <artifactId>security-sdk-captcha</artifactId>
 
     <dependencies>
 
-        <!--校验模块的api-->
+        <!--安全模块的api-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>validator-api</artifactId>
+            <artifactId>security-api</artifactId>
             <version>7.0.1</version>
         </dependency>
 

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

@@ -1,10 +1,10 @@
-package cn.stylefeng.roses.kemel.validator.captcha;
+package cn.stylefeng.roses.kemel.security.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.api.CaptchaApi;
-import cn.stylefeng.roses.kernel.validator.api.pojo.EasyCaptcha;
+import cn.stylefeng.roses.kernel.security.api.CaptchaApi;
+import cn.stylefeng.roses.kernel.security.api.pojo.EasyCaptcha;
 import com.wf.captcha.SpecCaptcha;
 
 /**

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

@@ -1,9 +1,8 @@
-package cn.stylefeng.roses.kemel.validator.captcha.cache;
+package cn.stylefeng.roses.kemel.security.captcha.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.memory.AbstractMemoryCacheOperator;
-
-import static cn.stylefeng.roses.kernel.validator.api.constants.CaptchaConstants.CAPTCHA_CACHE_KEY_PREFIX;
+import cn.stylefeng.roses.kernel.security.api.constants.CaptchaConstants;
 
 /**
  * 图形验证码缓存
@@ -19,6 +18,7 @@ public class CaptchaMemoryCache extends AbstractMemoryCacheOperator<String> {
 
     @Override
     public String getCommonKeyPrefix() {
-        return CAPTCHA_CACHE_KEY_PREFIX;
+        return CaptchaConstants.CAPTCHA_CACHE_KEY_PREFIX;
     }
+
 }

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

@@ -1,9 +1,8 @@
-package cn.stylefeng.roses.kemel.validator.captcha.cache;
+package cn.stylefeng.roses.kemel.security.captcha.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.memory.AbstractMemoryCacheOperator;
-
-import static cn.stylefeng.roses.kernel.validator.api.constants.CaptchaConstants.CAPTCHA_CACHE_KEY_PREFIX;
+import cn.stylefeng.roses.kernel.security.api.constants.CaptchaConstants;
 
 /**
  * 图形验证码缓存
@@ -19,7 +18,7 @@ public class CaptchaRedisCache extends AbstractMemoryCacheOperator<Long> {
 
     @Override
     public String getCommonKeyPrefix() {
-        return CAPTCHA_CACHE_KEY_PREFIX;
+        return CaptchaConstants.CAPTCHA_CACHE_KEY_PREFIX;
     }
 
 }

kernel-d-security/security-sdk-count/pom.xml

@@ -6,18 +6,18 @@
 
     <parent>
         <groupId>cn.stylefeng.roses</groupId>
-        <artifactId>kernel-d-validator</artifactId>
+        <artifactId>kernel-d-security</artifactId>
         <version>7.0.1</version>
     </parent>
 
-    <artifactId>validator-sdk-count</artifactId>
+    <artifactId>security-sdk-count</artifactId>
 
     <dependencies>
 
-        <!--校验模块的api-->
+        <!--安全模块的api-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>validator-api</artifactId>
+            <artifactId>security-api</artifactId>
             <version>7.0.1</version>
         </dependency>
 

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

@@ -1,12 +1,12 @@
-package cn.stylefeng.roses.kemel.validator.count;
+package cn.stylefeng.roses.kemel.security.count;
 
 import cn.hutool.core.convert.Convert;
 import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
 import cn.stylefeng.roses.kernel.cache.api.constants.CacheConstants;
-import cn.stylefeng.roses.kernel.validator.api.CountValidatorApi;
-import cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants;
-import cn.stylefeng.roses.kernel.validator.api.exception.CountValidateException;
-import cn.stylefeng.roses.kernel.validator.api.exception.enums.CountValidateExceptionEnum;
+import cn.stylefeng.roses.kernel.security.api.CountValidatorApi;
+import cn.stylefeng.roses.kernel.security.api.constants.CounterConstants;
+import cn.stylefeng.roses.kernel.security.api.exception.CountValidateException;
+import cn.stylefeng.roses.kernel.security.api.exception.enums.CountValidateExceptionEnum;
 
 /**
  * 默认的计数校验器
@@ -29,10 +29,10 @@ public class DefaultCountValidator implements CountValidatorApi {
         long currentTimeSeconds = System.currentTimeMillis() / 1000;
 
         // 上一次操作时间秒数的缓存key COUNT_VALIDATE:key:RECORD_SECONDS
-        String recordTimeSecondsKey = ValidatorConstants.COUNT_VALIDATE_CACHE_KEY_PREFIX + CacheConstants.CACHE_DELIMITER + key + CacheConstants.CACHE_DELIMITER + ValidatorConstants.RECORD_TIME_SECONDS;
+        String recordTimeSecondsKey = CounterConstants.COUNT_VALIDATE_CACHE_KEY_PREFIX + CacheConstants.CACHE_DELIMITER + key + CacheConstants.CACHE_DELIMITER + CounterConstants.RECORD_TIME_SECONDS;
 
         // 上一次执行次数的记录缓存key COUNT_VALIDATE:key:COUNT_NUMBER
-        String countNumberKey = ValidatorConstants.COUNT_VALIDATE_CACHE_KEY_PREFIX + CacheConstants.CACHE_DELIMITER + key + CacheConstants.CACHE_DELIMITER + ValidatorConstants.COUNT_NUMBER;
+        String countNumberKey = CounterConstants.COUNT_VALIDATE_CACHE_KEY_PREFIX + CacheConstants.CACHE_DELIMITER + key + CacheConstants.CACHE_DELIMITER + CounterConstants.COUNT_NUMBER;
 
         // 获取缓存中上一次操作时间秒数
         Object recordTimeSecondsObject = cacheOperatorApi.get(recordTimeSecondsKey);

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

@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kemel.validator.count.cache;
+package cn.stylefeng.roses.kemel.security.count.cache;
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.stylefeng.roses.kernel.cache.memory.AbstractMemoryCacheOperator;
+import cn.stylefeng.roses.kernel.security.api.constants.CounterConstants;
 
-import static cn.stylefeng.roses.kernel.validator.api.constants.ValidatorConstants.COUNT_VALIDATE_CACHE_KEY_PREFIX;
 
 /**
  * 计数用的缓存
@@ -19,7 +19,7 @@ public class DefaultCountValidateCache extends AbstractMemoryCacheOperator<Long>
 
     @Override
     public String getCommonKeyPrefix() {
-        return COUNT_VALIDATE_CACHE_KEY_PREFIX;
+        return CounterConstants.COUNT_VALIDATE_CACHE_KEY_PREFIX;
     }
 
 }

kernel-d-security/security-spring-boot-starter/pom.xml

@@ -24,6 +24,27 @@
             <version>7.0.1</version>
         </dependency>
 
+        <!--图形验证码模块-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>security-sdk-captcha</artifactId>
+            <version>7.0.1</version>
+        </dependency>
+
+        <!--count模块-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>security-sdk-count</artifactId>
+            <version>7.0.1</version>
+        </dependency>
+
+        <!--黑白名单校验-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>security-sdk-black-white</artifactId>
+            <version>7.0.1</version>
+        </dependency>
+
     </dependencies>
 
 </project>

kernel-d-security/security-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/security/starter/CaptchaAutoConfiguration.java

@@ -0,0 +1,36 @@
+package cn.stylefeng.roses.kernel.security.starter;
+
+import cn.hutool.cache.CacheUtil;
+import cn.hutool.cache.impl.TimedCache;
+import cn.stylefeng.roses.kemel.security.captcha.CaptchaService;
+import cn.stylefeng.roses.kemel.security.captcha.cache.CaptchaMemoryCache;
+import cn.stylefeng.roses.kernel.cache.api.constants.CacheConstants;
+import cn.stylefeng.roses.kernel.security.api.CaptchaApi;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 图形验证码自动配置
+ *
+ * @author fengshuonan
+ * @date 2020/12/1 21:44
+ */
+@Configuration
+public class CaptchaAutoConfiguration {
+
+    /**
+     * 图形验证码
+     *
+     * @author chenjinlong
+     * @date 2021/1/15 11:25
+     */
+    @Bean
+    @ConditionalOnMissingBean(CaptchaApi.class)
+    public CaptchaApi captchaApi() {
+        TimedCache<String, String> timedCache = CacheUtil.newTimedCache(CacheConstants.NONE_EXPIRED_TIME);
+        CaptchaMemoryCache captchaMemoryCache = new CaptchaMemoryCache(timedCache);
+        return new CaptchaService(captchaMemoryCache);
+    }
+
+}

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

@@ -1,24 +1,21 @@
-package cn.stylefeng.roses.kernel.validator.starter;
+package cn.stylefeng.roses.kernel.security.starter;
 
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.TimedCache;
-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 cn.stylefeng.roses.kemel.security.blackwhite.BlackListService;
+import cn.stylefeng.roses.kemel.security.blackwhite.WhiteListService;
+import cn.stylefeng.roses.kemel.security.blackwhite.cache.BlackListMemoryCache;
+import cn.stylefeng.roses.kemel.security.blackwhite.cache.WhiteListMemoryCache;
+import cn.stylefeng.roses.kemel.security.count.DefaultCountValidator;
+import cn.stylefeng.roses.kemel.security.count.cache.DefaultCountValidateCache;
+import cn.stylefeng.roses.kernel.cache.api.constants.CacheConstants;
+import cn.stylefeng.roses.kernel.security.api.BlackListApi;
+import cn.stylefeng.roses.kernel.security.api.CountValidatorApi;
+import cn.stylefeng.roses.kernel.security.api.WhiteListApi;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import static cn.stylefeng.roses.kernel.cache.api.constants.CacheConstants.NONE_EXPIRED_TIME;
 
 /**
  * 校验器自动配置
@@ -38,7 +35,7 @@ public class ValidatorAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean(BlackListApi.class)
     public BlackListApi blackListApi() {
-        TimedCache<String, String> timedCache = CacheUtil.newTimedCache(NONE_EXPIRED_TIME);
+        TimedCache<String, String> timedCache = CacheUtil.newTimedCache(CacheConstants.NONE_EXPIRED_TIME);
         BlackListMemoryCache blackListMemoryCache = new BlackListMemoryCache(timedCache);
         return new BlackListService(blackListMemoryCache);
     }
@@ -52,7 +49,7 @@ public class ValidatorAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean(CountValidatorApi.class)
     public CountValidatorApi countValidatorApi() {
-        TimedCache<String, Long> timedCache = CacheUtil.newTimedCache(NONE_EXPIRED_TIME);
+        TimedCache<String, Long> timedCache = CacheUtil.newTimedCache(CacheConstants.NONE_EXPIRED_TIME);
         DefaultCountValidateCache defaultCountValidateCache = new DefaultCountValidateCache(timedCache);
         return new DefaultCountValidator(defaultCountValidateCache);
     }
@@ -66,23 +63,9 @@ public class ValidatorAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean(WhiteListApi.class)
     public WhiteListApi whiteListApi() {
-        TimedCache<String, String> timedCache = CacheUtil.newTimedCache(NONE_EXPIRED_TIME);
+        TimedCache<String, String> timedCache = CacheUtil.newTimedCache(CacheConstants.NONE_EXPIRED_TIME);
         WhiteListMemoryCache whiteListMemoryCache = new WhiteListMemoryCache(timedCache);
         return new WhiteListService(whiteListMemoryCache);
     }
 
-    /**
-     * 图形验证码
-     *
-     * @author chenjinlong
-     * @date 2021/1/15 11:25
-     */
-    @Bean
-    @ConditionalOnMissingBean(CaptchaApi.class)
-    public CaptchaApi captchaApi() {
-        TimedCache<String, String> timedCache = CacheUtil.newTimedCache(NONE_EXPIRED_TIME);
-        CaptchaMemoryCache captchaMemoryCache = new CaptchaMemoryCache(timedCache);
-        return new CaptchaService(captchaMemoryCache);
-    }
-
 }

kernel-d-security/security-spring-boot-starter/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   cn.stylefeng.roses.kernel.security.starter.GunsSecurityAutoConfiguration,\
-  cn.stylefeng.roses.kernel.security.starter.GunsXssAutoConfiguration
+  cn.stylefeng.roses.kernel.security.starter.GunsXssAutoConfiguration,\
+  cn.stylefeng.roses.kernel.security.starter.ValidatorAutoConfiguration,\
+  cn.stylefeng.roses.kernel.security.starter.CaptchaAutoConfiguration

kernel-d-sms/sms-business-validation/pom.xml

@@ -47,6 +47,14 @@
             <version>7.0.1</version>
         </dependency>
 
+        <!--安全模块模块-->
+        <!--发送短信前的验证码校验，防止暴力发送短信-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>security-api</artifactId>
+            <version>7.0.1</version>
+        </dependency>
+
         <!--数据库sdk-->
         <!--数据库dao框架-->
         <dependency>

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
+import cn.stylefeng.roses.kernel.security.api.CaptchaApi;
 import cn.stylefeng.roses.kernel.sms.api.SmsSenderApi;
 import cn.stylefeng.roses.kernel.sms.api.exception.SmsException;
 import cn.stylefeng.roses.kernel.sms.api.expander.SmsConfigExpander;
@@ -19,7 +20,6 @@ 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.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;

kernel-d-validator/pom.xml

@@ -17,9 +17,6 @@
 
     <modules>
         <module>validator-api</module>
-        <module>validator-sdk-count</module>
-        <module>validator-sdk-black-white</module>
-        <module>validator-sdk-captcha</module>
         <module>validator-spring-boot-starter</module>
     </modules>
 

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

@@ -28,29 +28,4 @@ public interface ValidatorConstants {
      */
     String DEFAULT_LOGIC_DELETE_FIELD_VALUE = "Y";
 
-    /**
-     * 计数校验用的 缓存前缀标识
-     */
-    String COUNT_VALIDATE_CACHE_KEY_PREFIX = "COUNT_VALIDATE";
-
-    /**
-     * 黑名单 缓存前缀标识
-     */
-    String BLACK_LIST_CACHE_KEY_PREFIX = "BLACK_LIST";
-
-    /**
-     * 白名单 缓存前缀标识
-     */
-    String WHITE_LIST_CACHE_KEY_PREFIX = "WHITE_LIST";
-
-    /**
-     * 计数校验用的 计数当时的秒数
-     */
-    String RECORD_TIME_SECONDS = "RECORD_TIME_SECONDS";
-
-    /**
-     * 计数校验用的 时间窗内的次数
-     */
-    String COUNT_NUMBER = "COUNT_NUMBER";
-
 }

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

@@ -1,12 +0,0 @@
-package cn.stylefeng.roses.kernel.validator.api.expander;
-
-/**
- * XSS相关配置
- *
- * @author fengshuonan
- * @date 2021/1/13 23:21
- */
-public class XssConfigExpander {
-
-
-}

kernel-d-validator/validator-spring-boot-starter/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.stylefeng.roses.kernel.validator.starter.ValidatorAutoConfiguration,\
 cn.stylefeng.roses.kernel.validator.starter.MethodArgumentResolverAutoConfiguration

kernel-s-system/system-business-user/pom.xml

@@ -62,6 +62,14 @@
             <version>7.0.1</version>
         </dependency>
 
+        <!--安全模块api-->
+        <!--用在图形验证码-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>security-api</artifactId>
+            <version>7.0.1</version>
+        </dependency>
+
         <!--缓存api-->
         <!--用户的查询会使用缓存-->
         <dependency>

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.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
-import cn.stylefeng.roses.kernel.validator.api.CaptchaApi;
+import cn.stylefeng.roses.kernel.security.api.CaptchaApi;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;