Merge branch 'develop'

# Conflicts:
#	pom.xml
#	src/main/java/au/com/royalpay/payment/manage/pos/datasource/DataSourceConfiguration.java

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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();
     }