From 8a53baf134362f8326bda0b720c18d2c4a567f97 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 10 May 2021 12:04:05 +0200 Subject: [PATCH 1/2] gix --- .../portos-bo-portlet/docroot/WEB-INF/src/service.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 051d88f5..93a748f5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2600 - build.date=1620227802640 + build.number=2601 + build.date=1620304230178 build.auto.upgrade=true ## From f6e51736fa267f52fbc411591462b2f5fcccd74e Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 10 May 2021 12:15:34 +0200 Subject: [PATCH 2/2] correzione download allegati zip --- .../tref/liferay/portos/bo/portlet/FascicoloPortlet.java | 8 ++++++-- .../docroot/WEB-INF/src/service.properties | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java index 2ee9e31c..9c23b7b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java @@ -31,6 +31,7 @@ import it.tref.liferay.portos.bo.util.WorkflowUtil; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; @@ -354,10 +355,13 @@ public class FascicoloPortlet extends MVCPortlet { if (Validator.isNull(doc.getDlFileEntryId())) { continue; } + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(doc.getDlFileEntryId()); inputStream = DLFileEntryLocalServiceUtil.getFileAsStream(fileEntry.getFileEntryId(), - fileEntry.getVersion(), false); - String name = fileEntry.getTitle(); + fileEntry.getVersion(), false); + String s = new String(fileEntry.getTitle().getBytes(StandardCharsets.UTF_8)); + byte[] b = s.getBytes(StandardCharsets.ISO_8859_1); + String name = new String(b, StandardCharsets.ISO_8859_1); zipWriter.addEntry(name, inputStream); } finally { StreamUtil.cleanUp(inputStream); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 93a748f5..bf14df84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2601 - build.date=1620304230178 + build.number=2602 + build.date=1620641411855 build.auto.upgrade=true ##