Merge branch 'develop'

master
taylor.dang 5 years ago
commit e43f890a24

@ -10,11 +10,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.1.3</version> <version>1.1.4</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.1.2</jib-maven-plugin.version> <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
<docker-image.version>${project.version}</docker-image.version> <docker-image.version>${project.version}</docker-image.version>
</properties> </properties>

@ -21,13 +21,13 @@ import java.util.Map;
public class DataSourceConfiguration { public class DataSourceConfiguration {
@Bean(name = "masterDataSource") @Bean(name = "masterDataSource")
@ConfigurationProperties(prefix = "app.datasource.master") @ConfigurationProperties(prefix = "spring.datasource.master")
public DataSource masterDataSource() { public DataSource masterDataSource() {
return DataSourceBuilder.create().type(HikariDataSource.class).build(); return DataSourceBuilder.create().type(HikariDataSource.class).build();
} }
@Bean(name = "slaveDataSource") @Bean(name = "slaveDataSource")
@ConfigurationProperties(prefix = "app.datasource.slave") @ConfigurationProperties(prefix = "spring.datasource.slave")
public DataSource slaveDataSource() { public DataSource slaveDataSource() {
return DataSourceBuilder.create().type(HikariDataSource.class).build(); return DataSourceBuilder.create().type(HikariDataSource.class).build();
} }

Loading…
Cancel
Save