[shiro] branch SHIRO-804_avoid_conflict_with_spring created (now 4e2e68d)

[bm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a change to branch SHIRO-804_avoid_conflict_with_spring
in repository https://gitbox.apache.org/repos/asf/shiro.git.


      at 4e2e68d  add Spring internal proxy creator condition

This branch includes the following new commits:

     new 4e2e68d  add Spring internal proxy creator condition

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[shiro] 01/01: add Spring internal proxy creator condition

[bm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch SHIRO-804_avoid_conflict_with_spring
in repository https://gitbox.apache.org/repos/asf/shiro.git

commit 4e2e68dc8c08284a3e2cc4fb86a45cf4e6529134
Author: seaswalker <xs...@hotmail.com>
AuthorDate: Wed Dec 16 11:25:45 2020 +0800

    add Spring internal proxy creator condition
---
 .../autoconfigure/ShiroAnnotationProcessorAutoConfiguration.java     | 5 ++++-
 1 file changed, 4 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 6c00d29..6b00e51 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,6 +21,7 @@ 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.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -38,7 +39,9 @@ public class ShiroAnnotationProcessorAutoConfiguration extends AbstractShiroAnno
 
     @Bean
     @DependsOn("lifecycleBeanPostProcessor")
-    @ConditionalOnMissingBean
+    @ConditionalOnMissingBean(
+            value = DefaultAdvisorAutoProxyCreator.class, name = AopConfigUtils.AUTO_PROXY_CREATOR_BEAN_NAME
+    )
     @Override
     public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() {
         return super.defaultAdvisorAutoProxyCreator();