Merge branch 'master' of http://crssdev-git.wesm.ph/crss/config into 2.6.x

crss-dataflow-app/crss-dataflow-app-pemc-dev.yml

@@ -36,5 +36,5 @@ sftp:
 
 scheduler:
   job-execution-timeout-minutes:
-    default: 120
+    default: 360
 

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-dev.yml

@@ -2,24 +2,28 @@ spring:
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
+        url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
         username: crss_nmms
         password: lbgg1i2Y
         driverClassName: org.postgresql.Driver
   crss-registration:
       dataSource:
         jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+        url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
         username: crss_registration
         password: 51UF3JA9
         driverClassName: org.postgresql.Driver

crss-mq-computation/crss-mq-computation-pemc-dev.yml

@@ -2,6 +2,7 @@ spring:
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -11,6 +12,7 @@ spring:
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -20,6 +22,7 @@ spring:
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

crss-mtr/crss-mtr-pemc-dev.yml

@@ -2,6 +2,7 @@ spring:
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -11,6 +12,7 @@ spring:
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -20,6 +22,7 @@ spring:
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml

@@ -5,7 +5,7 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
-      maximumPoolSize: 2
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main: