Merge branch 'test6.8.9'

@@ -110,6 +110,8 @@ public class DataSourceConfig {
         dataSource.setPassword(passWord);// 密码
         dataSource.setInitialSize(initialSize);
         dataSource.setMaxActive(maxTotal);
+        dataSource.setRemoveAbandoned(false);
+//        dataSource.setRemoveAbandonedTimeout(1800);
        // dataSource.setMaxIdle(maxIdle);
         dataSource.setMinIdle(minIdle);
         dataSource.setQueryTimeout(defaultQueryTimeout);