🚚 调整下 security 的包名

link gh-172
ballcat-projects · Jun 7, 2023 · 9549581 · 9549581
1 parent 9b6d4c3
commit 9549581
Show file tree

Hide file tree

Showing 27 changed files with 48 additions and 48 deletions.
diff --git a/...oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java b/...oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java
@@ -17,12 +17,12 @@
 
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.ballcat.security.oauth2.authentication.OAuth2UserAuthenticationToken;
-import org.ballcat.security.oauth2.jackson2.LongMixin;
-import org.ballcat.security.oauth2.jackson2.OAuth2UserAuthenticationTokenMixin;
-import org.ballcat.security.oauth2.jackson2.UserMixin;
-import org.ballcat.security.oauth2.userdetails.User;
-import org.ballcat.security.oauth2.util.PasswordUtils;
+import org.ballcat.springsecurity.oauth2.authentication.OAuth2UserAuthenticationToken;
+import org.ballcat.springsecurity.oauth2.jackson2.LongMixin;
+import org.ballcat.springsecurity.oauth2.jackson2.OAuth2UserAuthenticationTokenMixin;
+import org.ballcat.springsecurity.oauth2.jackson2.UserMixin;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
+import org.ballcat.springsecurity.util.PasswordUtils;
 import lombok.RequiredArgsConstructor;
 import org.ballcat.springsecurity.oauth2.server.authorization.OAuth2AuthorizationObjectMapperCustomizer;
 import org.ballcat.springsecurity.oauth2.server.authorization.config.BallcatOAuth2AuthorizationServerSecurityFilterChainBuilder;

diff --git a/...allcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java b/...allcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java
@@ -15,9 +15,9 @@
  */
 package org.ballcat.springsecurity.oauth2.server.authorization.token;
 
-import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants;
-import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants;
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.constant.TokenAttributeNameConstants;
+import org.ballcat.springsecurity.oauth2.constant.UserInfoFiledNameConstants;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.server.authorization.authentication.OAuth2ClientAuthenticationToken;
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsContext;

diff --git a/...org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java b/...org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java
@@ -18,7 +18,7 @@
 import cn.hutool.core.text.CharSequenceUtil;
 import org.ballcat.common.model.result.R;
 import org.ballcat.common.model.result.SystemResultCode;
-import org.ballcat.security.oauth2.ScopeNames;
+import org.ballcat.springsecurity.oauth2.ScopeNames;
 import org.ballcat.common.util.JsonUtils;
 import lombok.RequiredArgsConstructor;
 import org.ballcat.security.captcha.CaptchaValidateResult;

diff --git a/...cat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java b/...cat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java
@@ -18,8 +18,8 @@
 import org.ballcat.common.core.request.wrapper.ModifyParamMapRequestWrapper;
 import org.ballcat.common.model.result.R;
 import org.ballcat.common.model.result.SystemResultCode;
-import org.ballcat.security.oauth2.ScopeNames;
-import org.ballcat.security.oauth2.util.PasswordUtils;
+import org.ballcat.springsecurity.oauth2.ScopeNames;
+import org.ballcat.springsecurity.util.PasswordUtils;
 import org.ballcat.common.util.JsonUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java b/...java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java
@@ -15,7 +15,7 @@
  */
 package org.ballcat.springsecurity.oauth2.server.authorization;
 
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients;
 import org.ballcat.springsecurity.oauth2.server.authorization.user.TestUsers;
 import org.springframework.security.authentication.TestingAuthenticationToken;

diff --git a/.../authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java b/.../authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java
@@ -15,7 +15,7 @@
  */
 package org.ballcat.springsecurity.oauth2.server.authorization.authentication;
 
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients;
 import org.ballcat.springsecurity.oauth2.server.authorization.context.TestAuthorizationServerContext;
 import org.ballcat.springsecurity.oauth2.server.authorization.user.TestUsers;

diff --git a/...t/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java b/...t/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java
@@ -15,9 +15,9 @@
  */
 package org.ballcat.springsecurity.oauth2.server.authorization.token;
 
-import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants;
-import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants;
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.constant.TokenAttributeNameConstants;
+import org.ballcat.springsecurity.oauth2.constant.UserInfoFiledNameConstants;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import org.ballcat.springsecurity.oauth2.server.authorization.authentication.OAuth2ResourceOwnerPasswordAuthenticationToken;
 import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients;
 import org.ballcat.springsecurity.oauth2.server.authorization.context.TestAuthorizationServerContext;

diff --git a/.../src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java b/.../src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java
@@ -15,8 +15,8 @@
  */
 package org.ballcat.springsecurity.oauth2.server.authorization.user;
 
-import org.ballcat.security.oauth2.constant.UserAttributeNameConstants;
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.constant.UserAttributeNameConstants;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 import java.util.Collection;

diff --git a/.../component/CustomPermissionEvaluator.java → .../component/CustomPermissionEvaluator.java b/.../component/CustomPermissionEvaluator.java → .../component/CustomPermissionEvaluator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.component;
+package org.ballcat.springsecurity.component;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...g/ballcat/security/oauth2/ScopeNames.java → ...cat/springsecurity/oauth2/ScopeNames.java b/...g/ballcat/security/oauth2/ScopeNames.java → ...cat/springsecurity/oauth2/ScopeNames.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2;
+package org.ballcat.springsecurity.oauth2;
 
 /**
  * @author hccake

diff --git a/...cation/OAuth2UserAuthenticationToken.java → ...cation/OAuth2UserAuthenticationToken.java b/...cation/OAuth2UserAuthenticationToken.java → ...cation/OAuth2UserAuthenticationToken.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.authentication;
+package org.ballcat.springsecurity.oauth2.authentication;
 
 import lombok.EqualsAndHashCode;
 import org.springframework.security.authentication.AbstractAuthenticationToken;

diff --git a/...constant/TokenAttributeNameConstants.java → ...constant/TokenAttributeNameConstants.java b/...constant/TokenAttributeNameConstants.java → ...constant/TokenAttributeNameConstants.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.constant;
+package org.ballcat.springsecurity.oauth2.constant;
 
 /**
  * @author hccake

diff --git a/.../constant/UserAttributeNameConstants.java → .../constant/UserAttributeNameConstants.java b/.../constant/UserAttributeNameConstants.java → .../constant/UserAttributeNameConstants.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.constant;
+package org.ballcat.springsecurity.oauth2.constant;
 
 /**
  * @author hccake

diff --git a/.../constant/UserInfoFiledNameConstants.java → .../constant/UserInfoFiledNameConstants.java b/.../constant/UserInfoFiledNameConstants.java → .../constant/UserInfoFiledNameConstants.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.constant;
+package org.ballcat.springsecurity.oauth2.constant;
 
 /**
  * @author hccake

diff --git a/...t/security/oauth2/jackson2/LongMixin.java → ...ngsecurity/oauth2/jackson2/LongMixin.java b/...t/security/oauth2/jackson2/LongMixin.java → ...ngsecurity/oauth2/jackson2/LongMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.jackson2;
+package org.ballcat.springsecurity.oauth2.jackson2;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/...2UserAuthenticationTokenDeserializer.java → ...2UserAuthenticationTokenDeserializer.java b/...2UserAuthenticationTokenDeserializer.java → ...2UserAuthenticationTokenDeserializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.jackson2;
+package org.ballcat.springsecurity.oauth2.jackson2;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -22,8 +22,8 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.ballcat.security.oauth2.authentication.OAuth2UserAuthenticationToken;
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.authentication.OAuth2UserAuthenticationToken;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 

diff --git a/...2/OAuth2UserAuthenticationTokenMixin.java → ...2/OAuth2UserAuthenticationTokenMixin.java b/...2/OAuth2UserAuthenticationTokenMixin.java → ...2/OAuth2UserAuthenticationTokenMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.jackson2;
+package org.ballcat.springsecurity.oauth2.jackson2;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

diff --git a/...ity/oauth2/jackson2/UserDeserializer.java → ...ity/oauth2/jackson2/UserDeserializer.java b/...ity/oauth2/jackson2/UserDeserializer.java → ...ity/oauth2/jackson2/UserDeserializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.jackson2;
+package org.ballcat.springsecurity.oauth2.jackson2;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.MissingNode;
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 

diff --git a/...t/security/oauth2/jackson2/UserMixin.java → ...ngsecurity/oauth2/jackson2/UserMixin.java b/...t/security/oauth2/jackson2/UserMixin.java → ...ngsecurity/oauth2/jackson2/UserMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.jackson2;
+package org.ballcat.springsecurity.oauth2.jackson2;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

diff --git a/...y/oauth2/userdetails/ClientPrincipal.java → ...y/oauth2/userdetails/ClientPrincipal.java b/...y/oauth2/userdetails/ClientPrincipal.java → ...y/oauth2/userdetails/ClientPrincipal.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.userdetails;
+package org.ballcat.springsecurity.oauth2.userdetails;
 
 import org.springframework.lang.NonNull;
 import org.springframework.security.core.GrantedAuthority;

diff --git a/...cat/security/oauth2/userdetails/User.java → ...ringsecurity/oauth2/userdetails/User.java b/...cat/security/oauth2/userdetails/User.java → ...ringsecurity/oauth2/userdetails/User.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.userdetails;
+package org.ballcat.springsecurity.oauth2.userdetails;
 
 import lombok.Builder;
 import lombok.Getter;

diff --git a/...t/security/oauth2/util/PasswordUtils.java → ...at/springsecurity/util/PasswordUtils.java b/...t/security/oauth2/util/PasswordUtils.java → ...at/springsecurity/util/PasswordUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.util;
+package org.ballcat.springsecurity.util;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.crypto.Mode;

diff --git a/...t/security/oauth2/util/SecurityUtils.java → ...at/springsecurity/util/SecurityUtils.java b/...t/security/oauth2/util/SecurityUtils.java → ...at/springsecurity/util/SecurityUtils.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.util;
+package org.ballcat.springsecurity.util;
 
-import org.ballcat.security.oauth2.userdetails.ClientPrincipal;
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.userdetails.ClientPrincipal;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import lombok.experimental.UtilityClass;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

diff --git a/...at/security/oauth2/test/PasswordTest.java → ...ingsecurity/oauth2/test/PasswordTest.java b/...at/security/oauth2/test/PasswordTest.java → ...ingsecurity/oauth2/test/PasswordTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.ballcat.security.oauth2.test;
+package org.ballcat.springsecurity.oauth2.test;
 
-import org.ballcat.security.oauth2.util.PasswordUtils;
+import org.ballcat.springsecurity.util.PasswordUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.security.crypto.password.PasswordEncoder;

diff --git a/.../ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java b/.../ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java
@@ -15,7 +15,7 @@
  */
 package org.ballcat.springsecurity.oauth2.server.resource;
 
-import org.ballcat.security.oauth2.component.CustomPermissionEvaluator;
+import org.ballcat.springsecurity.component.CustomPermissionEvaluator;
 import org.ballcat.springsecurity.oauth2.server.resource.configurer.BallcatOauth2ResourceServerSecurityFilterChainBuilder;
 import org.ballcat.springsecurity.oauth2.server.resource.configurer.OAuth2ResourceServerConfigurerCustomizer;
 import org.ballcat.springsecurity.oauth2.server.resource.configurer.OAuth2ResourceServerExtensionConfigurer;

diff --git a/...ngsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java b/...ngsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java
@@ -16,11 +16,11 @@
 package org.ballcat.springsecurity.oauth2.server.resource.introspection;
 
 import cn.hutool.core.collection.CollUtil;
-import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants;
-import org.ballcat.security.oauth2.constant.UserAttributeNameConstants;
-import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants;
-import org.ballcat.security.oauth2.userdetails.ClientPrincipal;
-import org.ballcat.security.oauth2.userdetails.User;
+import org.ballcat.springsecurity.oauth2.constant.TokenAttributeNameConstants;
+import org.ballcat.springsecurity.oauth2.constant.UserAttributeNameConstants;
+import org.ballcat.springsecurity.oauth2.constant.UserInfoFiledNameConstants;
+import org.ballcat.springsecurity.oauth2.userdetails.ClientPrincipal;
+import org.ballcat.springsecurity.oauth2.userdetails.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;

diff --git a/.../resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java b/.../resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java
@@ -16,7 +16,7 @@
 package org.ballcat.springsecurity.oauth2.server.resource.introspection;
 
 import cn.hutool.core.collection.CollUtil;
-import org.ballcat.security.oauth2.userdetails.ClientPrincipal;
+import org.ballcat.springsecurity.oauth2.userdetails.ClientPrincipal;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;