Skip to content

feat: 添加批量上传、文件列表排序、批量删除和下载功能 #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: 添加批量上传、文件列表排序、批量删除和下载功能 #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions server/src/main/java/cn/keking/utils/DateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package cn.keking.utils;

import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;

/**
* @author kl (http://kailing.pub)
Expand All @@ -23,4 +26,17 @@ public static long getCurrentSecond() {
public static long calculateCurrentTimeDifference(long datetime) {
return getCurrentSecond() - datetime;
}

/**
* 将时间戳格式化为可读字符串
* @param timestamp 时间戳（毫秒）
* @return 格式化后的时间字符串
*/
public static String formatTime(long timestamp) {
LocalDateTime dateTime = LocalDateTime.ofInstant(
Instant.ofEpochMilli(timestamp),
ZoneId.systemDefault()
);
return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
}
}
273 changes: 255 additions & 18 deletions server/src/main/java/cn/keking/web/controller/FileController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.springframework.util.StreamUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
Expand All @@ -26,6 +27,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
Expand All @@ -38,6 +40,30 @@
import static cn.keking.utils.CaptchaUtil.CAPTCHA_CODE;
import static cn.keking.utils.CaptchaUtil.CAPTCHA_GENERATE_TIME;

/**
* 批量删除文件请求模型
*/
class BatchDeleteRequest {
private List<String> fileNames;
private String password;

public List<String> getFileNames() {
return fileNames;
}

public void setFileNames(List<String> fileNames) {
this.fileNames = fileNames;
}

public String getPassword() {
return password;
}

public void setPassword(String password) {
this.password = password;
}
}

/**
* @author yudian-it
* 2017/12/1
Expand All @@ -55,23 +81,50 @@ public class FileController {

@PostMapping("/fileUpload")
public ReturnResponse<Object> fileUpload(@RequestParam("file") MultipartFile file) {
ReturnResponse<Object> checkResult = this.fileUploadCheck(file);
if (checkResult.isFailure()) {
return checkResult;
// 将单个文件转为数组，调用批量上传方法
MultipartFile[] files = new MultipartFile[]{file};
return batchFileUpload(files);
}

@PostMapping("/batchFileUpload")
public ReturnResponse<Object> batchFileUpload(@RequestParam("files") MultipartFile[] files) {
if (files == null || files.length == 0) {
return ReturnResponse.failure("没有选择文件");
}
File outFile = new File(fileDir + demoPath);
if (!outFile.exists() && !outFile.mkdirs()) {
logger.error("创建文件夹【{}】失败，请检查目录权限！", fileDir + demoPath);
}
String fileName = checkResult.getContent().toString();
logger.info("上传文件：{}{}{}", fileDir, demoPath, fileName);
try (InputStream in = file.getInputStream(); OutputStream out = Files.newOutputStream(Paths.get(fileDir + demoPath + fileName))) {
StreamUtils.copy(in, out);
return ReturnResponse.success(null);
} catch (IOException e) {
logger.error("文件上传失败", e);
return ReturnResponse.failure();

List<String> successFiles = new ArrayList<>();
List<String> failureFiles = new ArrayList<>();

for (MultipartFile file : files) {
ReturnResponse<Object> checkResult = this.fileUploadCheck(file);
if (checkResult.isFailure()) {
failureFiles.add(file.getOriginalFilename() + "(" + checkResult.getMsg() + ")");
continue;
}

File outFile = new File(fileDir + demoPath);
if (!outFile.exists() && !outFile.mkdirs()) {
logger.error("创建文件夹【{}】失败，请检查目录权限！", fileDir + demoPath);
}

String fileName = checkResult.getContent().toString();
logger.info("上传文件：{}{}{}", fileDir, demoPath, fileName);

try (InputStream in = file.getInputStream();
OutputStream out = Files.newOutputStream(Paths.get(fileDir + demoPath + fileName))) {
StreamUtils.copy(in, out);
successFiles.add(fileName);
} catch (IOException e) {
logger.error("文件上传失败: " + fileName, e);
failureFiles.add(fileName);
}
}

Map<String, Object> result = new HashMap<>();
result.put("success", successFiles);
result.put("failure", failureFiles);

return ReturnResponse.success(result);
}

@GetMapping("/deleteFile")
Expand Down Expand Up @@ -132,9 +185,10 @@ public List<Map<String, String>> getFiles() {
File[] files = Objects.requireNonNull(file.listFiles());
Arrays.sort(files, (f1, f2) -> Long.compare(f2.lastModified(), f1.lastModified()));
Arrays.stream(files).forEach(file1 -> {
Map<String, String> fileName = new HashMap<>();
fileName.put("fileName", demoDir + "/" + file1.getName());
list.add(fileName);
Map<String, String> fileInfo = new HashMap<>();
fileInfo.put("fileName", demoDir + "/" + file1.getName());
fileInfo.put("uploadTime", DateUtils.formatTime(file1.lastModified()));
list.add(fileInfo);
});
}
return list;
Expand Down Expand Up @@ -220,8 +274,191 @@ public Object directory(String urls) {
return RarUtils.getTree(fileUrl);
}

/**
* 批量删除文件名检查，不进行密码验证
*
* @param fileName 文件名
* @return 校验结果
*/
private ReturnResponse<Object> batchDeleteFileCheck(String fileName) {
if (ObjectUtils.isEmpty(fileName)) {
return ReturnResponse.failure("文件名为空，删除失败！");
}

String decodedFileName = null;
try {
// 先进行 URL 解码再进行 Base64 解码
String urlDecoded = java.net.URLDecoder.decode(fileName, "UTF-8");
decodedFileName = WebUtils.decodeUrl(urlDecoded);

if (decodedFileName == null) {
logger.error("文件名解码后为空，原始文件名: {}", fileName);
return ReturnResponse.failure("文件名解码失败，删除失败！");
}
} catch (Exception ex) {
logger.error("文件名解码异常: " + fileName, ex);
return ReturnResponse.failure("文件名解码异常，删除失败！");
}

// 处理路径中的分隔符
if (decodedFileName.contains("/")) {
decodedFileName = decodedFileName.substring(decodedFileName.lastIndexOf("/") + 1);
}

// 检查文件名合法性
if (KkFileUtils.isIllegalFileName(decodedFileName)) {
return ReturnResponse.failure("非法文件名，删除失败！");
}

return ReturnResponse.success(decodedFileName);
}

@PostMapping("/batchDeleteFiles")
public ReturnResponse<Object> batchDeleteFiles(HttpServletRequest request, @RequestBody BatchDeleteRequest deleteRequest) {
if (deleteRequest == null || deleteRequest.getFileNames() == null || deleteRequest.getFileNames().isEmpty()) {
return ReturnResponse.failure("未选择任何文件");
}

String password = deleteRequest.getPassword();
if (ObjectUtils.isEmpty(password)) {
return ReturnResponse.failure("密码 or 验证码为空，删除失败！");
}

String expectedPassword = ConfigConstants.getDeleteCaptcha() ? WebUtils.getSessionAttr(request, CAPTCHA_CODE) : ConfigConstants.getPassword();
if (!password.equalsIgnoreCase(expectedPassword)) {
logger.error("批量删除文件失败，密码错误！");
return ReturnResponse.failure("删除文件失败，密码错误！");
}

int successCount = 0;
int failureCount = 0;

for (String encodedFileName : deleteRequest.getFileNames()) {
try {
// 处理前端传入的编码文件名，只做文件名检查，不重复验证密码
ReturnResponse<Object> checkResult = this.batchDeleteFileCheck(encodedFileName);
if (checkResult.isFailure()) {
failureCount++;
continue;
}

String fileName = checkResult.getContent().toString();
File file = new File(fileDir + demoPath + fileName);
logger.info("批量删除文件：{}", file.getAbsolutePath());
if (file.exists() && file.delete()) {
successCount++;
} else {
failureCount++;
logger.error("删除文件【{}】失败，请检查目录权限！", file.getPath());
}
} catch (Exception e) {
failureCount++;
logger.error("删除文件失败: " + encodedFileName, e);
}
}

// 如果使用验证码，删除缓存验证码
if (ConfigConstants.getDeleteCaptcha()) {
WebUtils.removeSessionAttr(request, CAPTCHA_CODE);
}

Map<String, Integer> result = new HashMap<>();
result.put("success", successCount);
result.put("failure", failureCount);

return ReturnResponse.success(result);
}

private boolean existsFile(String fileName) {
File file = new File(fileDir + demoPath + fileName);
return file.exists();
}

/**
* 处理文件下载请求
*
* @param urlPath 经过Base64编码的文件URL
* @param response HttpServletResponse对象
*/
@GetMapping("/download")
public void downloadFile(String urlPath, HttpServletResponse response) {
String decodedUrl;
try {
decodedUrl = WebUtils.decodeUrl(urlPath);
} catch (Exception ex) {
logger.error("文件下载失败，urlPath：{}，错误信息：{}", urlPath, ex.getMessage());
return;
}

if (decodedUrl == null) {
return;
}

// 先检查是否是demo目录的文件
String fileName = decodedUrl;
boolean isDemoFile = false;

// 处理demo目录下的文件
if (fileName.startsWith(demoDir)) {
isDemoFile = true;
if (fileName.startsWith(demoDir + "/")) {
fileName = fileName.substring((demoDir + "/").length());
} else if (fileName.startsWith(demoDir + "\\")) {
fileName = fileName.substring((demoDir + "\\").length());
} else {
fileName = fileName.substring(demoDir.length());
}
}

// 从文件名中提取实际的文件名（不含路径）
String displayFileName = fileName;
if (displayFileName.contains("/")) {
displayFileName = displayFileName.substring(displayFileName.lastIndexOf("/") + 1);
}
if (displayFileName.contains("\\")) {
displayFileName = displayFileName.substring(displayFileName.lastIndexOf("\\") + 1);
}

// 确定文件的实际路径
String localFilePath;
if (isDemoFile) {
localFilePath = fileDir + demoPath + fileName;
} else {
localFilePath = fileDir + fileName;
}

File file = new File(localFilePath);
if (!file.exists()) {
try {
response.setContentType("text/html;charset=utf-8");
response.getWriter().write("404，您请求的文件不存在!");
logger.error("请求的文件不存在，路径：{}", localFilePath);
return;
} catch (IOException e) {
logger.error("写入响应数据失败", e);
return;
}
}

// 设置文件下载响应头
response.setContentType("application/octet-stream");
response.setHeader("Content-Disposition", "attachment;filename=" +
new String(displayFileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));

// 将文件写入响应输出流
try (InputStream inputStream = Files.newInputStream(file.toPath());
OutputStream outputStream = response.getOutputStream()) {

byte[] buffer = new byte[4096];
int bytesRead;
while ((bytesRead = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, bytesRead);
}
outputStream.flush();
logger.info("文件下载成功：{}", localFilePath);

} catch (IOException e) {
logger.error("文件下载失败，文件路径：{}，错误信息：{}", localFilePath, e.getMessage());
}
}
}
1 change: 1 addition & 0 deletions server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ private void setFileAttribute(ServletRequest request){
request.setAttribute("pdfDisableEditing", ConfigConstants.getPdfDisableEditing());
request.setAttribute("switchDisabled", ConfigConstants.getOfficePreviewSwitchDisabled());
request.setAttribute("fileUploadDisable", ConfigConstants.getFileUploadDisable());
request.setAttribute("enableDelete", true);
request.setAttribute("beian", ConfigConstants.getBeian());
request.setAttribute("size", ConfigConstants.maxSize());
request.setAttribute("deleteCaptcha", ConfigConstants.getDeleteCaptcha());
Expand Down
Loading
Loading