diff --git a/pom.xml b/pom.xml
index baf790dc1..58d237563 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
manage
- 1.1.0
+ 1.1.1
UTF-8
diff --git a/src/main/java/au/com/royalpay/payment/manage/pos/datasource/DataSourceConfiguration.java b/src/main/java/au/com/royalpay/payment/manage/pos/datasource/DataSourceConfiguration.java
index d5abe9fb9..2b8b606ef 100644
--- a/src/main/java/au/com/royalpay/payment/manage/pos/datasource/DataSourceConfiguration.java
+++ b/src/main/java/au/com/royalpay/payment/manage/pos/datasource/DataSourceConfiguration.java
@@ -6,9 +6,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
import javax.sql.DataSource;
import java.util.HashMap;
import java.util.Map;
@@ -20,17 +19,17 @@ import java.util.Map;
@Configuration
@EnableTransactionManagement
public class DataSourceConfiguration {
- @Value("${spring.datasource.type}")
+ @Value("${app.datasource.type:'com.alibaba.druid.pool.DruidDataSource'}")
private Class extends DataSource> dataSourceType;
@Bean(name = "masterDataSource")
- @ConfigurationProperties(prefix = "spring.datasource.master")
+ @ConfigurationProperties(prefix = "app.datasource.master")
public DataSource masterDataSource() {
return DataSourceBuilder.create().type(dataSourceType).build();
}
@Bean(name = "slaveDataSource")
- @ConfigurationProperties(prefix = "spring.datasource.slave")
+ @ConfigurationProperties(prefix = "app.datasource.slave")
public DataSource slaveDataSource() {
return DataSourceBuilder.create().type(dataSourceType).build();
}