From 96c88e3cad46fbf9549298a73556be4504519958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=85=AB?= Date: Fri, 24 Jul 2020 23:49:33 +0800 Subject: [PATCH] [opt] optimize server's datasouce config --- .../config/MultiDatasourceConfig.java | 4 +++- .../main/resources/application-daily.properties | 16 ++++++++-------- .../main/resources/application-pre.properties | 16 ++++++++-------- .../resources/application-product.properties | 16 ++++++++-------- 4 files changed, 27 insertions(+), 25 deletions(-) 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 46d1960d..53550268 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 @@ -21,12 +21,13 @@ 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.core") + @ConfigurationProperties(prefix = "spring.datasource.druid") public DataSource initOmsCoreDatasource() { return DruidDataSourceBuilder.create().build(); } @@ -37,6 +38,7 @@ public class MultiDatasourceConfig { 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); diff --git a/powerjob-server/src/main/resources/application-daily.properties b/powerjob-server/src/main/resources/application-daily.properties index 8da45bb0..a0e57d82 100644 --- a/powerjob-server/src/main/resources/application-daily.properties +++ b/powerjob-server/src/main/resources/application-daily.properties @@ -2,14 +2,14 @@ oms.env=DAILY logging.config=classpath:logback-dev.xml ####### 外部数据库配置（需要用户更改为自己的数据库配置） ####### -spring.datasource.druid.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.druid.core.url=jdbc:mysql://remotehost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8 -spring.datasource.druid.core.username=root -spring.datasource.druid.core.password=No1Bug2Please3! -spring.datasource.druid.core.initial-size=5 -spring.datasource.druid.core.max-active=20 -spring.datasource.druid.core.test-while-idle=false -spring.datasource.druid.core.name=remoteDatasource +spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.druid.url=jdbc:mysql://remotehost: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 ####### mongoDB配置，非核心依赖，可移除 ####### spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-daily diff --git a/powerjob-server/src/main/resources/application-pre.properties b/powerjob-server/src/main/resources/application-pre.properties index 437980ff..2825e6d9 100644 --- a/powerjob-server/src/main/resources/application-pre.properties +++ b/powerjob-server/src/main/resources/application-pre.properties @@ -2,14 +2,14 @@ oms.env=PRE logging.config=classpath:logback-product.xml ####### 数据库配置 ####### -spring.datasource.druid.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.druid.core.url=jdbc:mysql://remotehost:3306/powerjob-pre?useUnicode=true&characterEncoding=UTF-8 -spring.datasource.druid.core.username=root -spring.datasource.druid.core.password=No1Bug2Please3! -spring.datasource.druid.core.initial-size=5 -spring.datasource.druid.core.max-active=20 -spring.datasource.druid.core.test-while-idle=false -spring.datasource.druid.core.name=remoteDatasource +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 ####### 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 45e47949..5215c7aa 100644 --- a/powerjob-server/src/main/resources/application-product.properties +++ b/powerjob-server/src/main/resources/application-product.properties @@ -2,14 +2,14 @@ oms.env=PRODUCT logging.config=classpath:logback-product.xml ####### 数据库配置 ####### -spring.datasource.druid.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.druid.core.url=jdbc:mysql://localhost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 -spring.datasource.druid.core.username=root -spring.datasource.druid.core.password=No1Bug2Please3! -spring.datasource.druid.core.initial-size=5 -spring.datasource.druid.core.max-active=20 -spring.datasource.druid.core.test-while-idle=false -spring.datasource.druid.core.name=remoteDatasource +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 ####### mongoDB配置，非核心依赖，可移除 ####### spring.data.mongodb.uri=mongodb://localhost:27017/powerjob-product