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 e3006523977717356e0adccc049fe4b57557770f..da014d449a3a69b7e6ee26b9e1b6769c8a13ee78 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 2fcf938f91fa33f254507b904649fcf858dad007..1850b5a7a551b20210fe47fd410195121516f852 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 c283a5034bdef996fd26f7f685285c6215ff6245..57ccde8b0bee5aa44fd90c4f1fdf0fa3eadb8196 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 1e37d3931066634a2b7f86b4bc49a64d90f8e466..425fce30bff9959a186013975194bcc9eb714e09 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 4809dc3b1b66665967be5d535864d0159ad140a3..a4800c8696fa7cfbcc97784b4580cb26d3e95510 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 {