ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!70 代码合并

Browse Source 
Merge pull request !70 from MAC/develop
This commit is contained in:
MAC 2021-07-19 15:55:30 +00:00 committed by Gitee
commit a099889ee7
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/qiwenshare/file/controller/FileController.java
View File

@ -24,6 +24,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import org.eclipse.jetty.util.StringUtil;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -375,6 +376,12 @@ public class FileController {
String newfilePath = moveFileDto.getFilePath(); String newfilePath = moveFileDto.getFilePath();
String fileName = moveFileDto.getFileName(); String fileName = moveFileDto.getFileName();
String extendName = moveFileDto.getExtendName(); String extendName = moveFileDto.getExtendName();
if (StringUtil.isEmpty(extendName)) {
String testFilePath = oldfilePath + fileName + "/";
if (newfilePath.startsWith(testFilePath)) {
return RestResult.fail().message("原路径与目标路径冲突，不能移动");
}
}
userFileService.updateFilepathByFilepath(oldfilePath, newfilePath, fileName, extendName, sessionUserBean.getUserId()); userFileService.updateFilepathByFilepath(oldfilePath, newfilePath, fileName, extendName, sessionUserBean.getUserId());
return RestResult.success(); return RestResult.success();
@ -397,6 +404,14 @@ public class FileController {
List<UserFile> fileList = JSON.parseArray(files, UserFile.class); List<UserFile> fileList = JSON.parseArray(files, UserFile.class);
for (UserFile userFile : fileList) { for (UserFile userFile : fileList) {
if (StringUtil.isEmpty(userFile.getExtendName())) {
String testFilePath = userFile.getFilePath() + userFile.getFileName() + "/";
if (newfilePath.startsWith(testFilePath)) {
return RestResult.fail().message("原路径与目标路径冲突，不能移动");
}
}
userFileService.updateFilepathByFilepath(userFile.getFilePath(), newfilePath, userFile.getFileName(), userFile.getExtendName(), sessionUserBean.getUserId()); userFileService.updateFilepathByFilepath(userFile.getFilePath(), newfilePath, userFile.getFileName(), userFile.getExtendName(), sessionUserBean.getUserId());
} }