gitee
/
file-online-preview
mirror of https://gitee.com/kekingcn/file-online-preview
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!217 [fixed] getRelFilePath 返回null 导致KkFileUtils.isAllowedUpload的空指针异常修复 

Merge pull request !217 from lujiaming/master
pull/218/head
kailing 2023-08-21 15:39:30 +00:00 committed by Gitee
parent bb3b5b3dff d8146f0495
commit 096426b8e2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/cn/keking/utils/DownloadUtils.java
View File

@ -49,6 +49,12 @@ public class DownloadUtils {
} }
ReturnResponse<String> response = new ReturnResponse<>(0, "下载成功!!!", ""); ReturnResponse<String> response = new ReturnResponse<>(0, "下载成功!!!", "");
String realPath = getRelFilePath(fileName, fileAttribute); String realPath = getRelFilePath(fileName, fileAttribute);
if(!StringUtils.hasText(realPath)){
response.setCode(1);
response.setContent(null);
response.setMsg("下载失败:文件名不合法!" + urlStr);
return response;
}
if (!KkFileUtils.isAllowedUpload(realPath)) { if (!KkFileUtils.isAllowedUpload(realPath)) {
response.setCode(1); response.setCode(1);
response.setContent(null); response.setContent(null);
@ -61,12 +67,6 @@ public class DownloadUtils {
response.setMsg(fileName); response.setMsg(fileName);
return response; return response;
} }
if(!StringUtils.hasText(realPath)){
response.setCode(1);
response.setContent(null);
response.setMsg("下载失败:文件名不合法!" + urlStr);
return response;
}
if(realPath.equals("cunzhai")){ if(realPath.equals("cunzhai")){
response.setContent(fileDir + fileName); response.setContent(fileDir + fileName);
response.setMsg(fileName); response.setMsg(fileName);