third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[opt] rollback database, use Hikari again

Browse Source
This commit is contained in:
朱八 2020-07-26 22:18:29 +08:00
parent 8d8b8d504a
commit 97f1bbca6c
6 changed files with 34 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
powerjob-server/pom.xml
View File

@ -24,7 +24,6 @@
<mvn.invoker.version>3.0.1</mvn.invoker.version> <mvn.invoker.version>3.0.1</mvn.invoker.version>
<commons.net.version>3.6</commons.net.version> <commons.net.version>3.6</commons.net.version>
<fastjson.version>1.2.68</fastjson.version> <fastjson.version>1.2.68</fastjson.version>
<druid.starter.version>1.1.23</druid.starter.version>
<!-- 部署时跳过该module --> <!-- 部署时跳过该module -->
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
@ -79,18 +78,6 @@
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${springboot.version}</version> <version>${springboot.version}</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.starter.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId> <artifactId>spring-boot-starter-data-mongodb</artifactId>

29
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java
View File

@ -1,8 +1,9 @@
package com.github.kfcfans.powerjob.server.persistence.config; package com.github.kfcfans.powerjob.server.persistence.config;
import com.alibaba.druid.pool.DruidDataSource; import com.zaxxer.hikari.HikariConfig;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import com.zaxxer.hikari.HikariDataSource;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; 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_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 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_MIN_SIZE = 4;
private static final int H2_MAX_ACTIVE_SIZE = 10; private static final int H2_MAX_ACTIVE_SIZE = 10;
private static final String H2_DATASOURCE_NAME = "localDatasource";
@Primary @Primary
@Bean("omsCoreDatasource") @Bean("omsCoreDatasource")
@ConfigurationProperties(prefix = "spring.datasource.druid") @ConfigurationProperties(prefix = "spring.datasource.core")
public DataSource initOmsCoreDatasource() { public DataSource initOmsCoreDatasource() {
return DruidDataSourceBuilder.create().build(); return DataSourceBuilder.create().build();
} }
@Bean("omsLocalDatasource") @Bean("omsLocalDatasource")
public DataSource initOmsLocalDatasource() { public DataSource initOmsLocalDatasource() {
DruidDataSource ds = new DruidDataSource(); HikariConfig config = new HikariConfig();
ds.setDriverClassName(H2_DRIVER_CLASS_NAME); config.setDriverClassName(H2_DRIVER_CLASS_NAME);
ds.setUrl(H2_JDBC_URL); config.setJdbcUrl(H2_JDBC_URL);
ds.setInitialSize(H2_INITIAL_SIZE); config.setAutoCommit(true);
ds.setMinIdle(H2_MIN_SIZE); // 池中最小空闲连接数量
ds.setMaxActive(H2_MAX_ACTIVE_SIZE); config.setMinimumIdle(H2_MIN_SIZE);
ds.setName(H2_DATASOURCE_NAME); // 池中最大连接数量
ds.setTestWhileIdle(false); config.setMaximumPoolSize(H2_MAX_ACTIVE_SIZE);
return ds; return new HikariDataSource(config);
} }
} }

16
powerjob-server/src/main/resources/application-daily.properties
View File

@ -2,17 +2,15 @@ oms.env=DAILY
logging.config=classpath:logback-dev.xml logging.config=classpath:logback-dev.xml
####### 外部数据库配置（需要用户更改为自己的数据库配置） ####### ####### 外部数据库配置（需要用户更改为自己的数据库配置） #######
spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.core.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.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8
spring.datasource.druid.username=root spring.datasource.core.username=root
spring.datasource.druid.password=No1Bug2Please3! spring.datasource.core.password=No1Bug2Please3!
spring.datasource.druid.initial-size=5 spring.datasource.core.hikari.maximum-pool-size=20
spring.datasource.druid.max-active=10 spring.datasource.core.hikari.minimum-idle=5
spring.datasource.druid.test-while-idle=false
spring.datasource.druid.name=remoteDatasource
####### mongoDB配置，非核心依赖，可移除 ####### ####### 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 spring.mail.host=smtp.163.com

14
powerjob-server/src/main/resources/application-pre.properties
View File

@ -2,14 +2,12 @@ oms.env=PRE
logging.config=classpath:logback-product.xml logging.config=classpath:logback-product.xml
####### 数据库配置 ####### ####### 数据库配置 #######
spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.core.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.core.jdbc-url=jdbc:mysql://remotehost:3306/powerjob-pre?useUnicode=true&characterEncoding=UTF-8
spring.datasource.druid.username=root spring.datasource.core.username=root
spring.datasource.druid.password=No1Bug2Please3! spring.datasource.core.password=No1Bug2Please3!
spring.datasource.druid.initial-size=5 spring.datasource.core.hikari.maximum-pool-size=20
spring.datasource.druid.max-active=20 spring.datasource.core.hikari.minimum-idle=5
spring.datasource.druid.test-while-idle=false
spring.datasource.druid.name=remoteDatasource
####### mongoDB配置，非核心依赖，可移除 ####### ####### mongoDB配置，非核心依赖，可移除 #######
spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-pre spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-pre

14
powerjob-server/src/main/resources/application-product.properties
View File

@ -2,14 +2,12 @@ oms.env=PRODUCT
logging.config=classpath:logback-product.xml logging.config=classpath:logback-product.xml
####### 数据库配置 ####### ####### 数据库配置 #######
spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.core.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.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8
spring.datasource.druid.username=root spring.datasource.core.username=root
spring.datasource.druid.password=No1Bug2Please3! spring.datasource.core.password=No1Bug2Please3!
spring.datasource.druid.initial-size=5 spring.datasource.core.hikari.maximum-pool-size=20
spring.datasource.druid.max-active=20 spring.datasource.core.hikari.minimum-idle=5
spring.datasource.druid.test-while-idle=false
spring.datasource.druid.name=remoteDatasource
####### mongoDB配置，非核心依赖，可移除 ####### ####### mongoDB配置，非核心依赖，可移除 #######
spring.data.mongodb.uri=mongodb://localhost:27017/powerjob-product spring.data.mongodb.uri=mongodb://localhost:27017/powerjob-product

12
powerjob-server/src/main/resources/application.properties
View File

@ -5,6 +5,7 @@ spring.profiles.active=daily
spring.main.banner-mode=log spring.main.banner-mode=log
spring.jpa.open-in-view=false spring.jpa.open-in-view=false
spring.data.mongodb.repositories.type=none spring.data.mongodb.repositories.type=none
logging.level.org.mongodb=warn
# 文件上传配置 # 文件上传配置
spring.servlet.multipart.enabled=true 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-file-size=209715200
spring.servlet.multipart.max-request-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 文件中） ###### ###### PowerJob 自身配置（该配置只允许存在于 application.properties 文件中） ######
# akka ActorSystem 服务端口 # akka ActorSystem 服务端口
oms.akka.port=10086 oms.akka.port=10086