diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java index b13b7cff8..451484200 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfiguration.java @@ -19,9 +19,9 @@ package com.pig4cloud.pigx.auth.config; import com.pig4cloud.pigx.auth.support.CustomeOAuth2AccessTokenGenerator; import com.pig4cloud.pigx.auth.support.core.CustomeOAuth2TokenCustomizer; import com.pig4cloud.pigx.auth.support.core.FormIdentityLoginConfigurer; -import com.pig4cloud.pigx.auth.support.core.PigDaoAuthenticationProvider; -import com.pig4cloud.pigx.auth.support.handler.PigAuthenticationFailureEventHandler; -import com.pig4cloud.pigx.auth.support.handler.PigAuthenticationSuccessEventHandler; +import com.pig4cloud.pigx.auth.support.core.PigxDaoAuthenticationProvider; +import com.pig4cloud.pigx.auth.support.handler.PigxAuthenticationFailureEventHandler; +import com.pig4cloud.pigx.auth.support.handler.PigxAuthenticationSuccessEventHandler; import com.pig4cloud.pigx.auth.support.password.OAuth2ResourceOwnerPasswordAuthenticationConverter; import com.pig4cloud.pigx.auth.support.password.OAuth2ResourceOwnerPasswordAuthenticationProvider; import com.pig4cloud.pigx.auth.support.sms.OAuth2ResourceOwnerSmsAuthenticationConverter; @@ -66,8 +66,8 @@ public class AuthorizationServerConfiguration { @Bean @Order(Ordered.HIGHEST_PRECEDENCE) public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http, - PigAuthenticationSuccessEventHandler successEventHandler, - PigAuthenticationFailureEventHandler failureEventHandler) throws Exception { + PigxAuthenticationSuccessEventHandler successEventHandler, + PigxAuthenticationFailureEventHandler failureEventHandler) throws Exception { OAuth2AuthorizationServerConfigurer authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer(); http.apply(authorizationServerConfigurer.tokenEndpoint((tokenEndpoint) -> {// 个性化认证授权端点 @@ -149,7 +149,7 @@ public class AuthorizationServerConfiguration { authenticationManager, authorizationService, oAuth2TokenGenerator()); // 处理 UsernamePasswordAuthenticationToken - http.authenticationProvider(new PigDaoAuthenticationProvider()); + http.authenticationProvider(new PigxDaoAuthenticationProvider()); // 处理 OAuth2ResourceOwnerPasswordAuthenticationToken http.authenticationProvider(resourceOwnerPasswordAuthenticationProvider); // 处理 OAuth2ResourceOwnerSmsAuthenticationToken diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java similarity index 98% rename from pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java rename to pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index 6a5ae5490..d97772897 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -26,7 +26,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysTenant; import com.pig4cloud.pigx.admin.api.feign.RemoteClientDetailsService; import com.pig4cloud.pigx.admin.api.feign.RemoteTenantService; import com.pig4cloud.pigx.admin.api.vo.TokenVo; -import com.pig4cloud.pigx.auth.support.handler.PigAuthenticationFailureEventHandler; +import com.pig4cloud.pigx.auth.support.handler.PigxAuthenticationFailureEventHandler; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; @@ -76,9 +76,9 @@ import java.util.stream.Collectors; @RestController @RequiredArgsConstructor @RequestMapping("/token") -public class PigTokenEndpoint { +public class PigxTokenEndpoint { - private final PigAuthenticationFailureEventHandler authenticationFailureHandler; + private final PigxAuthenticationFailureEventHandler authenticationFailureHandler; private final OAuth2AuthorizationService authorizationService; diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java index c71fb65ef..493e6128d 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java @@ -3,7 +3,7 @@ package com.pig4cloud.pigx.auth.support.base; import cn.hutool.core.util.BooleanUtil; import cn.hutool.extra.spring.SpringUtil; import com.pig4cloud.pigx.common.core.constant.CommonConstants; -import com.pig4cloud.pigx.common.security.service.PigRedisOAuth2AuthorizationService; +import com.pig4cloud.pigx.common.security.service.PigxRedisOAuth2AuthorizationService; import com.pig4cloud.pigx.common.security.util.OAuth2ErrorCodesExpand; import com.pig4cloud.pigx.common.security.util.ScopeException; import lombok.extern.slf4j.Slf4j; @@ -156,7 +156,7 @@ public abstract class OAuth2ResourceOwnerBaseAuthenticationProvider accessTokenHttpResponseConverter = new OAuth2AccessTokenResponseHttpMessageConverter(); diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigLogoutSuccessEventHandler.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigxLogoutSuccessEventHandler.java similarity index 96% rename from pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigLogoutSuccessEventHandler.java rename to pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigxLogoutSuccessEventHandler.java index df6de0522..152d960ac 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigLogoutSuccessEventHandler.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigxLogoutSuccessEventHandler.java @@ -35,7 +35,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class PigLogoutSuccessEventHandler implements ApplicationListener { +public class PigxLogoutSuccessEventHandler implements ApplicationListener { @Override public void onApplicationEvent(LogoutSuccessEvent event) { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/annotation/EnablePigxResourceServer.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/annotation/EnablePigxResourceServer.java index c22a2d3cb..c18617140 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/annotation/EnablePigxResourceServer.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/annotation/EnablePigxResourceServer.java @@ -16,9 +16,9 @@ package com.pig4cloud.pigx.common.security.annotation; -import com.pig4cloud.pigx.common.security.component.PigResourceServerAutoConfiguration; -import com.pig4cloud.pigx.common.security.component.PigResourceServerConfiguration; -import com.pig4cloud.pigx.common.security.feign.PigFeignClientConfiguration; +import com.pig4cloud.pigx.common.security.component.PigxResourceServerAutoConfiguration; +import com.pig4cloud.pigx.common.security.component.PigxResourceServerConfiguration; +import com.pig4cloud.pigx.common.security.feign.PigxFeignClientConfiguration; import org.springframework.context.annotation.Import; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; @@ -35,8 +35,8 @@ import java.lang.annotation.*; @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @EnableGlobalMethodSecurity(prePostEnabled = true) -@Import({ PigResourceServerAutoConfiguration.class, PigResourceServerConfiguration.class, - PigFeignClientConfiguration.class }) +@Import({ PigxResourceServerAutoConfiguration.class, PigxResourceServerConfiguration.class, + PigxFeignClientConfiguration.class }) public @interface EnablePigxResourceServer { } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigBearerTokenExtractor.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxBearerTokenExtractor.java similarity index 96% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigBearerTokenExtractor.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxBearerTokenExtractor.java index 248f4029a..01f7d2992 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigBearerTokenExtractor.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxBearerTokenExtractor.java @@ -34,7 +34,7 @@ import java.util.regex.Pattern; * @author caiqy * @date 2020.05.15 */ -public class PigBearerTokenExtractor implements BearerTokenResolver { +public class PigxBearerTokenExtractor implements BearerTokenResolver { private static final Pattern authorizationPattern = Pattern.compile("^Bearer (?[a-zA-Z0-9-:._~+/]+=*)$", Pattern.CASE_INSENSITIVE); @@ -49,10 +49,11 @@ public class PigBearerTokenExtractor implements BearerTokenResolver { private final PermitAllUrlProperties urlProperties; - public PigBearerTokenExtractor(PermitAllUrlProperties urlProperties) { + public PigxBearerTokenExtractor(PermitAllUrlProperties urlProperties) { this.urlProperties = urlProperties; } + @Override public String resolve(HttpServletRequest request) { boolean match = urlProperties.getIgnoreUrls().stream() diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigClientCredentialsOAuth2AuthenticatedPrincipal.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxClientCredentialsOAuth2AuthenticatedPrincipal.java similarity index 88% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigClientCredentialsOAuth2AuthenticatedPrincipal.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxClientCredentialsOAuth2AuthenticatedPrincipal.java index bc4481d02..62d826e68 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigClientCredentialsOAuth2AuthenticatedPrincipal.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxClientCredentialsOAuth2AuthenticatedPrincipal.java @@ -14,7 +14,7 @@ import java.util.Map; * credential 支持客户端模式的用户存储 */ @RequiredArgsConstructor -public class PigClientCredentialsOAuth2AuthenticatedPrincipal implements OAuth2AuthenticatedPrincipal { +public class PigxClientCredentialsOAuth2AuthenticatedPrincipal implements OAuth2AuthenticatedPrincipal { private final Map attributes; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigCustomOpaqueTokenIntrospector.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxCustomOpaqueTokenIntrospector.java similarity index 94% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigCustomOpaqueTokenIntrospector.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxCustomOpaqueTokenIntrospector.java index 2cc6d1e99..c21882d9e 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigCustomOpaqueTokenIntrospector.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxCustomOpaqueTokenIntrospector.java @@ -30,7 +30,7 @@ import java.util.Optional; */ @Slf4j @RequiredArgsConstructor -public class PigCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector { +public class PigxCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector { private final OAuth2AuthorizationService authorizationService; @@ -43,7 +43,7 @@ public class PigCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector // 客户端模式默认返回 if (AuthorizationGrantType.CLIENT_CREDENTIALS.equals(oldAuthorization.getAuthorizationGrantType())) { - return new PigClientCredentialsOAuth2AuthenticatedPrincipal(oldAuthorization.getAttributes(), + return new PigxClientCredentialsOAuth2AuthenticatedPrincipal(oldAuthorization.getAttributes(), AuthorityUtils.NO_AUTHORITIES, oldAuthorization.getPrincipalName()); } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigResourceServerAutoConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerAutoConfiguration.java similarity index 89% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigResourceServerAutoConfiguration.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerAutoConfiguration.java index 342b137f0..51950ee1d 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigResourceServerAutoConfiguration.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.security.oauth2.server.resource.introspection.OpaqueT */ @RequiredArgsConstructor @EnableConfigurationProperties(PermitAllUrlProperties.class) -public class PigResourceServerAutoConfiguration { +public class PigxResourceServerAutoConfiguration { /** * 鉴权具体的实现逻辑 @@ -47,8 +47,8 @@ public class PigResourceServerAutoConfiguration { * @return BearerTokenExtractor */ @Bean - public PigBearerTokenExtractor pigBearerTokenExtractor(PermitAllUrlProperties urlProperties) { - return new PigBearerTokenExtractor(urlProperties); + public PigxBearerTokenExtractor pigBearerTokenExtractor(PermitAllUrlProperties urlProperties) { + return new PigxBearerTokenExtractor(urlProperties); } /** @@ -70,7 +70,7 @@ public class PigResourceServerAutoConfiguration { */ @Bean public OpaqueTokenIntrospector opaqueTokenIntrospector(OAuth2AuthorizationService authorizationService) { - return new PigCustomOpaqueTokenIntrospector(authorizationService); + return new PigxCustomOpaqueTokenIntrospector(authorizationService); } } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigResourceServerConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java similarity index 92% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigResourceServerConfiguration.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java index f7964d344..b762884c6 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigResourceServerConfiguration.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java @@ -36,13 +36,13 @@ import org.springframework.security.web.SecurityFilterChain; @Slf4j @EnableWebSecurity @RequiredArgsConstructor -public class PigResourceServerConfiguration { +public class PigxResourceServerConfiguration { protected final ResourceAuthExceptionEntryPoint resourceAuthExceptionEntryPoint; private final PermitAllUrlProperties permitAllUrl; - private final PigBearerTokenExtractor pigBearerTokenExtractor; + private final PigxBearerTokenExtractor pigxBearerTokenExtractor; private final OpaqueTokenIntrospector customOpaqueTokenIntrospector; @@ -56,7 +56,7 @@ public class PigResourceServerConfiguration { .oauth2ResourceServer( oauth2 -> oauth2.opaqueToken(token -> token.introspector(customOpaqueTokenIntrospector)) .authenticationEntryPoint(resourceAuthExceptionEntryPoint) - .bearerTokenResolver(pigBearerTokenExtractor)) + .bearerTokenResolver(pigxBearerTokenExtractor)) .headers().frameOptions().disable().and().csrf().disable(); return http.build(); diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigSecurityInnerAspect.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxSecurityInnerAspect.java similarity index 97% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigSecurityInnerAspect.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxSecurityInnerAspect.java index ea2beab31..3d8c1ed6c 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigSecurityInnerAspect.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxSecurityInnerAspect.java @@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletRequest; @Slf4j @Aspect @RequiredArgsConstructor -public class PigSecurityInnerAspect implements Ordered { +public class PigxSecurityInnerAspect implements Ordered { private final HttpServletRequest request; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigSecurityMessageSourceConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxSecurityMessageSourceConfiguration.java similarity index 95% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigSecurityMessageSourceConfiguration.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxSecurityMessageSourceConfiguration.java index a80aa91ee..05b0d0ebe 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigSecurityMessageSourceConfiguration.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxSecurityMessageSourceConfiguration.java @@ -33,7 +33,7 @@ import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebA * 注入自定义错误处理,覆盖 org/springframework/security/messages 内置异常 */ @ConditionalOnWebApplication(type = SERVLET) -public class PigSecurityMessageSourceConfiguration implements WebMvcConfigurer { +public class PigxSecurityMessageSourceConfiguration implements WebMvcConfigurer { @Bean public MessageSource securityMessageSource() { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigFeignClientConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignClientConfiguration.java old mode 100755 new mode 100644 similarity index 91% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigFeignClientConfiguration.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignClientConfiguration.java index 191d53581..ee95bc346 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigFeignClientConfiguration.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignClientConfiguration.java @@ -20,7 +20,7 @@ import feign.RequestInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver; -public class PigFeignClientConfiguration { +public class PigxFeignClientConfiguration { /** * 注入 oauth2 feign token 增强 @@ -29,7 +29,7 @@ public class PigFeignClientConfiguration { */ @Bean public RequestInterceptor oauthRequestInterceptor(BearerTokenResolver tokenResolver) { - return new PigOAuthRequestInterceptor(tokenResolver); + return new PigxOAuthRequestInterceptor(tokenResolver); } } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigOAuthRequestInterceptor.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxOAuthRequestInterceptor.java similarity index 96% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigOAuthRequestInterceptor.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxOAuthRequestInterceptor.java index 4ac2eb16e..8177d17ec 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigOAuthRequestInterceptor.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxOAuthRequestInterceptor.java @@ -25,7 +25,7 @@ import java.util.Collection; */ @Slf4j @RequiredArgsConstructor -public class PigOAuthRequestInterceptor implements RequestInterceptor { +public class PigxOAuthRequestInterceptor implements RequestInterceptor { private final BearerTokenResolver tokenResolver; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRedisOAuth2AuthorizationConsentService.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRedisOAuth2AuthorizationConsentService.java similarity index 94% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRedisOAuth2AuthorizationConsentService.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRedisOAuth2AuthorizationConsentService.java index d3bfdd7fa..377e95114 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRedisOAuth2AuthorizationConsentService.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRedisOAuth2AuthorizationConsentService.java @@ -9,7 +9,7 @@ import org.springframework.util.Assert; import java.util.concurrent.TimeUnit; @RequiredArgsConstructor -public class PigRedisOAuth2AuthorizationConsentService implements OAuth2AuthorizationConsentService { +public class PigxRedisOAuth2AuthorizationConsentService implements OAuth2AuthorizationConsentService { private final RedisTemplate redisTemplate; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRedisOAuth2AuthorizationService.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRedisOAuth2AuthorizationService.java similarity index 98% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRedisOAuth2AuthorizationService.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRedisOAuth2AuthorizationService.java index 502dfc28a..266108b5a 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRedisOAuth2AuthorizationService.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRedisOAuth2AuthorizationService.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; * @date 2022/5/27 */ @RequiredArgsConstructor -public class PigRedisOAuth2AuthorizationService implements OAuth2AuthorizationService { +public class PigxRedisOAuth2AuthorizationService implements OAuth2AuthorizationService { private final static Long TIMEOUT = 10L; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRemoteRegisteredClientRepository.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRemoteRegisteredClientRepository.java similarity index 98% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRemoteRegisteredClientRepository.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRemoteRegisteredClientRepository.java index bd6da1fdc..e3b93a93e 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigRemoteRegisteredClientRepository.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxRemoteRegisteredClientRepository.java @@ -33,7 +33,7 @@ import java.util.Optional; * @date 2022/5/29 */ @RequiredArgsConstructor -public class PigRemoteRegisteredClientRepository implements RegisteredClientRepository { +public class PigxRemoteRegisteredClientRepository implements RegisteredClientRepository { /** * 刷新令牌有效期默认 30 天 diff --git a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 8f949c55b..eac267c60 100644 --- a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -2,8 +2,8 @@ com.pig4cloud.pigx.common.security.service.PigxDefaultUserDetailsServiceImpl com.pig4cloud.pigx.common.security.service.PigxTocDefaultUserDetailsServiceImpl com.pig4cloud.pigx.common.security.service.PigxMobileUserDetailServiceImpl com.pig4cloud.pigx.common.security.service.PigxTocMobileUserDetailsServiceImpl -com.pig4cloud.pigx.common.security.service.PigRedisOAuth2AuthorizationService -com.pig4cloud.pigx.common.security.service.PigRedisOAuth2AuthorizationConsentService -com.pig4cloud.pigx.common.security.component.PigSecurityInnerAspect -com.pig4cloud.pigx.common.security.component.PigSecurityMessageSourceConfiguration -com.pig4cloud.pigx.common.security.service.PigRemoteRegisteredClientRepository +com.pig4cloud.pigx.common.security.service.PigxRedisOAuth2AuthorizationService +com.pig4cloud.pigx.common.security.service.PigxRedisOAuth2AuthorizationConsentService +com.pig4cloud.pigx.common.security.component.PigxSecurityInnerAspect +com.pig4cloud.pigx.common.security.component.PigxSecurityMessageSourceConfiguration +com.pig4cloud.pigx.common.security.service.PigxRemoteRegisteredClientRepository diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/file/dept.xlsx b/pigx-upms/pigx-upms-biz/src/main/resources/file/dept.xlsx new file mode 100644 index 000000000..e17580ab0 Binary files /dev/null and b/pigx-upms/pigx-upms-biz/src/main/resources/file/dept.xlsx differ