From d1d61f6f9ae0c992e4368e7df72dc9ad8ab57e40 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期四, 12 一月 2023 09:47:21 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/service/data/UploadService.java | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java index 472fdc0..d35e2a8 100644 --- a/src/main/java/com/lf/server/service/data/UploadService.java +++ b/src/main/java/com/lf/server/service/data/UploadService.java @@ -219,24 +219,23 @@ MetaEntity old = metaService.selectByGuid(mf.getGuid()); if (null != old) { - mf.setMsg("鏂囦欢宸插瓨鍦�"); + mf.setPath(old.getPath()); file.delete(); return 0; } String uploadPath = pathHelper.getUploadFullPath(); String targetPath = uploadPath + File.separator + mf.getGuid() + mf.getExtName(); + String subPath = FileHelper.getRelativePath(targetPath); File newFile = new File(targetPath); if (newFile.exists()) { - mf.setMsg("鏂囦欢宸插瓨鍦�"); + mf.setPath(subPath); file.delete(); return 0; } file.renameTo(newFile); - - String subPath = FileHelper.getRelativePath(targetPath); mf.setPath(subPath); return 1; @@ -290,17 +289,18 @@ MetaEntity old = metaService.selectByGuid(mf.getGuid()); if (null != old) { - mf.setMsg("鏂囦欢宸插瓨鍦�"); + mf.setPath(old.getPath()); FileHelper.deleteFiles(file); return; } String uploadPath = pathHelper.getUploadFullPath(); String targetPath = uploadPath + File.separator + mf.getGuid() + mf.getExtName(); + String subPath = FileHelper.getRelativePath(targetPath); File newFile = new File(targetPath); if (newFile.exists() && newFile.isDirectory()) { - mf.setMsg("鏂囦欢宸插瓨鍦�"); + mf.setPath(subPath); FileHelper.deleteFiles(file); return; } @@ -312,11 +312,9 @@ } for (File f : files) { - String subPath = targetPath + File.separator + FileHelper.getFileName(f.getPath()); - f.renameTo(new File(subPath)); + String subFile = targetPath + File.separator + FileHelper.getFileName(f.getPath()); + f.renameTo(new File(subFile)); } - - String subPath = FileHelper.getRelativePath(targetPath); mf.setPath(subPath); } -- Gitblit v1.9.3