Merge remote-tracking branch 'origin/master'

zhaowenxuan

8 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java

@@ -11,38 +11,38 @@
 */
@Configuration
public class DruidProperties {
    @Value("${spring.datasource.druid.initialSize}")
    private int initialSize;
//    @Value("${spring.datasource.druid.initialSize}")
    private int initialSize=5;

    @Value("${spring.datasource.druid.minIdle}")
    private int minIdle;
//    @Value("${spring.datasource.druid.minIdle}")
    private int minIdle=10;

    @Value("${spring.datasource.druid.maxActive}")
    private int maxActive;
//    @Value("${spring.datasource.druid.maxActive}")
    private int maxActive=20;

    @Value("${spring.datasource.druid.maxWait}")
    private int maxWait;
//    @Value("${spring.datasource.druid.maxWait}")
    private int maxWait=60000;

    @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
    private int timeBetweenEvictionRunsMillis;
//    @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
    private int timeBetweenEvictionRunsMillis=60000;

    @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}")
    private int minEvictableIdleTimeMillis;
//    @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}")
    private int minEvictableIdleTimeMillis=300000;

    @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}")
    private int maxEvictableIdleTimeMillis;
//    @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}")
    private int maxEvictableIdleTimeMillis=900000;

    @Value("${spring.datasource.druid.validationQuery}")
    private String validationQuery;
//    @Value("${spring.datasource.druid.validationQuery}")
//    private String validationQuery;

    @Value("${spring.datasource.druid.testWhileIdle}")
    private boolean testWhileIdle;
//    @Value("${spring.datasource.druid.testWhileIdle}")
    private boolean testWhileIdle=true;

    @Value("${spring.datasource.druid.testOnBorrow}")
    private boolean testOnBorrow;
//    @Value("${spring.datasource.druid.testOnBorrow}")
    private boolean testOnBorrow=false;

    @Value("${spring.datasource.druid.testOnReturn}")
    private boolean testOnReturn;
//    @Value("${spring.datasource.druid.testOnReturn}")
    private boolean testOnReturn=false;

    public DruidDataSource dataSource(DruidDataSource datasource) {
        /** 配置初始化大小、最小、最大 */
@@ -63,7 +63,7 @@
        /**
         * 用来检测连接是否有效的sql，要求是一个查询语句，常用select 'x'。如果validationQuery为null，testOnBorrow、testOnReturn、testWhileIdle都不会起作用。
         */
        datasource.setValidationQuery(validationQuery);
//        datasource.setValidationQuery(validationQuery);
        /** 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 */
        datasource.setTestWhileIdle(testWhileIdle);
        /** 申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */