Merge branch 'develop'

pom.xml

@@ -10,11 +10,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
 
     <properties>
         <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>
     </properties>
 

src/main/java/au/com/royalpay/payment/manage/pos/datasource/DataSourceConfiguration.java

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