Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

update > optimize the config follow the spring standard & help IDE quick hints

Browse Source
This commit is contained in:
lihengming
2017-07-05 14:35:26 +08:00
parent 28e6dc0473
commit 79b99c3827
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class DruidDataSourceAutoConfigure {
dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name"));
}
// set filters default value on StatViewServlet enabled.
if (! "false".equals(env.getProperty("spring.datasource.druid.StatViewServlet.enabled"))) {
if (!"false".equals(env.getProperty("spring.datasource.druid.stat-view-servlet.enabled"))) {
try {
dataSource.setFilters("stat");
} catch (SQLException e) {
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatProperties.java
+18
View File
@@ -52,6 +52,7 @@ public class DruidStatProperties {
}
public static class StatViewServlet {
private boolean enabled;
private String urlPattern;
private String allow;
private String deny;
@@ -59,6 +60,14 @@ public class DruidStatProperties {
private String loginPassword;
private String resetEnable;
public boolean isEnabled() {
return enabled;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public String getUrlPattern() {
return urlPattern;
}
@@ -109,6 +118,7 @@ public class DruidStatProperties {
}
public static class WebStatFilter {
private boolean enabled;
private String urlPattern;
private String exclusions;
private String sessionStatMaxCount;
@@ -117,6 +127,14 @@ public class DruidStatProperties {
private String principalCookieName;
private String profileEnable;
public boolean isEnabled() {
return enabled;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public String getUrlPattern() {
return urlPattern;
}
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatViewServletConfiguration.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
* @author lihengming [89921218@qq.com]
*/
@ConditionalOnWebApplication
@ConditionalOnProperty(name = "spring.datasource.druid.StatViewServlet.enabled", havingValue = "true", matchIfMissing = true)
@ConditionalOnProperty(name = {"spring.datasource.druid.stat-view-servlet.enabled"}, havingValue = "true", matchIfMissing = true)
public class DruidStatViewServletConfiguration {
@Bean
public ServletRegistrationBean servletRegistrationBean(DruidStatProperties properties) {
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidWebStatFilterConfiguration.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
* @author lihengming [89921218@qq.com]
*/
@ConditionalOnWebApplication
@ConditionalOnProperty(name = "spring.datasource.druid.WebStatFilter.enabled", havingValue = "true", matchIfMissing = true)
@ConditionalOnProperty(name = "spring.datasource.druid.web-stat-filter.enabled", havingValue = "true", matchIfMissing = true)
public class DruidWebStatFilterConfiguration {
@Bean
public FilterRegistrationBean filterRegistrationBean(DruidStatProperties properties) {