mirror of
https://gitee.com/kekingcn/file-online-preview.git
synced 2025-10-07 15:14:29 +08:00
!217 [fixed] getRelFilePath 返回null 导致KkFileUtils.isAllowedUpload的空指针异常修复
Merge pull request !217 from lujiaming/master
This commit is contained in:
@@ -49,6 +49,12 @@ public class DownloadUtils {
|
||||
}
|
||||
ReturnResponse<String> response = new ReturnResponse<>(0, "下载成功!!!", "");
|
||||
String realPath = getRelFilePath(fileName, fileAttribute);
|
||||
if(!StringUtils.hasText(realPath)){
|
||||
response.setCode(1);
|
||||
response.setContent(null);
|
||||
response.setMsg("下载失败:文件名不合法!" + urlStr);
|
||||
return response;
|
||||
}
|
||||
if (!KkFileUtils.isAllowedUpload(realPath)) {
|
||||
response.setCode(1);
|
||||
response.setContent(null);
|
||||
@@ -61,12 +67,6 @@ public class DownloadUtils {
|
||||
response.setMsg(fileName);
|
||||
return response;
|
||||
}
|
||||
if(!StringUtils.hasText(realPath)){
|
||||
response.setCode(1);
|
||||
response.setContent(null);
|
||||
response.setMsg("下载失败:文件名不合法!" + urlStr);
|
||||
return response;
|
||||
}
|
||||
if(realPath.equals("cunzhai")){
|
||||
response.setContent(fileDir + fileName);
|
||||
response.setMsg(fileName);
|
||||
|
Reference in New Issue
Block a user