From 6a197e18f75f488f2c40c5177da9e88f56ebd216 Mon Sep 17 00:00:00 2001 From: MAC <1162714483@qq.com> Date: Wed, 30 Mar 2022 21:06:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0):?= =?UTF-8?q?=20=E4=B8=8A=E4=BC=A0=E8=8E=B7=E5=8F=96=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qiwenshare/file/service/FiletransferService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/service/FiletransferService.java b/src/main/java/com/qiwenshare/file/service/FiletransferService.java index f9a9e55..8a48fbe 100644 --- a/src/main/java/com/qiwenshare/file/service/FiletransferService.java +++ b/src/main/java/com/qiwenshare/file/service/FiletransferService.java @@ -202,7 +202,7 @@ public class FiletransferService implements IFiletransferService { userFile.setIsDir(0); List userFileList = userFileMapper.selectList(new QueryWrapper<>(userFile)); if (userFileList.size() > 0) { - String fileName = fileDealComp.getRepeatFileName(userFile, uploadFileDto.getFilePath()); + String fileName = fileDealComp.getRepeatFileName(userFile, userFile.getFilePath()); userFile.setFileName(fileName); } userFile.setFileId(fileBean.getFileId()); @@ -391,7 +391,6 @@ public class FiletransferService implements IFiletransferService { } PreviewFile previewFile = new PreviewFile(); previewFile.setFileUrl(fileBean.getFileUrl()); -// previewFile.setFileSize(fileBean.getFileSize()); try { if ("true".equals(previewDTO.getIsMin())) { previewer.imageThumbnailPreview(httpServletResponse, previewFile); From 8570ebc08cf55eb772512417f0b641e7416b528d Mon Sep 17 00:00:00 2001 From: MAC <1162714483@qq.com> Date: Wed, 30 Mar 2022 21:07:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E5=88=9B=E5=BB=BA=E6=96=87=E4=BB=B6):?= =?UTF-8?q?=20=E5=88=9B=E5=BB=BA=E6=96=87=E4=BB=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiwenshare/file/controller/OfficeController.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/controller/OfficeController.java b/src/main/java/com/qiwenshare/file/controller/OfficeController.java index 32c5f95..17b9cec 100644 --- a/src/main/java/com/qiwenshare/file/controller/OfficeController.java +++ b/src/main/java/com/qiwenshare/file/controller/OfficeController.java @@ -122,15 +122,11 @@ public class OfficeController { userFile.setFileId(fileBean.getFileId()); userFileService.save(userFile); } - - result.success(); - result.setMessage("文件创建成功！"); + return RestResult.success().message("文件创建成功"); } catch (Exception e) { log.error(e.getMessage()); - result.setCode(500); - result.setMessage("服务器错误！"); + return RestResult.fail().message(e.getMessage()); } - return result; } @Operation(summary = "预览office文件", description = "预览office文件", tags = {"office"}) From 1be77ab7a039ba690b28ef3adf6e80801bcf19eb Mon Sep 17 00:00:00 2001 From: MAC <1162714483@qq.com> Date: Wed, 30 Mar 2022 21:09:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E6=96=87=E4=BB=B6):?= =?UTF-8?q?=20=E7=A7=BB=E5=8A=A8=E6=96=87=E4=BB=B6=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=B5=8C=E5=A5=97=E7=9B=AE=E5=BD=95=E6=B7=B7=E4=B9=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiwenshare/file/service/UserFileService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/service/UserFileService.java b/src/main/java/com/qiwenshare/file/service/UserFileService.java index 8e836a3..fa58bbe 100644 --- a/src/main/java/com/qiwenshare/file/service/UserFileService.java +++ b/src/main/java/com/qiwenshare/file/service/UserFileService.java @@ -118,13 +118,13 @@ public class UserFileService extends ServiceImpl impl oldfilePath = oldfilePath + fileName + "/"; newfilePath = newfilePath + fileName + "/"; - oldfilePath = oldfilePath.replace("\\", "\\\\\\\\"); - oldfilePath = oldfilePath.replace("'", "\\'"); - oldfilePath = oldfilePath.replace("%", "\\%"); - oldfilePath = oldfilePath.replace("_", "\\_"); - if (StringUtils.isEmpty(extendName)) { //为空说明是目录，则需要移动子目录 - userFileMapper.updateFilepathByFilepath(oldfilePath, newfilePath, userId); + List list = selectFileListLikeRightFilePath(oldfilePath, userId); + + for (UserFile newUserFile : list) { + newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(oldfilePath, newfilePath)); + userFileMapper.updateById(newUserFile); + } } } From 4f41985d2c57d0cc9f0b98210e79d5c568ee9850 Mon Sep 17 00:00:00 2001 From: MAC <1162714483@qq.com> Date: Wed, 30 Mar 2022 21:09:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?style(=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96)?= =?UTF-8?q?:=20=E5=B8=B8=E9=87=8F=E6=9B=BF=E6=8D=A2=E4=B8=BA=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/qiwenshare/file/util/OperationLogUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qiwenshare/file/util/OperationLogUtil.java b/src/main/java/com/qiwenshare/file/util/OperationLogUtil.java index 135eba5..1fa27cd 100644 --- a/src/main/java/com/qiwenshare/file/util/OperationLogUtil.java +++ b/src/main/java/com/qiwenshare/file/util/OperationLogUtil.java @@ -1,5 +1,6 @@ package com.qiwenshare.file.util; +import com.qiwenshare.common.constant.PlatformEnum; import com.qiwenshare.common.util.CollectUtil; import com.qiwenshare.common.util.DateUtil; import com.qiwenshare.file.domain.OperationLogBean; @@ -29,7 +30,7 @@ public class OperationLogUtil { operationLogBean.setResult(isSuccess); operationLogBean.setOperation(operation); operationLogBean.setDetail(detail); - operationLogBean.setPlatform(3); + operationLogBean.setPlatform(PlatformEnum.PAN.getCode()); return operationLogBean; }