From 88773ba4df5e32b86fecd5271c4af44d50a2fafb Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Thu, 14 Dec 2017 20:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../browser/config/BrowserSecurityConfig.java | 4 ++-- .../component/MsAuthenticationFailureHandler.java | 4 ++-- .../component/MsAuthenticationSuccessHandler.java | 4 ++-- .../controller/BrowserSecurityController.java | 2 +- .../core/BootStarterSecurityCoreApplication.java | 2 +- .../config/param}/BrowserProperties.java | 4 ++-- .../browser => browser/constant}/LoginType.java | 2 +- .../param => master}/SecurityProperties.java | 6 +++--- .../code}/config/ValidateCodeBean.java | 14 +++++++------- .../code/config/param}/ImageCodeProperties.java | 2 +- .../code/config/param}/SmsCodeProperties.java | 2 +- .../code/config/param}/ValidateCodeProperties.java | 2 +- .../code/constant}/ValidateCodeConst.java | 2 +- .../code/controller}/ValidateCodeController.java | 14 +++++++------- .../code/exception}/ValidateCodeException.java | 2 +- .../code/filter}/ValidateCodeFilter.java | 10 +++++----- .../code => validate/code/pojo}/ImageCode.java | 2 +- .../code => validate/code/pojo}/ValidateCode.java | 2 +- .../code/service}/SendSmsCode.java | 2 +- .../code/service/impl}/DefaultSendSmsCodeImpl.java | 4 ++-- .../code => validate/code/util}/ImageCodeUtil.java | 8 ++++---- .../code => validate/code/util}/SmsCodeUtil.java | 6 +++--- .../code/util}/ValidateCodeUtil.java | 4 ++-- 23 files changed, 52 insertions(+), 52 deletions(-) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{config/param/browser => browser/config/param}/BrowserProperties.java (89%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{constant/browser => browser/constant}/LoginType.java (83%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{config/param => master}/SecurityProperties.java (84%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{ => validate/code}/config/ValidateCodeBean.java (76%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{config/param/validate/code => validate/code/config/param}/ImageCodeProperties.java (90%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{config/param/validate/code => validate/code/config/param}/SmsCodeProperties.java (90%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{config/param/validate/code => validate/code/config/param}/ValidateCodeProperties.java (88%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{constant/validate/code => validate/code/constant}/ValidateCodeConst.java (78%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{controller/validate/code => validate/code/controller}/ValidateCodeController.java (84%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{exception/validate/code => validate/code/exception}/ValidateCodeException.java (82%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{filter/validate/code => validate/code/filter}/ValidateCodeFilter.java (93%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{pojo/validate/code => validate/code/pojo}/ImageCode.java (93%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{pojo/validate/code => validate/code/pojo}/ValidateCode.java (94%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{service/validate/code => validate/code/service}/SendSmsCode.java (56%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{service/impl/validate/code => validate/code/service/impl}/DefaultSendSmsCodeImpl.java (60%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{util/validate/code => validate/code/util}/ImageCodeUtil.java (91%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{util/validate/code => validate/code/util}/SmsCodeUtil.java (81%) rename boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/{util/validate/code => validate/code/util}/ValidateCodeUtil.java (63%) diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java index e73d7b3..22e8044 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java +++ b/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.validate.code.ValidateCodeFilter; +import com.micro.fast.security.core.master.SecurityProperties; +import com.micro.fast.security.core.validate.code.filter.ValidateCodeFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationFailureHandler.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationFailureHandler.java index ba1ee46..8788342 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationFailureHandler.java +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationFailureHandler.java @@ -1,8 +1,8 @@ package com.micro.fast.security.browser.config.component; import com.fasterxml.jackson.databind.ObjectMapper; -import com.micro.fast.security.core.constant.browser.LoginType; -import com.micro.fast.security.core.config.param.SecurityProperties; +import com.micro.fast.security.core.browser.constant.LoginType; +import com.micro.fast.security.core.master.SecurityProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationSuccessHandler.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationSuccessHandler.java index 574961a..188d26b 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationSuccessHandler.java +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/component/MsAuthenticationSuccessHandler.java @@ -1,8 +1,8 @@ package com.micro.fast.security.browser.config.component; import com.fasterxml.jackson.databind.ObjectMapper; -import com.micro.fast.security.core.constant.browser.LoginType; -import com.micro.fast.security.core.config.param.SecurityProperties; +import com.micro.fast.security.core.browser.constant.LoginType; +import com.micro.fast.security.core.master.SecurityProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/controller/BrowserSecurityController.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/controller/BrowserSecurityController.java index 3783ffe..dccc989 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/controller/BrowserSecurityController.java +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/controller/BrowserSecurityController.java @@ -1,6 +1,6 @@ package com.micro.fast.security.browser.controller; -import com.micro.fast.security.core.config.param.SecurityProperties; +import com.micro.fast.security.core.master.SecurityProperties; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/BootStarterSecurityCoreApplication.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/BootStarterSecurityCoreApplication.java index 0e69f86..428cc2d 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/BootStarterSecurityCoreApplication.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/BootStarterSecurityCoreApplication.java @@ -1,6 +1,6 @@ package com.micro.fast.security.core; -import com.micro.fast.security.core.config.param.SecurityProperties; +import com.micro.fast.security.core.master.SecurityProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/browser/BrowserProperties.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/config/param/BrowserProperties.java similarity index 89% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/browser/BrowserProperties.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/config/param/BrowserProperties.java index ce99015..9053950 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/browser/BrowserProperties.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/config/param/BrowserProperties.java @@ -1,6 +1,6 @@ -package com.micro.fast.security.core.config.param.browser; +package com.micro.fast.security.core.browser.config.param; -import com.micro.fast.security.core.constant.browser.LoginType; +import com.micro.fast.security.core.browser.constant.LoginType; import org.hibernate.validator.constraints.NotBlank; /** diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/constant/browser/LoginType.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/constant/LoginType.java similarity index 83% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/constant/browser/LoginType.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/constant/LoginType.java index 5a26a9c..725488c 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/constant/browser/LoginType.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/browser/constant/LoginType.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.constant.browser; +package com.micro.fast.security.core.browser.constant; /** * 用户进行身份认证后返回的类型 diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/SecurityProperties.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/master/SecurityProperties.java similarity index 84% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/SecurityProperties.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/master/SecurityProperties.java index 20ae279..a038a08 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/SecurityProperties.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/master/SecurityProperties.java @@ -1,7 +1,7 @@ -package com.micro.fast.security.core.config.param; +package com.micro.fast.security.core.master; -import com.micro.fast.security.core.config.param.browser.BrowserProperties; -import com.micro.fast.security.core.config.param.validate.code.ValidateCodeProperties; +import com.micro.fast.security.core.browser.config.param.BrowserProperties; +import com.micro.fast.security.core.validate.code.config.param.ValidateCodeProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import javax.validation.Valid; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/ValidateCodeBean.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/ValidateCodeBean.java similarity index 76% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/ValidateCodeBean.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/ValidateCodeBean.java index c5c2386..4b62e06 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/ValidateCodeBean.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/ValidateCodeBean.java @@ -1,11 +1,11 @@ -package com.micro.fast.security.core.config; +package com.micro.fast.security.core.validate.code.config; -import com.micro.fast.security.core.config.param.SecurityProperties; -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 com.micro.fast.security.core.master.SecurityProperties; +import com.micro.fast.security.core.validate.code.service.SendSmsCode; +import com.micro.fast.security.core.validate.code.service.impl.DefaultSendSmsCodeImpl; +import com.micro.fast.security.core.validate.code.util.ImageCodeUtil; +import com.micro.fast.security.core.validate.code.util.SmsCodeUtil; +import com.micro.fast.security.core.validate.code.util.ValidateCodeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ImageCodeProperties.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/ImageCodeProperties.java similarity index 90% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ImageCodeProperties.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/ImageCodeProperties.java index 822cb2e..ce58e91 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ImageCodeProperties.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/ImageCodeProperties.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.config.param.validate.code; +package com.micro.fast.security.core.validate.code.config.param; /** * 图形验证码默认的配置 diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/SmsCodeProperties.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/SmsCodeProperties.java similarity index 90% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/SmsCodeProperties.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/SmsCodeProperties.java index 433dd3b..08f875a 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/SmsCodeProperties.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/SmsCodeProperties.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.config.param.validate.code; +package com.micro.fast.security.core.validate.code.config.param; public class SmsCodeProperties { diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ValidateCodeProperties.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/ValidateCodeProperties.java similarity index 88% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ValidateCodeProperties.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/ValidateCodeProperties.java index 4d02cdd..ef9dd97 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ValidateCodeProperties.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/config/param/ValidateCodeProperties.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.config.param.validate.code; +package com.micro.fast.security.core.validate.code.config.param; /** * 验证码配置参数 diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/constant/validate/code/ValidateCodeConst.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/constant/ValidateCodeConst.java similarity index 78% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/constant/validate/code/ValidateCodeConst.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/constant/ValidateCodeConst.java index 519109f..f4ead4f 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/constant/validate/code/ValidateCodeConst.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/constant/ValidateCodeConst.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.constant.validate.code; +package com.micro.fast.security.core.validate.code.constant; /** * 验证码校验常量类 diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/controller/validate/code/ValidateCodeController.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/controller/ValidateCodeController.java similarity index 84% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/controller/validate/code/ValidateCodeController.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/controller/ValidateCodeController.java index 120efaa..40f92e1 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/controller/validate/code/ValidateCodeController.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/controller/ValidateCodeController.java @@ -1,11 +1,11 @@ -package com.micro.fast.security.core.controller.validate.code; +package com.micro.fast.security.core.validate.code.controller; -import com.micro.fast.security.core.config.param.SecurityProperties; -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 com.micro.fast.security.core.master.SecurityProperties; +import com.micro.fast.security.core.validate.code.constant.ValidateCodeConst; +import com.micro.fast.security.core.validate.code.pojo.ImageCode; +import com.micro.fast.security.core.validate.code.pojo.ValidateCode; +import com.micro.fast.security.core.validate.code.service.SendSmsCode; +import com.micro.fast.security.core.validate.code.util.ValidateCodeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.social.connect.web.HttpSessionSessionStrategy; import org.springframework.social.connect.web.SessionStrategy; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/exception/validate/code/ValidateCodeException.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/exception/ValidateCodeException.java similarity index 82% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/exception/validate/code/ValidateCodeException.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/exception/ValidateCodeException.java index d122e7d..747e55f 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/exception/validate/code/ValidateCodeException.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/exception/ValidateCodeException.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.exception.validate.code; +package com.micro.fast.security.core.validate.code.exception; import org.springframework.security.core.AuthenticationException; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/filter/validate/code/ValidateCodeFilter.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/filter/ValidateCodeFilter.java similarity index 93% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/filter/validate/code/ValidateCodeFilter.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/filter/ValidateCodeFilter.java index ed3cf60..9b5f222 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/filter/validate/code/ValidateCodeFilter.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/filter/ValidateCodeFilter.java @@ -1,9 +1,9 @@ -package com.micro.fast.security.core.filter.validate.code; +package com.micro.fast.security.core.validate.code.filter; -import com.micro.fast.security.core.config.param.SecurityProperties; -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 com.micro.fast.security.core.master.SecurityProperties; +import com.micro.fast.security.core.validate.code.constant.ValidateCodeConst; +import com.micro.fast.security.core.validate.code.exception.ValidateCodeException; +import com.micro.fast.security.core.validate.code.pojo.ValidateCode; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.web.authentication.AuthenticationFailureHandler; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/pojo/validate/code/ImageCode.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/pojo/ImageCode.java similarity index 93% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/pojo/validate/code/ImageCode.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/pojo/ImageCode.java index 06b625a..4920011 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/pojo/validate/code/ImageCode.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/pojo/ImageCode.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.pojo.validate.code; +package com.micro.fast.security.core.validate.code.pojo; import java.awt.image.BufferedImage; import java.io.Serializable; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/pojo/validate/code/ValidateCode.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/pojo/ValidateCode.java similarity index 94% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/pojo/validate/code/ValidateCode.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/pojo/ValidateCode.java index e9fbd9d..4bc558c 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/pojo/validate/code/ValidateCode.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/pojo/ValidateCode.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.pojo.validate.code; +package com.micro.fast.security.core.validate.code.pojo; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/service/validate/code/SendSmsCode.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/service/SendSmsCode.java similarity index 56% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/service/validate/code/SendSmsCode.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/service/SendSmsCode.java index 8bd3f3e..4fa7963 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/service/validate/code/SendSmsCode.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/service/SendSmsCode.java @@ -1,4 +1,4 @@ -package com.micro.fast.security.core.service.validate.code; +package com.micro.fast.security.core.validate.code.service; public interface SendSmsCode { void sendCode(String phone,String code); diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/service/impl/validate/code/DefaultSendSmsCodeImpl.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/service/impl/DefaultSendSmsCodeImpl.java similarity index 60% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/service/impl/validate/code/DefaultSendSmsCodeImpl.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/service/impl/DefaultSendSmsCodeImpl.java index 0d91863..30d2f7e 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/service/impl/validate/code/DefaultSendSmsCodeImpl.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/service/impl/DefaultSendSmsCodeImpl.java @@ -1,6 +1,6 @@ -package com.micro.fast.security.core.service.impl.validate.code; +package com.micro.fast.security.core.validate.code.service.impl; -import com.micro.fast.security.core.service.validate.code.SendSmsCode; +import com.micro.fast.security.core.validate.code.service.SendSmsCode; public class DefaultSendSmsCodeImpl implements SendSmsCode { diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/ImageCodeUtil.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/ImageCodeUtil.java similarity index 91% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/ImageCodeUtil.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/ImageCodeUtil.java index c94666e..b581dc2 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/ImageCodeUtil.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/ImageCodeUtil.java @@ -1,8 +1,8 @@ -package com.micro.fast.security.core.util.validate.code; +package com.micro.fast.security.core.validate.code.util; -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.validate.code.ImageCode; +import com.micro.fast.security.core.validate.code.config.param.ImageCodeProperties; +import com.micro.fast.security.core.master.SecurityProperties; +import com.micro.fast.security.core.validate.code.pojo.ImageCode; import org.springframework.web.bind.ServletRequestUtils; import org.springframework.web.context.request.ServletWebRequest; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/SmsCodeUtil.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/SmsCodeUtil.java similarity index 81% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/SmsCodeUtil.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/SmsCodeUtil.java index 0350eba..8240505 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/SmsCodeUtil.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/SmsCodeUtil.java @@ -1,7 +1,7 @@ -package com.micro.fast.security.core.util.validate.code; +package com.micro.fast.security.core.validate.code.util; -import com.micro.fast.security.core.config.param.SecurityProperties; -import com.micro.fast.security.core.pojo.validate.code.ValidateCode; +import com.micro.fast.security.core.master.SecurityProperties; +import com.micro.fast.security.core.validate.code.pojo.ValidateCode; import org.apache.commons.lang.RandomStringUtils; import org.springframework.web.context.request.ServletWebRequest; diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/ValidateCodeUtil.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/ValidateCodeUtil.java similarity index 63% rename from boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/ValidateCodeUtil.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/ValidateCodeUtil.java index 3efe4d0..a544e9f 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/util/validate/code/ValidateCodeUtil.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/validate/code/util/ValidateCodeUtil.java @@ -1,6 +1,6 @@ -package com.micro.fast.security.core.util.validate.code; +package com.micro.fast.security.core.validate.code.util; -import com.micro.fast.security.core.pojo.validate.code.ValidateCode; +import com.micro.fast.security.core.validate.code.pojo.ValidateCode; import org.springframework.web.context.request.ServletWebRequest; /**