Merge branch '2.0.x' into 2.1.x

  + fix conflicts

Conflicts:
	crss-mq-computation/crss-mq-computation-top-sit.yml

application-pemc-top-sit.yml

@@ -1,8 +1,9 @@
 spring:
   redis:
-    host: crss-top-sitredis.marathon.l4lb.thisdcos.directory
+    host: redis-crss-top-sit.marathon.mesos
   rabbitmq:
     host: crss-top-sitrabbitmq.marathon.l4lb.thisdcos.directory
 
 crss:
-  api.gateway: http://crss-top-sitcrss1application-main-ui.marathon.l4lb.thisdcos.directory:8080
+  api.gateway: http://crss-top-sitcrss1application-main-ui.marathon.l4lb.thisdcos.directory:8080
+  security.url: ${crss.api.gateway}/admin

application-top-sit.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    host: crss-top-sitredis.marathon.l4lb.thisdcos.directory
+    host: redis-crss-top-sit.marathon.mesos
   rabbitmq:
     host: crss-top-sitrabbitmq.marathon.l4lb.thisdcos.directory
 

crss-data/crss-data-pemc-top-sit.yml

@@ -10,14 +10,17 @@ crss:
       url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataextraction
       username: crss_sit_dataextraction
       password: 7nca5DyN
+      driverClassName: ${spring.datasource.driverClassName}
   datawarehouse:
     datasource:
       platform: postgresql
       url: jdbc:edb://10.176.11.23:5432/crss_sit_external?currentSchema=datawarehouse
       username: crss_sit_datawarehouse
       password: 8BE7ShE3
+      driverClassName: ${spring.datasource.driverClassName}
   registration:
      datasource:
        url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
        username: crss_sit_registration
-       password: 6UZU8ilC
+       password: 6UZU8ilC
+       driverClassName: ${spring.datasource.driverClassName}

crss-dataflow-app/crss-dataflow-app-pemc-uat-sit.yml

@@ -5,6 +5,7 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      maximumPoolSize: 20
   redis:
     database: 4
 

crss-mq-computation/crss-mq-computation-top-sit.yml

@@ -34,7 +34,7 @@ spring:
           authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
 
 batch:
-  maxWorkers: 10
+  maxWorkers: 31
   partitionSize:
     gap: 20
     mq: 100000
@@ -45,3 +45,12 @@ logging:
   level:
     com.pemc.crss: DEBUG
     org.springframework.cloud: DEBUG
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: 10.176.11.25
+    port: 2222
+    workingDirectory: /upload/mq
+    privateKey:

crss-mq-computation/crss-mq-computation.yml

@@ -66,7 +66,7 @@ logging:
 
 batch:
   chunkSize: 100
-  maxWorkers: 10
+  maxWorkers: 15
   partitionSize:
     gap: 2000
     mq: 1500

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

@@ -70,7 +70,7 @@ spring:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 8192
-          cpu: 2
+          cpu: 1
 
   batch:
     initializer:

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

@@ -70,7 +70,7 @@ spring:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 8192
-          cpu: 2
+          cpu: 1
 
   batch:
     initializer:
@@ -83,8 +83,8 @@ spring:
     port: 6379
 
 batch:
-  chunkSize: 1000
-  maxWorkers: 10
+  chunkSize: 100
+  maxWorkers: 30
   partitionSize:
     retDat: 300
     retBcq: 20000

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

@@ -50,7 +50,7 @@ spring:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 8192
-          cpu: 2
+          cpu: 1
 
   batch:
     initializer:

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

@@ -50,7 +50,7 @@ spring:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 8192
-          cpu: 2
+          cpu: 1
 
   batch:
     initializer:
@@ -60,7 +60,7 @@ spring:
 
 batch:
   chunkSize: 100
-  maxWorkers: 10
+  maxWorkers: 20
   partitionSize:
     amsSp: 1500
     amsInv: 1500

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

@@ -79,7 +79,7 @@ spring:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 8192
-          cpu: 2
+          cpu: 1
 
   batch:
     initializer:

crss-ui/crss-ui.yml

@@ -1,4 +1,6 @@
 zuul:
+  semaphore:
+    maxSemaphores: 30000
   host.socket-timeout-millis: 30000
   ignoredServices: '*'
   #default is Cookie,Set-Cookie,Authorization.