Merge branch 'fixbug/error' into 3.x

pcloud-common-core/src/main/java/com/pcloud/common/core/datasource/DataSourceConfig.java

@@ -67,6 +67,8 @@ public class DataSourceConfig {
 
 	private int minEvictableIdleTimeMillis;
 
+	private int maxEvictableIdleTimeMillis;
+
 	private String validationQuery;
 
 	private boolean testWhileIdle;
@@ -112,6 +114,7 @@ public class DataSourceConfig {
 			datasource.setMaxWait(maxWait);
 			datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
 			datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+			datasource.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis);
 			datasource.setValidationQuery(validationQuery);
 			datasource.setTestWhileIdle(testWhileIdle);
 			datasource.setTestOnBorrow(testOnBorrow);
@@ -273,6 +276,14 @@ public class DataSourceConfig {
 		this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
 	}
 
+	public int getMaxEvictableIdleTimeMillis() {
+		return maxEvictableIdleTimeMillis;
+	}
+
+	public void setMaxEvictableIdleTimeMillis(int maxEvictableIdleTimeMillis) {
+		this.maxEvictableIdleTimeMillis = maxEvictableIdleTimeMillis;
+	}
+
 	public String getValidationQuery() {
 		return validationQuery;
 	}