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

Merge branch 'lihengming-master'

Browse Source
This commit is contained in:
wenshao
2017-12-03 23:26:51 +08:00
parent 295aa9ca29 acd8e56cc6
commit 89f6a40ed3
8 changed files with 172 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
druid-spring-boot-starter/README.md
+2 -2
View File
@@ -12,12 +12,12 @@ Druid Spring Boot Starter 用于帮助你在Spring Boot项目中轻松集成Drui
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.5</version>
<version>1.1.6</version>
</dependency>
```
```Gradle```
```xml
compile 'com.alibaba:druid-spring-boot-starter:1.1.5'
compile 'com.alibaba:druid-spring-boot-starter:1.1.6'
```
2. 添加配置
druid-spring-boot-starter/README_EN.md
+2 -2
View File
@@ -12,12 +12,12 @@ Spring Boot with Druid support, help you simplify Druid config in Spring Boot.
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.5</version>
<version>1.1.6</version>
</dependency>
```
```Gradle```
```xml
compile 'com.alibaba:druid-spring-boot-starter:1.1.5'
compile 'com.alibaba:druid-spring-boot-starter:1.1.6'
```
2. Add configuration properties.
```xml
druid-spring-boot-starter/pom.xml
+17 -3
View File
@@ -4,15 +4,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.5</version>
<version>1.1.6</version>
<packaging>jar</packaging>
<name>druid-spring-boot-starter</name>
<description>Spring Boot with Druid support,help you simplify Druid config in Spring Boot.</description>
<url>https://github.com/alibaba/druid</url>
<properties>
<druid.version>1.1.5</druid.version>
<spring-boot.version>1.5.6.RELEASE</spring-boot.version>
<druid.version>1.1.6</druid.version>
<spring-boot.version>1.5.9.RELEASE</spring-boot.version>
</properties>
<developers>
@@ -44,6 +44,10 @@
<artifactId>druid</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
@@ -54,6 +58,16 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java
+14 -29
View File
@@ -15,62 +15,47 @@
*/
package com.alibaba.druid.spring.boot.autoconfigure;
import javax.sql.DataSource;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.metadata.DruidDataSourcePoolMetadata;
import com.alibaba.druid.spring.boot.autoconfigure.actuator.ActuatorConfiguration;
import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
import com.alibaba.druid.spring.boot.autoconfigure.stat.DruidFilterConfiguration;
import com.alibaba.druid.spring.boot.autoconfigure.stat.DruidSpringAopConfiguration;
import com.alibaba.druid.spring.boot.autoconfigure.stat.DruidStatViewServletConfiguration;
import com.alibaba.druid.spring.boot.autoconfigure.stat.DruidWebStatFilterConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadata;
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvider;
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvidersConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import javax.sql.DataSource;
/**
* @author lihengming [89921218@qq.com]
*/
@Configuration
@ConditionalOnClass(com.alibaba.druid.pool.DruidDataSource.class)
@ConditionalOnClass(DruidDataSource.class)
@AutoConfigureBefore(DataSourceAutoConfiguration.class)
@EnableConfigurationProperties({DruidStatProperties.class, DataSourceProperties.class})
@Import({DruidSpringAopConfiguration.class,
DruidStatViewServletConfiguration.class,
DruidWebStatFilterConfiguration.class,
DruidFilterConfiguration.class})
DruidStatViewServletConfiguration.class,
DruidWebStatFilterConfiguration.class,
DruidFilterConfiguration.class,
ActuatorConfiguration.class})
public class DruidDataSourceAutoConfigure {
private static final Logger LOGGER = LoggerFactory.getLogger(DruidDataSourceAutoConfigure.class);
@Bean
@ConditionalOnMissingBean
public DataSource dataSource() {
LOGGER.info("Init DruidDataSource");
return new DruidDataSourceWrapper();
}
/**
* Register the {@link DataSourcePoolMetadataProvider} instances to support DataSource metrics.
*
* @see DataSourcePoolMetadataProvidersConfiguration
*/
@Bean
public DataSourcePoolMetadataProvider druidDataSourcePoolMetadataProvider() {
return new DataSourcePoolMetadataProvider() {
@Override
public DataSourcePoolMetadata getDataSourcePoolMetadata(DataSource dataSource) {
if (dataSource instanceof DruidDataSource) {
return new DruidDataSourcePoolMetadata((DruidDataSource) dataSource);
}
return null;
}
};
}
}
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/ActuatorConfiguration.java
+69
View File
@@ -0,0 +1,69 @@
/*
* Copyright 1999-2017 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.spring.boot.autoconfigure.actuator;
import javax.sql.DataSource;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.actuator.endpoint.DruidDataSourceMvcEndpoint;
import com.alibaba.druid.spring.boot.autoconfigure.actuator.metadata.DruidDataSourcePoolMetadata;
import org.springframework.boot.actuate.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadata;
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvider;
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvidersConfiguration;
import org.springframework.context.annotation.Bean;
/**
* @author lihengming [89921218@qq.com]
*
* Spring Boot Actuator support.
*/
public class ActuatorConfiguration {
/**
* Register the {@link DataSourcePoolMetadataProvider} instances to support DataSource metrics.
*
* @see DataSourcePoolMetadataProvidersConfiguration
*/
@Bean
public DataSourcePoolMetadataProvider druidDataSourcePoolMetadataProvider() {
return new DataSourcePoolMetadataProvider() {
@Override
public DataSourcePoolMetadata getDataSourcePoolMetadata(DataSource dataSource) {
if (dataSource instanceof DruidDataSource) {
return new DruidDataSourcePoolMetadata((DruidDataSource)dataSource);
}
return null;
}
};
}
/**
* Register DruidDataSourceMvcEndpoint to support Spring Boot Actuator Endpoints.
*
* @see MvcEndpoint
*/
@Bean
@ConditionalOnMissingBean
@ConditionalOnWebApplication
@ConditionalOnEnabledEndpoint("druid")
public DruidDataSourceMvcEndpoint druidDataSourceMvcEndpoint() {
return new DruidDataSourceMvcEndpoint();
}
}
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/endpoint/DruidDataSourceMvcEndpoint.java
+44
View File
@@ -0,0 +1,44 @@
/*
* Copyright 1999-2017 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.spring.boot.autoconfigure.actuator.endpoint;
import com.alibaba.druid.stat.DruidStatManagerFacade;
import org.springframework.boot.actuate.endpoint.mvc.AbstractMvcEndpoint;
import org.springframework.boot.actuate.endpoint.mvc.ActuatorMediaTypes;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* @author lihengming [89921218@qq.com]
*/
@ConfigurationProperties(prefix = "endpoints.druid")
public class DruidDataSourceMvcEndpoint extends AbstractMvcEndpoint {
public DruidDataSourceMvcEndpoint() {
super("/druid-endpoint", true);
}
@ResponseBody
@GetMapping( produces = {ActuatorMediaTypes.APPLICATION_ACTUATOR_V1_JSON_VALUE,
MediaType.APPLICATION_JSON_VALUE})
public Object invoke() {
return DruidStatManagerFacade.getInstance().getDataSourceStatDataList();
}
}
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/metadata/DruidDataSourcePoolMetadata.java → druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/metadata/DruidDataSourcePoolMetadata.java
+17 -3
View File
@@ -1,12 +1,26 @@
package com.alibaba.druid.spring.boot.autoconfigure.metadata;
/*
* Copyright 1999-2017 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.spring.boot.autoconfigure.actuator.metadata;
import com.alibaba.druid.pool.DruidDataSource;
import org.springframework.boot.autoconfigure.jdbc.metadata.AbstractDataSourcePoolMetadata;
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadata;
/**
* {@link DataSourcePoolMetadata} for a Druid DataSource.
*
* @author lihengming [89921218@qq.com]
*/
public class DruidDataSourcePoolMetadata extends AbstractDataSourcePoolMetadata<DruidDataSource> {
druid-spring-boot-starter/src/test/resources/application.properties
+7
View File
@@ -25,4 +25,11 @@ spring.jpa.hibernate.ddl-auto=create-drop
# 更多配置属性见 DruidDataSource 内成员变量（只要有set方法便支持），或者根据IDE提示，或者查看官方文档
# 启用endpoint，默认访问地址：/druid-endpoint，可以使用endpoints.druid.path=自定义终端地址
endpoints.druid.enabled=true
# 默认需要安全认证才可以访问，可以用下面两种方法之一来禁用安全认证，详情见 Spring Boot 官方文档
endpoints.druid.sensitive=false
# management.security.enabled=false
# 注：配置文件可以根据习惯更换为 .yml