From 3cab378fdef806f67b6fff0d938d29a592af8ed3 Mon Sep 17 00:00:00 2001 From: aeizzz Date: Tue, 21 Feb 2023 09:46:36 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20pig=E5=89=8D?= =?UTF-8?q?=E7=BC=80=E6=94=B9=E6=88=90pigx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/AuthorizationServerConfiguration.java | 12 ++++++------ ...TokenEndpoint.java => PigxTokenEndpoint.java} | 6 +++--- ...2ResourceOwnerBaseAuthenticationProvider.java | 4 ++-- ...r.java => PigxDaoAuthenticationProvider.java} | 4 ++-- ...> PigxAuthenticationFailureEventHandler.java} | 2 +- ...> PigxAuthenticationSuccessEventHandler.java} | 2 +- ...r.java => PigxLogoutSuccessEventHandler.java} | 2 +- .../annotation/EnablePigxResourceServer.java | 10 +++++----- ...ractor.java => PigxBearerTokenExtractor.java} | 5 +++-- ...CredentialsOAuth2AuthenticatedPrincipal.java} | 2 +- ...va => PigxCustomOpaqueTokenIntrospector.java} | 4 ++-- ... => PigxResourceServerAutoConfiguration.java} | 8 ++++---- ...java => PigxResourceServerConfiguration.java} | 6 +++--- ...rAspect.java => PigxSecurityInnerAspect.java} | 2 +- ... PigxSecurityMessageSourceConfiguration.java} | 2 +- ...on.java => PigxFeignClientConfiguration.java} | 4 ++-- ...tor.java => PigxOAuthRequestInterceptor.java} | 2 +- ...xRedisOAuth2AuthorizationConsentService.java} | 2 +- ... => PigxRedisOAuth2AuthorizationService.java} | 2 +- ...=> PigxRemoteRegisteredClientRepository.java} | 2 +- ....boot.autoconfigure.AutoConfiguration.imports | 10 +++++----- .../src/main/resources/file/dept.xlsx | Bin 0 -> 9980 bytes 22 files changed, 47 insertions(+), 46 deletions(-) rename pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/{PigTokenEndpoint.java => PigxTokenEndpoint.java} (98%) rename pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/core/{PigDaoAuthenticationProvider.java => PigxDaoAuthenticationProvider.java} (98%) rename pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/{PigAuthenticationFailureEventHandler.java => PigxAuthenticationFailureEventHandler.java} (98%) rename pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/{PigAuthenticationSuccessEventHandler.java => PigxAuthenticationSuccessEventHandler.java} (98%) rename pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/{PigLogoutSuccessEventHandler.java => PigxLogoutSuccessEventHandler.java} (96%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/{PigBearerTokenExtractor.java => PigxBearerTokenExtractor.java} (96%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/{PigClientCredentialsOAuth2AuthenticatedPrincipal.java => PigxClientCredentialsOAuth2AuthenticatedPrincipal.java} (88%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/{PigCustomOpaqueTokenIntrospector.java => PigxCustomOpaqueTokenIntrospector.java} (94%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/{PigResourceServerAutoConfiguration.java => PigxResourceServerAutoConfiguration.java} (89%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/{PigResourceServerConfiguration.java => PigxResourceServerConfiguration.java} (92%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/{PigSecurityInnerAspect.java => PigxSecurityInnerAspect.java} (97%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/{PigSecurityMessageSourceConfiguration.java => PigxSecurityMessageSourceConfiguration.java} (95%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/{PigFeignClientConfiguration.java => PigxFeignClientConfiguration.java} (91%) mode change 100755 => 100644 rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/{PigOAuthRequestInterceptor.java => PigxOAuthRequestInterceptor.java} (96%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/{PigRedisOAuth2AuthorizationConsentService.java => PigxRedisOAuth2AuthorizationConsentService.java} (94%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/{PigRedisOAuth2AuthorizationService.java => PigxRedisOAuth2AuthorizationService.java} (98%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/{PigRemoteRegisteredClientRepository.java => PigxRemoteRegisteredClientRepository.java} (98%) create mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/file/dept.xlsx 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 0000000000000000000000000000000000000000..e17580ab018be702d752cdc1a52168e40bb89569 GIT binary patch literal 9980 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