!117 HikariCpPlugin 增加 保活时间+打印SQL语句占位符 等参数

Merge pull request !117 from 杜福忠/master

src/main/java/com/jfinal/plugin/hikaricp/HikariCpPlugin.java

@@ -28,7 +28,9 @@ import com.zaxxer.hikari.HikariDataSource;
  * At roughly 130Kb, the library is very light
  * @ClassName: HikaricpPlugin
  */
-public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
+@SuppressWarnings({"unused", "JavadocDeclaration"})
+public class HikariCpPlugin implements IPlugin, IDataSourceProvider {
+
 	/**
 	 * jdbc Url
 	 */
@@ -70,6 +72,12 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 	private long maxLifetime = 1800000;
 
 	/**
+	 * keepalive time must be less than maxLifetime (if maxLifetime is enabled)
+	 * Default: 180000 (3 minutes)
+	 */
+	private long keepaliveTime = 180000;
+
+	/**
 	 * If your driver supports JDBC4 we strongly recommend not setting this property.
 	 * This is for "legacy" databases that do not support the JDBC4 Connection.isValid() API
 	 * Default: none
@@ -133,6 +141,8 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 	 */
 	private long leakDetectionThreshold = 0;
 
+	private Boolean printLog;
+
 	/**
 	 * Hikari DataSource
 	 */
@@ -159,7 +169,7 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 
 	@Override
 	public boolean start() {
-		HikariConfig config = new HikariConfig();
+		HikariConfig config = newHikariConfig();
 		//设定基本参数
 		config.setJdbcUrl(jdbcUrl);
 		config.setUsername(username);
@@ -172,6 +182,7 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 		config.setConnectionTimeout(connectionTimeout);
 		config.setIdleTimeout(idleTimeout);
 		config.setMaxLifetime(maxLifetime);
+		config.setKeepaliveTime(keepaliveTime);
 		config.setMaximumPoolSize(maximumPoolSize);
 		config.setValidationTimeout(validationTimeout);
 
@@ -203,6 +214,12 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 			config.setConnectionInitSql(connectionInitSql);
 		}
 
+		// 配置日志记录器
+		if (printLog != null){
+			// 启用打印 SQL 语句和参数功能
+			config.addDataSourceProperty("printLog", printLog);
+		}
+
 		if(jdbcUrl.toLowerCase().contains(":mysql:")){
 			config.addDataSourceProperty("cachePrepStmts", "true");
 			config.addDataSourceProperty("useServerPrepStmts", "true");
@@ -223,6 +240,10 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 		return true;
 	}
 
+	protected HikariConfig newHikariConfig() {
+		return new HikariConfig();
+	}
+
 	@Override
 	public boolean stop() {
 		if (ds != null)
@@ -294,7 +315,7 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 
 	/**
 	 * 最大生命周期/最大存活时间(单位：毫秒) ，默认1800000 (30 分钟)
-	 * @param maxLifetime
+	 * @param maxLifetimeMs
 	 * @since V1.0.0
 	 */
 	public final void setMaxLifetime(long maxLifetimeMs) {
@@ -302,6 +323,16 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 	}
 
 	/**
+	 * 定时的对连接进行探活(单位：毫秒) ，默认180000 毫秒 (3 分钟)
+	 * 注意保活时间必须小于maxLifetime
+	 * @param keepaliveTime
+	 * @since V4.0.1
+	 */
+	public void setKeepaliveTime(long keepaliveTime) {
+		this.keepaliveTime = keepaliveTime;
+	}
+
+	/**
 	 * 连接池最大连接数 默认10
 	 * @param maximumPoolSize
 	 * @since V1.0.0
@@ -377,5 +408,14 @@ public class HikariCpPlugin implements IPlugin, IDataSourceProvider{
 	public final void setLeakDetectionThreshold(long leakDetectionThresholdMs) {
 		this.leakDetectionThreshold = leakDetectionThresholdMs;
 	}
+
+	/**
+	 * 启用打印 SQL 语句和参数功能
+	 * @param printLog
+	 */
+	public void setPrintLog(boolean printLog) {
+		this.printLog = printLog;
+	}
+
 }