Merge branch 'master' of github.com:elunez/eladmin

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();

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);