From c49d85bb5894bbdb4f86c461dfa4f82b1bf93e7a Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sat, 10 Mar 2018 21:59:33 +0800 Subject: [PATCH] fix > for #2395 --- .../autoconfigure/stat/DruidStatViewServletConfiguration.java | 2 +- .../autoconfigure/stat/DruidWebStatFilterConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java index eda38c3960..efe754be62 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean; @ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled", havingValue = "true", matchIfMissing = true) public class DruidStatViewServletConfiguration { @Bean - public ServletRegistrationBean servletRegistrationBean(DruidStatProperties properties) { + public ServletRegistrationBean statViewServletRegistrationBean(DruidStatProperties properties) { DruidStatProperties.StatViewServlet config = properties.getStatViewServlet(); ServletRegistrationBean registrationBean = new ServletRegistrationBean(); registrationBean.setServlet(new StatViewServlet()); diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java index d160f018f9..9117ee83a8 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean; @ConditionalOnProperty(name = "spring.datasource.druid.web-stat-filter.enabled", havingValue = "true", matchIfMissing = true) public class DruidWebStatFilterConfiguration { @Bean - public FilterRegistrationBean filterRegistrationBean(DruidStatProperties properties) { + public FilterRegistrationBean webStatFilterRegistrationBean(DruidStatProperties properties) { DruidStatProperties.WebStatFilter config = properties.getWebStatFilter(); FilterRegistrationBean registrationBean = new FilterRegistrationBean(); WebStatFilter filter = new WebStatFilter();