Merge pull request #3558 from eryanwcp/master

解决Spring Boot环境下AOP二次代理问题

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

@@ -42,6 +42,7 @@ public Advisor advisor(DruidStatProperties properties) {
     }
 
     @Bean
+    @ConditionalOnProperty(name = "spring.aop.auto",havingValue = "false")
     public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() {
         DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
         advisorAutoProxyCreator.setProxyTargetClass(true);