diff --git a/api/api-ingest/ingest-internal/src/main/java/fr/gouv/vitamui/ingest/internal/server/service/IngestGeneratorODTFile.java b/api/api-ingest/ingest-internal/src/main/java/fr/gouv/vitamui/ingest/internal/server/service/IngestGeneratorODTFile.java index 7cff37ed6030a91719acf677bf5bb2f2f41a5440..e48a356d61bc26adcfcf1f5190b726877369ac34 100644 --- a/api/api-ingest/ingest-internal/src/main/java/fr/gouv/vitamui/ingest/internal/server/service/IngestGeneratorODTFile.java +++ b/api/api-ingest/ingest-internal/src/main/java/fr/gouv/vitamui/ingest/internal/server/service/IngestGeneratorODTFile.java @@ -53,6 +53,7 @@ import org.odftoolkit.simple.table.Cell; import org.odftoolkit.simple.table.Row; import org.odftoolkit.simple.table.Table; import org.odftoolkit.simple.text.Paragraph; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.Resource; import org.springframework.util.FileCopyUtils; import org.w3c.dom.Document; @@ -93,6 +94,8 @@ public class IngestGeneratorODTFile { public static final String FIRST_TITLE = "Bordereau de versement d'archives"; public static final String SECOND_TITLE = "Détail des unités archivistiques de type répertoire et dossiers:"; + @Value("${tmp_folder_path}") + private String tmpFolderPath; public void generateDocumentHeader(TextDocument document, CustomerDto myCustomer, Resource customerLogo) throws IOException, URISyntaxException { @@ -129,10 +132,11 @@ public class IngestGeneratorODTFile { .getDecoder() .decode(customerLogoBase64Image); - imgFile = "src/main/resources/logo_ministere." + getExtensionByCustomerLogo(customerLogoBase64Image).toLowerCase(); + imgFile = tmpFolderPath + "/logo_ministere." + getExtensionByCustomerLogo(customerLogoBase64Image).toLowerCase(); FileUtils.writeByteArrayToFile(new File(imgFile), customerLogoDecodedBytes); headerTable.getCellByPosition(1,0).setImage(new URI(imgFile)); + FileUtils.forceDelete(new File(imgFile)); } diff --git a/api/api-ingest/ingest-internal/src/main/resources/application-dev.yml b/api/api-ingest/ingest-internal/src/main/resources/application-dev.yml index 392f70105999fa91542818eaa0f8d1d77e080f36..30d1d925adc13080db571e58c2a5a18f2c769a33 100644 --- a/api/api-ingest/ingest-internal/src/main/resources/application-dev.yml +++ b/api/api-ingest/ingest-internal/src/main/resources/application-dev.yml @@ -50,6 +50,8 @@ opentracing: host: localhost port: 6831 +tmp_folder_path: "src/main/resources" + logging: level: fr.gouv.vitamui.ingest: DEBUG diff --git a/api/api-ingest/ingest-internal/src/test/resources/application.yml b/api/api-ingest/ingest-internal/src/test/resources/application.yml index d1f1910a607653f775b85c3829b7ab9bfaef931f..a90e981c5309e4d9eb7b7c8a07a59a299da21999 100644 --- a/api/api-ingest/ingest-internal/src/test/resources/application.yml +++ b/api/api-ingest/ingest-internal/src/test/resources/application.yml @@ -27,4 +27,6 @@ server-identity: identityServerId: 1 +tmp_folder_path: "src/main/resources" + logbook.scheduling.sendEventToVitamTasks.enabled: false diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml index acf6ab4a25c230b15c418330b025856bce24ccc4..fcef0d2ab49ba422003155f29cc1d8f88f51dbb5 100755 --- a/deployment/environments/group_vars/all/vitamui_vars.yml +++ b/deployment/environments/group_vars/all/vitamui_vars.yml @@ -331,6 +331,7 @@ vitamui: secure: true jvm_log: false logging_level: "INFO" + tmp_folder_path : "{{ vitamui_defaults.folder.root_path }}/tmp" log: logback_max_file_size: "10MB" logback_max_history: 30 diff --git a/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2 b/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2 index 1dd28a2d123b9535e905e46c966197280843c4cf..0535f41ed6d858d699438fcf1549714db9b8890c 100644 --- a/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2 +++ b/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2 @@ -67,6 +67,7 @@ opentracing: host: {{ opentracing.jaeger.udp_sender.host }} port: {{ opentracing.jaeger.udp_sender.port }} +tmp_folder_path : {{ vitamui_struct.tmp_folder_path }}/{{ vitamui_struct.vitamui_component }} logging: config: {{ vitamui_folder_conf }}/logback.xml