From 2e6d665fcfe1d9a70dbb0be5df0ce05761d289aa Mon Sep 17 00:00:00 2001 From: o2sword <171715986@qq.com> Date: Fri, 16 Oct 2020 14:47:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E4=B8=8B=E8=BD=BD=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/x/general/core/entity/file/GeneralFile.java | 2 +- .../com/x/processplatform/assemble/surface/Business.java | 8 ++++---- .../ActionBatchDownloadWithWorkOrWorkCompleted.java | 3 ++- .../ActionBatchDownloadWithWorkOrWorkCompletedStream.java | 2 ++ .../surface/jaxrs/attachment/ActionUploadWorkInfo.java | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/o2server/x_general_core_entity/src/main/java/com/x/general/core/entity/file/GeneralFile.java b/o2server/x_general_core_entity/src/main/java/com/x/general/core/entity/file/GeneralFile.java index e300652397..da014d449a 100644 --- a/o2server/x_general_core_entity/src/main/java/com/x/general/core/entity/file/GeneralFile.java +++ b/o2server/x_general_core_entity/src/main/java/com/x/general/core/entity/file/GeneralFile.java @@ -163,7 +163,7 @@ public class GeneralFile extends StorageObject { @FieldDescribe("文件名称.") @Column(length = length_255B, name = ColumnNamePrefix + name_FIELDNAME) @Index(name = TABLE + IndexNameMiddle + name_FIELDNAME) - @CheckPersist(allowEmpty = false, fileNameString = true) + @CheckPersist(allowEmpty = false) private String name; public static final String extension_FIELDNAME = "extension"; diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/Business.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/Business.java index 2fcf938f91..1850b5a7a5 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/Business.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/Business.java @@ -1229,8 +1229,8 @@ public class Business { } try (ZipOutputStream zos = new ZipOutputStream(os)) { for (Map.Entry entry : filePathMap.entrySet()) { - zos.putNextEntry(new ZipEntry(new ZipEntry(StringUtils.replaceEach(entry.getKey(), - new String[] { "/", "\\" }, new String[] { "-", "-" })))); + zos.putNextEntry(new ZipEntry(StringUtils.replaceEach(entry.getKey(), + new String[] { "/",":","*","?","<<",">>","|","<",">","\\" }, new String[] { "","","","","","","","","","" }))); StorageMapping mapping = ThisApplication.context().storageMappings().get(Attachment.class, entry.getValue().getStorage()); try (ByteArrayOutputStream os1 = new ByteArrayOutputStream()) { @@ -1243,8 +1243,8 @@ public class Business { if (otherAttMap != null) { for (Map.Entry entry : otherAttMap.entrySet()) { - zos.putNextEntry(new ZipEntry(StringUtils.replaceEach(entry.getKey(), new String[] { "/", "\\" }, - new String[] { "-", "-" }))); + zos.putNextEntry(new ZipEntry(StringUtils.replaceEach(entry.getKey(), + new String[] { "/",":","*","?","<<",">>","|","<",">","\\" }, new String[] { "","","","","","","","","","" }))); zos.write(entry.getValue()); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionBatchDownloadWithWorkOrWorkCompleted.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionBatchDownloadWithWorkOrWorkCompleted.java index c283a5034b..57ccde8b0b 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionBatchDownloadWithWorkOrWorkCompleted.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionBatchDownloadWithWorkOrWorkCompleted.java @@ -100,7 +100,8 @@ class ActionBatchDownloadWithWorkOrWorkCompleted extends BaseAction { emc.commit(); } } - + fileName = StringUtils.replaceEach(fileName, + new String[] { "/",":","*","?","<<",">>","|","<",">","\\" }, new String[] { "","","","","","","","","","" }); logger.info("batchDown to {}，att size {}, from work {}", fileName, attachmentList.size(), workId); try (ByteArrayOutputStream os = new ByteArrayOutputStream()) { business.downToZip(readableAttachmentList, os, map); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionBatchDownloadWithWorkOrWorkCompletedStream.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionBatchDownloadWithWorkOrWorkCompletedStream.java index 1e37d39310..425fce30bf 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionBatchDownloadWithWorkOrWorkCompletedStream.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionBatchDownloadWithWorkOrWorkCompletedStream.java @@ -101,6 +101,8 @@ class ActionBatchDownloadWithWorkOrWorkCompletedStream extends BaseAction { } } + fileName = StringUtils.replaceEach(fileName, + new String[] { "/",":","*","?","<<",">>","|","<",">","\\" }, new String[] { "","","","","","","","","","" }); logger.info("batchDown to {}，att size {}, from work {}, has form {}", fileName, attachmentList.size(), workId, map.size()); try (ByteArrayOutputStream os = new ByteArrayOutputStream()) { diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionUploadWorkInfo.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionUploadWorkInfo.java index 4809dc3b1b..a4800c8696 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionUploadWorkInfo.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionUploadWorkInfo.java @@ -42,7 +42,7 @@ import com.x.processplatform.core.entity.content.WorkCompleted; class ActionUploadWorkInfo extends BaseAction { - private static Logger logger = LoggerFactory.getLogger(ActionEdit.class); + private static Logger logger = LoggerFactory.getLogger(ActionUploadWorkInfo.class); ActionResult execute(EffectivePerson effectivePerson, String workId, String flag, JsonElement jsonElement) throws Exception { -- GitLab