Selaa lähdekoodia

druid 改为 hikari

liuam 7 vuotta sitten
vanhempi
commit
ec2d9a1f71

+ 5 - 7
pom.xml

@@ -107,9 +107,11 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>3.2.0</version>
         </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -119,11 +121,7 @@
             <artifactId>junit-jupiter-api</artifactId>
             <version>RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>2.3.0</version>
-        </dependency>
+
 
     </dependencies>
 

+ 0 - 261
src/main/java/com/uas/ps/inquiry/DruidDBConfiguration.java

@@ -1,261 +0,0 @@
-package com.uas.ps.inquiry;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.alibaba.druid.support.http.WebStatFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
-
-import javax.sql.DataSource;
-import java.sql.SQLException;
-
-@Component
-@ConfigurationProperties(prefix = "datasource")
-public class DruidDBConfiguration {
-
-    private Logger logger = LoggerFactory.getLogger(DruidDBConfiguration.class);
-
-    private String url;
-
-    private String username;
-
-    private String password;
-
-    private String driverClassName;
-
-    private int initialSize;
-
-    private int minIdle;
-
-    private int maxActive;
-
-    private int maxWait;
-
-    private int timeBetweenEvictionRunsMillis;
-
-    private int minEvictableIdleTimeMillis;
-
-    private String validationQuery;
-
-    private boolean testWhileIdle;
-
-    private boolean testOnBorrow;
-
-    private boolean testOnReturn;
-
-    private int timeBetweenLogStatsMillis;
-
-    private boolean poolPreparedStatements;
-
-    private int maxPoolPreparedStatementPerConnectionSize;
-
-    private String filters;
-
-    private String connectionProperties;
-
-    @Bean
-    @Primary
-    public DataSource dataSource() {
-        DruidDataSource dataSource = new DruidDataSource();
-
-        dataSource.setUrl(url);
-        dataSource.setUsername(username);
-        dataSource.setPassword(password);
-        dataSource.setDriverClassName(driverClassName);
-
-        // configuration
-        dataSource.setInitialSize(initialSize);
-        dataSource.setMinIdle(minIdle);
-        dataSource.setMaxActive(maxActive);
-        dataSource.setMaxWait(maxWait);
-        dataSource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
-        dataSource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
-        dataSource.setValidationQuery(validationQuery);
-        dataSource.setTestWhileIdle(testWhileIdle);
-        dataSource.setTestOnBorrow(testOnBorrow);
-        dataSource.setTestOnReturn(testOnReturn);
-        dataSource.setTimeBetweenLogStatsMillis(timeBetweenLogStatsMillis);
-        dataSource.setPoolPreparedStatements(poolPreparedStatements);
-        dataSource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
-        try {
-            dataSource.setFilters(filters);
-        } catch (SQLException e) {
-            logger.error("数据源初始化失败: setFilters", e);
-        }
-        dataSource.setConnectionProperties(connectionProperties);
-        return dataSource;
-    }
-
-    @Bean
-    public ServletRegistrationBean servletRegistrationBean() {
-        return new ServletRegistrationBean(new StatViewServlet(), "/druid/*");
-    }
-
-    @Bean
-    public FilterRegistrationBean filterRegistrationBean() {
-        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
-        filterRegistrationBean.setFilter(new WebStatFilter());
-        filterRegistrationBean.addUrlPatterns("/*");
-        filterRegistrationBean.addInitParameter("exclusions",
-                "*.js,*.gif,*.jpg,*.png,*.bmp,*.css,*.ico,*.html,/druid/*");
-        return filterRegistrationBean;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getDriverClassName() {
-        return driverClassName;
-    }
-
-    public void setDriverClassName(String driverClassName) {
-        this.driverClassName = driverClassName;
-    }
-
-    public int getInitialSize() {
-        return initialSize;
-    }
-
-    public void setInitialSize(int initialSize) {
-        this.initialSize = initialSize;
-    }
-
-    public int getMinIdle() {
-        return minIdle;
-    }
-
-    public void setMinIdle(int minIdle) {
-        this.minIdle = minIdle;
-    }
-
-    public int getMaxActive() {
-        return maxActive;
-    }
-
-    public void setMaxActive(int maxActive) {
-        this.maxActive = maxActive;
-    }
-
-    public int getMaxWait() {
-        return maxWait;
-    }
-
-    public void setMaxWait(int maxWait) {
-        this.maxWait = maxWait;
-    }
-
-    public int getTimeBetweenEvictionRunsMillis() {
-        return timeBetweenEvictionRunsMillis;
-    }
-
-    public void setTimeBetweenEvictionRunsMillis(int timeBetweenEvictionRunsMillis) {
-        this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
-    }
-
-    public int getMinEvictableIdleTimeMillis() {
-        return minEvictableIdleTimeMillis;
-    }
-
-    public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) {
-        this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
-    }
-
-    public String getValidationQuery() {
-        return validationQuery;
-    }
-
-    public void setValidationQuery(String validationQuery) {
-        this.validationQuery = validationQuery;
-    }
-
-    public boolean isTestWhileIdle() {
-        return testWhileIdle;
-    }
-
-    public void setTestWhileIdle(boolean testWhileIdle) {
-        this.testWhileIdle = testWhileIdle;
-    }
-
-    public boolean isTestOnBorrow() {
-        return testOnBorrow;
-    }
-
-    public void setTestOnBorrow(boolean testOnBorrow) {
-        this.testOnBorrow = testOnBorrow;
-    }
-
-    public boolean isTestOnReturn() {
-        return testOnReturn;
-    }
-
-    public void setTestOnReturn(boolean testOnReturn) {
-        this.testOnReturn = testOnReturn;
-    }
-
-    public int getTimeBetweenLogStatsMillis() {
-        return timeBetweenLogStatsMillis;
-    }
-
-    public void setTimeBetweenLogStatsMillis(int timeBetweenLogStatsMillis) {
-        this.timeBetweenLogStatsMillis = timeBetweenLogStatsMillis;
-    }
-
-    public boolean isPoolPreparedStatements() {
-        return poolPreparedStatements;
-    }
-
-    public void setPoolPreparedStatements(boolean poolPreparedStatements) {
-        this.poolPreparedStatements = poolPreparedStatements;
-    }
-
-    public int getMaxPoolPreparedStatementPerConnectionSize() {
-        return maxPoolPreparedStatementPerConnectionSize;
-    }
-
-    public void setMaxPoolPreparedStatementPerConnectionSize(int maxPoolPreparedStatementPerConnectionSize) {
-        this.maxPoolPreparedStatementPerConnectionSize = maxPoolPreparedStatementPerConnectionSize;
-    }
-
-    public String getFilters() {
-        return filters;
-    }
-
-    public void setFilters(String filters) {
-        this.filters = filters;
-    }
-
-    public String getConnectionProperties() {
-        return connectionProperties;
-    }
-
-    public void setConnectionProperties(String connectionProperties) {
-        this.connectionProperties = connectionProperties;
-    }
-}

+ 13 - 18
src/main/resources/config/application-cloud.properties

@@ -1,21 +1,16 @@
-datasource.url=jdbc:mysql://10.10.0.208:3306/mall_prod?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
-datasource.username=sa
-datasource.password=Select123!#%*(
-datasource.driverClassName=com.mysql.jdbc.Driver
-datasource.initialSize=1
-datasource.minIdle=30
-datasource.maxActive=100
-datasource.maxWait=5000
-datasource.timeBetweenEvictionRunsMillis=60000
-datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1
-datasource.testWhileIdle=true
-datasource.testOnBorrow=true
-datasource.testOnReturn=false
-datasource.poolPreparedStatements=true
-datasource.maxPoolPreparedStatementPerConnectionSize=20
-datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+spring.datasource.url=jdbc:mysql://10.10.0.208:3306/mall_prod?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
+spring.datasource.username=sa
+spring.datasource.password=Select123!#%*(
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=60000
+spring.datasource.hikari.connection-test-query=SELECT 1
 
 # Access path
 ps.product.url=https://api-product.usoftmall.com/

+ 13 - 18
src/main/resources/config/application-dev.properties

@@ -1,21 +1,16 @@
-datasource.url=jdbc:mysql://192.168.253.12:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
-datasource.username=root
-datasource.password=select111***
-datasource.driverClassName=com.mysql.jdbc.Driver
-datasource.initialSize=1
-datasource.minIdle=30
-datasource.maxActive=500
-datasource.maxWait=5000
-datasource.timeBetweenEvictionRunsMillis=60000
-datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1
-datasource.testWhileIdle=true
-datasource.testOnBorrow=true
-datasource.testOnReturn=false
-datasource.poolPreparedStatements=true
-datasource.maxPoolPreparedStatementPerConnectionSize=20
-datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+spring.datasource.url=jdbc:mysql://192.168.253.12:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
+spring.datasource.username=root
+spring.datasource.password=select111***
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=60000
+spring.datasource.hikari.connection-test-query=SELECT 1
 # Access path
 #ps.product.url=http://192.168.253.12:24000/
 #dong localhost

+ 13 - 18
src/main/resources/config/application-test.properties

@@ -1,21 +1,16 @@
-datasource.url=jdbc:mysql://192.168.253.6:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
-datasource.username=root
-datasource.password=select111***
-datasource.driverClassName=com.mysql.jdbc.Driver
-datasource.initialSize=1
-datasource.minIdle=1
-datasource.maxActive=300
-datasource.maxWait=60000
-datasource.timeBetweenEvictionRunsMillis=60000
-datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1 FROM DUAL
-datasource.testWhileIdle=true
-datasource.testOnBorrow=true
-datasource.testOnReturn=false
-datasource.poolPreparedStatements=true
-datasource.maxPoolPreparedStatementPerConnectionSize=20
-datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+spring.datasource.url=jdbc:mysql://192.168.253.6:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
+spring.datasource.username=root
+spring.datasource.password=select111***
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=60000
+spring.datasource.hikari.connection-test-query=SELECT 1
 
 # Access path
 ps.product.url=http://218.17.158.219:24000/

+ 13 - 19
src/main/resources/config/application-txcloud.properties

@@ -1,22 +1,16 @@
-datasource.url=jdbc:mysql://172.16.0.200:3306/mall_prod?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
-datasource.username=root
-datasource.password=select111***
-datasource.driverClassName=com.mysql.jdbc.Driver
-datasource.initialSize=1
-datasource.minIdle=30
-datasource.maxActive=100
-datasource.maxWait=5000
-datasource.timeBetweenEvictionRunsMillis=60000
-datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1
-datasource.testWhileIdle=true
-datasource.testOnBorrow=true
-datasource.testOnReturn=false
-datasource.poolPreparedStatements=true
-datasource.timeBetweenLogStatsMillis=300000
-datasource.maxPoolPreparedStatementPerConnectionSize=20
-datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+spring.datasource.url=jdbc:mysql://172.16.0.200:3306/mall_prod?characterEncoding=utf-8&useSSL=false&autoReconnect=true&failOverReadOnly=false
+spring.datasource.username=root
+spring.datasource.password=select111***
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=60000
+spring.datasource.hikari.connection-test-query=SELECT 1
 
 # Access path
 ps.product.url=https://172.16.0.22:8080/