From a00fb55e4c62805294d74229dffa489b26572e9d Mon Sep 17 00:00:00 2001 From: Github Action Date: Fri, 22 Mar 2024 13:07:07 +0000 Subject: [PATCH 1/2] Version 2.4.4-SNAPSHOT [skip ci] --- batch/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 2 +- web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/batch/pom.xml b/batch/pom.xml index 7c52b6d4..25c2f309 100644 --- a/batch/pom.xml +++ b/batch/pom.xml @@ -3,7 +3,7 @@ itembackoffice fr.abes.item - 2.4.3 + 2.4.4-SNAPSHOT 4.0.0 jar diff --git a/core/pom.xml b/core/pom.xml index 30c4c101..8c4e37ae 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ itembackoffice fr.abes.item - 2.4.3 + 2.4.4-SNAPSHOT 4.0.0 jar diff --git a/pom.xml b/pom.xml index c1c77ab4..24b20eb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ fr.abes.item itembackoffice - 2.4.3 + 2.4.4-SNAPSHOT core web diff --git a/web/pom.xml b/web/pom.xml index 7fecaae6..3fa98efe 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,7 +3,7 @@ itembackoffice fr.abes.item - 2.4.3 + 2.4.4-SNAPSHOT 4.0.0 jar From 959efceca3235c9b9cc288700e3bd6bdb335d613 Mon Sep 17 00:00:00 2001 From: pierre-maraval Date: Wed, 27 Mar 2024 10:39:18 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20:=20Ajout=20poll=20pour=20requ=C3=AAt?= =?UTF-8?q?es=20CBS=20via=20l'API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- batch/src/main/resources/application-dev.properties | 1 + batch/src/main/resources/application-prod.properties | 1 + batch/src/main/resources/application-test.properties | 1 + .../java/fr/abes/item/service/impl/TraitementService.java | 5 ++++- web/src/main/resources/application-dev.properties | 1 + web/src/main/resources/application-prod.properties | 1 + web/src/main/resources/application-test.properties | 1 + 7 files changed, 10 insertions(+), 1 deletion(-) diff --git a/batch/src/main/resources/application-dev.properties b/batch/src/main/resources/application-dev.properties index 47140b3f..d3b9c114 100644 --- a/batch/src/main/resources/application-dev.properties +++ b/batch/src/main/resources/application-dev.properties @@ -29,6 +29,7 @@ sudoc.serveur= sudoc.port= #login permettant de tester si le CBS répond sudoc.login= +sudoc.poll= batch.min.hour=8 batch.max.hour=20 diff --git a/batch/src/main/resources/application-prod.properties b/batch/src/main/resources/application-prod.properties index 61c87415..febd6c69 100644 --- a/batch/src/main/resources/application-prod.properties +++ b/batch/src/main/resources/application-prod.properties @@ -30,6 +30,7 @@ sudoc.serveur= sudoc.port= #login permettant de tester si le CBS répond sudoc.login= +sudoc.poll= batch.min.hour=8 batch.max.hour=20 diff --git a/batch/src/main/resources/application-test.properties b/batch/src/main/resources/application-test.properties index 61c87415..febd6c69 100644 --- a/batch/src/main/resources/application-test.properties +++ b/batch/src/main/resources/application-test.properties @@ -30,6 +30,7 @@ sudoc.serveur= sudoc.port= #login permettant de tester si le CBS répond sudoc.login= +sudoc.poll= batch.min.hour=8 batch.max.hour=20 diff --git a/core/src/main/java/fr/abes/item/service/impl/TraitementService.java b/core/src/main/java/fr/abes/item/service/impl/TraitementService.java index b0e8ed33..b0d1e11d 100644 --- a/core/src/main/java/fr/abes/item/service/impl/TraitementService.java +++ b/core/src/main/java/fr/abes/item/service/impl/TraitementService.java @@ -28,6 +28,9 @@ @Service public class TraitementService implements ITraitementService { + @Value("${sudoc.poll}") + private Integer poll; + @Value("${sudoc.serveur}") private String serveurSudoc; @@ -42,7 +45,7 @@ public class TraitementService implements ITraitementService { private DaoProvider dao; public TraitementService() { - cbs = new ProcessCBS(); + cbs = new ProcessCBS(poll); } @Override diff --git a/web/src/main/resources/application-dev.properties b/web/src/main/resources/application-dev.properties index 46b77077..9e677050 100644 --- a/web/src/main/resources/application-dev.properties +++ b/web/src/main/resources/application-dev.properties @@ -30,6 +30,7 @@ sudoc.serveur= sudoc.port= #login permettant de tester si le CBS répond sudoc.login= +sudoc.poll= # Configuration des logs logging.config=classpath:log4j2-dev.xml diff --git a/web/src/main/resources/application-prod.properties b/web/src/main/resources/application-prod.properties index 6212d385..bf779fe9 100644 --- a/web/src/main/resources/application-prod.properties +++ b/web/src/main/resources/application-prod.properties @@ -30,6 +30,7 @@ sudoc.serveur= sudoc.port= #login permettant de tester si le CBS répond sudoc.login= +sudoc.poll= # Configuration des logs logging.config=classpath:log4j2-prod.xml diff --git a/web/src/main/resources/application-test.properties b/web/src/main/resources/application-test.properties index ebfb1a17..b539277f 100644 --- a/web/src/main/resources/application-test.properties +++ b/web/src/main/resources/application-test.properties @@ -30,6 +30,7 @@ sudoc.serveur= sudoc.port= #login permettant de tester si le CBS répond sudoc.login= +sudoc.poll= # Configuration des logs logging.config=classpath:log4j2-tests.xml