From 58575378db15d22a1f28b21a3512706280469bbb Mon Sep 17 00:00:00 2001 From: "j.yao.SUSE" Date: Sun, 3 Nov 2019 11:34:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=89=BE=E4=B8=8D=E5=88=B0=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98=20(#170)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `getCanonicalFile 可解析正确各种路径` 如果使用相对路径， 文件上传会报错， 使用 getCanonicalFile 修复 --- eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java index 151f0283..ae1c3547 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java @@ -140,7 +140,8 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { try { String fileName = name + nowStr + "." + suffix; String path = filePath + fileName; - File dest = new File(path); + // getCanonicalFile 可解析正确各种路径 + File dest = new File(path).getCanonicalFile(); // 检测是否存在目录 if (!dest.getParentFile().exists()) { dest.getParentFile().mkdirs(); From 9882cb97a71a37d032883fdca4cc3241a171cb0f Mon Sep 17 00:00:00 2001 From: "j.yao.SUSE" Date: Mon, 4 Nov 2019 11:31:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=98=A0=E5=B0=84=E4=BC=98=E5=8C=96=20(#172)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化后 获取静态资源路径和操作系统无关 --- .../src/main/java/me/zhengjie/config/ConfigurerAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java index 03351a75..ef835c6a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java @@ -35,8 +35,8 @@ public class ConfigurerAdapter implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - String avatarUtl = "file:" + avatar.replace("\\","/"); - String pathUtl = "file:" + path.replace("\\","/"); + String avatarUtl = Paths.get(avatar).normalize().toUri().toASCIIString(); + String pathUtl = Paths.get(path).normalize().toUri().toASCIIString(); registry.addResourceHandler("/avatar/**").addResourceLocations(avatarUtl).setCachePeriod(0); registry.addResourceHandler("/file/**").addResourceLocations(pathUtl).setCachePeriod(0); registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/").setCachePeriod(0);