修改项目结构

boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java

@@ -1,7 +1,7 @@
 package com.micro.fast.security.browser.config;
 
 import com.micro.fast.security.core.config.param.SecurityProperties;
-import com.micro.fast.security.core.filter.ValidateCodeFilter;
+import com.micro.fast.security.core.filter.validate.code.ValidateCodeFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;

boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationFailureHandler.java

@@ -1,7 +1,7 @@
 package com.micro.fast.security.browser.config.component;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.micro.fast.security.core.constant.LoginType;
+import com.micro.fast.security.core.constant.browser.LoginType;
 import com.micro.fast.security.core.config.param.SecurityProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationSuccessHandler.java

@@ -1,7 +1,7 @@
 package com.micro.fast.security.browser.config.component;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.micro.fast.security.core.constant.LoginType;
+import com.micro.fast.security.core.constant.browser.LoginType;
 import com.micro.fast.security.core.config.param.SecurityProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/ValidateCodeBean.java

@@ -1,13 +1,12 @@
 package com.micro.fast.security.core.config;
 
 import com.micro.fast.security.core.config.param.SecurityProperties;
-import com.micro.fast.security.core.service.SendSmsCode;
-import com.micro.fast.security.core.service.impl.DefaultSendSmsCodeImpl;
-import com.micro.fast.security.core.util.ImageCodeUtil;
-import com.micro.fast.security.core.util.SmsCodeUtil;
-import com.micro.fast.security.core.util.ValidateCodeUtil;
+import com.micro.fast.security.core.service.validate.code.SendSmsCode;
+import com.micro.fast.security.core.service.impl.validate.code.DefaultSendSmsCodeImpl;
+import com.micro.fast.security.core.util.validate.code.ImageCodeUtil;
+import com.micro.fast.security.core.util.validate.code.SmsCodeUtil;
+import com.micro.fast.security.core.util.validate.code.ValidateCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/SecurityProperties.java

@@ -1,6 +1,7 @@
 package com.micro.fast.security.core.config.param;
 
-import com.micro.fast.security.core.pojo.ValidateCode;
+import com.micro.fast.security.core.config.param.browser.BrowserProperties;
+import com.micro.fast.security.core.config.param.validate.code.ValidateCodeProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import javax.validation.Valid;

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/browser/BrowserProperties.java

@@ -1,6 +1,6 @@
-package com.micro.fast.security.core.config.param;
+package com.micro.fast.security.core.config.param.browser;
 
-import com.micro.fast.security.core.constant.LoginType;
+import com.micro.fast.security.core.constant.browser.LoginType;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ImageCodeProperties.java

@@ -1,4 +1,4 @@
-package com.micro.fast.security.core.config.param;
+package com.micro.fast.security.core.config.param.validate.code;
 
 /**
  * 图形验证码默认的配置

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/SmsCodeProperties.java

@@ -1,4 +1,4 @@
-package com.micro.fast.security.core.config.param;
+package com.micro.fast.security.core.config.param.validate.code;
 
 public class SmsCodeProperties {
 

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ValidateCodeProperties.java

@@ -1,4 +1,4 @@
-package com.micro.fast.security.core.config.param;
+package com.micro.fast.security.core.config.param.validate.code;
 
 /**
  * 验证码配置参数

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/constant/browser/LoginType.java

@@ -1,4 +1,4 @@
-package com.micro.fast.security.core.constant;
+package com.micro.fast.security.core.constant.browser;
 
 /**
  *  用户进行身份认证后返回的类型

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/constant/validate/code/ValidateCodeConst.java

@@ -1,4 +1,4 @@
-package com.micro.fast.security.core.constant;
+package com.micro.fast.security.core.constant.validate.code;
 
 /**
  * 验证码校验常量类

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/controller/validate/code/ValidateCodeController.java

@@ -1,13 +1,12 @@
-package com.micro.fast.security.core.controller;
+package com.micro.fast.security.core.controller.validate.code;
 
 import com.micro.fast.security.core.config.param.SecurityProperties;
-import com.micro.fast.security.core.constant.ValidateCodeConst;
-import com.micro.fast.security.core.pojo.ImageCode;
-import com.micro.fast.security.core.pojo.ValidateCode;
-import com.micro.fast.security.core.service.SendSmsCode;
-import com.micro.fast.security.core.util.ValidateCodeUtil;
+import com.micro.fast.security.core.constant.validate.code.ValidateCodeConst;
+import com.micro.fast.security.core.pojo.validate.code.ImageCode;
+import com.micro.fast.security.core.pojo.validate.code.ValidateCode;
+import com.micro.fast.security.core.service.validate.code.SendSmsCode;
+import com.micro.fast.security.core.util.validate.code.ValidateCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.social.connect.web.HttpSessionSessionStrategy;
 import org.springframework.social.connect.web.SessionStrategy;
 import org.springframework.web.bind.ServletRequestBindingException;

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/exception/validate/code/ValidateCodeException.java

@@ -1,4 +1,4 @@
-package com.micro.fast.security.core.exception;
+package com.micro.fast.security.core.exception.validate.code;
 
 import org.springframework.security.core.AuthenticationException;
 

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/filter/validate/code/ValidateCodeFilter.java

@@ -1,9 +1,9 @@
-package com.micro.fast.security.core.filter;
+package com.micro.fast.security.core.filter.validate.code;
 
 import com.micro.fast.security.core.config.param.SecurityProperties;
-import com.micro.fast.security.core.constant.ValidateCodeConst;
-import com.micro.fast.security.core.exception.ValidateCodeException;
-import com.micro.fast.security.core.pojo.ValidateCode;
+import com.micro.fast.security.core.constant.validate.code.ValidateCodeConst;
+import com.micro.fast.security.core.exception.validate.code.ValidateCodeException;
+import com.micro.fast.security.core.pojo.validate.code.ValidateCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/pojo/validate/code/ImageCode.java

@@ -1,8 +1,7 @@
-package com.micro.fast.security.core.pojo;
+package com.micro.fast.security.core.pojo.validate.code;
 
 import java.awt.image.BufferedImage;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * 图片验证码

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/pojo/validate/code/ValidateCode.java

@@ -1,4 +1,4 @@
-package com.micro.fast.security.core.pojo;
+package com.micro.fast.security.core.pojo.validate.code;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/service/impl/validate/code/DefaultSendSmsCodeImpl.java

@@ -1,6 +1,6 @@
-package com.micro.fast.security.core.service.impl;
+package com.micro.fast.security.core.service.impl.validate.code;
 
-import com.micro.fast.security.core.service.SendSmsCode;
+import com.micro.fast.security.core.service.validate.code.SendSmsCode;
 
 public class DefaultSendSmsCodeImpl implements SendSmsCode {
 

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/service/validate/code/SendSmsCode.java

@@ -1,4 +1,4 @@
-package com.micro.fast.security.core.service;
+package com.micro.fast.security.core.service.validate.code;
 
 public interface SendSmsCode {
   void sendCode(String phone,String code);

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/ImageCodeUtil.java

@@ -1,8 +1,8 @@
-package com.micro.fast.security.core.util;
+package com.micro.fast.security.core.util.validate.code;
 
-import com.micro.fast.security.core.config.param.ImageCodeProperties;
+import com.micro.fast.security.core.config.param.validate.code.ImageCodeProperties;
 import com.micro.fast.security.core.config.param.SecurityProperties;
-import com.micro.fast.security.core.pojo.ImageCode;
+import com.micro.fast.security.core.pojo.validate.code.ImageCode;
 import org.springframework.web.bind.ServletRequestUtils;
 import org.springframework.web.context.request.ServletWebRequest;
 

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/SmsCodeUtil.java

@@ -1,7 +1,7 @@
-package com.micro.fast.security.core.util;
+package com.micro.fast.security.core.util.validate.code;
 
 import com.micro.fast.security.core.config.param.SecurityProperties;
-import com.micro.fast.security.core.pojo.ValidateCode;
+import com.micro.fast.security.core.pojo.validate.code.ValidateCode;
 import org.apache.commons.lang.RandomStringUtils;
 import org.springframework.web.context.request.ServletWebRequest;
 

boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/ValidateCodeUtil.java

@@ -1,6 +1,6 @@
-package com.micro.fast.security.core.util;
+package com.micro.fast.security.core.util.validate.code;
 
-import com.micro.fast.security.core.pojo.ValidateCode;
+import com.micro.fast.security.core.pojo.validate.code.ValidateCode;
 import org.springframework.web.context.request.ServletWebRequest;
 
 /**