diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/service/PigxClientDetailsServiceImpl.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxClientDetailsServiceImpl.java similarity index 97% rename from pigx-auth/src/main/java/com/pig4cloud/pigx/auth/service/PigxClientDetailsServiceImpl.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxClientDetailsServiceImpl.java index 892932d0e..87472dd90 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/service/PigxClientDetailsServiceImpl.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxClientDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pigx.auth.service; +package com.pig4cloud.pigx.common.security.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; @@ -11,12 +11,12 @@ import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.Cacheable; +import org.springframework.context.annotation.Primary; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.oauth2.common.exceptions.InvalidClientException; import org.springframework.security.oauth2.provider.ClientDetails; import org.springframework.security.oauth2.provider.ClientDetailsService; import org.springframework.security.oauth2.provider.client.BaseClientDetails; -import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import java.util.Map; @@ -28,7 +28,7 @@ import java.util.Map; * 扩展 JdbcClientDetailsService 支持多租户 */ @Slf4j -@Service +@Primary @RequiredArgsConstructor public class PigxClientDetailsServiceImpl implements ClientDetailsService { diff --git a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories index 661f6ebcc..22399c14e 100644 --- a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories @@ -2,6 +2,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.pig4cloud.pigx.common.security.component.PigxTokenEnhancer,\ com.pig4cloud.pigx.common.security.component.PigxSecurityInnerAspect,\ com.pig4cloud.pigx.common.security.service.PigxUserDetailsServiceImpl,\ + com.pig4cloud.pigx.common.security.service.PigxClientDetailsServiceImpl,\ com.pig4cloud.pigx.common.security.component.PigxTokenStoreAutoConfiguration,\ com.pig4cloud.pigx.common.security.component.PigxTokenStoreCleanSchedule,\ com.pig4cloud.pigx.common.security.listener.AuthenticationFailureEventListener,\