Merge branch '2.2.x'

application-pemc-dev.yml

@@ -2,10 +2,12 @@ spring:
   rabbitmq:
     host: rabbitmq.marathon.l4lb.thisdcos.directory
   redis:
-    host: redis.marathon.mesos
+    host: redis.marathon.l4lb.thisdcos.directory
   datasource:
     driverClassName: org.postgresql.Driver
 
+security.server.url: http://crssedge-server.marathon.l4lb.thisdcos.directory:8080/admin
+
 crss:
   api.gateway: http://edge-server.marathon.l4lb.thisdcos.directory:8080
   security.url: http://edge-server.marathon.l4lb.thisdcos.directory:8080/uaa

crss-admin/crss-admin-pemc-dev.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=admin
+    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=admin
     username: crss_admin
     password: YReYA7fI
   mail:

crss-admin/crss-admin.yml

@@ -32,9 +32,9 @@ spring:
 # TODO: UPDATE configs for prod
 crss:
   ldap:
-    protocol: LDAPS
+    protocol: LDAP
     host: "192.168.95.106"
-    port: 636
+    port: 389
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO
     admin-user: "wesmsys\\crss_user"

crss-audit/crss-audit-pemc-dev.yml

@@ -2,6 +2,6 @@ spring:
   crss-audit:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=audit
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=audit
       username: crss_audit
       password: S0CuFyj6

crss-data/crss-data-pemc-dev.yml

@@ -1,22 +1,22 @@
 spring:
   datasource:
     driverClassName: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataextraction
+    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataextraction
     username: crss_dataextraction
     password: xgZx2FqM
 crss:
   metadata:
     datasource:
       driverClassName: org.postgresql.Driver
-      url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataextraction
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataextraction
       username: crss_dataextraction
       password: xgZx2FqM
   datawarehouse:
     datasource:
       platform: postgresql
-      url: jdbc:postgresql://192.168.1.81:5432/crss_external?currentSchema=datawarehouse
+      url: jdbc:postgresql://192.168.1.120:5432/crss_external?currentSchema=datawarehouse
       username: crss_datawarehouse
-      password: crss_datawarehouse
+      password: 8BE7ShE3
       driverClassName: org.postgresql.Driver
       hikari:
         connectionTimeout: 10000
@@ -25,7 +25,7 @@ crss:
   registration:
      datasource:
        driverClassName: org.postgresql.Driver
-       url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
+       url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
        username: crss_registration
        password: 51UF3JA9
        hikari:

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

@@ -1,7 +1,7 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver

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

@@ -2,7 +2,7 @@ spring:
   crss-nmms:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
 

crss-metering/crss-metering-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   profiles.include: pg-query
   datasource:
-    url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     hikari:

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

@@ -2,19 +2,19 @@ spring:
   crss-main:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
   crss-registration:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
   crss-nmms:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
 

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-dev.yml

@@ -1,19 +1,19 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-dev.yml

@@ -6,7 +6,7 @@ spring:
           content-type: application/json
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
@@ -15,7 +15,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -10,7 +10,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
@@ -19,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-dev.yml

@@ -2,7 +2,7 @@
 spring:
   profiles: dailyExtract
   datasource:
-    url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver
@@ -32,7 +32,7 @@ logging:
 spring:
   profiles: monthlyExtract
   datasource:
-    url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver
@@ -61,7 +61,7 @@ logging:
 # default
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver

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

@@ -1,25 +1,25 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: 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.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: 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.81:5432/crss?currentSchema=nmms
+        jdbcUrl: 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.81:5432/crss?currentSchema=registration
+        jdbcUrl: 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-azure.yml

@@ -36,8 +36,8 @@ spring:
 batch:
   # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
   partitionSize:
-    gap: 10000
-    mq: 10000
+    gap: 5000
+    mq: 5000
     ssla: 5000
     report: 1
 

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

@@ -1,7 +1,7 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -10,7 +10,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -19,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
+      jdbcUrl: 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

@@ -1,7 +1,7 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -10,7 +10,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -19,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

crss-sched/crss-sched-pemc-dev.yml

@@ -1,6 +1,6 @@
 spring:
   profiles.include: metronome
   datasource:
-    url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=scheduler
+    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=scheduler
     username: crss_scheduler
     password: 5Q4AY59T

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

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
@@ -9,5 +9,5 @@ spring:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=worklist
       username: crss_worklist
-      password: lbgg1i2Y
+      password: c3XL8Lcb
       driverClassName: org.postgresql.Driver

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
@@ -10,7 +10,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -19,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
@@ -28,7 +28,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
@@ -37,7 +37,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
@@ -10,7 +10,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -19,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
@@ -28,7 +28,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
@@ -37,7 +37,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-dev.yml

@@ -1,20 +1,20 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       maximumPoolSize: 5
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-dev.yml

@@ -1,29 +1,23 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       maximumPoolSize: 5
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-      driverClassName: org.postgresql.Driver
 
   profiles:
     include: mesos

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml

@@ -49,6 +49,7 @@ spring:
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: validate
         hbm2ddl:
+          auto: 
           import_files:
 
   cloud:
@@ -59,8 +60,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 8192
-          cpu: 1
+          memory: 12288
+          cpu: 3
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
@@ -72,14 +73,14 @@ spring:
 
 batch:
   chunkSize: 100
-  maxWorkers: 10
+  maxWorkers: 20
   partitionSize:
     amsSp: 1500
     amsInv: 1500
     amsEmf: 1500
     amsRmf: 1500
     energyStl: 5
-    lr: 1
+    lr: 3
     energyStlB: 150000
 
 

crss-settlement-task-validation/crss-settlement-task-validation-pemc-dev.yml

@@ -1,37 +1,37 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       maximumPoolSize: 5

crss-uaa/crss-uaa-ldap.yml

@@ -1,8 +1,8 @@
 crss:
   ldap:
-    protocol: LDAPS
+    protocol: LDAP
     host: "192.168.95.106"
-    port: 636
+    port: 389
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO
     admin-user: "wesmsys\\crss_user"

crss-uaa/crss-uaa-pemc-dev.yml

@@ -2,9 +2,9 @@ spring:
   redis:
     database: 2
   datasource:
-    url: jdbc:postgresql://192.168.1.81:5432/crss?currentSchema=admin
+    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=admin
     username: crss_admin
-    password: crss_admin
+    password: YReYA7fI
 
 crss:
   ldap:

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

@@ -9,7 +9,7 @@ spring:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
       username: crss_settlement
-      password: lbgg1i2Y
+      password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:

crss-worklist-app/crss-worklist-app.yml

@@ -6,7 +6,7 @@ spring:
       username: crss_worklist
       password: c3XL8Lcb
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
+      connectionTimeout: 150000
       maximumPoolSize: 5
   crss-stl:
     datasource:
@@ -14,7 +14,7 @@ spring:
       username: crss_settlement
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
-      connectionTimeout: 10000
+      connectionTimeout: 150000
       maximumPoolSize: 5
   crss-main:
     datasource: