From e1e05b761a29d123844f661e0ac12b33f00bf84d Mon Sep 17 00:00:00 2001
From: DokiYoloo <857815116@qq.com>
Date: Sat, 30 Jan 2021 17:19:23 +0800
Subject: [PATCH] !43 角色管理-编辑角色-功能权限显示异常 Merge pull request !43 from wihi/master
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
index 8c5a198..a49168c 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
@@ -3,7 +3,6 @@
import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException;
@@ -29,12 +28,6 @@
* 默认的文件名最大长度 100
*/
public static final int DEFAULT_FILE_NAME_LENGTH = 100;
-
- /**
- * 资源映射路径 前缀
- */
- @Value("${file.prefix}")
- public String localFilePrefix;
/**
* 根据文件路径上传
@@ -110,7 +103,7 @@
desc.getParentFile().mkdirs();
}
}
- return desc;
+ return desc.isAbsolute() ? desc : desc.getAbsoluteFile();
}
private static final String getPathFileName(String fileName) throws IOException
--
Gitblit v1.9.3