Merge ecd282c46c into 2e6bb735fb

druid-spring-boot-3-starter/src/main/java/com/alibaba/druid/spring/boot3/autoconfigure/stat/DruidSpringAopConfiguration.java

@@ -21,6 +21,7 @@ import org.aopalliance.aop.Advice;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.aop.support.RegexpMethodPointcutAdvisor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 
@@ -40,6 +41,7 @@ public class DruidSpringAopConfiguration {
     }
 
     @Bean
+    @ConditionalOnMissingClass("org.aspectj.weaver.Advice")
     @ConditionalOnProperty(name = "spring.aop.auto", havingValue = "false")
     public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() {
         DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();

druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java

@@ -21,6 +21,7 @@ import org.aopalliance.aop.Advice;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.aop.support.RegexpMethodPointcutAdvisor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 
@@ -40,6 +41,7 @@ public class DruidSpringAopConfiguration {
     }
 
     @Bean
+    @ConditionalOnMissingClass("org.aspectj.weaver.Advice")
     @ConditionalOnProperty(name = "spring.aop.auto", havingValue = "false")
     public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() {
         DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();