Merge branch '2.1.x'

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

@@ -34,7 +34,9 @@ spring:
           authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
 
 batch:
-  maxWorkers: 31
+  maxWorkers: 20
+  partitionSize:
+      mq: 120000
 
 logging:
   level:

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

@@ -6,7 +6,7 @@ spring:
       password: i17SMOPm
       driverClassName: com.edb.Driver
       connectionTimeout: 900000
-      maximumPoolSize: 8
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -16,7 +16,7 @@ spring:
       password: D9JpfUtT
       driverClassName: com.edb.Driver
       connectionTimeout: 900000
-      maximumPoolSize: 8
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
@@ -61,7 +61,7 @@ spring:
         hbm2ddl:
           import_files:
         jdbc:
-          batch_size: 10000
+          batch_size: 100000
 
   cloud:
     task:
@@ -87,18 +87,18 @@ spring:
     port: 6379
 
 batch:
-  chunkSize: 10000
+  chunkSize: 100000
   maxWorkers: 18
   partitionSize:
-    retDat: 450
-    retBcq: 44000
+    disAggBcqBuyer: 500
     calcEta: 500
     procNss: 1500
     nss: 500
     nssTot: 450000
-    disAggBcq: 1000
-    disAggBcqBuyer: 1000
     disAggBcqSeller: 1000
+    disAggBcq: 500
+    retBcq: 44000
+    retDat: 450
     rta: 900
     rprta: 2000
     rcra: 900

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

@@ -42,7 +42,7 @@ spring:
         deleteFilesOnExit: false
 
 batch:
-  resourceLocation: "file:target/libs/crss-settlement-task-invoice-generation-2.1.0.BUILD-SNAPSHOT.jar"
+  resourceLocation: "file:target/libs/crss-settlement-task-invoice-generation-2.1.1.BUILD-SNAPSHOT.jar"
   chunkSize: 100
   maxWorkers: 2
   partitionSize:

crss-uaa/crss-uaa-azure.yml

@@ -13,6 +13,18 @@ crss:
     oauth2:
       default-redirect-uri: http://crss.azure.crss.exist.com
       registered-redirect-uris: http://crss.azure.crss.exist.com,http://bsmd.azure.crss.exist.com
+  ldap:
+    protocol: LDAPS
+    host: "192.168.233.8"
+    port: 636
+    root-dn: "dc=wesmsys,dc=local"
+    user-search-base: MO,MP,SO
+    admin-user: "wesmsys\\crssadmin"
+    admin-password: "123qweASD"
+    username-field: "userPrincipalName"
+    domain: "wesmsys.local"
+    embedded: false
+    passwordOpEnabled: true
 
 
 logging: