This is an automated email from the ASF dual-hosted git repository. bdemers pushed a commit to branch aop-1-10-x in repository https://gitbox.apache.org/repos/asf/shiro.git
commit a99d0b235870fdefab38b27424bd6522a127fd3a Author: George CAO <[email protected]> AuthorDate: Fri Oct 7 11:43:24 2022 +0800 Avoid another proxy creator when @EnableAspectJAutoProxy enabled --- .../autoconfigure/ShiroAnnotationProcessorAutoConfiguration.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAnnotationProcessorAutoConfiguration.java b/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAnnotationProcessorAutoConfiguration.java index 6c00d293..b17fa1b1 100644 --- a/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAnnotationProcessorAutoConfiguration.java +++ b/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAnnotationProcessorAutoConfiguration.java @@ -21,7 +21,10 @@ package org.apache.shiro.spring.boot.autoconfigure; import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.spring.config.AbstractShiroAnnotationProcessorConfiguration; import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; +import org.springframework.aop.config.AopConfigUtils; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -32,13 +35,14 @@ import org.springframework.context.annotation.DependsOn; * @since 1.4.0 */ @SuppressWarnings("SpringFacetCodeInspection") +@AutoConfigureAfter(AopAutoConfiguration.class) @Configuration @ConditionalOnProperty(name = "shiro.annotations.enabled", matchIfMissing = true) public class ShiroAnnotationProcessorAutoConfiguration extends AbstractShiroAnnotationProcessorConfiguration { @Bean @DependsOn("lifecycleBeanPostProcessor") - @ConditionalOnMissingBean + @ConditionalOnMissingBean(name = AopConfigUtils.AUTO_PROXY_CREATOR_BEAN_NAME) @Override public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() { return super.defaultAdvisorAutoProxyCreator();
