fuhouyin/dynamic-datasource
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add druid config (#489)

Browse Source
This commit is contained in:
xuwenping123 2023-04-18 09:18:07 +08:00 committed by GitHub
parent 89d81b9b4b
commit 9350e0e858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/baomidou/dynamic/datasource/creator/DruidDataSourceCreator.java
View File

@ -202,6 +202,12 @@ public class DruidDataSourceCreator extends AbstractDataSourceCreator implements
dataSource.setTransactionQueryTimeout(transactionQueryTimeout); dataSource.setTransactionQueryTimeout(transactionQueryTimeout);
} }
Long timeBetweenConnectErrorMillis =
config.getTimeBetweenConnectErrorMillis() == null ? gConfig.getTimeBetweenConnectErrorMillis() : config.getTimeBetweenConnectErrorMillis();
if (timeBetweenConnectErrorMillis != null) {
dataSource.setTimeBetweenConnectErrorMillis(timeBetweenConnectErrorMillis);
}
// since druid 1.2.12 // since druid 1.2.12
Integer connectTimeout = config.getConnectTimeout() == null ? gConfig.getConnectTimeout() : config.getConnectTimeout(); Integer connectTimeout = config.getConnectTimeout() == null ? gConfig.getConnectTimeout() : config.getConnectTimeout();
if (connectTimeout != null) { if (connectTimeout != null) {

1
core/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/druid/DruidConfig.java
View File

@ -80,6 +80,7 @@ public class DruidConfig {
private String publicKey; private String publicKey;
private Integer connectTimeout; // millisecond private Integer connectTimeout; // millisecond
private Integer socketTimeout; // millisecond private Integer socketTimeout; // millisecond
private Long timeBetweenConnectErrorMillis; // millisecond
private Map<String, Object> wall = new HashMap<>(); private Map<String, Object> wall = new HashMap<>();
private Map<String, Object> slf4j = new HashMap<>(); private Map<String, Object> slf4j = new HashMap<>();