Merge branch '2.6.x'

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

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

crss-settlement-app/crss-settlement-app.yml

@@ -18,6 +18,14 @@ spring:
         driverClassName: com.edb.Driver
         connectionTimeout: 150000
         maximumPoolSize: 3
+  crss-main:
+    datasource:
+        jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=meterprocess
+        username: crss_meterprocess
+        password: D9JpfUtT
+        driverClassName: com.edb.Driver
+        connectionTimeout: 150000
+        maximumPoolSize: 3
   jpa:
     show-sql: false
     generate-ddl: false