diff --git a/core/pom.xml b/core/pom.xml index 1a792f1b..4bd32487 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.usthe.sureness + org.dromara.sureness sureness-core 1.1.0 jar @@ -27,8 +27,8 @@ tomsun28 tomsun28@outlook.com - usthe - usthe.com + dromara + dromara.org diff --git a/core/src/main/java/com/usthe/sureness/DefaultSurenessConfig.java b/core/src/main/java/org/dromara/sureness/DefaultSurenessConfig.java similarity index 82% rename from core/src/main/java/com/usthe/sureness/DefaultSurenessConfig.java rename to core/src/main/java/org/dromara/sureness/DefaultSurenessConfig.java index 5d64b51c..fd2f47cf 100644 --- a/core/src/main/java/com/usthe/sureness/DefaultSurenessConfig.java +++ b/core/src/main/java/org/dromara/sureness/DefaultSurenessConfig.java @@ -1,21 +1,21 @@ -package com.usthe.sureness; +package org.dromara.sureness; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.support.DigestProcessor; -import com.usthe.sureness.processor.support.JwtProcessor; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; -import com.usthe.sureness.subject.creater.*; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.support.DigestProcessor; +import org.dromara.sureness.processor.support.JwtProcessor; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.subject.creater.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/handler/AttachSessionServletHandler.java b/core/src/main/java/org/dromara/sureness/handler/AttachSessionServletHandler.java similarity index 89% rename from core/src/main/java/com/usthe/sureness/handler/AttachSessionServletHandler.java rename to core/src/main/java/org/dromara/sureness/handler/AttachSessionServletHandler.java index 49ab37f1..6fe16e35 100644 --- a/core/src/main/java/com/usthe/sureness/handler/AttachSessionServletHandler.java +++ b/core/src/main/java/org/dromara/sureness/handler/AttachSessionServletHandler.java @@ -1,10 +1,11 @@ -package com.usthe.sureness.handler; - -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessConstant; +package org.dromara.sureness.handler; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; + +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessConstant; + import static java.util.Objects.isNull; /** diff --git a/core/src/main/java/com/usthe/sureness/handler/HandlerManager.java b/core/src/main/java/org/dromara/sureness/handler/HandlerManager.java similarity index 94% rename from core/src/main/java/com/usthe/sureness/handler/HandlerManager.java rename to core/src/main/java/org/dromara/sureness/handler/HandlerManager.java index a2ac7478..2b3d026f 100644 --- a/core/src/main/java/com/usthe/sureness/handler/HandlerManager.java +++ b/core/src/main/java/org/dromara/sureness/handler/HandlerManager.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.handler; +package org.dromara.sureness.handler; -import com.usthe.sureness.subject.SubjectSum; +import org.dromara.sureness.subject.SubjectSum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/handler/SuccessHandler.java b/core/src/main/java/org/dromara/sureness/handler/SuccessHandler.java similarity index 78% rename from core/src/main/java/com/usthe/sureness/handler/SuccessHandler.java rename to core/src/main/java/org/dromara/sureness/handler/SuccessHandler.java index d67b19a9..ce1de352 100644 --- a/core/src/main/java/com/usthe/sureness/handler/SuccessHandler.java +++ b/core/src/main/java/org/dromara/sureness/handler/SuccessHandler.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.handler; +package org.dromara.sureness.handler; -import com.usthe.sureness.subject.SubjectSum; +import org.dromara.sureness.subject.SubjectSum; /** * the handler process after auth success diff --git a/core/src/main/java/com/usthe/sureness/matcher/DefaultPathRoleMatcher.java b/core/src/main/java/org/dromara/sureness/matcher/DefaultPathRoleMatcher.java similarity index 96% rename from core/src/main/java/com/usthe/sureness/matcher/DefaultPathRoleMatcher.java rename to core/src/main/java/org/dromara/sureness/matcher/DefaultPathRoleMatcher.java index 3558801b..9ee66776 100644 --- a/core/src/main/java/com/usthe/sureness/matcher/DefaultPathRoleMatcher.java +++ b/core/src/main/java/org/dromara/sureness/matcher/DefaultPathRoleMatcher.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.matcher; +package org.dromara.sureness.matcher; -import com.usthe.sureness.matcher.util.TirePathTree; -import com.usthe.sureness.mgt.SurenessNoInitException; -import com.usthe.sureness.subject.Subject; +import org.dromara.sureness.matcher.util.TirePathTree; +import org.dromara.sureness.mgt.SurenessNoInitException; +import org.dromara.sureness.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/matcher/PathTreeProvider.java b/core/src/main/java/org/dromara/sureness/matcher/PathTreeProvider.java similarity index 97% rename from core/src/main/java/com/usthe/sureness/matcher/PathTreeProvider.java rename to core/src/main/java/org/dromara/sureness/matcher/PathTreeProvider.java index 5a596ce8..41128903 100644 --- a/core/src/main/java/com/usthe/sureness/matcher/PathTreeProvider.java +++ b/core/src/main/java/org/dromara/sureness/matcher/PathTreeProvider.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.matcher; +package org.dromara.sureness.matcher; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; diff --git a/core/src/main/java/com/usthe/sureness/matcher/SurenessLoadDataException.java b/core/src/main/java/org/dromara/sureness/matcher/SurenessLoadDataException.java similarity index 69% rename from core/src/main/java/com/usthe/sureness/matcher/SurenessLoadDataException.java rename to core/src/main/java/org/dromara/sureness/matcher/SurenessLoadDataException.java index 3ba2ceca..a3a72582 100644 --- a/core/src/main/java/com/usthe/sureness/matcher/SurenessLoadDataException.java +++ b/core/src/main/java/org/dromara/sureness/matcher/SurenessLoadDataException.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.matcher; +package org.dromara.sureness.matcher; -import com.usthe.sureness.processor.exception.ExtSurenessException; +import org.dromara.sureness.processor.exception.ExtSurenessException; /** * datasource load exception diff --git a/core/src/main/java/com/usthe/sureness/matcher/TreePathRoleMatcher.java b/core/src/main/java/org/dromara/sureness/matcher/TreePathRoleMatcher.java similarity index 88% rename from core/src/main/java/com/usthe/sureness/matcher/TreePathRoleMatcher.java rename to core/src/main/java/org/dromara/sureness/matcher/TreePathRoleMatcher.java index 7d8d0c61..bec3482d 100644 --- a/core/src/main/java/com/usthe/sureness/matcher/TreePathRoleMatcher.java +++ b/core/src/main/java/org/dromara/sureness/matcher/TreePathRoleMatcher.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.matcher; +package org.dromara.sureness.matcher; -import com.usthe.sureness.mgt.SurenessNoInitException; -import com.usthe.sureness.subject.Subject; +import org.dromara.sureness.mgt.SurenessNoInitException; +import org.dromara.sureness.subject.Subject; /** * path-role matcher interface diff --git a/core/src/main/java/com/usthe/sureness/matcher/util/TirePathTree.java b/core/src/main/java/org/dromara/sureness/matcher/util/TirePathTree.java similarity index 99% rename from core/src/main/java/com/usthe/sureness/matcher/util/TirePathTree.java rename to core/src/main/java/org/dromara/sureness/matcher/util/TirePathTree.java index ef9090c3..db98607c 100644 --- a/core/src/main/java/com/usthe/sureness/matcher/util/TirePathTree.java +++ b/core/src/main/java/org/dromara/sureness/matcher/util/TirePathTree.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.matcher.util; +package org.dromara.sureness.matcher.util; import org.slf4j.Logger; diff --git a/core/src/main/java/com/usthe/sureness/mgt/SecurityManager.java b/core/src/main/java/org/dromara/sureness/mgt/SecurityManager.java similarity index 76% rename from core/src/main/java/com/usthe/sureness/mgt/SecurityManager.java rename to core/src/main/java/org/dromara/sureness/mgt/SecurityManager.java index e1c431cf..080f74d4 100644 --- a/core/src/main/java/com/usthe/sureness/mgt/SecurityManager.java +++ b/core/src/main/java/org/dromara/sureness/mgt/SecurityManager.java @@ -1,12 +1,12 @@ -package com.usthe.sureness.mgt; - -import com.usthe.sureness.processor.exception.UnsupportedSubjectException; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.processor.exception.BaseSurenessException; +package org.dromara.sureness.mgt; import java.util.List; +import org.dromara.sureness.processor.exception.BaseSurenessException; +import org.dromara.sureness.processor.exception.UnsupportedSubjectException; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectSum; + /** * Authentication authorization entrance interface * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/mgt/SurenessNoInitException.java b/core/src/main/java/org/dromara/sureness/mgt/SurenessNoInitException.java similarity index 69% rename from core/src/main/java/com/usthe/sureness/mgt/SurenessNoInitException.java rename to core/src/main/java/org/dromara/sureness/mgt/SurenessNoInitException.java index ede5418f..b2b0e0d0 100644 --- a/core/src/main/java/com/usthe/sureness/mgt/SurenessNoInitException.java +++ b/core/src/main/java/org/dromara/sureness/mgt/SurenessNoInitException.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.mgt; +package org.dromara.sureness.mgt; -import com.usthe.sureness.processor.exception.ExtSurenessException; +import org.dromara.sureness.processor.exception.ExtSurenessException; /** * sureness not init exception diff --git a/core/src/main/java/com/usthe/sureness/mgt/SurenessSecurityManager.java b/core/src/main/java/org/dromara/sureness/mgt/SurenessSecurityManager.java similarity index 90% rename from core/src/main/java/com/usthe/sureness/mgt/SurenessSecurityManager.java rename to core/src/main/java/org/dromara/sureness/mgt/SurenessSecurityManager.java index d5cba351..68512a4d 100644 --- a/core/src/main/java/com/usthe/sureness/mgt/SurenessSecurityManager.java +++ b/core/src/main/java/org/dromara/sureness/mgt/SurenessSecurityManager.java @@ -1,13 +1,13 @@ -package com.usthe.sureness.mgt; - -import com.usthe.sureness.handler.HandlerManager; -import com.usthe.sureness.matcher.TreePathRoleMatcher; -import com.usthe.sureness.processor.ProcessorManager; -import com.usthe.sureness.processor.exception.UnsupportedSubjectException; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.processor.exception.BaseSurenessException; +package org.dromara.sureness.mgt; + +import org.dromara.sureness.handler.HandlerManager; +import org.dromara.sureness.matcher.TreePathRoleMatcher; +import org.dromara.sureness.processor.ProcessorManager; +import org.dromara.sureness.processor.exception.BaseSurenessException; +import org.dromara.sureness.processor.exception.UnsupportedSubjectException; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SubjectSum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/processor/BaseProcessor.java b/core/src/main/java/org/dromara/sureness/processor/BaseProcessor.java similarity index 84% rename from core/src/main/java/com/usthe/sureness/processor/BaseProcessor.java rename to core/src/main/java/org/dromara/sureness/processor/BaseProcessor.java index d6b8fbe9..e1d16e8d 100644 --- a/core/src/main/java/com/usthe/sureness/processor/BaseProcessor.java +++ b/core/src/main/java/org/dromara/sureness/processor/BaseProcessor.java @@ -1,13 +1,13 @@ -package com.usthe.sureness.processor; - -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; -import com.usthe.sureness.processor.exception.SurenessAuthorizationException; -import com.usthe.sureness.processor.exception.UnauthorizedException; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.subject.Subject; +package org.dromara.sureness.processor; import java.util.List; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.processor.exception.SurenessAuthorizationException; +import org.dromara.sureness.processor.exception.UnauthorizedException; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectSum; + /** * abstract processor * diff --git a/core/src/main/java/com/usthe/sureness/processor/DefaultProcessorManager.java b/core/src/main/java/org/dromara/sureness/processor/DefaultProcessorManager.java similarity index 85% rename from core/src/main/java/com/usthe/sureness/processor/DefaultProcessorManager.java rename to core/src/main/java/org/dromara/sureness/processor/DefaultProcessorManager.java index 907916d8..52bfd4f5 100644 --- a/core/src/main/java/com/usthe/sureness/processor/DefaultProcessorManager.java +++ b/core/src/main/java/org/dromara/sureness/processor/DefaultProcessorManager.java @@ -1,11 +1,11 @@ -package com.usthe.sureness.processor; +package org.dromara.sureness.processor; -import com.usthe.sureness.mgt.SurenessNoInitException; -import com.usthe.sureness.processor.exception.ProcessorNotFoundException; -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; -import com.usthe.sureness.processor.exception.SurenessAuthorizationException; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.subject.Subject; +import org.dromara.sureness.mgt.SurenessNoInitException; +import org.dromara.sureness.processor.exception.ProcessorNotFoundException; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.processor.exception.SurenessAuthorizationException; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectSum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/processor/Processor.java b/core/src/main/java/org/dromara/sureness/processor/Processor.java similarity index 76% rename from core/src/main/java/com/usthe/sureness/processor/Processor.java rename to core/src/main/java/org/dromara/sureness/processor/Processor.java index 993cf08d..9a3cbe2a 100644 --- a/core/src/main/java/com/usthe/sureness/processor/Processor.java +++ b/core/src/main/java/org/dromara/sureness/processor/Processor.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.processor; +package org.dromara.sureness.processor; -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; -import com.usthe.sureness.processor.exception.SurenessAuthorizationException; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.subject.Subject; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.processor.exception.SurenessAuthorizationException; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectSum; /** * processor diff --git a/core/src/main/java/com/usthe/sureness/processor/ProcessorManager.java b/core/src/main/java/org/dromara/sureness/processor/ProcessorManager.java similarity index 69% rename from core/src/main/java/com/usthe/sureness/processor/ProcessorManager.java rename to core/src/main/java/org/dromara/sureness/processor/ProcessorManager.java index ca7f7f60..51e8b410 100644 --- a/core/src/main/java/com/usthe/sureness/processor/ProcessorManager.java +++ b/core/src/main/java/org/dromara/sureness/processor/ProcessorManager.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.processor; +package org.dromara.sureness.processor; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.subject.Subject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectSum; /** * processor manager diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/BaseSurenessException.java b/core/src/main/java/org/dromara/sureness/processor/exception/BaseSurenessException.java similarity index 84% rename from core/src/main/java/com/usthe/sureness/processor/exception/BaseSurenessException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/BaseSurenessException.java index 5f54679e..cd7baa8c 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/BaseSurenessException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/BaseSurenessException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * sureness basic exception, other exceptions inherit this exception diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/DisabledAccountException.java b/core/src/main/java/org/dromara/sureness/processor/exception/DisabledAccountException.java similarity index 84% rename from core/src/main/java/com/usthe/sureness/processor/exception/DisabledAccountException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/DisabledAccountException.java index d0501db5..9fd1015e 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/DisabledAccountException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/DisabledAccountException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authentication exception: Disable lock account exception diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/ExcessiveAttemptsException.java b/core/src/main/java/org/dromara/sureness/processor/exception/ExcessiveAttemptsException.java similarity index 86% rename from core/src/main/java/com/usthe/sureness/processor/exception/ExcessiveAttemptsException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/ExcessiveAttemptsException.java index 821c59c1..06bddcab 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/ExcessiveAttemptsException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/ExcessiveAttemptsException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authentication exception: Too many attempts after regular authentication failure diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/ExpiredCredentialsException.java b/core/src/main/java/org/dromara/sureness/processor/exception/ExpiredCredentialsException.java similarity index 84% rename from core/src/main/java/com/usthe/sureness/processor/exception/ExpiredCredentialsException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/ExpiredCredentialsException.java index 193c219f..25d6bca5 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/ExpiredCredentialsException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/ExpiredCredentialsException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authentication exception: Expired certificate diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/ExtSurenessException.java b/core/src/main/java/org/dromara/sureness/processor/exception/ExtSurenessException.java similarity index 86% rename from core/src/main/java/com/usthe/sureness/processor/exception/ExtSurenessException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/ExtSurenessException.java index 6dd22d00..c7d1270b 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/ExtSurenessException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/ExtSurenessException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Extended Sureness exception. diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/IncorrectCredentialsException.java b/core/src/main/java/org/dromara/sureness/processor/exception/IncorrectCredentialsException.java similarity index 84% rename from core/src/main/java/com/usthe/sureness/processor/exception/IncorrectCredentialsException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/IncorrectCredentialsException.java index 0bf725ff..a32d38cc 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/IncorrectCredentialsException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/IncorrectCredentialsException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authentication exception: Bad credentials diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/NeedDigestInfoException.java b/core/src/main/java/org/dromara/sureness/processor/exception/NeedDigestInfoException.java similarity index 91% rename from core/src/main/java/com/usthe/sureness/processor/exception/NeedDigestInfoException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/NeedDigestInfoException.java index e79b8852..95e2e7b0 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/NeedDigestInfoException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/NeedDigestInfoException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * exception for digest auth diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/ProcessorNotFoundException.java b/core/src/main/java/org/dromara/sureness/processor/exception/ProcessorNotFoundException.java similarity index 85% rename from core/src/main/java/com/usthe/sureness/processor/exception/ProcessorNotFoundException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/ProcessorNotFoundException.java index 9dd8620a..2be8c909 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/ProcessorNotFoundException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/ProcessorNotFoundException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authentication exception: there is no processor support this subject diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/SurenessAuthenticationException.java b/core/src/main/java/org/dromara/sureness/processor/exception/SurenessAuthenticationException.java similarity index 87% rename from core/src/main/java/com/usthe/sureness/processor/exception/SurenessAuthenticationException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/SurenessAuthenticationException.java index 1427f71a..c51377ab 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/SurenessAuthenticationException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/SurenessAuthenticationException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authentication exception diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/SurenessAuthorizationException.java b/core/src/main/java/org/dromara/sureness/processor/exception/SurenessAuthorizationException.java similarity index 86% rename from core/src/main/java/com/usthe/sureness/processor/exception/SurenessAuthorizationException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/SurenessAuthorizationException.java index 3a10ce5e..a4fdf647 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/SurenessAuthorizationException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/SurenessAuthorizationException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authorization exception diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/UnauthorizedException.java b/core/src/main/java/org/dromara/sureness/processor/exception/UnauthorizedException.java similarity index 84% rename from core/src/main/java/com/usthe/sureness/processor/exception/UnauthorizedException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/UnauthorizedException.java index b3fafc25..45a71811 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/UnauthorizedException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/UnauthorizedException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authorization exception: No permission to access the resource diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/UnknownAccountException.java b/core/src/main/java/org/dromara/sureness/processor/exception/UnknownAccountException.java similarity index 84% rename from core/src/main/java/com/usthe/sureness/processor/exception/UnknownAccountException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/UnknownAccountException.java index 903349c3..d6e17c92 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/UnknownAccountException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/UnknownAccountException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authentication exception: Unknown account exception diff --git a/core/src/main/java/com/usthe/sureness/processor/exception/UnsupportedSubjectException.java b/core/src/main/java/org/dromara/sureness/processor/exception/UnsupportedSubjectException.java similarity index 94% rename from core/src/main/java/com/usthe/sureness/processor/exception/UnsupportedSubjectException.java rename to core/src/main/java/org/dromara/sureness/processor/exception/UnsupportedSubjectException.java index c7d4aa7e..12571637 100644 --- a/core/src/main/java/com/usthe/sureness/processor/exception/UnsupportedSubjectException.java +++ b/core/src/main/java/org/dromara/sureness/processor/exception/UnsupportedSubjectException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.processor.exception; +package org.dromara.sureness.processor.exception; /** * Authentication exception: Can not support this request diff --git a/core/src/main/java/com/usthe/sureness/processor/support/DigestProcessor.java b/core/src/main/java/org/dromara/sureness/processor/support/DigestProcessor.java similarity index 85% rename from core/src/main/java/com/usthe/sureness/processor/support/DigestProcessor.java rename to core/src/main/java/org/dromara/sureness/processor/support/DigestProcessor.java index 775f8bf1..e46a878b 100644 --- a/core/src/main/java/com/usthe/sureness/processor/support/DigestProcessor.java +++ b/core/src/main/java/org/dromara/sureness/processor/support/DigestProcessor.java @@ -1,16 +1,16 @@ -package com.usthe.sureness.processor.support; +package org.dromara.sureness.processor.support; -import com.usthe.sureness.processor.BaseProcessor; -import com.usthe.sureness.processor.exception.DisabledAccountException; -import com.usthe.sureness.processor.exception.ExcessiveAttemptsException; -import com.usthe.sureness.processor.exception.IncorrectCredentialsException; -import com.usthe.sureness.processor.exception.UnknownAccountException; -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; -import com.usthe.sureness.processor.exception.NeedDigestInfoException; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.support.DigestSubject; +import org.dromara.sureness.processor.BaseProcessor; +import org.dromara.sureness.processor.exception.DisabledAccountException; +import org.dromara.sureness.processor.exception.ExcessiveAttemptsException; +import org.dromara.sureness.processor.exception.IncorrectCredentialsException; +import org.dromara.sureness.processor.exception.NeedDigestInfoException; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.processor.exception.UnknownAccountException; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.support.DigestSubject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/processor/support/JwtProcessor.java b/core/src/main/java/org/dromara/sureness/processor/support/JwtProcessor.java similarity index 81% rename from core/src/main/java/com/usthe/sureness/processor/support/JwtProcessor.java rename to core/src/main/java/org/dromara/sureness/processor/support/JwtProcessor.java index 59b68d7e..4222d346 100644 --- a/core/src/main/java/com/usthe/sureness/processor/support/JwtProcessor.java +++ b/core/src/main/java/org/dromara/sureness/processor/support/JwtProcessor.java @@ -1,19 +1,20 @@ -package com.usthe.sureness.processor.support; +package org.dromara.sureness.processor.support; -import com.usthe.sureness.processor.BaseProcessor; -import com.usthe.sureness.processor.exception.ExpiredCredentialsException; -import com.usthe.sureness.processor.exception.IncorrectCredentialsException; -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.subject.support.SinglePrincipalMap; -import com.usthe.sureness.util.JsonWebTokenUtil; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.MalformedJwtException; import io.jsonwebtoken.security.SignatureException; import io.jsonwebtoken.UnsupportedJwtException; + +import org.dromara.sureness.processor.BaseProcessor; +import org.dromara.sureness.processor.exception.ExpiredCredentialsException; +import org.dromara.sureness.processor.exception.IncorrectCredentialsException; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.subject.support.SinglePrincipalMap; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/processor/support/NoneProcessor.java b/core/src/main/java/org/dromara/sureness/processor/support/NoneProcessor.java similarity index 67% rename from core/src/main/java/com/usthe/sureness/processor/support/NoneProcessor.java rename to core/src/main/java/org/dromara/sureness/processor/support/NoneProcessor.java index ca429184..aaa5890e 100644 --- a/core/src/main/java/com/usthe/sureness/processor/support/NoneProcessor.java +++ b/core/src/main/java/org/dromara/sureness/processor/support/NoneProcessor.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.processor.support; +package org.dromara.sureness.processor.support; -import com.usthe.sureness.processor.BaseProcessor; -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; -import com.usthe.sureness.processor.exception.UnknownAccountException; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.support.NoneSubject; +import org.dromara.sureness.processor.BaseProcessor; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.processor.exception.UnknownAccountException; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.support.NoneSubject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/processor/support/PasswordProcessor.java b/core/src/main/java/org/dromara/sureness/processor/support/PasswordProcessor.java similarity index 78% rename from core/src/main/java/com/usthe/sureness/processor/support/PasswordProcessor.java rename to core/src/main/java/org/dromara/sureness/processor/support/PasswordProcessor.java index d59610c1..a1dffe60 100644 --- a/core/src/main/java/com/usthe/sureness/processor/support/PasswordProcessor.java +++ b/core/src/main/java/org/dromara/sureness/processor/support/PasswordProcessor.java @@ -1,16 +1,16 @@ -package com.usthe.sureness.processor.support; +package org.dromara.sureness.processor.support; -import com.usthe.sureness.processor.BaseProcessor; -import com.usthe.sureness.processor.exception.DisabledAccountException; -import com.usthe.sureness.processor.exception.ExcessiveAttemptsException; -import com.usthe.sureness.processor.exception.IncorrectCredentialsException; -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; -import com.usthe.sureness.processor.exception.UnknownAccountException; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.support.PasswordSubject; -import com.usthe.sureness.util.Md5Util; +import org.dromara.sureness.processor.BaseProcessor; +import org.dromara.sureness.processor.exception.DisabledAccountException; +import org.dromara.sureness.processor.exception.ExcessiveAttemptsException; +import org.dromara.sureness.processor.exception.IncorrectCredentialsException; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.processor.exception.UnknownAccountException; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.util.Md5Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/processor/support/SessionProcessor.java b/core/src/main/java/org/dromara/sureness/processor/support/SessionProcessor.java similarity index 63% rename from core/src/main/java/com/usthe/sureness/processor/support/SessionProcessor.java rename to core/src/main/java/org/dromara/sureness/processor/support/SessionProcessor.java index 998b1638..e9b1dbe9 100644 --- a/core/src/main/java/com/usthe/sureness/processor/support/SessionProcessor.java +++ b/core/src/main/java/org/dromara/sureness/processor/support/SessionProcessor.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.processor.support; +package org.dromara.sureness.processor.support; -import com.usthe.sureness.processor.BaseProcessor; -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.support.SessionSubject; +import org.dromara.sureness.processor.BaseProcessor; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.support.SessionSubject; /** * process session auth diff --git a/core/src/main/java/com/usthe/sureness/provider/DefaultAccount.java b/core/src/main/java/org/dromara/sureness/provider/DefaultAccount.java similarity index 98% rename from core/src/main/java/com/usthe/sureness/provider/DefaultAccount.java rename to core/src/main/java/org/dromara/sureness/provider/DefaultAccount.java index 0f3aa1c0..31782f81 100644 --- a/core/src/main/java/com/usthe/sureness/provider/DefaultAccount.java +++ b/core/src/main/java/org/dromara/sureness/provider/DefaultAccount.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.provider; +package org.dromara.sureness.provider; import java.util.List; diff --git a/core/src/main/java/com/usthe/sureness/provider/SurenessAccount.java b/core/src/main/java/org/dromara/sureness/provider/SurenessAccount.java similarity index 95% rename from core/src/main/java/com/usthe/sureness/provider/SurenessAccount.java rename to core/src/main/java/org/dromara/sureness/provider/SurenessAccount.java index 857998a8..b76ac4bf 100644 --- a/core/src/main/java/com/usthe/sureness/provider/SurenessAccount.java +++ b/core/src/main/java/org/dromara/sureness/provider/SurenessAccount.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.provider; +package org.dromara.sureness.provider; import java.util.List; diff --git a/core/src/main/java/com/usthe/sureness/provider/SurenessAccountProvider.java b/core/src/main/java/org/dromara/sureness/provider/SurenessAccountProvider.java similarity index 89% rename from core/src/main/java/com/usthe/sureness/provider/SurenessAccountProvider.java rename to core/src/main/java/org/dromara/sureness/provider/SurenessAccountProvider.java index 1ba73827..702672dd 100644 --- a/core/src/main/java/com/usthe/sureness/provider/SurenessAccountProvider.java +++ b/core/src/main/java/org/dromara/sureness/provider/SurenessAccountProvider.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.provider; +package org.dromara.sureness.provider; /** * load account data interface diff --git a/core/src/main/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProvider.java b/core/src/main/java/org/dromara/sureness/provider/annotation/AnnotationPathTreeProvider.java similarity index 94% rename from core/src/main/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProvider.java rename to core/src/main/java/org/dromara/sureness/provider/annotation/AnnotationPathTreeProvider.java index 8a4a8d9a..eb2210a8 100644 --- a/core/src/main/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProvider.java +++ b/core/src/main/java/org/dromara/sureness/provider/annotation/AnnotationPathTreeProvider.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.provider.annotation; +package org.dromara.sureness.provider.annotation; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.util.ClassScanner; -import com.usthe.sureness.util.SurenessCommonUtil; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.util.ClassScanner; +import org.dromara.sureness.util.SurenessCommonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/provider/annotation/RequiresRoles.java b/core/src/main/java/org/dromara/sureness/provider/annotation/RequiresRoles.java similarity index 93% rename from core/src/main/java/com/usthe/sureness/provider/annotation/RequiresRoles.java rename to core/src/main/java/org/dromara/sureness/provider/annotation/RequiresRoles.java index 1ce43d4d..0efdf30d 100644 --- a/core/src/main/java/com/usthe/sureness/provider/annotation/RequiresRoles.java +++ b/core/src/main/java/org/dromara/sureness/provider/annotation/RequiresRoles.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.provider.annotation; +package org.dromara.sureness.provider.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/usthe/sureness/provider/annotation/WithoutAuth.java b/core/src/main/java/org/dromara/sureness/provider/annotation/WithoutAuth.java similarity index 92% rename from core/src/main/java/com/usthe/sureness/provider/annotation/WithoutAuth.java rename to core/src/main/java/org/dromara/sureness/provider/annotation/WithoutAuth.java index 82368006..2911f45a 100644 --- a/core/src/main/java/com/usthe/sureness/provider/annotation/WithoutAuth.java +++ b/core/src/main/java/org/dromara/sureness/provider/annotation/WithoutAuth.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.provider.annotation; +package org.dromara.sureness.provider.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentAccountProvider.java b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentAccountProvider.java similarity index 90% rename from core/src/main/java/com/usthe/sureness/provider/ducument/DocumentAccountProvider.java rename to core/src/main/java/org/dromara/sureness/provider/ducument/DocumentAccountProvider.java index 564da519..95230537 100644 --- a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentAccountProvider.java +++ b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentAccountProvider.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.provider.ducument; +package org.dromara.sureness.provider.ducument; -import com.usthe.sureness.provider.DefaultAccount; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.DefaultAccount; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.provider.SurenessAccountProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProvider.java b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentPathTreeProvider.java similarity index 90% rename from core/src/main/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProvider.java rename to core/src/main/java/org/dromara/sureness/provider/ducument/DocumentPathTreeProvider.java index c494ec08..b85abe1c 100644 --- a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProvider.java +++ b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentPathTreeProvider.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.provider.ducument; +package org.dromara.sureness.provider.ducument; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.matcher.SurenessLoadDataException; -import com.usthe.sureness.util.SurenessCommonUtil; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.matcher.SurenessLoadDataException; +import org.dromara.sureness.util.SurenessCommonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceAccess.java b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceAccess.java similarity index 98% rename from core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceAccess.java rename to core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceAccess.java index 564732a6..6cbdd2d7 100644 --- a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceAccess.java +++ b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceAccess.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.provider.ducument; +package org.dromara.sureness.provider.ducument; import org.yaml.snakeyaml.Yaml; diff --git a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceDefaultProvider.java b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceDefaultProvider.java similarity index 90% rename from core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceDefaultProvider.java rename to core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceDefaultProvider.java index 9de8e097..763fe043 100644 --- a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceDefaultProvider.java +++ b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceDefaultProvider.java @@ -1,11 +1,11 @@ -package com.usthe.sureness.provider.ducument; +package org.dromara.sureness.provider.ducument; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.matcher.SurenessLoadDataException; -import com.usthe.sureness.provider.DefaultAccount; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.util.SurenessCommonUtil; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.matcher.SurenessLoadDataException; +import org.dromara.sureness.provider.DefaultAccount; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.util.SurenessCommonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceEntity.java b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceEntity.java similarity index 94% rename from core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceEntity.java rename to core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceEntity.java index d8030b39..f4e855c9 100644 --- a/core/src/main/java/com/usthe/sureness/provider/ducument/DocumentResourceEntity.java +++ b/core/src/main/java/org/dromara/sureness/provider/ducument/DocumentResourceEntity.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.provider.ducument; +package org.dromara.sureness.provider.ducument; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/usthe/sureness/security/XssSqlServletRequestWrapper.java b/core/src/main/java/org/dromara/sureness/security/XssSqlServletRequestWrapper.java similarity index 98% rename from core/src/main/java/com/usthe/sureness/security/XssSqlServletRequestWrapper.java rename to core/src/main/java/org/dromara/sureness/security/XssSqlServletRequestWrapper.java index eaf05fd9..02756fcc 100644 --- a/core/src/main/java/com/usthe/sureness/security/XssSqlServletRequestWrapper.java +++ b/core/src/main/java/org/dromara/sureness/security/XssSqlServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.security; +package org.dromara.sureness.security; import javax.servlet.http.Cookie; diff --git a/core/src/main/java/com/usthe/sureness/security/XssSqlUtil.java b/core/src/main/java/org/dromara/sureness/security/XssSqlUtil.java similarity index 98% rename from core/src/main/java/com/usthe/sureness/security/XssSqlUtil.java rename to core/src/main/java/org/dromara/sureness/security/XssSqlUtil.java index b0600ae6..72db99a2 100644 --- a/core/src/main/java/com/usthe/sureness/security/XssSqlUtil.java +++ b/core/src/main/java/org/dromara/sureness/security/XssSqlUtil.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.security; +package org.dromara.sureness.security; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/usthe/sureness/subject/PrincipalMap.java b/core/src/main/java/org/dromara/sureness/subject/PrincipalMap.java similarity index 95% rename from core/src/main/java/com/usthe/sureness/subject/PrincipalMap.java rename to core/src/main/java/org/dromara/sureness/subject/PrincipalMap.java index 3ab9aa8b..0d54864d 100644 --- a/core/src/main/java/com/usthe/sureness/subject/PrincipalMap.java +++ b/core/src/main/java/org/dromara/sureness/subject/PrincipalMap.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.subject; +package org.dromara.sureness.subject; import java.util.Map; diff --git a/core/src/main/java/com/usthe/sureness/subject/Subject.java b/core/src/main/java/org/dromara/sureness/subject/Subject.java similarity index 96% rename from core/src/main/java/com/usthe/sureness/subject/Subject.java rename to core/src/main/java/org/dromara/sureness/subject/Subject.java index 5eea6d60..f881e6a6 100644 --- a/core/src/main/java/com/usthe/sureness/subject/Subject.java +++ b/core/src/main/java/org/dromara/sureness/subject/Subject.java @@ -1,11 +1,11 @@ -package com.usthe.sureness.subject; +package org.dromara.sureness.subject; -import com.usthe.sureness.subject.support.SurenessSubjectSum; - import java.io.Serializable; import java.util.List; +import org.dromara.sureness.subject.support.SurenessSubjectSum; + /** * AuthenticationToken AuthorizationToken subject * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/subject/SubjectCreate.java b/core/src/main/java/org/dromara/sureness/subject/SubjectCreate.java similarity index 94% rename from core/src/main/java/com/usthe/sureness/subject/SubjectCreate.java rename to core/src/main/java/org/dromara/sureness/subject/SubjectCreate.java index 6647028b..192edfd5 100644 --- a/core/src/main/java/com/usthe/sureness/subject/SubjectCreate.java +++ b/core/src/main/java/org/dromara/sureness/subject/SubjectCreate.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.subject; +package org.dromara.sureness.subject; /** * subject creator interface diff --git a/core/src/main/java/com/usthe/sureness/subject/SubjectFactory.java b/core/src/main/java/org/dromara/sureness/subject/SubjectFactory.java similarity index 95% rename from core/src/main/java/com/usthe/sureness/subject/SubjectFactory.java rename to core/src/main/java/org/dromara/sureness/subject/SubjectFactory.java index 1f2f9bee..741731e7 100644 --- a/core/src/main/java/com/usthe/sureness/subject/SubjectFactory.java +++ b/core/src/main/java/org/dromara/sureness/subject/SubjectFactory.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.subject; +package org.dromara.sureness.subject; import java.util.List; diff --git a/core/src/main/java/com/usthe/sureness/subject/SubjectSum.java b/core/src/main/java/org/dromara/sureness/subject/SubjectSum.java similarity index 96% rename from core/src/main/java/com/usthe/sureness/subject/SubjectSum.java rename to core/src/main/java/org/dromara/sureness/subject/SubjectSum.java index 11749afc..6454d157 100644 --- a/core/src/main/java/com/usthe/sureness/subject/SubjectSum.java +++ b/core/src/main/java/org/dromara/sureness/subject/SubjectSum.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.subject; +package org.dromara.sureness.subject; import java.io.Serializable; import java.util.Collection; diff --git a/core/src/main/java/com/usthe/sureness/subject/SurenessSubjectFactory.java b/core/src/main/java/org/dromara/sureness/subject/SurenessSubjectFactory.java similarity index 96% rename from core/src/main/java/com/usthe/sureness/subject/SurenessSubjectFactory.java rename to core/src/main/java/org/dromara/sureness/subject/SurenessSubjectFactory.java index 9a3967b0..699970a4 100644 --- a/core/src/main/java/com/usthe/sureness/subject/SurenessSubjectFactory.java +++ b/core/src/main/java/org/dromara/sureness/subject/SurenessSubjectFactory.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.subject; +package org.dromara.sureness.subject; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectJakartaServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectJakartaServletCreator.java similarity index 90% rename from core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectJakartaServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectJakartaServletCreator.java index d9078723..4e0bbf8d 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectJakartaServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectJakartaServletCreator.java @@ -1,11 +1,12 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; -import com.usthe.sureness.util.ServletUtil; -import com.usthe.sureness.util.SurenessConstant; import jakarta.servlet.http.HttpServletRequest; + +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.util.ServletUtil; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectJaxRsCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectJaxRsCreator.java similarity index 91% rename from core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectJaxRsCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectJaxRsCreator.java index c8eb7c23..914482d4 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectJaxRsCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectJaxRsCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectServletCreator.java similarity index 90% rename from core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectServletCreator.java index 86cea5bd..0b567dd8 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectServletCreator.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; -import com.usthe.sureness.util.ServletUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.util.ServletUtil; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectSpringReactiveCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectSpringReactiveCreator.java similarity index 91% rename from core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectSpringReactiveCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectSpringReactiveCreator.java index b6bb174f..8ddd1d96 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/BasicSubjectSpringReactiveCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/BasicSubjectSpringReactiveCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectJakartaServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectJakartaServletCreator.java similarity index 93% rename from core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectJakartaServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectJakartaServletCreator.java index 9d6291f4..6ade9676 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectJakartaServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectJakartaServletCreator.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.DigestSubject; -import com.usthe.sureness.util.ServletUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.DigestSubject; +import org.dromara.sureness.util.ServletUtil; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectJaxRsCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectJaxRsCreator.java similarity index 94% rename from core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectJaxRsCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectJaxRsCreator.java index f4f0fcd5..a0ab61dc 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectJaxRsCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectJaxRsCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.DigestSubject; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.DigestSubject; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectServletCreator.java similarity index 93% rename from core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectServletCreator.java index 021392de..6513c755 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectServletCreator.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.DigestSubject; -import com.usthe.sureness.util.ServletUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.DigestSubject; +import org.dromara.sureness.util.ServletUtil; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectSpringReactiveCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectSpringReactiveCreator.java similarity index 94% rename from core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectSpringReactiveCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectSpringReactiveCreator.java index c0ef7b03..15c4744d 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/DigestSubjectSpringReactiveCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/DigestSubjectSpringReactiveCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.DigestSubject; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.DigestSubject; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectJakartaServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectJakartaServletCreator.java similarity index 86% rename from core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectJakartaServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectJakartaServletCreator.java index e47c59b3..039c530f 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectJakartaServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectJakartaServletCreator.java @@ -1,11 +1,11 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.ServletUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.ServletUtil; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectJaxRsCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectJaxRsCreator.java similarity index 87% rename from core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectJaxRsCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectJaxRsCreator.java index e7fb4b81..299b6626 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectJaxRsCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectJaxRsCreator.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectServletCreator.java similarity index 86% rename from core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectServletCreator.java index c437a32c..571d9a88 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectServletCreator.java @@ -1,11 +1,11 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.ServletUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.ServletUtil; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectSpringReactiveCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectSpringReactiveCreator.java similarity index 89% rename from core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectSpringReactiveCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectSpringReactiveCreator.java index 4fc8c3e4..1b10d39b 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectSpringReactiveCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectSpringReactiveCreator.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.SurenessConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsJakartaServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsJakartaServletCreator.java similarity index 81% rename from core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsJakartaServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsJakartaServletCreator.java index 565aa621..d0307894 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsJakartaServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsJakartaServletCreator.java @@ -1,11 +1,11 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.ServletUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.ServletUtil; +import org.dromara.sureness.util.SurenessConstant; import jakarta.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsJaxRsCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsJaxRsCreator.java similarity index 83% rename from core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsJaxRsCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsJaxRsCreator.java index 827e58aa..50ef3949 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsJaxRsCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsJaxRsCreator.java @@ -1,13 +1,13 @@ -package com.usthe.sureness.subject.creater; - -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.SurenessConstant; +package org.dromara.sureness.subject.creater; import javax.ws.rs.container.ContainerRequestContext; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.SurenessConstant; + /** * the subject creator support creating JwtSubject from websocket * only support JAX-RS diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsServletCreator.java similarity index 81% rename from core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsServletCreator.java index 4a1c4c0e..25f25162 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsServletCreator.java @@ -1,14 +1,14 @@ -package com.usthe.sureness.subject.creater; - -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.ServletUtil; -import com.usthe.sureness.util.SurenessConstant; +package org.dromara.sureness.subject.creater; import javax.servlet.http.HttpServletRequest; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.ServletUtil; +import org.dromara.sureness.util.SurenessConstant; + /** * the subject creator support creating JwtSubject from websocket * only support HttpServletRequest diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsSpringReactiveCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsSpringReactiveCreator.java similarity index 85% rename from core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsSpringReactiveCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsSpringReactiveCreator.java index 34b77fa9..d8dd9ceb 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/JwtSubjectWsSpringReactiveCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/JwtSubjectWsSpringReactiveCreator.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.SurenessConstant; import org.springframework.http.server.reactive.ServerHttpRequest; import java.net.InetSocketAddress; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectJakartaServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectJakartaServletCreator.java similarity index 79% rename from core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectJakartaServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectJakartaServletCreator.java index 3d8229e1..ff11b1a1 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectJakartaServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectJakartaServletCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.NoneSubject; -import com.usthe.sureness.util.ServletUtil; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.NoneSubject; +import org.dromara.sureness.util.ServletUtil; import jakarta.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectJaxRsCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectJaxRsCreator.java similarity index 81% rename from core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectJaxRsCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectJaxRsCreator.java index 85e16203..6b1aa186 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectJaxRsCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectJaxRsCreator.java @@ -1,11 +1,11 @@ -package com.usthe.sureness.subject.creater; - -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.NoneSubject; +package org.dromara.sureness.subject.creater; import javax.ws.rs.container.ContainerRequestContext; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.NoneSubject; + /** * the subject creator support creating NoneSubject * all request content can create a NoneSubject diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectServletCreator.java similarity index 79% rename from core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectServletCreator.java index 650e8742..911754e2 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectServletCreator.java @@ -1,12 +1,12 @@ -package com.usthe.sureness.subject.creater; - -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.NoneSubject; -import com.usthe.sureness.util.ServletUtil; +package org.dromara.sureness.subject.creater; import javax.servlet.http.HttpServletRequest; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.NoneSubject; +import org.dromara.sureness.util.ServletUtil; + /** * the subject creator support creating NoneSubject * all request content can create a NoneSubject diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectSpringReactiveCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectSpringReactiveCreator.java similarity index 85% rename from core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectSpringReactiveCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectSpringReactiveCreator.java index 20d0339c..a750ec5b 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/NoneSubjectSpringReactiveCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/NoneSubjectSpringReactiveCreator.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.NoneSubject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.NoneSubject; import org.springframework.http.server.reactive.ServerHttpRequest; import java.net.InetSocketAddress; diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/SessionSubjectJakartaServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/SessionSubjectJakartaServletCreator.java similarity index 86% rename from core/src/main/java/com/usthe/sureness/subject/creater/SessionSubjectJakartaServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/SessionSubjectJakartaServletCreator.java index d80d3ff6..3d74a153 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/SessionSubjectJakartaServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/SessionSubjectJakartaServletCreator.java @@ -1,15 +1,16 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.SessionSubject; -import com.usthe.sureness.util.SurenessConstant; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; import java.util.List; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.SessionSubject; +import org.dromara.sureness.util.SurenessConstant; + /** * the subject creator support creating SessionSubject * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/subject/creater/SessionSubjectServletCreator.java b/core/src/main/java/org/dromara/sureness/subject/creater/SessionSubjectServletCreator.java similarity index 86% rename from core/src/main/java/com/usthe/sureness/subject/creater/SessionSubjectServletCreator.java rename to core/src/main/java/org/dromara/sureness/subject/creater/SessionSubjectServletCreator.java index c722088a..4b86bf85 100644 --- a/core/src/main/java/com/usthe/sureness/subject/creater/SessionSubjectServletCreator.java +++ b/core/src/main/java/org/dromara/sureness/subject/creater/SessionSubjectServletCreator.java @@ -1,13 +1,14 @@ -package com.usthe.sureness.subject.creater; - -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.SessionSubject; -import com.usthe.sureness.util.SurenessConstant; +package org.dromara.sureness.subject.creater; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; + +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.SessionSubject; +import org.dromara.sureness.util.SurenessConstant; + import java.util.List; /** diff --git a/core/src/main/java/com/usthe/sureness/subject/support/DigestSubject.java b/core/src/main/java/org/dromara/sureness/subject/support/DigestSubject.java similarity index 98% rename from core/src/main/java/com/usthe/sureness/subject/support/DigestSubject.java rename to core/src/main/java/org/dromara/sureness/subject/support/DigestSubject.java index 409351e1..235922eb 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/DigestSubject.java +++ b/core/src/main/java/org/dromara/sureness/subject/support/DigestSubject.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.support; - -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; +package org.dromara.sureness.subject.support; import java.util.List; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; + /** * subject for digest auth * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/subject/support/JwtSubject.java b/core/src/main/java/org/dromara/sureness/subject/support/JwtSubject.java similarity index 97% rename from core/src/main/java/com/usthe/sureness/subject/support/JwtSubject.java rename to core/src/main/java/org/dromara/sureness/subject/support/JwtSubject.java index b58795df..74c44486 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/JwtSubject.java +++ b/core/src/main/java/org/dromara/sureness/subject/support/JwtSubject.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.support; - -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; +package org.dromara.sureness.subject.support; import java.util.List; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; + /** * the subject support jwt auth * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/subject/support/NoneSubject.java b/core/src/main/java/org/dromara/sureness/subject/support/NoneSubject.java similarity index 95% rename from core/src/main/java/com/usthe/sureness/subject/support/NoneSubject.java rename to core/src/main/java/org/dromara/sureness/subject/support/NoneSubject.java index a9c33af6..8929e018 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/NoneSubject.java +++ b/core/src/main/java/org/dromara/sureness/subject/support/NoneSubject.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.support; - -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; +package org.dromara.sureness.subject.support; import java.util.List; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; + /** * Subject without authentication information * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/subject/support/PasswordSubject.java b/core/src/main/java/org/dromara/sureness/subject/support/PasswordSubject.java similarity index 97% rename from core/src/main/java/com/usthe/sureness/subject/support/PasswordSubject.java rename to core/src/main/java/org/dromara/sureness/subject/support/PasswordSubject.java index fae362a6..7be21c0f 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/PasswordSubject.java +++ b/core/src/main/java/org/dromara/sureness/subject/support/PasswordSubject.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.support; - -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; +package org.dromara.sureness.subject.support; import java.util.List; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; + /** * the subject support BASIC AUTH or other username-password AUTH * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/subject/support/SessionSubject.java b/core/src/main/java/org/dromara/sureness/subject/support/SessionSubject.java similarity index 96% rename from core/src/main/java/com/usthe/sureness/subject/support/SessionSubject.java rename to core/src/main/java/org/dromara/sureness/subject/support/SessionSubject.java index a8f92638..9f8f594d 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/SessionSubject.java +++ b/core/src/main/java/org/dromara/sureness/subject/support/SessionSubject.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.subject.support; - -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; +package org.dromara.sureness.subject.support; import java.util.List; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; + /** * the session subject * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/subject/support/SinglePrincipalMap.java b/core/src/main/java/org/dromara/sureness/subject/support/SinglePrincipalMap.java similarity index 96% rename from core/src/main/java/com/usthe/sureness/subject/support/SinglePrincipalMap.java rename to core/src/main/java/org/dromara/sureness/subject/support/SinglePrincipalMap.java index 62ddfca8..66472e6d 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/SinglePrincipalMap.java +++ b/core/src/main/java/org/dromara/sureness/subject/support/SinglePrincipalMap.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.subject.support; - -import com.usthe.sureness.subject.PrincipalMap; +package org.dromara.sureness.subject.support; import java.util.*; +import org.dromara.sureness.subject.PrincipalMap; + /** * principal map single impl * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/subject/support/SurenessSubjectSum.java b/core/src/main/java/org/dromara/sureness/subject/support/SurenessSubjectSum.java similarity index 94% rename from core/src/main/java/com/usthe/sureness/subject/support/SurenessSubjectSum.java rename to core/src/main/java/org/dromara/sureness/subject/support/SurenessSubjectSum.java index 98cba1f8..a231d7ea 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/SurenessSubjectSum.java +++ b/core/src/main/java/org/dromara/sureness/subject/support/SurenessSubjectSum.java @@ -1,10 +1,11 @@ -package com.usthe.sureness.subject.support; +package org.dromara.sureness.subject.support; -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.SubjectSum; import java.util.Collection; import java.util.List; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.SubjectSum; + /** * subject summary * @author tomsun28 diff --git a/core/src/main/java/com/usthe/sureness/util/ClassScanner.java b/core/src/main/java/org/dromara/sureness/util/ClassScanner.java similarity index 99% rename from core/src/main/java/com/usthe/sureness/util/ClassScanner.java rename to core/src/main/java/org/dromara/sureness/util/ClassScanner.java index 5ae93977..1945d334 100644 --- a/core/src/main/java/com/usthe/sureness/util/ClassScanner.java +++ b/core/src/main/java/org/dromara/sureness/util/ClassScanner.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/util/JsonWebTokenUtil.java b/core/src/main/java/org/dromara/sureness/util/JsonWebTokenUtil.java similarity index 96% rename from core/src/main/java/com/usthe/sureness/util/JsonWebTokenUtil.java rename to core/src/main/java/org/dromara/sureness/util/JsonWebTokenUtil.java index c7377e12..6c731e8e 100644 --- a/core/src/main/java/com/usthe/sureness/util/JsonWebTokenUtil.java +++ b/core/src/main/java/org/dromara/sureness/util/JsonWebTokenUtil.java @@ -1,306 +1,308 @@ -package com.usthe.sureness.util; - -import com.usthe.sureness.processor.exception.ExtSurenessException; -import io.jsonwebtoken.*; -import io.jsonwebtoken.security.*; -import io.jsonwebtoken.security.SignatureException; - -import javax.xml.bind.DatatypeConverter; -import java.security.Key; -import java.util.*; -import java.util.regex.Pattern; - -/** - * json web token util - * use hmac algorithm, can change the secretKey by setDefaultSecretKey - * @author tomsun28 - * @date 16:29 2018/3/8 - */ -public class JsonWebTokenUtil { - - /** default SUBJECT KEY **/ - private static final String DEFAULT_SECRET_KEY = - "MIIEowIBAl+f/dKhaX0csgOCTlCxq20yhmUea6H6JIpST3ST1SE2Rwp" + - "LnfKefTjsIfJLBa2YkhEqE/GtcHDTNe4CU6+9y/S5z50Kik70LsP43r" + - "RnLN7XNn4wARoQXizIv6MHUsIV+EFfiMw/x7R0ntu4aWr/CWuApcFaj" + - "4mWEa6EwrPHTZmbT5Mt45AM2UYhzDHK+0F0rUq3MwH+oXsm+L3F/zjj" + - "M6EByXIO+SV5+8tVt4bisXQ13rbN0oxhUZR73+LDj9mxa6rFhMW+lfx" + - "CyaFv0bwq2Eik0jdrKUtsA6bx3sDJeFV643R+YYzGMRIqcBIp6AKA98" + - "GM2RIqcBIp6-?::4390fsf4sdl6opf)4ZI:tdQMtcQQ14pkOAQdQ546"; - - /** JWT format has 3 point **/ - private static final int COUNT_3 = 3; - - /** Determine whether it is a base64 string **/ - private static final Pattern BASE64_PATTERN = - Pattern.compile("^([A-Za-z0-9+/_-]+)(=*)$"); - - /** Encryption and decryption signature **/ - private static Key secretKey; - - private static volatile boolean isUsedDefault = true; - - static { - byte[] secretKeyBytes = DatatypeConverter.parseBase64Binary(DEFAULT_SECRET_KEY); - secretKey = Keys.hmacShaKeyFor(secretKeyBytes); - } - - - /** - * issue json web token - * @param id token ID - * @param subject user ID - * @param issuer issuer - * @param period period time(s) - * @param roles Access claim-roles - * @param permissions Access claim-permissions - * @param isRefresh is a refresh token - * @return java.lang.String jwt - */ - @Deprecated - public static String issueJwt(String id, String subject, String issuer, Long period, - List roles, List permissions, - Boolean isRefresh) { - Map customClaimMap = new HashMap<>(4); - customClaimMap.put(SurenessConstant.ROLES, roles); - customClaimMap.put("perms", permissions); - customClaimMap.put("isRefresh", isRefresh); - return issueJwtAll(id, subject, issuer, period, null, null, - null, null, customClaimMap); - } - - /** - * issue json web token - * @param id token ID - * @param subject user ID - * @param issuer issuer - * @param period period time(s) - * @param roles Access claim-roles - * @return java.lang.String jwt - */ - public static String issueJwt(String id, String subject, String issuer, Long period, List roles) { - Map customClaimMap = Collections.singletonMap(SurenessConstant.ROLES, roles); - return issueJwtAll(id, subject, issuer, period, null, null, - null, null, customClaimMap); - } - - /** - * issue all jwt params - * @param id token ID - * @param subject user ID - * @param issuer issuer - * @param period period time(s) - * @param audience this ID Token is intended for, client id info - * @param payload payload - * @param notBefore Not Before(s) - * @param roles roles the user has - * @param headerMap header - * @param customClaimMap custom claim param - * @return json web token - */ - public static String issueJwt(String id, String subject, String issuer, Long period, - String audience, String payload, Long notBefore, List roles, - Map headerMap, Map customClaimMap){ - if (customClaimMap == null) { - customClaimMap = Collections.singletonMap(SurenessConstant.ROLES, roles); - } else { - customClaimMap.put(SurenessConstant.ROLES, roles); - } - return issueJwtAll(id, subject, issuer, period, audience, payload, notBefore, headerMap, customClaimMap); - } - - /** - * issue all jwt params - * @param id token ID - * @param subject user ID - * @param issuer issuer - * @param period period time(s) - * @param roles roles the user has - * @param customClaimMap custom claim param - * @return json web token - */ - public static String issueJwt(String id, String subject, String issuer, Long period, - List roles, Map customClaimMap){ - if (customClaimMap == null) { - customClaimMap = new HashMap<>(8); - } - if (roles != null && !roles.isEmpty()) { - customClaimMap.put(SurenessConstant.ROLES, roles); - } - return issueJwtAll(id, subject, issuer, period, null, null, - null, null, customClaimMap); - } - - /** - * issue jwt params - * @param subject user ID - * @param period period time(s) - * @param roles roles the user has - * @param customClaimMap custom claim param - * @return json web token - */ - public static String issueJwt(String subject, Long period, - List roles, Map customClaimMap){ - String id = UUID.randomUUID().toString(); - String issuer = "sureness-token-server"; - return issueJwt(id, subject, issuer, period, - roles, customClaimMap); - } - - /** - * issue jwt params - * @param subject user ID - * @param period period time(s) - * @param roles roles the user has - * @return json web token - */ - public static String issueJwt(String subject, Long period, List roles){ - String id = UUID.randomUUID().toString(); - String issuer = "sureness-token-server"; - return issueJwt(id, subject, issuer, period, - roles, null); - } - - /** - * issue jwt params - * @param subject user ID - * @param period period time(s) - * @return json web token - */ - public static String issueJwt(String subject, Long period){ - String id = UUID.randomUUID().toString(); - String issuer = "sureness-token-server"; - return issueJwt(id, subject, issuer, period, - null, null); - } - - /** - * issue jwt params - * @param subject user ID - * @param period period time(s) - * @param customClaimMap custom claim param - * @return json web token - */ - public static String issueJwt(String subject, Long period, Map customClaimMap){ - String id = UUID.randomUUID().toString(); - String issuer = "sureness-token-server"; - return issueJwt(id, subject, issuer, period, null, customClaimMap); - } - - /** - * issue all jwt params - * @param id token ID - * @param subject user ID - * @param issuer issuer - * @param period period time(s) - * @param audience this ID Token is intended for, client id info - * @param payload payload - * @param notBefore Not Before(s) - * @param headerMap header - * @param customClaimMap custom claim param - * @return json web token - */ - public static String issueJwtAll(String id, String subject, String issuer, Long period, - String audience, String payload, Long notBefore, - Map headerMap, Map customClaimMap){ - if (isUsedDefault) { - throw new ExtSurenessException("Please config your custom jwt secret. JsonWebTokenUtil.setDefaultSecretKey | sureness.jwt.secret"); - } - long currentTimeMillis = System.currentTimeMillis(); - JwtBuilder jwtBuilder = Jwts.builder(); - if (id != null) { - jwtBuilder.setId(id); - } - if (subject != null) { - jwtBuilder.setSubject(subject); - } - if (issuer != null) { - jwtBuilder.setIssuer(issuer); - } - // set issue create time - jwtBuilder.setIssuedAt(new Date(currentTimeMillis)); - // set expired time - if (null != period) { - jwtBuilder.setExpiration(new Date(currentTimeMillis + period * 1000)); - } - if (null != audience) { - jwtBuilder.setAudience(audience); - } - if (null != payload) { - jwtBuilder.setPayload(payload); - } - if (null != notBefore){ - jwtBuilder.setNotBefore(new Date(notBefore * 1000)); - } - if(null != headerMap) { - jwtBuilder.setHeader(headerMap); - } - //claim param, eg: roles, perms, isRefresh - if (null != customClaimMap) { - customClaimMap.forEach(jwtBuilder::claim); - } - // compress，optional GZIP - jwtBuilder.compressWith(CompressionCodecs.DEFLATE); - // set secret key - jwtBuilder.signWith(secretKey); - return jwtBuilder.compact(); - } - - /** - * To determine whether it is not a JWT - * Use format to judge, no verification - * @param jwt JWT TOKEN - * @return is a JWT return false, else true - */ - public static boolean isNotJsonWebToken(String jwt) { - if (jwt == null || "".equals(jwt)) { - return true; - } - // base64url_encode(Header) + '.' + base64url_encode(Claims) + '.' + base64url_encode(Signature) - String[] jwtArr = jwt.split("\\."); - if (jwtArr.length != COUNT_3) { - return true; - } - for (String jwtTmp : jwtArr) { - if (!BASE64_PATTERN.matcher(jwtTmp).matches()) { - return true; - } - } - return false; - } - - /** - * - * @param jwt json web token - * @return parse content body - * @throws ExpiredJwtException token expired - * @throws UnsupportedJwtException unSupport TOKEN - * @throws MalformedJwtException Parameter format exception - * @throws SignatureException signature exception - * @throws IllegalArgumentException illegal argument - */ - public static Claims parseJwt(String jwt) throws ExpiredJwtException, UnsupportedJwtException, - MalformedJwtException, SignatureException, IllegalArgumentException { - - return Jwts.parserBuilder().setSigningKey(secretKey).build() - .parseClaimsJws(jwt).getBody(); - - // token ID -- claims.getId() - // user ID -- claims.getSubject() - // issuer -- claims.getIssuer() - // issue time -- claims.getIssuedAt() - // audience -- claims.getAudience() - // Access claim-roles -- claims.get("roles", String.class) - // Access claim-permissions -- claims.get("perms", String.class) - } - - /** - * set the jwt secret key - * @param secretNowKeyValue key value - */ - public static void setDefaultSecretKey(String secretNowKeyValue) { - byte[] secretKeyBytes = DatatypeConverter.parseBase64Binary(secretNowKeyValue); - secretKey = Keys.hmacShaKeyFor(secretKeyBytes); - isUsedDefault = false; - } -} +package org.dromara.sureness.util; + +import io.jsonwebtoken.*; +import io.jsonwebtoken.security.*; +import io.jsonwebtoken.security.SignatureException; + +import javax.xml.bind.DatatypeConverter; + +import org.dromara.sureness.processor.exception.ExtSurenessException; + +import java.security.Key; +import java.util.*; +import java.util.regex.Pattern; + +/** + * json web token util + * use hmac algorithm, can change the secretKey by setDefaultSecretKey + * @author tomsun28 + * @date 16:29 2018/3/8 + */ +public class JsonWebTokenUtil { + + /** default SUBJECT KEY **/ + private static final String DEFAULT_SECRET_KEY = + "MIIEowIBAl+f/dKhaX0csgOCTlCxq20yhmUea6H6JIpST3ST1SE2Rwp" + + "LnfKefTjsIfJLBa2YkhEqE/GtcHDTNe4CU6+9y/S5z50Kik70LsP43r" + + "RnLN7XNn4wARoQXizIv6MHUsIV+EFfiMw/x7R0ntu4aWr/CWuApcFaj" + + "4mWEa6EwrPHTZmbT5Mt45AM2UYhzDHK+0F0rUq3MwH+oXsm+L3F/zjj" + + "M6EByXIO+SV5+8tVt4bisXQ13rbN0oxhUZR73+LDj9mxa6rFhMW+lfx" + + "CyaFv0bwq2Eik0jdrKUtsA6bx3sDJeFV643R+YYzGMRIqcBIp6AKA98" + + "GM2RIqcBIp6-?::4390fsf4sdl6opf)4ZI:tdQMtcQQ14pkOAQdQ546"; + + /** JWT format has 3 point **/ + private static final int COUNT_3 = 3; + + /** Determine whether it is a base64 string **/ + private static final Pattern BASE64_PATTERN = + Pattern.compile("^([A-Za-z0-9+/_-]+)(=*)$"); + + /** Encryption and decryption signature **/ + private static Key secretKey; + + private static volatile boolean isUsedDefault = true; + + static { + byte[] secretKeyBytes = DatatypeConverter.parseBase64Binary(DEFAULT_SECRET_KEY); + secretKey = Keys.hmacShaKeyFor(secretKeyBytes); + } + + + /** + * issue json web token + * @param id token ID + * @param subject user ID + * @param issuer issuer + * @param period period time(s) + * @param roles Access claim-roles + * @param permissions Access claim-permissions + * @param isRefresh is a refresh token + * @return java.lang.String jwt + */ + @Deprecated + public static String issueJwt(String id, String subject, String issuer, Long period, + List roles, List permissions, + Boolean isRefresh) { + Map customClaimMap = new HashMap<>(4); + customClaimMap.put(SurenessConstant.ROLES, roles); + customClaimMap.put("perms", permissions); + customClaimMap.put("isRefresh", isRefresh); + return issueJwtAll(id, subject, issuer, period, null, null, + null, null, customClaimMap); + } + + /** + * issue json web token + * @param id token ID + * @param subject user ID + * @param issuer issuer + * @param period period time(s) + * @param roles Access claim-roles + * @return java.lang.String jwt + */ + public static String issueJwt(String id, String subject, String issuer, Long period, List roles) { + Map customClaimMap = Collections.singletonMap(SurenessConstant.ROLES, roles); + return issueJwtAll(id, subject, issuer, period, null, null, + null, null, customClaimMap); + } + + /** + * issue all jwt params + * @param id token ID + * @param subject user ID + * @param issuer issuer + * @param period period time(s) + * @param audience this ID Token is intended for, client id info + * @param payload payload + * @param notBefore Not Before(s) + * @param roles roles the user has + * @param headerMap header + * @param customClaimMap custom claim param + * @return json web token + */ + public static String issueJwt(String id, String subject, String issuer, Long period, + String audience, String payload, Long notBefore, List roles, + Map headerMap, Map customClaimMap){ + if (customClaimMap == null) { + customClaimMap = Collections.singletonMap(SurenessConstant.ROLES, roles); + } else { + customClaimMap.put(SurenessConstant.ROLES, roles); + } + return issueJwtAll(id, subject, issuer, period, audience, payload, notBefore, headerMap, customClaimMap); + } + + /** + * issue all jwt params + * @param id token ID + * @param subject user ID + * @param issuer issuer + * @param period period time(s) + * @param roles roles the user has + * @param customClaimMap custom claim param + * @return json web token + */ + public static String issueJwt(String id, String subject, String issuer, Long period, + List roles, Map customClaimMap){ + if (customClaimMap == null) { + customClaimMap = new HashMap<>(8); + } + if (roles != null && !roles.isEmpty()) { + customClaimMap.put(SurenessConstant.ROLES, roles); + } + return issueJwtAll(id, subject, issuer, period, null, null, + null, null, customClaimMap); + } + + /** + * issue jwt params + * @param subject user ID + * @param period period time(s) + * @param roles roles the user has + * @param customClaimMap custom claim param + * @return json web token + */ + public static String issueJwt(String subject, Long period, + List roles, Map customClaimMap){ + String id = UUID.randomUUID().toString(); + String issuer = "sureness-token-server"; + return issueJwt(id, subject, issuer, period, + roles, customClaimMap); + } + + /** + * issue jwt params + * @param subject user ID + * @param period period time(s) + * @param roles roles the user has + * @return json web token + */ + public static String issueJwt(String subject, Long period, List roles){ + String id = UUID.randomUUID().toString(); + String issuer = "sureness-token-server"; + return issueJwt(id, subject, issuer, period, + roles, null); + } + + /** + * issue jwt params + * @param subject user ID + * @param period period time(s) + * @return json web token + */ + public static String issueJwt(String subject, Long period){ + String id = UUID.randomUUID().toString(); + String issuer = "sureness-token-server"; + return issueJwt(id, subject, issuer, period, + null, null); + } + + /** + * issue jwt params + * @param subject user ID + * @param period period time(s) + * @param customClaimMap custom claim param + * @return json web token + */ + public static String issueJwt(String subject, Long period, Map customClaimMap){ + String id = UUID.randomUUID().toString(); + String issuer = "sureness-token-server"; + return issueJwt(id, subject, issuer, period, null, customClaimMap); + } + + /** + * issue all jwt params + * @param id token ID + * @param subject user ID + * @param issuer issuer + * @param period period time(s) + * @param audience this ID Token is intended for, client id info + * @param payload payload + * @param notBefore Not Before(s) + * @param headerMap header + * @param customClaimMap custom claim param + * @return json web token + */ + public static String issueJwtAll(String id, String subject, String issuer, Long period, + String audience, String payload, Long notBefore, + Map headerMap, Map customClaimMap){ + if (isUsedDefault) { + throw new ExtSurenessException("Please config your custom jwt secret. JsonWebTokenUtil.setDefaultSecretKey | sureness.jwt.secret"); + } + long currentTimeMillis = System.currentTimeMillis(); + JwtBuilder jwtBuilder = Jwts.builder(); + if (id != null) { + jwtBuilder.setId(id); + } + if (subject != null) { + jwtBuilder.setSubject(subject); + } + if (issuer != null) { + jwtBuilder.setIssuer(issuer); + } + // set issue create time + jwtBuilder.setIssuedAt(new Date(currentTimeMillis)); + // set expired time + if (null != period) { + jwtBuilder.setExpiration(new Date(currentTimeMillis + period * 1000)); + } + if (null != audience) { + jwtBuilder.setAudience(audience); + } + if (null != payload) { + jwtBuilder.setPayload(payload); + } + if (null != notBefore){ + jwtBuilder.setNotBefore(new Date(notBefore * 1000)); + } + if(null != headerMap) { + jwtBuilder.setHeader(headerMap); + } + //claim param, eg: roles, perms, isRefresh + if (null != customClaimMap) { + customClaimMap.forEach(jwtBuilder::claim); + } + // compress，optional GZIP + jwtBuilder.compressWith(CompressionCodecs.DEFLATE); + // set secret key + jwtBuilder.signWith(secretKey); + return jwtBuilder.compact(); + } + + /** + * To determine whether it is not a JWT + * Use format to judge, no verification + * @param jwt JWT TOKEN + * @return is a JWT return false, else true + */ + public static boolean isNotJsonWebToken(String jwt) { + if (jwt == null || "".equals(jwt)) { + return true; + } + // base64url_encode(Header) + '.' + base64url_encode(Claims) + '.' + base64url_encode(Signature) + String[] jwtArr = jwt.split("\\."); + if (jwtArr.length != COUNT_3) { + return true; + } + for (String jwtTmp : jwtArr) { + if (!BASE64_PATTERN.matcher(jwtTmp).matches()) { + return true; + } + } + return false; + } + + /** + * + * @param jwt json web token + * @return parse content body + * @throws ExpiredJwtException token expired + * @throws UnsupportedJwtException unSupport TOKEN + * @throws MalformedJwtException Parameter format exception + * @throws SignatureException signature exception + * @throws IllegalArgumentException illegal argument + */ + public static Claims parseJwt(String jwt) throws ExpiredJwtException, UnsupportedJwtException, + MalformedJwtException, SignatureException, IllegalArgumentException { + + return Jwts.parserBuilder().setSigningKey(secretKey).build() + .parseClaimsJws(jwt).getBody(); + + // token ID -- claims.getId() + // user ID -- claims.getSubject() + // issuer -- claims.getIssuer() + // issue time -- claims.getIssuedAt() + // audience -- claims.getAudience() + // Access claim-roles -- claims.get("roles", String.class) + // Access claim-permissions -- claims.get("perms", String.class) + } + + /** + * set the jwt secret key + * @param secretNowKeyValue key value + */ + public static void setDefaultSecretKey(String secretNowKeyValue) { + byte[] secretKeyBytes = DatatypeConverter.parseBase64Binary(secretNowKeyValue); + secretKey = Keys.hmacShaKeyFor(secretKeyBytes); + isUsedDefault = false; + } +} diff --git a/core/src/main/java/com/usthe/sureness/util/Md5Util.java b/core/src/main/java/org/dromara/sureness/util/Md5Util.java similarity index 97% rename from core/src/main/java/com/usthe/sureness/util/Md5Util.java rename to core/src/main/java/org/dromara/sureness/util/Md5Util.java index 0143da4c..3e829e28 100644 --- a/core/src/main/java/com/usthe/sureness/util/Md5Util.java +++ b/core/src/main/java/org/dromara/sureness/util/Md5Util.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/usthe/sureness/util/ServletUtil.java b/core/src/main/java/org/dromara/sureness/util/ServletUtil.java similarity index 99% rename from core/src/main/java/com/usthe/sureness/util/ServletUtil.java rename to core/src/main/java/org/dromara/sureness/util/ServletUtil.java index 9732cf0e..1d59f620 100644 --- a/core/src/main/java/com/usthe/sureness/util/ServletUtil.java +++ b/core/src/main/java/org/dromara/sureness/util/ServletUtil.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; diff --git a/core/src/main/java/com/usthe/sureness/util/SurenessCommonUtil.java b/core/src/main/java/org/dromara/sureness/util/SurenessCommonUtil.java similarity index 98% rename from core/src/main/java/com/usthe/sureness/util/SurenessCommonUtil.java rename to core/src/main/java/org/dromara/sureness/util/SurenessCommonUtil.java index deac7af7..a9f88c72 100644 --- a/core/src/main/java/com/usthe/sureness/util/SurenessCommonUtil.java +++ b/core/src/main/java/org/dromara/sureness/util/SurenessCommonUtil.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; import java.util.Random; import java.util.Set; diff --git a/core/src/main/java/com/usthe/sureness/util/SurenessConstant.java b/core/src/main/java/org/dromara/sureness/util/SurenessConstant.java similarity index 96% rename from core/src/main/java/com/usthe/sureness/util/SurenessConstant.java rename to core/src/main/java/org/dromara/sureness/util/SurenessConstant.java index fa62739c..07e5155c 100644 --- a/core/src/main/java/com/usthe/sureness/util/SurenessConstant.java +++ b/core/src/main/java/org/dromara/sureness/util/SurenessConstant.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; /** * sureness public constant diff --git a/core/src/main/java/com/usthe/sureness/util/SurenessContextHolder.java b/core/src/main/java/org/dromara/sureness/util/SurenessContextHolder.java similarity index 95% rename from core/src/main/java/com/usthe/sureness/util/SurenessContextHolder.java rename to core/src/main/java/org/dromara/sureness/util/SurenessContextHolder.java index b46122aa..a8791ac7 100644 --- a/core/src/main/java/com/usthe/sureness/util/SurenessContextHolder.java +++ b/core/src/main/java/org/dromara/sureness/util/SurenessContextHolder.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectSum; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectSum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/test/java/com/usthe/sureness/DefaultSurenessConfigTest.java b/core/src/test/java/org/dromara/sureness/DefaultSurenessConfigTest.java similarity index 76% rename from core/src/test/java/com/usthe/sureness/DefaultSurenessConfigTest.java rename to core/src/test/java/org/dromara/sureness/DefaultSurenessConfigTest.java index aaa02918..db751e8a 100644 --- a/core/src/test/java/com/usthe/sureness/DefaultSurenessConfigTest.java +++ b/core/src/test/java/org/dromara/sureness/DefaultSurenessConfigTest.java @@ -1,12 +1,13 @@ -package com.usthe.sureness; +package org.dromara.sureness; -import com.usthe.sureness.provider.ducument.DocumentResourceAccess; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +import org.dromara.sureness.DefaultSurenessConfig; +import org.dromara.sureness.provider.ducument.DocumentResourceAccess; + /** * @author tomsun28 * @date 2021/1/17 11:02 diff --git a/core/src/test/java/com/usthe/sureness/matcher/DefaultPathRoleMatcherTest.java b/core/src/test/java/org/dromara/sureness/matcher/DefaultPathRoleMatcherTest.java similarity index 92% rename from core/src/test/java/com/usthe/sureness/matcher/DefaultPathRoleMatcherTest.java rename to core/src/test/java/org/dromara/sureness/matcher/DefaultPathRoleMatcherTest.java index 4bb6c9a0..96edc286 100644 --- a/core/src/test/java/com/usthe/sureness/matcher/DefaultPathRoleMatcherTest.java +++ b/core/src/test/java/org/dromara/sureness/matcher/DefaultPathRoleMatcherTest.java @@ -1,8 +1,10 @@ -package com.usthe.sureness.matcher; +package org.dromara.sureness.matcher; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.support.NoneSubject; -import com.usthe.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.support.NoneSubject; +import org.dromara.sureness.subject.support.PasswordSubject; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/matcher/util/TirePathTreeTest.java b/core/src/test/java/org/dromara/sureness/matcher/util/TirePathTreeTest.java similarity index 98% rename from core/src/test/java/com/usthe/sureness/matcher/util/TirePathTreeTest.java rename to core/src/test/java/org/dromara/sureness/matcher/util/TirePathTreeTest.java index b7eb8243..5d4208ec 100644 --- a/core/src/test/java/com/usthe/sureness/matcher/util/TirePathTreeTest.java +++ b/core/src/test/java/org/dromara/sureness/matcher/util/TirePathTreeTest.java @@ -1,5 +1,6 @@ -package com.usthe.sureness.matcher.util; +package org.dromara.sureness.matcher.util; +import org.dromara.sureness.matcher.util.TirePathTree; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/mgt/SurenessSecurityManagerTest.java b/core/src/test/java/org/dromara/sureness/mgt/SurenessSecurityManagerTest.java similarity index 90% rename from core/src/test/java/com/usthe/sureness/mgt/SurenessSecurityManagerTest.java rename to core/src/test/java/org/dromara/sureness/mgt/SurenessSecurityManagerTest.java index e5a279e8..e8c420ae 100644 --- a/core/src/test/java/com/usthe/sureness/mgt/SurenessSecurityManagerTest.java +++ b/core/src/test/java/org/dromara/sureness/mgt/SurenessSecurityManagerTest.java @@ -1,10 +1,12 @@ -package com.usthe.sureness.mgt; +package org.dromara.sureness.mgt; -import com.usthe.sureness.DefaultSurenessConfig; -import com.usthe.sureness.processor.exception.IncorrectCredentialsException; -import com.usthe.sureness.provider.ducument.DocumentResourceAccess; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.DefaultSurenessConfig; +import org.dromara.sureness.mgt.SecurityManager; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.IncorrectCredentialsException; +import org.dromara.sureness.provider.ducument.DocumentResourceAccess; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProviderTest.java b/core/src/test/java/org/dromara/sureness/provider/annotation/AnnotationPathTreeProviderTest.java similarity index 86% rename from core/src/test/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProviderTest.java rename to core/src/test/java/org/dromara/sureness/provider/annotation/AnnotationPathTreeProviderTest.java index ce2d1c5a..d1dd1758 100644 --- a/core/src/test/java/com/usthe/sureness/provider/annotation/AnnotationPathTreeProviderTest.java +++ b/core/src/test/java/org/dromara/sureness/provider/annotation/AnnotationPathTreeProviderTest.java @@ -1,5 +1,6 @@ -package com.usthe.sureness.provider.annotation; +package org.dromara.sureness.provider.annotation; +import org.dromara.sureness.provider.annotation.AnnotationPathTreeProvider; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProviderTest.java b/core/src/test/java/org/dromara/sureness/provider/ducument/DocumentPathTreeProviderTest.java similarity index 78% rename from core/src/test/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProviderTest.java rename to core/src/test/java/org/dromara/sureness/provider/ducument/DocumentPathTreeProviderTest.java index 0757a206..e6cf6824 100644 --- a/core/src/test/java/com/usthe/sureness/provider/ducument/DocumentPathTreeProviderTest.java +++ b/core/src/test/java/org/dromara/sureness/provider/ducument/DocumentPathTreeProviderTest.java @@ -1,6 +1,8 @@ -package com.usthe.sureness.provider.ducument; +package org.dromara.sureness.provider.ducument; -import com.usthe.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.provider.ducument.DocumentResourceAccess; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/provider/ducument/DocumentResourceAccessTest.java b/core/src/test/java/org/dromara/sureness/provider/ducument/DocumentResourceAccessTest.java similarity index 86% rename from core/src/test/java/com/usthe/sureness/provider/ducument/DocumentResourceAccessTest.java rename to core/src/test/java/org/dromara/sureness/provider/ducument/DocumentResourceAccessTest.java index 7389249e..2e19c536 100644 --- a/core/src/test/java/com/usthe/sureness/provider/ducument/DocumentResourceAccessTest.java +++ b/core/src/test/java/org/dromara/sureness/provider/ducument/DocumentResourceAccessTest.java @@ -1,5 +1,7 @@ -package com.usthe.sureness.provider.ducument; +package org.dromara.sureness.provider.ducument; +import org.dromara.sureness.provider.ducument.DocumentResourceAccess; +import org.dromara.sureness.provider.ducument.DocumentResourceEntity; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.ThrowingSupplier; diff --git a/core/src/test/java/com/usthe/sureness/security/XssSqlUtilTest.java b/core/src/test/java/org/dromara/sureness/security/XssSqlUtilTest.java similarity index 89% rename from core/src/test/java/com/usthe/sureness/security/XssSqlUtilTest.java rename to core/src/test/java/org/dromara/sureness/security/XssSqlUtilTest.java index 8f66d4b2..6bb0d116 100644 --- a/core/src/test/java/com/usthe/sureness/security/XssSqlUtilTest.java +++ b/core/src/test/java/org/dromara/sureness/security/XssSqlUtilTest.java @@ -1,9 +1,11 @@ -package com.usthe.sureness.security; +package org.dromara.sureness.security; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +import org.dromara.sureness.security.XssSqlUtil; + /** * @author tomsun28 * @date 2021/4/2 21:38 diff --git a/core/src/test/java/com/usthe/sureness/subject/SurenessSubjectFactoryTest.java b/core/src/test/java/org/dromara/sureness/subject/SurenessSubjectFactoryTest.java similarity index 80% rename from core/src/test/java/com/usthe/sureness/subject/SurenessSubjectFactoryTest.java rename to core/src/test/java/org/dromara/sureness/subject/SurenessSubjectFactoryTest.java index c5382c1c..b44dcdc5 100644 --- a/core/src/test/java/com/usthe/sureness/subject/SurenessSubjectFactoryTest.java +++ b/core/src/test/java/org/dromara/sureness/subject/SurenessSubjectFactoryTest.java @@ -1,11 +1,14 @@ -package com.usthe.sureness.subject; +package org.dromara.sureness.subject; -import com.usthe.sureness.subject.creater.BasicSubjectServletCreator; -import com.usthe.sureness.subject.creater.DigestSubjectServletCreator; -import com.usthe.sureness.subject.creater.JwtSubjectServletCreator; -import com.usthe.sureness.subject.creater.NoneSubjectServletCreator; -import com.usthe.sureness.subject.support.NoneSubject; -import com.usthe.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.subject.creater.BasicSubjectServletCreator; +import org.dromara.sureness.subject.creater.DigestSubjectServletCreator; +import org.dromara.sureness.subject.creater.JwtSubjectServletCreator; +import org.dromara.sureness.subject.creater.NoneSubjectServletCreator; +import org.dromara.sureness.subject.support.NoneSubject; +import org.dromara.sureness.subject.support.PasswordSubject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/subject/creater/BasicSubjectServletCreatorTest.java b/core/src/test/java/org/dromara/sureness/subject/creater/BasicSubjectServletCreatorTest.java similarity index 91% rename from core/src/test/java/com/usthe/sureness/subject/creater/BasicSubjectServletCreatorTest.java rename to core/src/test/java/org/dromara/sureness/subject/creater/BasicSubjectServletCreatorTest.java index 2815d9bb..059a579e 100644 --- a/core/src/test/java/com/usthe/sureness/subject/creater/BasicSubjectServletCreatorTest.java +++ b/core/src/test/java/org/dromara/sureness/subject/creater/BasicSubjectServletCreatorTest.java @@ -1,6 +1,7 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.creater.BasicSubjectServletCreator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/subject/creater/DigestSubjectServletCreatorTest.java b/core/src/test/java/org/dromara/sureness/subject/creater/DigestSubjectServletCreatorTest.java similarity index 90% rename from core/src/test/java/com/usthe/sureness/subject/creater/DigestSubjectServletCreatorTest.java rename to core/src/test/java/org/dromara/sureness/subject/creater/DigestSubjectServletCreatorTest.java index 1bd7440a..ec5d6473 100644 --- a/core/src/test/java/com/usthe/sureness/subject/creater/DigestSubjectServletCreatorTest.java +++ b/core/src/test/java/org/dromara/sureness/subject/creater/DigestSubjectServletCreatorTest.java @@ -1,6 +1,7 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.creater.DigestSubjectServletCreator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/subject/creater/JwtSubjectServletCreatorTest.java b/core/src/test/java/org/dromara/sureness/subject/creater/JwtSubjectServletCreatorTest.java similarity index 91% rename from core/src/test/java/com/usthe/sureness/subject/creater/JwtSubjectServletCreatorTest.java rename to core/src/test/java/org/dromara/sureness/subject/creater/JwtSubjectServletCreatorTest.java index ccb1fb71..880832d0 100644 --- a/core/src/test/java/com/usthe/sureness/subject/creater/JwtSubjectServletCreatorTest.java +++ b/core/src/test/java/org/dromara/sureness/subject/creater/JwtSubjectServletCreatorTest.java @@ -1,7 +1,8 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.creater.JwtSubjectServletCreator; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/subject/creater/NoneSubjectServletCreatorTest.java b/core/src/test/java/org/dromara/sureness/subject/creater/NoneSubjectServletCreatorTest.java similarity index 86% rename from core/src/test/java/com/usthe/sureness/subject/creater/NoneSubjectServletCreatorTest.java rename to core/src/test/java/org/dromara/sureness/subject/creater/NoneSubjectServletCreatorTest.java index f0e35617..a8834594 100644 --- a/core/src/test/java/com/usthe/sureness/subject/creater/NoneSubjectServletCreatorTest.java +++ b/core/src/test/java/org/dromara/sureness/subject/creater/NoneSubjectServletCreatorTest.java @@ -1,6 +1,7 @@ -package com.usthe.sureness.subject.creater; +package org.dromara.sureness.subject.creater; -import com.usthe.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.creater.NoneSubjectServletCreator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/util/ClassScannerTest.java b/core/src/test/java/org/dromara/sureness/util/ClassScannerTest.java similarity index 87% rename from core/src/test/java/com/usthe/sureness/util/ClassScannerTest.java rename to core/src/test/java/org/dromara/sureness/util/ClassScannerTest.java index 23387ec9..7d8db723 100644 --- a/core/src/test/java/com/usthe/sureness/util/ClassScannerTest.java +++ b/core/src/test/java/org/dromara/sureness/util/ClassScannerTest.java @@ -1,5 +1,6 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; +import org.dromara.sureness.util.ClassScanner; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/core/src/test/java/com/usthe/sureness/util/JsonWebTokenUtilTest.java b/core/src/test/java/org/dromara/sureness/util/JsonWebTokenUtilTest.java similarity index 97% rename from core/src/test/java/com/usthe/sureness/util/JsonWebTokenUtilTest.java rename to core/src/test/java/org/dromara/sureness/util/JsonWebTokenUtilTest.java index a6435e20..5db60c8b 100644 --- a/core/src/test/java/com/usthe/sureness/util/JsonWebTokenUtilTest.java +++ b/core/src/test/java/org/dromara/sureness/util/JsonWebTokenUtilTest.java @@ -1,6 +1,8 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; import io.jsonwebtoken.Claims; + +import org.dromara.sureness.util.JsonWebTokenUtil; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/usthe/sureness/util/Md5UtilTest.java b/core/src/test/java/org/dromara/sureness/util/Md5UtilTest.java similarity index 79% rename from core/src/test/java/com/usthe/sureness/util/Md5UtilTest.java rename to core/src/test/java/org/dromara/sureness/util/Md5UtilTest.java index 272386cc..faac8f48 100644 --- a/core/src/test/java/com/usthe/sureness/util/Md5UtilTest.java +++ b/core/src/test/java/org/dromara/sureness/util/Md5UtilTest.java @@ -1,10 +1,12 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.dromara.sureness.util.Md5Util; + /** * @author tomsun28 * @date 16:28 2020-03-08 diff --git a/core/src/test/java/com/usthe/sureness/util/SurenessCommonUtilTest.java b/core/src/test/java/org/dromara/sureness/util/SurenessCommonUtilTest.java similarity index 91% rename from core/src/test/java/com/usthe/sureness/util/SurenessCommonUtilTest.java rename to core/src/test/java/org/dromara/sureness/util/SurenessCommonUtilTest.java index 4bacb3e6..3c592e96 100644 --- a/core/src/test/java/com/usthe/sureness/util/SurenessCommonUtilTest.java +++ b/core/src/test/java/org/dromara/sureness/util/SurenessCommonUtilTest.java @@ -1,6 +1,7 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; +import org.dromara.sureness.util.SurenessCommonUtil; import org.junit.jupiter.api.Test; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/test/java/com/usthe/sureness/util/SurenessContextHolderTest.java b/core/src/test/java/org/dromara/sureness/util/SurenessContextHolderTest.java similarity index 79% rename from core/src/test/java/com/usthe/sureness/util/SurenessContextHolderTest.java rename to core/src/test/java/org/dromara/sureness/util/SurenessContextHolderTest.java index 14903498..6a178b2c 100644 --- a/core/src/test/java/com/usthe/sureness/util/SurenessContextHolderTest.java +++ b/core/src/test/java/org/dromara/sureness/util/SurenessContextHolderTest.java @@ -1,11 +1,13 @@ -package com.usthe.sureness.util; +package org.dromara.sureness.util; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.subject.support.SurenessSubjectSum; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.subject.support.SurenessSubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; + /** * @author tomsun28 * @date 2021/1/17 22:37 diff --git a/pom.xml b/pom.xml index 864d73dd..968ade49 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.usthe.sureness + org.dromara.sureness sureness pom 1.0.0-SNAPSHOT @@ -32,12 +32,12 @@ - com.usthe.sureness + org.dromara.sureness sureness-core ${sureness.version} - com.usthe.sureness + org.dromara.sureness spring-boot-starter-sureness ${sureness.version} diff --git a/sample-bootstrap/pom.xml b/sample-bootstrap/pom.xml index 1fa443b6..4a3e5c2a 100644 --- a/sample-bootstrap/pom.xml +++ b/sample-bootstrap/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> sureness - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT ../pom.xml @@ -33,7 +33,7 @@ true - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/BootstrapApplication.java b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/BootstrapApplication.java similarity index 90% rename from sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/BootstrapApplication.java rename to sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/BootstrapApplication.java index a7e894f6..52b1f89d 100644 --- a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/BootstrapApplication.java +++ b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/BootstrapApplication.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.bootstrap; +package org.dromara.sureness.sample.bootstrap; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/SurenessFilterExample.java b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/SurenessFilterExample.java similarity index 95% rename from sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/SurenessFilterExample.java rename to sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/SurenessFilterExample.java index af23f5fc..3f9a1c0d 100644 --- a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/SurenessFilterExample.java +++ b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/SurenessFilterExample.java @@ -1,10 +1,11 @@ -package com.usthe.sureness.sample.bootstrap; +package org.dromara.sureness.sample.bootstrap; import com.fasterxml.jackson.databind.ObjectMapper; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; + +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/SurenessConfiguration.java b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/SurenessConfiguration.java similarity index 81% rename from sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/SurenessConfiguration.java rename to sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/SurenessConfiguration.java index a84ec1e0..4dc93a59 100644 --- a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/SurenessConfiguration.java +++ b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/SurenessConfiguration.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.sample.bootstrap.config; +package org.dromara.sureness.sample.bootstrap.config; -import com.usthe.sureness.DefaultSurenessConfig; +import org.dromara.sureness.DefaultSurenessConfig; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/SwaggerConfiguration.java b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/SwaggerConfiguration.java similarity index 96% rename from sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/SwaggerConfiguration.java rename to sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/SwaggerConfiguration.java index d9f9d76a..e239122b 100644 --- a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/SwaggerConfiguration.java +++ b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/SwaggerConfiguration.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.bootstrap.config; +package org.dromara.sureness.sample.bootstrap.config; import org.springframework.context.annotation.Bean; diff --git a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/WebSocketConfig.java b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/WebSocketConfig.java similarity index 88% rename from sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/WebSocketConfig.java rename to sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/WebSocketConfig.java index 87549bbb..e7f71d91 100644 --- a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/config/WebSocketConfig.java +++ b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.bootstrap.config; +package org.dromara.sureness.sample.bootstrap.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/AccountController.java b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/AccountController.java similarity index 87% rename from sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/AccountController.java rename to sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/AccountController.java index aaa91a48..52e8f3b5 100644 --- a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/AccountController.java +++ b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/AccountController.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.sample.bootstrap.controller; +package org.dromara.sureness.sample.bootstrap.controller; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.Md5Util; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.Md5Util; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/SimulateController.java b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/SimulateController.java similarity index 99% rename from sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/SimulateController.java rename to sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/SimulateController.java index 1ad1e81e..1b45018a 100644 --- a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/SimulateController.java +++ b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/SimulateController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.bootstrap.controller; +package org.dromara.sureness.sample.bootstrap.controller; import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; diff --git a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/WebSocketEndpoint.java b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/WebSocketEndpoint.java similarity index 91% rename from sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/WebSocketEndpoint.java rename to sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/WebSocketEndpoint.java index 5a68c2b4..61af7864 100644 --- a/sample-bootstrap/src/main/java/com/usthe/sureness/sample/bootstrap/controller/WebSocketEndpoint.java +++ b/sample-bootstrap/src/main/java/org/dromara/sureness/sample/bootstrap/controller/WebSocketEndpoint.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.sample.bootstrap.controller; +package org.dromara.sureness.sample.bootstrap.controller; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/sample-tom/pom.xml b/sample-tom/pom.xml index 5c63be6d..e75c526d 100644 --- a/sample-tom/pom.xml +++ b/sample-tom/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> sureness - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT ../pom.xml @@ -52,7 +52,7 @@ - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/TomApplication.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/TomApplication.java similarity index 91% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/TomApplication.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/TomApplication.java index 57546172..0eea8bda 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/TomApplication.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/TomApplication.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom; +package org.dromara.sureness.sample.tom; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/AccountController.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/AccountController.java similarity index 93% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/AccountController.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/AccountController.java index 4212752e..a10712bb 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/AccountController.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/AccountController.java @@ -1,10 +1,11 @@ -package com.usthe.sureness.sample.tom.controller; +package org.dromara.sureness.sample.tom.controller; -import com.usthe.sureness.sample.tom.pojo.dto.Account; -import com.usthe.sureness.sample.tom.pojo.dto.Message; -import com.usthe.sureness.sample.tom.service.AccountService; -import com.usthe.sureness.util.JsonWebTokenUtil; import lombok.extern.slf4j.Slf4j; + +import org.dromara.sureness.sample.tom.pojo.dto.Account; +import org.dromara.sureness.sample.tom.pojo.dto.Message; +import org.dromara.sureness.sample.tom.service.AccountService; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/AnnotationController.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/AnnotationController.java similarity index 80% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/AnnotationController.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/AnnotationController.java index cb48ad16..192978bd 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/AnnotationController.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/AnnotationController.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.sample.tom.controller; +package org.dromara.sureness.sample.tom.controller; -import com.usthe.sureness.provider.annotation.RequiresRoles; -import com.usthe.sureness.provider.annotation.WithoutAuth; +import org.dromara.sureness.provider.annotation.RequiresRoles; +import org.dromara.sureness.provider.annotation.WithoutAuth; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/ResourceController.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/ResourceController.java similarity index 94% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/ResourceController.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/ResourceController.java index 12bb93bf..de97057d 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/ResourceController.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/ResourceController.java @@ -1,9 +1,10 @@ -package com.usthe.sureness.sample.tom.controller; +package org.dromara.sureness.sample.tom.controller; -import com.usthe.sureness.sample.tom.pojo.dto.Message; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; -import com.usthe.sureness.sample.tom.service.ResourceService; import lombok.extern.slf4j.Slf4j; + +import org.dromara.sureness.sample.tom.pojo.dto.Message; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.service.ResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/RoleController.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/RoleController.java similarity index 95% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/RoleController.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/RoleController.java index d2d51e69..b2bdec4f 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/RoleController.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/RoleController.java @@ -1,10 +1,11 @@ -package com.usthe.sureness.sample.tom.controller; +package org.dromara.sureness.sample.tom.controller; -import com.usthe.sureness.sample.tom.pojo.dto.Message; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleDO; -import com.usthe.sureness.sample.tom.service.RoleService; import lombok.extern.slf4j.Slf4j; + +import org.dromara.sureness.sample.tom.pojo.dto.Message; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleDO; +import org.dromara.sureness.sample.tom.service.RoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/TokenStorage.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/TokenStorage.java similarity index 97% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/TokenStorage.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/TokenStorage.java index 62f94af5..9067b98e 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/TokenStorage.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/TokenStorage.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.controller; +package org.dromara.sureness.sample.tom.controller; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/UserController.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/UserController.java similarity index 90% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/UserController.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/UserController.java index 8ebb537e..a5a9c529 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/controller/UserController.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/controller/UserController.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.sample.tom.controller; +package org.dromara.sureness.sample.tom.controller; -import com.usthe.sureness.sample.tom.pojo.dto.Message; -import com.usthe.sureness.sample.tom.service.AccountService; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.sample.tom.pojo.dto.Message; +import org.dromara.sureness.sample.tom.service.AccountService; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthResourceDao.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthResourceDao.java similarity index 95% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthResourceDao.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthResourceDao.java index d4fd658e..493b9447 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthResourceDao.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthResourceDao.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthRoleDao.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthRoleDao.java similarity index 86% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthRoleDao.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthRoleDao.java index 6f927e27..b8f89570 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthRoleDao.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthRoleDao.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleDO; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthRoleResourceBindDao.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthRoleResourceBindDao.java similarity index 86% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthRoleResourceBindDao.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthRoleResourceBindDao.java index 820df165..49fa6d5c 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthRoleResourceBindDao.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthRoleResourceBindDao.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleResourceBindDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleResourceBindDO; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthUserDao.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthUserDao.java similarity index 90% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthUserDao.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthUserDao.java index cec17e58..6c221e53 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthUserDao.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthUserDao.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.pojo.entity.AuthUserDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthUserDO; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthUserRoleBindDao.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthUserRoleBindDao.java similarity index 84% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthUserRoleBindDao.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthUserRoleBindDao.java index 2e182de8..88928a3d 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/dao/AuthUserRoleBindDao.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/dao/AuthUserRoleBindDao.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthUserRoleBindDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthUserRoleBindDO; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/handler/GlobalExceptionHandler.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/handler/GlobalExceptionHandler.java similarity index 95% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/handler/GlobalExceptionHandler.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/handler/GlobalExceptionHandler.java index 1de9e85c..5184de48 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/handler/GlobalExceptionHandler.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/handler/GlobalExceptionHandler.java @@ -1,8 +1,9 @@ -package com.usthe.sureness.sample.tom.handler; +package org.dromara.sureness.sample.tom.handler; -import com.usthe.sureness.sample.tom.pojo.dto.Message; -import com.usthe.sureness.sample.tom.service.impl.DataConflictException; import lombok.extern.slf4j.Slf4j; + +import org.dromara.sureness.sample.tom.pojo.dto.Message; +import org.dromara.sureness.sample.tom.service.impl.DataConflictException; import org.springframework.dao.DataAccessException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/dto/Account.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/dto/Account.java similarity index 92% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/dto/Account.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/dto/Account.java index 23e499ab..f47ad48e 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/dto/Account.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/dto/Account.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.pojo.dto; +package org.dromara.sureness.sample.tom.pojo.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/dto/Message.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/dto/Message.java similarity index 91% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/dto/Message.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/dto/Message.java index 8bf28878..b0002953 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/dto/Message.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/dto/Message.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.pojo.dto; +package org.dromara.sureness.sample.tom.pojo.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthResourceDO.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthResourceDO.java similarity index 96% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthResourceDO.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthResourceDO.java index 11479f8f..9dcc4126 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthResourceDO.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthResourceDO.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.pojo.entity; +package org.dromara.sureness.sample.tom.pojo.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthRoleDO.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthRoleDO.java similarity index 95% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthRoleDO.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthRoleDO.java index 3fd531f6..90ec05a8 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthRoleDO.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthRoleDO.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.pojo.entity; +package org.dromara.sureness.sample.tom.pojo.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthRoleResourceBindDO.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthRoleResourceBindDO.java similarity index 94% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthRoleResourceBindDO.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthRoleResourceBindDO.java index 65eaa884..992be21d 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthRoleResourceBindDO.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthRoleResourceBindDO.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.pojo.entity; +package org.dromara.sureness.sample.tom.pojo.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthUserDO.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthUserDO.java similarity index 96% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthUserDO.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthUserDO.java index a4798b6d..7014c0a8 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthUserDO.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthUserDO.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.pojo.entity; +package org.dromara.sureness.sample.tom.pojo.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthUserRoleBindDO.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthUserRoleBindDO.java similarity index 94% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthUserRoleBindDO.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthUserRoleBindDO.java index 38fd99a5..504be11f 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthUserRoleBindDO.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/pojo/entity/AuthUserRoleBindDO.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.pojo.entity; +package org.dromara.sureness.sample.tom.pojo.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/AccountService.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/AccountService.java similarity index 90% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/AccountService.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/AccountService.java index aeb8fc6f..846c4630 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/AccountService.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/AccountService.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.sample.tom.service; - -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.sample.tom.pojo.dto.Account; +package org.dromara.sureness.sample.tom.service; import java.util.List; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.sample.tom.pojo.dto.Account; + /** * @author tomsun28 * @date 00:12 2019-08-01 diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/ResourceService.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/ResourceService.java similarity index 93% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/ResourceService.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/ResourceService.java index 37907ed0..fa339247 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/ResourceService.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/ResourceService.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.sample.tom.service; +package org.dromara.sureness.sample.tom.service; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; import org.springframework.data.domain.Page; import java.util.List; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/RoleService.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/RoleService.java similarity index 92% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/RoleService.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/RoleService.java index a4432938..c63a2083 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/RoleService.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/RoleService.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.sample.tom.service; +package org.dromara.sureness.sample.tom.service; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleDO; import org.springframework.data.domain.Page; import java.util.List; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/AccountServiceImpl.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/AccountServiceImpl.java similarity index 85% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/AccountServiceImpl.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/AccountServiceImpl.java index 6a454641..776eafad 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/AccountServiceImpl.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/AccountServiceImpl.java @@ -1,15 +1,15 @@ -package com.usthe.sureness.sample.tom.service.impl; +package org.dromara.sureness.sample.tom.service.impl; -import com.usthe.sureness.provider.DefaultAccount; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.sample.tom.dao.AuthUserDao; -import com.usthe.sureness.sample.tom.dao.AuthUserRoleBindDao; -import com.usthe.sureness.sample.tom.pojo.dto.Account; -import com.usthe.sureness.sample.tom.pojo.entity.AuthUserDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthUserRoleBindDO; -import com.usthe.sureness.sample.tom.service.AccountService; -import com.usthe.sureness.util.Md5Util; -import com.usthe.sureness.util.SurenessCommonUtil; +import org.dromara.sureness.provider.DefaultAccount; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.sample.tom.dao.AuthUserDao; +import org.dromara.sureness.sample.tom.dao.AuthUserRoleBindDao; +import org.dromara.sureness.sample.tom.pojo.dto.Account; +import org.dromara.sureness.sample.tom.pojo.entity.AuthUserDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthUserRoleBindDO; +import org.dromara.sureness.sample.tom.service.AccountService; +import org.dromara.sureness.util.Md5Util; +import org.dromara.sureness.util.SurenessCommonUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/DataConflictException.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/DataConflictException.java similarity index 80% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/DataConflictException.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/DataConflictException.java index 2bef6abb..93497f00 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/DataConflictException.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/DataConflictException.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom.service.impl; +package org.dromara.sureness.sample.tom.service.impl; /** diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/ResourceServiceImpl.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/ResourceServiceImpl.java similarity index 91% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/ResourceServiceImpl.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/ResourceServiceImpl.java index fd3e1836..940e31b3 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/ResourceServiceImpl.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/ResourceServiceImpl.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.sample.tom.service.impl; +package org.dromara.sureness.sample.tom.service.impl; -import com.usthe.sureness.sample.tom.dao.AuthResourceDao; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; -import com.usthe.sureness.sample.tom.service.ResourceService; +import org.dromara.sureness.sample.tom.dao.AuthResourceDao; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.service.ResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/RoleServiceImpl.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/RoleServiceImpl.java similarity index 86% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/RoleServiceImpl.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/RoleServiceImpl.java index f0051cd1..e37a7d9e 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/service/impl/RoleServiceImpl.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/service/impl/RoleServiceImpl.java @@ -1,13 +1,13 @@ -package com.usthe.sureness.sample.tom.service.impl; - -import com.usthe.sureness.matcher.TreePathRoleMatcher; -import com.usthe.sureness.sample.tom.dao.AuthResourceDao; -import com.usthe.sureness.sample.tom.dao.AuthRoleDao; -import com.usthe.sureness.sample.tom.dao.AuthRoleResourceBindDao; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleResourceBindDO; -import com.usthe.sureness.sample.tom.service.RoleService; +package org.dromara.sureness.sample.tom.service.impl; + +import org.dromara.sureness.matcher.TreePathRoleMatcher; +import org.dromara.sureness.sample.tom.dao.AuthResourceDao; +import org.dromara.sureness.sample.tom.dao.AuthRoleDao; +import org.dromara.sureness.sample.tom.dao.AuthRoleResourceBindDao; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleResourceBindDO; +import org.dromara.sureness.sample.tom.service.RoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/SurenessFilterExample.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/SurenessFilterExample.java similarity index 86% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/SurenessFilterExample.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/SurenessFilterExample.java index 92a3fc26..76682fb9 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/SurenessFilterExample.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/SurenessFilterExample.java @@ -1,16 +1,17 @@ -package com.usthe.sureness.sample.tom.sureness; +package org.dromara.sureness.sample.tom.sureness; import com.fasterxml.jackson.databind.ObjectMapper; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.DisabledAccountException; -import com.usthe.sureness.processor.exception.ExcessiveAttemptsException; -import com.usthe.sureness.processor.exception.ExpiredCredentialsException; -import com.usthe.sureness.processor.exception.IncorrectCredentialsException; -import com.usthe.sureness.processor.exception.UnauthorizedException; -import com.usthe.sureness.processor.exception.UnknownAccountException; -import com.usthe.sureness.sample.tom.sureness.processor.RefreshExpiredTokenException; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; + +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.DisabledAccountException; +import org.dromara.sureness.processor.exception.ExcessiveAttemptsException; +import org.dromara.sureness.processor.exception.ExpiredCredentialsException; +import org.dromara.sureness.processor.exception.IncorrectCredentialsException; +import org.dromara.sureness.processor.exception.UnauthorizedException; +import org.dromara.sureness.processor.exception.UnknownAccountException; +import org.dromara.sureness.sample.tom.sureness.processor.RefreshExpiredTokenException; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/config/SurenessConfiguration.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/config/SurenessConfiguration.java similarity index 73% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/config/SurenessConfiguration.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/config/SurenessConfiguration.java index 3ad6296a..e690cace 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/config/SurenessConfiguration.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/config/SurenessConfiguration.java @@ -1,27 +1,27 @@ -package com.usthe.sureness.sample.tom.sureness.config; +package org.dromara.sureness.sample.tom.sureness.config; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.matcher.TreePathRoleMatcher; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.ProcessorManager; -import com.usthe.sureness.processor.support.JwtProcessor; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.annotation.AnnotationPathTreeProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.sample.tom.sureness.processor.CustomTokenProcessor; -import com.usthe.sureness.sample.tom.sureness.subject.CustomPasswdSubjectCreator; -import com.usthe.sureness.sample.tom.sureness.subject.CustomTokenSubjectCreator; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; -import com.usthe.sureness.subject.creater.BasicSubjectServletCreator; -import com.usthe.sureness.subject.creater.JwtSubjectServletCreator; -import com.usthe.sureness.subject.creater.NoneSubjectServletCreator; -import com.usthe.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.matcher.TreePathRoleMatcher; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.ProcessorManager; +import org.dromara.sureness.processor.support.JwtProcessor; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.annotation.AnnotationPathTreeProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.sample.tom.sureness.processor.CustomTokenProcessor; +import org.dromara.sureness.sample.tom.sureness.subject.CustomPasswdSubjectCreator; +import org.dromara.sureness.sample.tom.sureness.subject.CustomTokenSubjectCreator; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.subject.creater.BasicSubjectServletCreator; +import org.dromara.sureness.subject.creater.JwtSubjectServletCreator; +import org.dromara.sureness.subject.creater.NoneSubjectServletCreator; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java similarity index 89% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java index 08e49b40..5b86c4e5 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java @@ -1,12 +1,12 @@ -package com.usthe.sureness.sample.tom.sureness.processor; +package org.dromara.sureness.sample.tom.sureness.processor; -import com.usthe.sureness.processor.BaseProcessor; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.sample.tom.controller.TokenStorage; -import com.usthe.sureness.sample.tom.sureness.subject.CustomTokenSubject; -import com.usthe.sureness.subject.Subject; +import org.dromara.sureness.processor.BaseProcessor; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.sample.tom.controller.TokenStorage; +import org.dromara.sureness.sample.tom.sureness.subject.CustomTokenSubject; +import org.dromara.sureness.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/RefreshExpiredTokenException.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/processor/RefreshExpiredTokenException.java similarity index 64% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/RefreshExpiredTokenException.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/processor/RefreshExpiredTokenException.java index c9b0c75b..3d86da1f 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/RefreshExpiredTokenException.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/processor/RefreshExpiredTokenException.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.sample.tom.sureness.processor; +package org.dromara.sureness.sample.tom.sureness.processor; -import com.usthe.sureness.processor.exception.SurenessAuthenticationException; +import org.dromara.sureness.processor.exception.SurenessAuthenticationException; /** * refresh token message diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabaseAccountProvider.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/provider/DatabaseAccountProvider.java similarity index 67% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabaseAccountProvider.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/provider/DatabaseAccountProvider.java index ce245225..a33b77a0 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabaseAccountProvider.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/provider/DatabaseAccountProvider.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.sample.tom.sureness.provider; +package org.dromara.sureness.sample.tom.sureness.provider; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.sample.tom.service.AccountService; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.sample.tom.service.AccountService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java similarity index 77% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java index 7026474c..63de1919 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/provider/DatabasePathTreeProvider.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.sample.tom.sureness.provider; +package org.dromara.sureness.sample.tom.sureness.provider; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.sample.tom.service.ResourceService; -import com.usthe.sureness.util.SurenessCommonUtil; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.sample.tom.service.ResourceService; +import org.dromara.sureness.util.SurenessCommonUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomPasswdSubjectCreator.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomPasswdSubjectCreator.java similarity index 89% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomPasswdSubjectCreator.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomPasswdSubjectCreator.java index 07a67334..14f0a7d3 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomPasswdSubjectCreator.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomPasswdSubjectCreator.java @@ -1,11 +1,11 @@ -package com.usthe.sureness.sample.tom.sureness.subject; - -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; +package org.dromara.sureness.sample.tom.sureness.subject; import javax.servlet.http.HttpServletRequest; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; + /** * custom subject creator * A custom creator is demonstrated here diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubject.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomTokenSubject.java similarity index 96% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubject.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomTokenSubject.java index 07a5fda7..4f1bb133 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubject.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomTokenSubject.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.sample.tom.sureness.subject; - -import com.usthe.sureness.subject.PrincipalMap; -import com.usthe.sureness.subject.Subject; +package org.dromara.sureness.sample.tom.sureness.subject; import java.util.List; +import org.dromara.sureness.subject.PrincipalMap; +import org.dromara.sureness.subject.Subject; + /** * custom define token subject * @author tomsun28 diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubjectCreator.java b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomTokenSubjectCreator.java similarity index 91% rename from sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubjectCreator.java rename to sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomTokenSubjectCreator.java index c2024ac7..f6099ee1 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubjectCreator.java +++ b/sample-tom/src/main/java/org/dromara/sureness/sample/tom/sureness/subject/CustomTokenSubjectCreator.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.sample.tom.sureness.subject; +package org.dromara.sureness.sample.tom.sureness.subject; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/TomApplicationTest.java b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/TomApplicationTest.java similarity index 80% rename from sample-tom/src/test/java/com/usthe/sureness/sample/tom/TomApplicationTest.java rename to sample-tom/src/test/java/org/dromara/sureness/sample/tom/TomApplicationTest.java index 502a5ae0..ead459c2 100644 --- a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/TomApplicationTest.java +++ b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/TomApplicationTest.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.tom; +package org.dromara.sureness.sample.tom; import org.springframework.boot.test.context.SpringBootTest; diff --git a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthResourceDaoTest.java b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthResourceDaoTest.java similarity index 93% rename from sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthResourceDaoTest.java rename to sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthResourceDaoTest.java index be939285..84227a61 100644 --- a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthResourceDaoTest.java +++ b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthResourceDaoTest.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.sample.tom.dao; - -import com.usthe.sureness.sample.tom.TomApplicationTest; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; +package org.dromara.sureness.sample.tom.dao; import org.assertj.core.api.Assertions; +import org.dromara.sureness.sample.tom.TomApplicationTest; +import org.dromara.sureness.sample.tom.dao.AuthResourceDao; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthRoleDaoTest.java b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthRoleDaoTest.java similarity index 85% rename from sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthRoleDaoTest.java rename to sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthRoleDaoTest.java index f5c7a7e8..e654f7a9 100644 --- a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthRoleDaoTest.java +++ b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthRoleDaoTest.java @@ -1,8 +1,9 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.TomApplicationTest; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleDO; import org.assertj.core.api.Assertions; +import org.dromara.sureness.sample.tom.TomApplicationTest; +import org.dromara.sureness.sample.tom.dao.AuthRoleDao; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleDO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthRoleResourceBindDaoTest.java b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthRoleResourceBindDaoTest.java similarity index 85% rename from sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthRoleResourceBindDaoTest.java rename to sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthRoleResourceBindDaoTest.java index f52ef48a..13c24027 100644 --- a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthRoleResourceBindDaoTest.java +++ b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthRoleResourceBindDaoTest.java @@ -1,10 +1,13 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.TomApplicationTest; -import com.usthe.sureness.sample.tom.pojo.entity.AuthResourceDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleResourceBindDO; import org.assertj.core.api.Assertions; +import org.dromara.sureness.sample.tom.TomApplicationTest; +import org.dromara.sureness.sample.tom.dao.AuthResourceDao; +import org.dromara.sureness.sample.tom.dao.AuthRoleDao; +import org.dromara.sureness.sample.tom.dao.AuthRoleResourceBindDao; +import org.dromara.sureness.sample.tom.pojo.entity.AuthResourceDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleResourceBindDO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthUserDaoTest.java b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthUserDaoTest.java similarity index 85% rename from sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthUserDaoTest.java rename to sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthUserDaoTest.java index 54b8e264..b889aea9 100644 --- a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthUserDaoTest.java +++ b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthUserDaoTest.java @@ -1,9 +1,10 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.TomApplicationTest; -import com.usthe.sureness.sample.tom.pojo.entity.AuthUserDO; import org.assertj.core.api.Assertions; +import org.dromara.sureness.sample.tom.TomApplicationTest; +import org.dromara.sureness.sample.tom.dao.AuthUserDao; +import org.dromara.sureness.sample.tom.pojo.entity.AuthUserDO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthUserRoleBindDaoTest.java b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthUserRoleBindDaoTest.java similarity index 84% rename from sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthUserRoleBindDaoTest.java rename to sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthUserRoleBindDaoTest.java index e9220324..1dc8e4b1 100644 --- a/sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthUserRoleBindDaoTest.java +++ b/sample-tom/src/test/java/org/dromara/sureness/sample/tom/dao/AuthUserRoleBindDaoTest.java @@ -1,10 +1,13 @@ -package com.usthe.sureness.sample.tom.dao; +package org.dromara.sureness.sample.tom.dao; -import com.usthe.sureness.sample.tom.TomApplicationTest; -import com.usthe.sureness.sample.tom.pojo.entity.AuthRoleDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthUserDO; -import com.usthe.sureness.sample.tom.pojo.entity.AuthUserRoleBindDO; import org.assertj.core.api.Assertions; +import org.dromara.sureness.sample.tom.TomApplicationTest; +import org.dromara.sureness.sample.tom.dao.AuthRoleDao; +import org.dromara.sureness.sample.tom.dao.AuthUserDao; +import org.dromara.sureness.sample.tom.dao.AuthUserRoleBindDao; +import org.dromara.sureness.sample.tom.pojo.entity.AuthRoleDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthUserDO; +import org.dromara.sureness.sample.tom.pojo.entity.AuthUserRoleBindDO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/samples/javalin-sureness/pom.xml b/samples/javalin-sureness/pom.xml index 167ba460..c9b914b6 100644 --- a/samples/javalin-sureness/pom.xml +++ b/samples/javalin-sureness/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ 3.13.6 - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/javalin-sureness/src/main/java/com/usthe/sureness/javalin/Application.java b/samples/javalin-sureness/src/main/java/org/dromara/sureness/javalin/Application.java similarity index 92% rename from samples/javalin-sureness/src/main/java/com/usthe/sureness/javalin/Application.java rename to samples/javalin-sureness/src/main/java/org/dromara/sureness/javalin/Application.java index 82aa1225..7af4635f 100644 --- a/samples/javalin-sureness/src/main/java/com/usthe/sureness/javalin/Application.java +++ b/samples/javalin-sureness/src/main/java/org/dromara/sureness/javalin/Application.java @@ -1,12 +1,13 @@ -package com.usthe.sureness.javalin; +package org.dromara.sureness.javalin; -import com.usthe.sureness.DefaultSurenessConfig; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.SurenessContextHolder; import io.javalin.Javalin; + +import org.dromara.sureness.DefaultSurenessConfig; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/jfinal-sureness/pom.xml b/samples/jfinal-sureness/pom.xml index 3471b10d..b23aec7f 100644 --- a/samples/jfinal-sureness/pom.xml +++ b/samples/jfinal-sureness/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -24,7 +24,7 @@ 4.9.11 - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/Application.java b/samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/Application.java similarity index 90% rename from samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/Application.java rename to samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/Application.java index cf0ed462..5710a491 100644 --- a/samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/Application.java +++ b/samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/Application.java @@ -1,9 +1,10 @@ -package com.usthe.sureness.jfinal; +package org.dromara.sureness.jfinal; + +import org.dromara.sureness.DefaultSurenessConfig; import com.jfinal.config.*; import com.jfinal.server.undertow.UndertowServer; import com.jfinal.template.Engine; -import com.usthe.sureness.DefaultSurenessConfig; /** * startup diff --git a/samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/BlogController.java b/samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/BlogController.java similarity index 93% rename from samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/BlogController.java rename to samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/BlogController.java index d55e441e..48d0ab80 100644 --- a/samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/BlogController.java +++ b/samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/BlogController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.jfinal; +package org.dromara.sureness.jfinal; import com.jfinal.aop.Before; import com.jfinal.core.Controller; diff --git a/samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/SurenessInterceptor.java b/samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/SurenessInterceptor.java similarity index 90% rename from samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/SurenessInterceptor.java rename to samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/SurenessInterceptor.java index 06c9baeb..f5519982 100644 --- a/samples/jfinal-sureness/src/main/java/com/usthe/sureness/jfinal/SurenessInterceptor.java +++ b/samples/jfinal-sureness/src/main/java/org/dromara/sureness/jfinal/SurenessInterceptor.java @@ -1,16 +1,17 @@ -package com.usthe.sureness.jfinal; +package org.dromara.sureness.jfinal; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; import javax.servlet.http.HttpServletRequest; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; + /** * sureness interceptor to protect api diff --git a/samples/ktor-sureness/pom.xml b/samples/ktor-sureness/pom.xml index aa27827f..ea45fef6 100644 --- a/samples/ktor-sureness/pom.xml +++ b/samples/ktor-sureness/pom.xml @@ -3,7 +3,7 @@ 4.0.0 samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT ktor-sureness @@ -34,7 +34,7 @@ - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/ktor-sureness/resources/application.conf b/samples/ktor-sureness/resources/application.conf index a8171f58..ded6abf4 100644 --- a/samples/ktor-sureness/resources/application.conf +++ b/samples/ktor-sureness/resources/application.conf @@ -4,6 +4,6 @@ ktor { port = ${?PORT} } application { - modules = [ com.usthe.sureness.demo.ApplicationKt.module ] + modules = [ org.dromara.sureness.demo.ApplicationKt.module ] } } diff --git a/samples/ktor-sureness/src/Application.kt b/samples/ktor-sureness/src/Application.kt index 8060d365..5b560170 100644 --- a/samples/ktor-sureness/src/Application.kt +++ b/samples/ktor-sureness/src/Application.kt @@ -1,9 +1,9 @@ package com.usthe.sureness.demo -import com.usthe.sureness.DefaultSurenessConfig -import com.usthe.sureness.mgt.SurenessSecurityManager -import com.usthe.sureness.processor.exception.* -import com.usthe.sureness.util.SurenessContextHolder +import org.dromara.sureness.DefaultSurenessConfig +import org.dromara.sureness.mgt.SurenessSecurityManager +import org.dromara.sureness.processor.exception.* +import org.dromara.sureness.util.SurenessContextHolder import io.ktor.application.Application import io.ktor.application.ApplicationCallPipeline import io.ktor.application.call diff --git a/samples/micro-profile-sureness/pom.xml b/samples/micro-profile-sureness/pom.xml index 5a382fcc..1d69ed73 100644 --- a/samples/micro-profile-sureness/pom.xml +++ b/samples/micro-profile-sureness/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ provided - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/DemoRestApplication.java b/samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/DemoRestApplication.java similarity index 76% rename from samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/DemoRestApplication.java rename to samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/DemoRestApplication.java index 0dac4080..92321de1 100644 --- a/samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/DemoRestApplication.java +++ b/samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/DemoRestApplication.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.microprofile; - -import com.usthe.sureness.DefaultSurenessConfig; +package org.dromara.sureness.microprofile; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; +import org.dromara.sureness.DefaultSurenessConfig; + /** * @author Lenovo */ diff --git a/samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/HelloController.java b/samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/HelloController.java similarity index 85% rename from samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/HelloController.java rename to samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/HelloController.java index 0b45ad0d..fc6d83d3 100644 --- a/samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/HelloController.java +++ b/samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/HelloController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.microprofile; +package org.dromara.sureness.microprofile; import javax.inject.Singleton; import javax.ws.rs.GET; diff --git a/samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/ResourceController.java b/samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/ResourceController.java similarity index 97% rename from samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/ResourceController.java rename to samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/ResourceController.java index f934e4ce..2bc5008c 100644 --- a/samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/ResourceController.java +++ b/samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/ResourceController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.microprofile; +package org.dromara.sureness.microprofile; import javax.ws.rs.*; import javax.ws.rs.core.Context; diff --git a/samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/SurenessFilter.java b/samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/SurenessFilter.java similarity index 88% rename from samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/SurenessFilter.java rename to samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/SurenessFilter.java index 254cad32..bc43a54b 100644 --- a/samples/micro-profile-sureness/src/main/java/com/usthe/sureness/microprofile/SurenessFilter.java +++ b/samples/micro-profile-sureness/src/main/java/org/dromara/sureness/microprofile/SurenessFilter.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.microprofile; +package org.dromara.sureness.microprofile; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/micronaut-sureness/pom.xml b/samples/micronaut-sureness/pom.xml index ae9a78cb..555fd45f 100644 --- a/samples/micronaut-sureness/pom.xml +++ b/samples/micronaut-sureness/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -37,7 +37,7 @@ - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/Application.java b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/Application.java similarity index 82% rename from samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/Application.java rename to samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/Application.java index be781b4d..26c4377a 100644 --- a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/Application.java +++ b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/Application.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.micronaut; +package org.dromara.sureness.micronaut; import io.micronaut.runtime.Micronaut; diff --git a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/controller/SimulateController.java b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/controller/SimulateController.java similarity index 99% rename from samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/controller/SimulateController.java rename to samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/controller/SimulateController.java index 62129f51..ab01e1cb 100644 --- a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/controller/SimulateController.java +++ b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/controller/SimulateController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.micronaut.controller; +package org.dromara.sureness.micronaut.controller; import io.micronaut.core.util.StringUtils; import io.micronaut.http.HttpRequest; diff --git a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/support/BasicSubjectReactiveCreator.java b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/support/BasicSubjectReactiveCreator.java similarity index 92% rename from samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/support/BasicSubjectReactiveCreator.java rename to samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/support/BasicSubjectReactiveCreator.java index 38797447..d02902b3 100644 --- a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/support/BasicSubjectReactiveCreator.java +++ b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/support/BasicSubjectReactiveCreator.java @@ -1,9 +1,10 @@ -package com.usthe.sureness.micronaut.support; +package org.dromara.sureness.micronaut.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; import io.micronaut.http.HttpRequest; + +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/support/NoneSubjectReactiveCreator.java b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/support/NoneSubjectReactiveCreator.java similarity index 80% rename from samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/support/NoneSubjectReactiveCreator.java rename to samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/support/NoneSubjectReactiveCreator.java index 7d8566cc..4aba068e 100644 --- a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/support/NoneSubjectReactiveCreator.java +++ b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/support/NoneSubjectReactiveCreator.java @@ -1,12 +1,13 @@ -package com.usthe.sureness.micronaut.support; +package org.dromara.sureness.micronaut.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.NoneSubject; import io.micronaut.http.HttpRequest; import java.net.InetSocketAddress; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.NoneSubject; + /** * @author tom */ diff --git a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/MicronautSurenessFilterExample.java b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/sureness/MicronautSurenessFilterExample.java similarity index 91% rename from samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/MicronautSurenessFilterExample.java rename to samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/sureness/MicronautSurenessFilterExample.java index 01193293..4e9b2c4a 100644 --- a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/MicronautSurenessFilterExample.java +++ b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/sureness/MicronautSurenessFilterExample.java @@ -1,10 +1,6 @@ -package com.usthe.sureness.micronaut.sureness; +package org.dromara.sureness.micronaut.sureness; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpStatus; import io.micronaut.http.MutableHttpResponse; @@ -12,6 +8,11 @@ import io.micronaut.http.filter.HttpServerFilter; import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; + +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.reactivestreams.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/SurenessConfiguration.java b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/sureness/SurenessConfiguration.java similarity index 70% rename from samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/SurenessConfiguration.java rename to samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/sureness/SurenessConfiguration.java index 27551bad..d6611996 100644 --- a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/SurenessConfiguration.java +++ b/samples/micronaut-sureness/src/main/java/org/dromara/sureness/micronaut/sureness/SurenessConfiguration.java @@ -1,21 +1,22 @@ -package com.usthe.sureness.micronaut.sureness; +package org.dromara.sureness.micronaut.sureness; -import com.usthe.sureness.micronaut.support.BasicSubjectReactiveCreator; -import com.usthe.sureness.micronaut.support.NoneSubjectReactiveCreator; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; import io.micronaut.context.annotation.Factory; + +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.micronaut.support.BasicSubjectReactiveCreator; +import org.dromara.sureness.micronaut.support.NoneSubjectReactiveCreator; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/micronaut-sureness/src/test/java/com/sureness/MicronautSurenessTest.java b/samples/micronaut-sureness/src/test/java/org/dromara/MicronautSurenessTest.java similarity index 95% rename from samples/micronaut-sureness/src/test/java/com/sureness/MicronautSurenessTest.java rename to samples/micronaut-sureness/src/test/java/org/dromara/MicronautSurenessTest.java index 02607d5c..57e508cd 100644 --- a/samples/micronaut-sureness/src/test/java/com/sureness/MicronautSurenessTest.java +++ b/samples/micronaut-sureness/src/test/java/org/dromara/MicronautSurenessTest.java @@ -1,4 +1,4 @@ -package com.sureness; +package org.dromara; import io.micronaut.runtime.EmbeddedApplication; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; diff --git a/samples/pom.xml b/samples/pom.xml index 1614c943..36619894 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> sureness - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -32,7 +32,7 @@ - com.usthe.sureness + org.dromara.sureness solon-plugin-sureness 1.0.0-SNAPSHOT diff --git a/samples/quarkus-sureness/pom.xml b/samples/quarkus-sureness/pom.xml index 2978de1f..b319ffe1 100644 --- a/samples/quarkus-sureness/pom.xml +++ b/samples/quarkus-sureness/pom.xml @@ -4,7 +4,7 @@ 4.0.0 samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT quarkus-sureness @@ -34,7 +34,7 @@ - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/quarkus-sureness/src/main/java/com/usthe/sureness/ExampleResource.java b/samples/quarkus-sureness/src/main/java/org/dromara/sureness/ExampleResource.java similarity index 98% rename from samples/quarkus-sureness/src/main/java/com/usthe/sureness/ExampleResource.java rename to samples/quarkus-sureness/src/main/java/org/dromara/sureness/ExampleResource.java index d9ef52a7..8d97539f 100644 --- a/samples/quarkus-sureness/src/main/java/com/usthe/sureness/ExampleResource.java +++ b/samples/quarkus-sureness/src/main/java/org/dromara/sureness/ExampleResource.java @@ -1,4 +1,4 @@ -package com.usthe.sureness; +package org.dromara.sureness; import javax.ws.rs.*; diff --git a/samples/quarkus-sureness/src/main/java/com/usthe/sureness/SurenessConfiguration.java b/samples/quarkus-sureness/src/main/java/org/dromara/sureness/SurenessConfiguration.java similarity index 83% rename from samples/quarkus-sureness/src/main/java/com/usthe/sureness/SurenessConfiguration.java rename to samples/quarkus-sureness/src/main/java/org/dromara/sureness/SurenessConfiguration.java index bc5e6d7d..3fc50c60 100644 --- a/samples/quarkus-sureness/src/main/java/com/usthe/sureness/SurenessConfiguration.java +++ b/samples/quarkus-sureness/src/main/java/org/dromara/sureness/SurenessConfiguration.java @@ -1,10 +1,12 @@ -package com.usthe.sureness; +package org.dromara.sureness; import io.quarkus.runtime.Startup; import javax.enterprise.context.ApplicationScoped; +import org.dromara.sureness.DefaultSurenessConfig; + /** * sureness config,Use DefaultSurenessConfig * @author tomsun28 diff --git a/samples/quarkus-sureness/src/main/java/com/usthe/sureness/SurenessFilterExample.java b/samples/quarkus-sureness/src/main/java/org/dromara/sureness/SurenessFilterExample.java similarity index 90% rename from samples/quarkus-sureness/src/main/java/com/usthe/sureness/SurenessFilterExample.java rename to samples/quarkus-sureness/src/main/java/org/dromara/sureness/SurenessFilterExample.java index b6e1a03c..dc31227e 100644 --- a/samples/quarkus-sureness/src/main/java/com/usthe/sureness/SurenessFilterExample.java +++ b/samples/quarkus-sureness/src/main/java/org/dromara/sureness/SurenessFilterExample.java @@ -1,9 +1,9 @@ -package com.usthe.sureness; +package org.dromara.sureness; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-plugin-sureness-demo/pom.xml b/samples/solon-plugin-sureness-demo/pom.xml index 768079c1..442391bc 100644 --- a/samples/solon-plugin-sureness-demo/pom.xml +++ b/samples/solon-plugin-sureness-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ - com.usthe.sureness + org.dromara.sureness solon-plugin-sureness 1.0.0-SNAPSHOT diff --git a/samples/solon-plugin-sureness-demo/src/main/java/com/usthe/sureness/solon/demo/App.java b/samples/solon-plugin-sureness-demo/src/main/java/org/dromara/sureness/solon/demo/App.java similarity index 81% rename from samples/solon-plugin-sureness-demo/src/main/java/com/usthe/sureness/solon/demo/App.java rename to samples/solon-plugin-sureness-demo/src/main/java/org/dromara/sureness/solon/demo/App.java index 5d6f6abe..6ce7c400 100644 --- a/samples/solon-plugin-sureness-demo/src/main/java/com/usthe/sureness/solon/demo/App.java +++ b/samples/solon-plugin-sureness-demo/src/main/java/org/dromara/sureness/solon/demo/App.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.solon.demo; +package org.dromara.sureness.solon.demo; import org.noear.solon.Solon; diff --git a/samples/solon-plugin-sureness-demo/src/main/java/com/usthe/sureness/solon/demo/controller/HelloController.java b/samples/solon-plugin-sureness-demo/src/main/java/org/dromara/sureness/solon/demo/controller/HelloController.java similarity index 96% rename from samples/solon-plugin-sureness-demo/src/main/java/com/usthe/sureness/solon/demo/controller/HelloController.java rename to samples/solon-plugin-sureness-demo/src/main/java/org/dromara/sureness/solon/demo/controller/HelloController.java index aa3864fd..a5fbb516 100644 --- a/samples/solon-plugin-sureness-demo/src/main/java/com/usthe/sureness/solon/demo/controller/HelloController.java +++ b/samples/solon-plugin-sureness-demo/src/main/java/org/dromara/sureness/solon/demo/controller/HelloController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.solon.demo.controller; +package org.dromara.sureness.solon.demo.controller; import org.noear.solon.annotation.*; import org.noear.solon.core.handle.Context; diff --git a/samples/solon-plugin-sureness/pom.xml b/samples/solon-plugin-sureness/pom.xml index c278a10c..ca2a8d6f 100644 --- a/samples/solon-plugin-sureness/pom.xml +++ b/samples/solon-plugin-sureness/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -31,7 +31,7 @@ - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/SurenessPluginImp.java b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/SurenessPluginImp.java similarity index 80% rename from samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/SurenessPluginImp.java rename to samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/SurenessPluginImp.java index 5648b00d..e85874a4 100644 --- a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/SurenessPluginImp.java +++ b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/SurenessPluginImp.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.solon.plugin; +package org.dromara.sureness.solon.plugin; -import com.usthe.sureness.solon.plugin.integration.SurenessConfiguration; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.solon.plugin.integration.SurenessConfiguration; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.SurenessContextHolder; import org.noear.solon.SolonApp; import org.noear.solon.core.Plugin; import org.noear.solon.core.handle.RenderManager; diff --git a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/integration/SurenessConfiguration.java b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/integration/SurenessConfiguration.java similarity index 69% rename from samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/integration/SurenessConfiguration.java rename to samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/integration/SurenessConfiguration.java index 5310b7e7..dc478172 100644 --- a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/integration/SurenessConfiguration.java +++ b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/integration/SurenessConfiguration.java @@ -1,25 +1,25 @@ -package com.usthe.sureness.solon.plugin.integration; +package org.dromara.sureness.solon.plugin.integration; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.support.DigestProcessor; -import com.usthe.sureness.processor.support.JwtProcessor; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.solon.plugin.support.BasicSubjectSolonCreator; -import com.usthe.sureness.solon.plugin.support.DigestSubjectSolonCreator; -import com.usthe.sureness.solon.plugin.support.JwtSubjectSolonCreator; -import com.usthe.sureness.solon.plugin.support.NoneSubjectSolonCreator; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.support.DigestProcessor; +import org.dromara.sureness.processor.support.JwtProcessor; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.solon.plugin.support.BasicSubjectSolonCreator; +import org.dromara.sureness.solon.plugin.support.DigestSubjectSolonCreator; +import org.dromara.sureness.solon.plugin.support.JwtSubjectSolonCreator; +import org.dromara.sureness.solon.plugin.support.NoneSubjectSolonCreator; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; import org.noear.solon.annotation.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/integration/SurenessFilter.java b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/integration/SurenessFilter.java similarity index 91% rename from samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/integration/SurenessFilter.java rename to samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/integration/SurenessFilter.java index ae5d0ef8..ef55c675 100644 --- a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/integration/SurenessFilter.java +++ b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/integration/SurenessFilter.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.solon.plugin.integration; +package org.dromara.sureness.solon.plugin.integration; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.noear.solon.annotation.Component; import org.noear.solon.core.handle.Context; import org.noear.solon.core.handle.Filter; diff --git a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/BasicSubjectSolonCreator.java b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/BasicSubjectSolonCreator.java similarity index 92% rename from samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/BasicSubjectSolonCreator.java rename to samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/BasicSubjectSolonCreator.java index 8f914d44..53032355 100644 --- a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/BasicSubjectSolonCreator.java +++ b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/BasicSubjectSolonCreator.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.solon.plugin.support; +package org.dromara.sureness.solon.plugin.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; import org.noear.solon.core.handle.Context; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/DigestSubjectSolonCreator.java b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/DigestSubjectSolonCreator.java similarity index 93% rename from samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/DigestSubjectSolonCreator.java rename to samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/DigestSubjectSolonCreator.java index 92f2672c..346b6013 100644 --- a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/DigestSubjectSolonCreator.java +++ b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/DigestSubjectSolonCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.solon.support; +package org.dromara.sureness.solon.plugin.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.DigestSubject; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.DigestSubject; +import org.dromara.sureness.util.SurenessConstant; import org.noear.solon.core.handle.Context; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/JwtSubjectSolonCreator.java b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/JwtSubjectSolonCreator.java similarity index 89% rename from samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/JwtSubjectSolonCreator.java rename to samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/JwtSubjectSolonCreator.java index d922f152..fdcefeb8 100644 --- a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/JwtSubjectSolonCreator.java +++ b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/JwtSubjectSolonCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.solon.support; +package org.dromara.sureness.solon.plugin.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.noear.solon.core.handle.Context; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/NoneSubjectSolonCreator.java b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/NoneSubjectSolonCreator.java similarity index 81% rename from samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/NoneSubjectSolonCreator.java rename to samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/NoneSubjectSolonCreator.java index 3f2ac05e..09480698 100644 --- a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/NoneSubjectSolonCreator.java +++ b/samples/solon-plugin-sureness/src/main/java/org/dromara/sureness/solon/plugin/support/NoneSubjectSolonCreator.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.solon.plugin.support; +package org.dromara.sureness.solon.plugin.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.NoneSubject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.NoneSubject; import org.noear.solon.core.handle.Context; /** diff --git a/samples/solon-plugin-sureness/src/main/resources/META-INF/solon/com.usthe.sureness.solon.plugin.properties b/samples/solon-plugin-sureness/src/main/resources/META-INF/solon/com.usthe.sureness.solon.plugin.properties deleted file mode 100644 index b3af84ba..00000000 --- a/samples/solon-plugin-sureness/src/main/resources/META-INF/solon/com.usthe.sureness.solon.plugin.properties +++ /dev/null @@ -1 +0,0 @@ -solon.plugin=com.usthe.sureness.solon.plugin.SurenessPluginImp \ No newline at end of file diff --git a/samples/solon-plugin-sureness/src/main/resources/META-INF/solon/org.dromara.sureness.solon.plugin.properties b/samples/solon-plugin-sureness/src/main/resources/META-INF/solon/org.dromara.sureness.solon.plugin.properties new file mode 100644 index 00000000..282066a4 --- /dev/null +++ b/samples/solon-plugin-sureness/src/main/resources/META-INF/solon/org.dromara.sureness.solon.plugin.properties @@ -0,0 +1 @@ +solon.plugin=org.dromara.sureness.solon.plugin.SurenessPluginImp \ No newline at end of file diff --git a/samples/solon-sureness/pom.xml b/samples/solon-sureness/pom.xml index 6229e0af..283927b9 100644 --- a/samples/solon-sureness/pom.xml +++ b/samples/solon-sureness/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -31,7 +31,7 @@ - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/App.java b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/App.java similarity index 84% rename from samples/solon-sureness/src/main/java/com/usthe/sureness/solon/App.java rename to samples/solon-sureness/src/main/java/org/dromara/sureness/solon/App.java index 778a2b37..bb450eff 100644 --- a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/App.java +++ b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/App.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.solon; +package org.dromara.sureness.solon; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.SurenessContextHolder; import org.noear.solon.Solon; import org.noear.solon.SolonApp; import org.noear.solon.core.handle.Result; diff --git a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/SurenessConfiguration.java b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/SurenessConfiguration.java similarity index 70% rename from samples/solon-sureness/src/main/java/com/usthe/sureness/solon/SurenessConfiguration.java rename to samples/solon-sureness/src/main/java/org/dromara/sureness/solon/SurenessConfiguration.java index 5983513a..ad5f4c22 100644 --- a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/SurenessConfiguration.java +++ b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/SurenessConfiguration.java @@ -1,25 +1,25 @@ -package com.usthe.sureness.solon; +package org.dromara.sureness.solon; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.support.DigestProcessor; -import com.usthe.sureness.processor.support.JwtProcessor; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.solon.support.BasicSubjectSolonCreator; -import com.usthe.sureness.solon.support.DigestSubjectSolonCreator; -import com.usthe.sureness.solon.support.JwtSubjectSolonCreator; -import com.usthe.sureness.solon.support.NoneSubjectSolonCreator; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.support.DigestProcessor; +import org.dromara.sureness.processor.support.JwtProcessor; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.solon.support.BasicSubjectSolonCreator; +import org.dromara.sureness.solon.support.DigestSubjectSolonCreator; +import org.dromara.sureness.solon.support.JwtSubjectSolonCreator; +import org.dromara.sureness.solon.support.NoneSubjectSolonCreator; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; import org.noear.solon.annotation.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/SurenessFilterExample.java b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/SurenessFilterExample.java similarity index 90% rename from samples/solon-sureness/src/main/java/com/usthe/sureness/solon/SurenessFilterExample.java rename to samples/solon-sureness/src/main/java/org/dromara/sureness/solon/SurenessFilterExample.java index c3e7db12..41c388a0 100644 --- a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/SurenessFilterExample.java +++ b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/SurenessFilterExample.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.solon; +package org.dromara.sureness.solon; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.noear.solon.annotation.Component; import org.noear.solon.core.handle.*; import org.slf4j.Logger; diff --git a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/controller/HelloController.java b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/controller/HelloController.java similarity index 96% rename from samples/solon-sureness/src/main/java/com/usthe/sureness/solon/controller/HelloController.java rename to samples/solon-sureness/src/main/java/org/dromara/sureness/solon/controller/HelloController.java index d9aa6906..e82d7cbd 100644 --- a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/controller/HelloController.java +++ b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/controller/HelloController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.solon.controller; +package org.dromara.sureness.solon.controller; import org.noear.solon.annotation.*; import org.noear.solon.core.handle.Context; diff --git a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/BasicSubjectSolonCreator.java b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/BasicSubjectSolonCreator.java similarity index 92% rename from samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/BasicSubjectSolonCreator.java rename to samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/BasicSubjectSolonCreator.java index dd52a6f4..0abbc2f3 100644 --- a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/BasicSubjectSolonCreator.java +++ b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/BasicSubjectSolonCreator.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.solon.support; +package org.dromara.sureness.solon.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; import org.noear.solon.core.handle.Context; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/DigestSubjectSolonCreator.java b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/DigestSubjectSolonCreator.java similarity index 93% rename from samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/DigestSubjectSolonCreator.java rename to samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/DigestSubjectSolonCreator.java index 8a501841..fa8588c2 100644 --- a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/DigestSubjectSolonCreator.java +++ b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/DigestSubjectSolonCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.solon.plugin.support; +package org.dromara.sureness.solon.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.DigestSubject; -import com.usthe.sureness.util.SurenessConstant; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.DigestSubject; +import org.dromara.sureness.util.SurenessConstant; import org.noear.solon.core.handle.Context; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/JwtSubjectSolonCreator.java b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/JwtSubjectSolonCreator.java similarity index 89% rename from samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/JwtSubjectSolonCreator.java rename to samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/JwtSubjectSolonCreator.java index 27cc0cde..3d456af1 100644 --- a/samples/solon-plugin-sureness/src/main/java/com/usthe/sureness/solon/plugin/support/JwtSubjectSolonCreator.java +++ b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/JwtSubjectSolonCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.solon.plugin.support; +package org.dromara.sureness.solon.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.noear.solon.core.handle.Context; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/NoneSubjectSolonCreator.java b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/NoneSubjectSolonCreator.java similarity index 81% rename from samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/NoneSubjectSolonCreator.java rename to samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/NoneSubjectSolonCreator.java index ff2ee08a..c249b24c 100644 --- a/samples/solon-sureness/src/main/java/com/usthe/sureness/solon/support/NoneSubjectSolonCreator.java +++ b/samples/solon-sureness/src/main/java/org/dromara/sureness/solon/support/NoneSubjectSolonCreator.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.solon.support; +package org.dromara.sureness.solon.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.NoneSubject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.NoneSubject; import org.noear.solon.core.handle.Context; /** diff --git a/samples/spring-gateway-sureness/pom.xml b/samples/spring-gateway-sureness/pom.xml index 7abf463c..c1b73331 100644 --- a/samples/spring-gateway-sureness/pom.xml +++ b/samples/spring-gateway-sureness/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -14,13 +14,11 @@ 1.8 2020.0.2 - 1.0.3 - com.usthe.sureness + org.dromara.sureness sureness-core - ${sureness-core.version} diff --git a/samples/spring-gateway-sureness/src/main/java/gateway/sureness/SurenessConfiguration.java b/samples/spring-gateway-sureness/src/main/java/gateway/sureness/SurenessConfiguration.java index f565b17d..6e9c1bbb 100644 --- a/samples/spring-gateway-sureness/src/main/java/gateway/sureness/SurenessConfiguration.java +++ b/samples/spring-gateway-sureness/src/main/java/gateway/sureness/SurenessConfiguration.java @@ -1,7 +1,7 @@ package gateway.sureness; -import com.usthe.sureness.DefaultSurenessConfig; +import org.dromara.sureness.DefaultSurenessConfig; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/samples/spring-gateway-sureness/src/main/java/gateway/sureness/SurenessFilter.java b/samples/spring-gateway-sureness/src/main/java/gateway/sureness/SurenessFilter.java index 0d0f4cfe..285e97ca 100644 --- a/samples/spring-gateway-sureness/src/main/java/gateway/sureness/SurenessFilter.java +++ b/samples/spring-gateway-sureness/src/main/java/gateway/sureness/SurenessFilter.java @@ -1,9 +1,9 @@ package gateway.sureness; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import io.netty.buffer.UnpooledByteBufAllocator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/spring-webflux-sureness/pom.xml b/samples/spring-webflux-sureness/pom.xml index ff894481..179809fb 100644 --- a/samples/spring-webflux-sureness/pom.xml +++ b/samples/spring-webflux-sureness/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -23,7 +23,7 @@ spring-boot-starter-webflux - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SpringBootApplication.java b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SpringBootApplication.java similarity index 87% rename from samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SpringBootApplication.java rename to samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SpringBootApplication.java index 61dd6ef9..ef867785 100644 --- a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SpringBootApplication.java +++ b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SpringBootApplication.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.spring.webflux; +package org.dromara.sureness.spring.webflux; import org.springframework.boot.SpringApplication; diff --git a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SurenessConfiguration.java b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SurenessConfiguration.java similarity index 70% rename from samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SurenessConfiguration.java rename to samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SurenessConfiguration.java index 5a07eeae..690ef31b 100644 --- a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SurenessConfiguration.java +++ b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SurenessConfiguration.java @@ -1,23 +1,23 @@ -package com.usthe.sureness.spring.webflux; +package org.dromara.sureness.spring.webflux; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.support.JwtProcessor; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.spring.webflux.support.BasicSubjectReactiveCreator; -import com.usthe.sureness.spring.webflux.support.JwtSubjectReactiveCreator; -import com.usthe.sureness.spring.webflux.support.NoneSubjectReactiveCreator; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.support.JwtProcessor; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.spring.webflux.support.BasicSubjectReactiveCreator; +import org.dromara.sureness.spring.webflux.support.JwtSubjectReactiveCreator; +import org.dromara.sureness.spring.webflux.support.NoneSubjectReactiveCreator; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; diff --git a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SurenessFilterExample.java b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SurenessFilterExample.java similarity index 91% rename from samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SurenessFilterExample.java rename to samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SurenessFilterExample.java index d816348e..31e9d100 100644 --- a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/SurenessFilterExample.java +++ b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/SurenessFilterExample.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.spring.webflux; +package org.dromara.sureness.spring.webflux; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; diff --git a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/controller/ExampleController.java b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/controller/ExampleController.java similarity index 96% rename from samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/controller/ExampleController.java rename to samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/controller/ExampleController.java index 155e58c0..c6b733af 100644 --- a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/controller/ExampleController.java +++ b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/controller/ExampleController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.spring.webflux.controller; +package org.dromara.sureness.spring.webflux.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/controller/SimulateController.java b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/controller/SimulateController.java similarity index 97% rename from samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/controller/SimulateController.java rename to samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/controller/SimulateController.java index e9dae300..47ad8349 100644 --- a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/controller/SimulateController.java +++ b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/controller/SimulateController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.spring.webflux.controller; +package org.dromara.sureness.spring.webflux.controller; import org.springframework.http.ResponseEntity; diff --git a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/BasicSubjectReactiveCreator.java b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/BasicSubjectReactiveCreator.java similarity index 93% rename from samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/BasicSubjectReactiveCreator.java rename to samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/BasicSubjectReactiveCreator.java index f2c6be83..4211c73d 100644 --- a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/BasicSubjectReactiveCreator.java +++ b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/BasicSubjectReactiveCreator.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.spring.webflux.support; +package org.dromara.sureness.spring.webflux.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.PasswordSubject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.PasswordSubject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/JwtSubjectReactiveCreator.java b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/JwtSubjectReactiveCreator.java similarity index 90% rename from samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/JwtSubjectReactiveCreator.java rename to samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/JwtSubjectReactiveCreator.java index 42733d12..945207d0 100644 --- a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/JwtSubjectReactiveCreator.java +++ b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/JwtSubjectReactiveCreator.java @@ -1,9 +1,9 @@ -package com.usthe.sureness.spring.webflux.support; +package org.dromara.sureness.spring.webflux.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.JwtSubject; -import com.usthe.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.JwtSubject; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/NoneSubjectReactiveCreator.java b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/NoneSubjectReactiveCreator.java similarity index 84% rename from samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/NoneSubjectReactiveCreator.java rename to samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/NoneSubjectReactiveCreator.java index fd2ba481..48f1db02 100644 --- a/samples/spring-webflux-sureness/src/main/java/com/usthe/sureness/spring/webflux/support/NoneSubjectReactiveCreator.java +++ b/samples/spring-webflux-sureness/src/main/java/org/dromara/sureness/spring/webflux/support/NoneSubjectReactiveCreator.java @@ -1,8 +1,8 @@ -package com.usthe.sureness.spring.webflux.support; +package org.dromara.sureness.spring.webflux.support; -import com.usthe.sureness.subject.Subject; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.support.NoneSubject; +import org.dromara.sureness.subject.Subject; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.support.NoneSubject; import org.springframework.http.server.reactive.ServerHttpRequest; import java.net.InetSocketAddress; diff --git a/samples/sureness-redis-session/pom.xml b/samples/sureness-redis-session/pom.xml index 7f6f3c83..dea353cf 100644 --- a/samples/sureness-redis-session/pom.xml +++ b/samples/sureness-redis-session/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> sureness - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT ../../pom.xml @@ -33,7 +33,7 @@ spring-boot-starter-data-redis - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/RedisSessionApplication.java b/samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/RedisSessionApplication.java similarity index 91% rename from samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/RedisSessionApplication.java rename to samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/RedisSessionApplication.java index 54bdb2fb..cdcfa9d8 100644 --- a/samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/RedisSessionApplication.java +++ b/samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/RedisSessionApplication.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.redis.session; +package org.dromara.sureness.sample.redis.session; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/controller/SimulateController.java b/samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/controller/SimulateController.java similarity index 97% rename from samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/controller/SimulateController.java rename to samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/controller/SimulateController.java index 5c47a6dc..7b37a306 100644 --- a/samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/controller/SimulateController.java +++ b/samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/controller/SimulateController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.redis.session.controller; +package org.dromara.sureness.sample.redis.session.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/sureness/SurenessConfiguration.java b/samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/sureness/SurenessConfiguration.java similarity index 72% rename from samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/sureness/SurenessConfiguration.java rename to samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/sureness/SurenessConfiguration.java index 495bd300..04d35b3f 100644 --- a/samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/sureness/SurenessConfiguration.java +++ b/samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/sureness/SurenessConfiguration.java @@ -1,27 +1,27 @@ -package com.usthe.sureness.sample.redis.session.sureness; +package org.dromara.sureness.sample.redis.session.sureness; -import com.usthe.sureness.handler.AttachSessionServletHandler; -import com.usthe.sureness.handler.HandlerManager; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.matcher.TreePathRoleMatcher; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.ProcessorManager; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.processor.support.SessionProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.annotation.AnnotationPathTreeProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; -import com.usthe.sureness.subject.creater.BasicSubjectServletCreator; -import com.usthe.sureness.subject.creater.NoneSubjectServletCreator; -import com.usthe.sureness.subject.creater.SessionSubjectServletCreator; +import org.dromara.sureness.handler.AttachSessionServletHandler; +import org.dromara.sureness.handler.HandlerManager; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.matcher.TreePathRoleMatcher; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.ProcessorManager; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.processor.support.SessionProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.annotation.AnnotationPathTreeProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.subject.creater.BasicSubjectServletCreator; +import org.dromara.sureness.subject.creater.NoneSubjectServletCreator; +import org.dromara.sureness.subject.creater.SessionSubjectServletCreator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/sureness/SurenessFilterExample.java b/samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/sureness/SurenessFilterExample.java similarity index 94% rename from samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/sureness/SurenessFilterExample.java rename to samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/sureness/SurenessFilterExample.java index f359bc84..d8f09ad0 100644 --- a/samples/sureness-redis-session/src/main/java/com/usthe/sureness/sample/redis/session/sureness/SurenessFilterExample.java +++ b/samples/sureness-redis-session/src/main/java/org/dromara/sureness/sample/redis/session/sureness/SurenessFilterExample.java @@ -1,10 +1,11 @@ -package com.usthe.sureness.sample.redis.session.sureness; +package org.dromara.sureness.sample.redis.session.sureness; import com.fasterxml.jackson.databind.ObjectMapper; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; + +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/samples/sureness-session/pom.xml b/samples/sureness-session/pom.xml index 2c6aa59e..866438fa 100644 --- a/samples/sureness-session/pom.xml +++ b/samples/sureness-session/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> sureness - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT ../../pom.xml @@ -25,7 +25,7 @@ spring-boot-starter-web - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/SessionApplication.java b/samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/SessionApplication.java similarity index 90% rename from samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/SessionApplication.java rename to samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/SessionApplication.java index b2f139b8..5993efb7 100644 --- a/samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/SessionApplication.java +++ b/samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/SessionApplication.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.session; +package org.dromara.sureness.sample.session; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/controller/SimulateController.java b/samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/controller/SimulateController.java similarity index 97% rename from samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/controller/SimulateController.java rename to samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/controller/SimulateController.java index da1fcb47..2ee6ff2e 100644 --- a/samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/controller/SimulateController.java +++ b/samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/controller/SimulateController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.sample.session.controller; +package org.dromara.sureness.sample.session.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/sureness/SurenessConfiguration.java b/samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/sureness/SurenessConfiguration.java similarity index 72% rename from samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/sureness/SurenessConfiguration.java rename to samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/sureness/SurenessConfiguration.java index 0d2a4a5c..67011f8c 100644 --- a/samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/sureness/SurenessConfiguration.java +++ b/samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/sureness/SurenessConfiguration.java @@ -1,27 +1,27 @@ -package com.usthe.sureness.sample.session.sureness; +package org.dromara.sureness.sample.session.sureness; -import com.usthe.sureness.handler.AttachSessionServletHandler; -import com.usthe.sureness.handler.HandlerManager; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.matcher.TreePathRoleMatcher; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.ProcessorManager; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.processor.support.SessionProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.annotation.AnnotationPathTreeProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; -import com.usthe.sureness.subject.creater.BasicSubjectServletCreator; -import com.usthe.sureness.subject.creater.NoneSubjectServletCreator; -import com.usthe.sureness.subject.creater.SessionSubjectServletCreator; +import org.dromara.sureness.handler.AttachSessionServletHandler; +import org.dromara.sureness.handler.HandlerManager; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.matcher.TreePathRoleMatcher; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.ProcessorManager; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.processor.support.SessionProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.annotation.AnnotationPathTreeProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.subject.creater.BasicSubjectServletCreator; +import org.dromara.sureness.subject.creater.NoneSubjectServletCreator; +import org.dromara.sureness.subject.creater.SessionSubjectServletCreator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/sureness/SurenessFilterExample.java b/samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/sureness/SurenessFilterExample.java similarity index 94% rename from samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/sureness/SurenessFilterExample.java rename to samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/sureness/SurenessFilterExample.java index 03ddcd3f..855e8608 100644 --- a/samples/sureness-session/src/main/java/com/usthe/sureness/sample/session/sureness/SurenessFilterExample.java +++ b/samples/sureness-session/src/main/java/org/dromara/sureness/sample/session/sureness/SurenessFilterExample.java @@ -1,10 +1,11 @@ -package com.usthe.sureness.sample.session.sureness; +package org.dromara.sureness.sample.session.sureness; import com.fasterxml.jackson.databind.ObjectMapper; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; + +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/samples/sureness-spring-boot-starter-example/pom.xml b/samples/sureness-spring-boot-starter-example/pom.xml index e31def5a..200e3ab8 100644 --- a/samples/sureness-spring-boot-starter-example/pom.xml +++ b/samples/sureness-spring-boot-starter-example/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ test - com.usthe.sureness + org.dromara.sureness spring-boot-starter-sureness diff --git a/samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/BootstrapApplication.java b/samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/BootstrapApplication.java similarity index 90% rename from samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/BootstrapApplication.java rename to samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/BootstrapApplication.java index 65a075d1..467c1c7a 100644 --- a/samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/BootstrapApplication.java +++ b/samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/BootstrapApplication.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.bootstrap; +package org.dromara.sureness.bootstrap; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/AccountController.java b/samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/AccountController.java similarity index 87% rename from samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/AccountController.java rename to samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/AccountController.java index 19827521..58c2aba1 100644 --- a/samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/AccountController.java +++ b/samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/AccountController.java @@ -1,10 +1,10 @@ -package com.usthe.sureness.bootstrap.controller; +package org.dromara.sureness.bootstrap.controller; -import com.usthe.sureness.provider.SurenessAccount; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.util.JsonWebTokenUtil; -import com.usthe.sureness.util.Md5Util; +import org.dromara.sureness.provider.SurenessAccount; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.util.Md5Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/SimulateController.java b/samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/SimulateController.java similarity index 99% rename from samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/SimulateController.java rename to samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/SimulateController.java index 269a1d7f..157494b5 100644 --- a/samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/SimulateController.java +++ b/samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/SimulateController.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.bootstrap.controller; +package org.dromara.sureness.bootstrap.controller; import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; diff --git a/samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/WebSocketEndpoint.java b/samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/WebSocketEndpoint.java similarity index 91% rename from samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/WebSocketEndpoint.java rename to samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/WebSocketEndpoint.java index 6ebab952..e977c8cb 100644 --- a/samples/sureness-spring-boot-starter-example/src/main/java/com/usthe/sureness/bootstrap/controller/WebSocketEndpoint.java +++ b/samples/sureness-spring-boot-starter-example/src/main/java/org/dromara/sureness/bootstrap/controller/WebSocketEndpoint.java @@ -1,7 +1,7 @@ -package com.usthe.sureness.bootstrap.controller; +package org.dromara.sureness.bootstrap.controller; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/samples/sureness-spring-boot-starter-example/src/main/resources/application.yml b/samples/sureness-spring-boot-starter-example/src/main/resources/application.yml index b0f26717..3a34c342 100644 --- a/samples/sureness-spring-boot-starter-example/src/main/resources/application.yml +++ b/samples/sureness-spring-boot-starter-example/src/main/resources/application.yml @@ -20,7 +20,7 @@ sureness: annotation: enable: true scan-packages: - - com.usthe.sureness.bootstrap.controller + - org.dromara.sureness.bootstrap.controller session: enable: true websocket: diff --git a/samples/zuul-sureness/pom.xml b/samples/zuul-sureness/pom.xml index da55e4be..9b7f9449 100644 --- a/samples/zuul-sureness/pom.xml +++ b/samples/zuul-sureness/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> samples - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 @@ -34,7 +34,7 @@ 2.2.6.RELEASE - com.usthe.sureness + org.dromara.sureness sureness-core diff --git a/samples/zuul-sureness/src/main/java/zuul/sureness/SurenessConfiguration.java b/samples/zuul-sureness/src/main/java/zuul/sureness/SurenessConfiguration.java index 47b1ef21..b11796c9 100644 --- a/samples/zuul-sureness/src/main/java/zuul/sureness/SurenessConfiguration.java +++ b/samples/zuul-sureness/src/main/java/zuul/sureness/SurenessConfiguration.java @@ -1,7 +1,7 @@ package zuul.sureness; -import com.usthe.sureness.DefaultSurenessConfig; +import org.dromara.sureness.DefaultSurenessConfig; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/samples/zuul-sureness/src/main/java/zuul/sureness/SurenessFilter.java b/samples/zuul-sureness/src/main/java/zuul/sureness/SurenessFilter.java index 45b809f4..aa412b67 100644 --- a/samples/zuul-sureness/src/main/java/zuul/sureness/SurenessFilter.java +++ b/samples/zuul-sureness/src/main/java/zuul/sureness/SurenessFilter.java @@ -3,10 +3,11 @@ import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; import com.netflix.zuul.exception.ZuulException; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.exception.*; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; + +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.exception.*; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants; diff --git a/support/pom.xml b/support/pom.xml index b247b7b9..5eeeb3ac 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> sureness - com.usthe.sureness + org.dromara.sureness 1.0.0-SNAPSHOT 4.0.0 diff --git a/support/spring-boot-starter-sureness/pom.xml b/support/spring-boot-starter-sureness/pom.xml index d66ad7e8..355f1cbc 100644 --- a/support/spring-boot-starter-sureness/pom.xml +++ b/support/spring-boot-starter-sureness/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.usthe.sureness + org.dromara.sureness spring-boot-starter-sureness 1.1.0 jar @@ -76,7 +76,7 @@ true - com.usthe.sureness + org.dromara.sureness sureness-core ${sureness.version} diff --git a/support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessAutoConfiguration.java b/support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessAutoConfiguration.java similarity index 80% rename from support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessAutoConfiguration.java rename to support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessAutoConfiguration.java index 22740ad6..0fc178ad 100644 --- a/support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessAutoConfiguration.java +++ b/support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessAutoConfiguration.java @@ -1,42 +1,42 @@ -package com.usthe.sureness.configuration; +package org.dromara.sureness.configuration; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.matcher.TreePathRoleMatcher; -import com.usthe.sureness.mgt.SecurityManager; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.ProcessorManager; -import com.usthe.sureness.processor.support.DigestProcessor; -import com.usthe.sureness.processor.support.JwtProcessor; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.processor.support.SessionProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.annotation.AnnotationPathTreeProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; -import com.usthe.sureness.subject.creater.BasicSubjectJaxRsCreator; -import com.usthe.sureness.subject.creater.BasicSubjectServletCreator; -import com.usthe.sureness.subject.creater.BasicSubjectSpringReactiveCreator; -import com.usthe.sureness.subject.creater.DigestSubjectJaxRsCreator; -import com.usthe.sureness.subject.creater.DigestSubjectServletCreator; -import com.usthe.sureness.subject.creater.DigestSubjectSpringReactiveCreator; -import com.usthe.sureness.subject.creater.JwtSubjectJaxRsCreator; -import com.usthe.sureness.subject.creater.JwtSubjectServletCreator; -import com.usthe.sureness.subject.creater.JwtSubjectSpringReactiveCreator; -import com.usthe.sureness.subject.creater.JwtSubjectWsJaxRsCreator; -import com.usthe.sureness.subject.creater.JwtSubjectWsServletCreator; -import com.usthe.sureness.subject.creater.JwtSubjectWsSpringReactiveCreator; -import com.usthe.sureness.subject.creater.NoneSubjectJaxRsCreator; -import com.usthe.sureness.subject.creater.NoneSubjectServletCreator; -import com.usthe.sureness.subject.creater.NoneSubjectSpringReactiveCreator; -import com.usthe.sureness.subject.creater.SessionSubjectServletCreator; -import com.usthe.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.matcher.TreePathRoleMatcher; +import org.dromara.sureness.mgt.SecurityManager; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.ProcessorManager; +import org.dromara.sureness.processor.support.DigestProcessor; +import org.dromara.sureness.processor.support.JwtProcessor; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.processor.support.SessionProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.annotation.AnnotationPathTreeProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.subject.creater.BasicSubjectJaxRsCreator; +import org.dromara.sureness.subject.creater.BasicSubjectServletCreator; +import org.dromara.sureness.subject.creater.BasicSubjectSpringReactiveCreator; +import org.dromara.sureness.subject.creater.DigestSubjectJaxRsCreator; +import org.dromara.sureness.subject.creater.DigestSubjectServletCreator; +import org.dromara.sureness.subject.creater.DigestSubjectSpringReactiveCreator; +import org.dromara.sureness.subject.creater.JwtSubjectJaxRsCreator; +import org.dromara.sureness.subject.creater.JwtSubjectServletCreator; +import org.dromara.sureness.subject.creater.JwtSubjectSpringReactiveCreator; +import org.dromara.sureness.subject.creater.JwtSubjectWsJaxRsCreator; +import org.dromara.sureness.subject.creater.JwtSubjectWsServletCreator; +import org.dromara.sureness.subject.creater.JwtSubjectWsSpringReactiveCreator; +import org.dromara.sureness.subject.creater.NoneSubjectJaxRsCreator; +import org.dromara.sureness.subject.creater.NoneSubjectServletCreator; +import org.dromara.sureness.subject.creater.NoneSubjectSpringReactiveCreator; +import org.dromara.sureness.subject.creater.SessionSubjectServletCreator; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -50,6 +50,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import static org.dromara.sureness.configuration.SurenessProperties.*; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -57,8 +59,6 @@ import java.util.List; import java.util.Set; -import static com.usthe.sureness.configuration.SurenessProperties.*; - /** * @author wangtao diff --git a/support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessFilter.java b/support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessFilter.java similarity index 87% rename from support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessFilter.java rename to support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessFilter.java index 1e1d9bb0..37898838 100644 --- a/support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessFilter.java +++ b/support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessFilter.java @@ -1,15 +1,15 @@ -package com.usthe.sureness.configuration; +package org.dromara.sureness.configuration; -import com.usthe.sureness.mgt.SecurityManager; -import com.usthe.sureness.processor.exception.DisabledAccountException; -import com.usthe.sureness.processor.exception.ExcessiveAttemptsException; -import com.usthe.sureness.processor.exception.ExpiredCredentialsException; -import com.usthe.sureness.processor.exception.IncorrectCredentialsException; -import com.usthe.sureness.processor.exception.NeedDigestInfoException; -import com.usthe.sureness.processor.exception.UnauthorizedException; -import com.usthe.sureness.processor.exception.UnknownAccountException; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +import org.dromara.sureness.mgt.SecurityManager; +import org.dromara.sureness.processor.exception.DisabledAccountException; +import org.dromara.sureness.processor.exception.ExcessiveAttemptsException; +import org.dromara.sureness.processor.exception.ExpiredCredentialsException; +import org.dromara.sureness.processor.exception.IncorrectCredentialsException; +import org.dromara.sureness.processor.exception.NeedDigestInfoException; +import org.dromara.sureness.processor.exception.UnauthorizedException; +import org.dromara.sureness.processor.exception.UnknownAccountException; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessInitException.java b/support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessInitException.java similarity index 67% rename from support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessInitException.java rename to support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessInitException.java index e6d33c7d..1e93db77 100644 --- a/support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessInitException.java +++ b/support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessInitException.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.configuration; +package org.dromara.sureness.configuration; -import com.usthe.sureness.processor.exception.ExtSurenessException; +import org.dromara.sureness.processor.exception.ExtSurenessException; /** * sureness init exception diff --git a/support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessProperties.java b/support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessProperties.java similarity index 98% rename from support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessProperties.java rename to support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessProperties.java index 49377e85..ea09d903 100644 --- a/support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessProperties.java +++ b/support/spring-boot-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessProperties.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.configuration; +package org.dromara.sureness.configuration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/support/spring-boot3-starter-sureness/pom.xml b/support/spring-boot3-starter-sureness/pom.xml index 093738e5..1a9f5c8d 100644 --- a/support/spring-boot3-starter-sureness/pom.xml +++ b/support/spring-boot3-starter-sureness/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.usthe.sureness + org.dromara.sureness spring-boot3-starter-sureness 1.1.0 jar @@ -76,7 +76,7 @@ true - com.usthe.sureness + org.dromara.sureness sureness-core ${sureness.version} diff --git a/support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessAutoConfiguration.java b/support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessAutoConfiguration.java similarity index 79% rename from support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessAutoConfiguration.java rename to support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessAutoConfiguration.java index 0f224b91..20f9e85f 100644 --- a/support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessAutoConfiguration.java +++ b/support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessAutoConfiguration.java @@ -1,48 +1,48 @@ -package com.usthe.sureness.configuration; +package org.dromara.sureness.configuration; -import com.usthe.sureness.matcher.DefaultPathRoleMatcher; -import com.usthe.sureness.matcher.PathTreeProvider; -import com.usthe.sureness.matcher.TreePathRoleMatcher; -import com.usthe.sureness.mgt.SecurityManager; -import com.usthe.sureness.mgt.SurenessSecurityManager; -import com.usthe.sureness.processor.DefaultProcessorManager; -import com.usthe.sureness.processor.Processor; -import com.usthe.sureness.processor.ProcessorManager; -import com.usthe.sureness.processor.support.DigestProcessor; -import com.usthe.sureness.processor.support.JwtProcessor; -import com.usthe.sureness.processor.support.NoneProcessor; -import com.usthe.sureness.processor.support.PasswordProcessor; -import com.usthe.sureness.processor.support.SessionProcessor; -import com.usthe.sureness.provider.SurenessAccountProvider; -import com.usthe.sureness.provider.annotation.AnnotationPathTreeProvider; -import com.usthe.sureness.provider.ducument.DocumentAccountProvider; -import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider; -import com.usthe.sureness.subject.SubjectCreate; -import com.usthe.sureness.subject.SubjectFactory; -import com.usthe.sureness.subject.SurenessSubjectFactory; -import com.usthe.sureness.subject.creater.BasicSubjectJakartaServletCreator; -import com.usthe.sureness.subject.creater.BasicSubjectJaxRsCreator; -import com.usthe.sureness.subject.creater.BasicSubjectServletCreator; -import com.usthe.sureness.subject.creater.BasicSubjectSpringReactiveCreator; -import com.usthe.sureness.subject.creater.DigestSubjectJakartaServletCreator; -import com.usthe.sureness.subject.creater.DigestSubjectJaxRsCreator; -import com.usthe.sureness.subject.creater.DigestSubjectServletCreator; -import com.usthe.sureness.subject.creater.DigestSubjectSpringReactiveCreator; -import com.usthe.sureness.subject.creater.JwtSubjectJakartaServletCreator; -import com.usthe.sureness.subject.creater.JwtSubjectJaxRsCreator; -import com.usthe.sureness.subject.creater.JwtSubjectServletCreator; -import com.usthe.sureness.subject.creater.JwtSubjectSpringReactiveCreator; -import com.usthe.sureness.subject.creater.JwtSubjectWsJakartaServletCreator; -import com.usthe.sureness.subject.creater.JwtSubjectWsJaxRsCreator; -import com.usthe.sureness.subject.creater.JwtSubjectWsServletCreator; -import com.usthe.sureness.subject.creater.JwtSubjectWsSpringReactiveCreator; -import com.usthe.sureness.subject.creater.NoneSubjectJakartaServletCreator; -import com.usthe.sureness.subject.creater.NoneSubjectJaxRsCreator; -import com.usthe.sureness.subject.creater.NoneSubjectServletCreator; -import com.usthe.sureness.subject.creater.NoneSubjectSpringReactiveCreator; -import com.usthe.sureness.subject.creater.SessionSubjectJakartaServletCreator; -import com.usthe.sureness.subject.creater.SessionSubjectServletCreator; -import com.usthe.sureness.util.JsonWebTokenUtil; +import org.dromara.sureness.matcher.DefaultPathRoleMatcher; +import org.dromara.sureness.matcher.PathTreeProvider; +import org.dromara.sureness.matcher.TreePathRoleMatcher; +import org.dromara.sureness.mgt.SecurityManager; +import org.dromara.sureness.mgt.SurenessSecurityManager; +import org.dromara.sureness.processor.DefaultProcessorManager; +import org.dromara.sureness.processor.Processor; +import org.dromara.sureness.processor.ProcessorManager; +import org.dromara.sureness.processor.support.DigestProcessor; +import org.dromara.sureness.processor.support.JwtProcessor; +import org.dromara.sureness.processor.support.NoneProcessor; +import org.dromara.sureness.processor.support.PasswordProcessor; +import org.dromara.sureness.processor.support.SessionProcessor; +import org.dromara.sureness.provider.SurenessAccountProvider; +import org.dromara.sureness.provider.annotation.AnnotationPathTreeProvider; +import org.dromara.sureness.provider.ducument.DocumentAccountProvider; +import org.dromara.sureness.provider.ducument.DocumentPathTreeProvider; +import org.dromara.sureness.subject.SubjectCreate; +import org.dromara.sureness.subject.SubjectFactory; +import org.dromara.sureness.subject.SurenessSubjectFactory; +import org.dromara.sureness.subject.creater.BasicSubjectJakartaServletCreator; +import org.dromara.sureness.subject.creater.BasicSubjectJaxRsCreator; +import org.dromara.sureness.subject.creater.BasicSubjectServletCreator; +import org.dromara.sureness.subject.creater.BasicSubjectSpringReactiveCreator; +import org.dromara.sureness.subject.creater.DigestSubjectJakartaServletCreator; +import org.dromara.sureness.subject.creater.DigestSubjectJaxRsCreator; +import org.dromara.sureness.subject.creater.DigestSubjectServletCreator; +import org.dromara.sureness.subject.creater.DigestSubjectSpringReactiveCreator; +import org.dromara.sureness.subject.creater.JwtSubjectJakartaServletCreator; +import org.dromara.sureness.subject.creater.JwtSubjectJaxRsCreator; +import org.dromara.sureness.subject.creater.JwtSubjectServletCreator; +import org.dromara.sureness.subject.creater.JwtSubjectSpringReactiveCreator; +import org.dromara.sureness.subject.creater.JwtSubjectWsJakartaServletCreator; +import org.dromara.sureness.subject.creater.JwtSubjectWsJaxRsCreator; +import org.dromara.sureness.subject.creater.JwtSubjectWsServletCreator; +import org.dromara.sureness.subject.creater.JwtSubjectWsSpringReactiveCreator; +import org.dromara.sureness.subject.creater.NoneSubjectJakartaServletCreator; +import org.dromara.sureness.subject.creater.NoneSubjectJaxRsCreator; +import org.dromara.sureness.subject.creater.NoneSubjectServletCreator; +import org.dromara.sureness.subject.creater.NoneSubjectSpringReactiveCreator; +import org.dromara.sureness.subject.creater.SessionSubjectJakartaServletCreator; +import org.dromara.sureness.subject.creater.SessionSubjectServletCreator; +import org.dromara.sureness.util.JsonWebTokenUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -56,6 +56,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import static org.dromara.sureness.configuration.SurenessProperties.*; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -63,8 +65,6 @@ import java.util.List; import java.util.Set; -import static com.usthe.sureness.configuration.SurenessProperties.*; - /** * @author wangtao diff --git a/support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessInitException.java b/support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessInitException.java similarity index 67% rename from support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessInitException.java rename to support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessInitException.java index e6d33c7d..1e93db77 100644 --- a/support/spring-boot-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessInitException.java +++ b/support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessInitException.java @@ -1,6 +1,6 @@ -package com.usthe.sureness.configuration; +package org.dromara.sureness.configuration; -import com.usthe.sureness.processor.exception.ExtSurenessException; +import org.dromara.sureness.processor.exception.ExtSurenessException; /** * sureness init exception diff --git a/support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessJakartaServletFilter.java b/support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessJakartaServletFilter.java similarity index 87% rename from support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessJakartaServletFilter.java rename to support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessJakartaServletFilter.java index 72d9abc5..1eb2fc9f 100644 --- a/support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessJakartaServletFilter.java +++ b/support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessJakartaServletFilter.java @@ -1,15 +1,5 @@ -package com.usthe.sureness.configuration; - -import com.usthe.sureness.mgt.SecurityManager; -import com.usthe.sureness.processor.exception.DisabledAccountException; -import com.usthe.sureness.processor.exception.ExcessiveAttemptsException; -import com.usthe.sureness.processor.exception.ExpiredCredentialsException; -import com.usthe.sureness.processor.exception.IncorrectCredentialsException; -import com.usthe.sureness.processor.exception.NeedDigestInfoException; -import com.usthe.sureness.processor.exception.UnauthorizedException; -import com.usthe.sureness.processor.exception.UnknownAccountException; -import com.usthe.sureness.subject.SubjectSum; -import com.usthe.sureness.util.SurenessContextHolder; +package org.dromara.sureness.configuration; + import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; import jakarta.servlet.FilterConfig; @@ -17,6 +7,17 @@ import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletResponse; + +import org.dromara.sureness.mgt.SecurityManager; +import org.dromara.sureness.processor.exception.DisabledAccountException; +import org.dromara.sureness.processor.exception.ExcessiveAttemptsException; +import org.dromara.sureness.processor.exception.ExpiredCredentialsException; +import org.dromara.sureness.processor.exception.IncorrectCredentialsException; +import org.dromara.sureness.processor.exception.NeedDigestInfoException; +import org.dromara.sureness.processor.exception.UnauthorizedException; +import org.dromara.sureness.processor.exception.UnknownAccountException; +import org.dromara.sureness.subject.SubjectSum; +import org.dromara.sureness.util.SurenessContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessProperties.java b/support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessProperties.java similarity index 98% rename from support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessProperties.java rename to support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessProperties.java index 9794e7af..0c143a31 100644 --- a/support/spring-boot3-starter-sureness/src/main/java/com/usthe/sureness/configuration/SurenessProperties.java +++ b/support/spring-boot3-starter-sureness/src/main/java/org/dromara/sureness/configuration/SurenessProperties.java @@ -1,4 +1,4 @@ -package com.usthe.sureness.configuration; +package org.dromara.sureness.configuration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component;