diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index 464668af..dc745cf1 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -24,7 +24,6 @@ 3.0.1 3.6 1.2.68 - 1.1.23 true @@ -79,18 +78,6 @@ spring-boot-starter-data-jpa ${springboot.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.starter.version} - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot spring-boot-starter-data-mongodb diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java index 53550268..62f55b99 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java @@ -1,8 +1,9 @@ package com.github.kfcfans.powerjob.server.persistence.config; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; @@ -20,28 +21,26 @@ public class MultiDatasourceConfig { private static final String H2_DRIVER_CLASS_NAME = "org.h2.Driver"; private static final String H2_JDBC_URL = "jdbc:h2:file:~/powerjob-server/h2/powerjob_server_db"; - private static final int H2_INITIAL_SIZE = 4; private static final int H2_MIN_SIZE = 4; private static final int H2_MAX_ACTIVE_SIZE = 10; - private static final String H2_DATASOURCE_NAME = "localDatasource"; @Primary @Bean("omsCoreDatasource") - @ConfigurationProperties(prefix = "spring.datasource.druid") + @ConfigurationProperties(prefix = "spring.datasource.core") public DataSource initOmsCoreDatasource() { - return DruidDataSourceBuilder.create().build(); + return DataSourceBuilder.create().build(); } @Bean("omsLocalDatasource") public DataSource initOmsLocalDatasource() { - DruidDataSource ds = new DruidDataSource(); - ds.setDriverClassName(H2_DRIVER_CLASS_NAME); - ds.setUrl(H2_JDBC_URL); - ds.setInitialSize(H2_INITIAL_SIZE); - ds.setMinIdle(H2_MIN_SIZE); - ds.setMaxActive(H2_MAX_ACTIVE_SIZE); - ds.setName(H2_DATASOURCE_NAME); - ds.setTestWhileIdle(false); - return ds; + HikariConfig config = new HikariConfig(); + config.setDriverClassName(H2_DRIVER_CLASS_NAME); + config.setJdbcUrl(H2_JDBC_URL); + config.setAutoCommit(true); + // 池中最小空闲连接数量 + config.setMinimumIdle(H2_MIN_SIZE); + // 池中最大连接数量 + config.setMaximumPoolSize(H2_MAX_ACTIVE_SIZE); + return new HikariDataSource(config); } } diff --git a/powerjob-server/src/main/resources/application-daily.properties b/powerjob-server/src/main/resources/application-daily.properties index ed4040e0..cb7778b6 100644 --- a/powerjob-server/src/main/resources/application-daily.properties +++ b/powerjob-server/src/main/resources/application-daily.properties @@ -2,17 +2,15 @@ oms.env=DAILY logging.config=classpath:logback-dev.xml ####### 外部数据库配置(需要用户更改为自己的数据库配置) ####### -spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.druid.url=jdbc:mysql://localhost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8 -spring.datasource.druid.username=root -spring.datasource.druid.password=No1Bug2Please3! -spring.datasource.druid.initial-size=5 -spring.datasource.druid.max-active=10 -spring.datasource.druid.test-while-idle=false -spring.datasource.druid.name=remoteDatasource +spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8 +spring.datasource.core.username=root +spring.datasource.core.password=No1Bug2Please3! +spring.datasource.core.hikari.maximum-pool-size=20 +spring.datasource.core.hikari.minimum-idle=5 ####### mongoDB配置,非核心依赖,可移除 ####### -spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-daily +spring.data.mongodb.uri=mongodb://localhost:27017/powerjob-daily ####### 邮件配置(启用邮件报警则需要) ####### spring.mail.host=smtp.163.com diff --git a/powerjob-server/src/main/resources/application-pre.properties b/powerjob-server/src/main/resources/application-pre.properties index 2825e6d9..f2d33b88 100644 --- a/powerjob-server/src/main/resources/application-pre.properties +++ b/powerjob-server/src/main/resources/application-pre.properties @@ -2,14 +2,12 @@ oms.env=PRE logging.config=classpath:logback-product.xml ####### 数据库配置 ####### -spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.druid.url=jdbc:mysql://remotehost:3306/powerjob-pre?useUnicode=true&characterEncoding=UTF-8 -spring.datasource.druid.username=root -spring.datasource.druid.password=No1Bug2Please3! -spring.datasource.druid.initial-size=5 -spring.datasource.druid.max-active=20 -spring.datasource.druid.test-while-idle=false -spring.datasource.druid.name=remoteDatasource +spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3306/powerjob-pre?useUnicode=true&characterEncoding=UTF-8 +spring.datasource.core.username=root +spring.datasource.core.password=No1Bug2Please3! +spring.datasource.core.hikari.maximum-pool-size=20 +spring.datasource.core.hikari.minimum-idle=5 ####### mongoDB配置,非核心依赖,可移除 ####### spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-pre diff --git a/powerjob-server/src/main/resources/application-product.properties b/powerjob-server/src/main/resources/application-product.properties index 5215c7aa..0a4e2556 100644 --- a/powerjob-server/src/main/resources/application-product.properties +++ b/powerjob-server/src/main/resources/application-product.properties @@ -2,14 +2,12 @@ oms.env=PRODUCT logging.config=classpath:logback-product.xml ####### 数据库配置 ####### -spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.druid.url=jdbc:mysql://localhost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 -spring.datasource.druid.username=root -spring.datasource.druid.password=No1Bug2Please3! -spring.datasource.druid.initial-size=5 -spring.datasource.druid.max-active=20 -spring.datasource.druid.test-while-idle=false -spring.datasource.druid.name=remoteDatasource +spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 +spring.datasource.core.username=root +spring.datasource.core.password=No1Bug2Please3! +spring.datasource.core.hikari.maximum-pool-size=20 +spring.datasource.core.hikari.minimum-idle=5 ####### mongoDB配置,非核心依赖,可移除 ####### spring.data.mongodb.uri=mongodb://localhost:27017/powerjob-product diff --git a/powerjob-server/src/main/resources/application.properties b/powerjob-server/src/main/resources/application.properties index 781cd407..6dc9fd8b 100644 --- a/powerjob-server/src/main/resources/application.properties +++ b/powerjob-server/src/main/resources/application.properties @@ -5,6 +5,7 @@ spring.profiles.active=daily spring.main.banner-mode=log spring.jpa.open-in-view=false spring.data.mongodb.repositories.type=none +logging.level.org.mongodb=warn # 文件上传配置 spring.servlet.multipart.enabled=true @@ -12,17 +13,6 @@ spring.servlet.multipart.file-size-threshold=0 spring.servlet.multipart.max-file-size=209715200 spring.servlet.multipart.max-request-size=209715200 -# druid 监控配置(监控地址 /druid,登陆账号和密码默认都是 powerjob) -spring.datasource.druid.filters=stat -spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* -spring.datasource.druid.filter.stat.enabled=true -spring.datasource.druid.filter.stat.log-slow-sql=true -spring.datasource.druid.filter.stat.slow-sql-millis=5000 -spring.datasource.druid.stat-view-servlet.allow=* -spring.datasource.druid.stat-view-servlet.enabled=true -spring.datasource.druid.stat-view-servlet.login-username=powerjob -spring.datasource.druid.stat-view-servlet.login-password=powerjob - ###### PowerJob 自身配置(该配置只允许存在于 application.properties 文件中) ###### # akka ActorSystem 服务端口 oms.akka.port=10086