renun/zfile
1
0
Fork 0
mirror of https://github.com/zfile-dev/zfile.git synced 2025-04-19 05:34:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 日志文件无法正常下载功能修复

Browse Source
This commit is contained in:
赵俊
2021-04-10 20:19:26 +08:00
parent 73198d7852
commit 5b383c8741
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/im/zhaojun/zfile/controller/admin/LogController.java
View File

@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.Date;
@@ -26,14 +25,14 @@ public class LogController {
* 系统日志下载
*/
@GetMapping("/log")
public ResponseEntity<Object> downloadLog(HttpServletResponse response) {
public ResponseEntity<Object> downloadLog() {
if (log.isDebugEnabled()) {
log.debug("下载诊断日志");
}
String userHome = System.getProperty("user.home");
File fileZip = ZipUtil.zip(userHome + "/.zfile/logs");
String currentDate = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
return FileUtil.export(fileZip, "ZFile 诊断日志 - " + currentDate + ".zip");
return FileUtil.exportSingleThread(fileZip, "ZFile 诊断日志 - " + currentDate + ".zip");
}
}

2
src/main/java/im/zhaojun/zfile/controller/home/LocalController.java
View File

@@ -32,8 +32,6 @@ public class LocalController {
*
* @param driveId
* 驱动器 ID
*
* @return 文件
*/
@GetMapping("/file/{driveId}/**")
@ResponseBody

34
src/main/java/im/zhaojun/zfile/util/FileUtil.java
View File

@@ -23,7 +23,13 @@ import java.util.Date;
@Slf4j
public class FileUtil {
public static ResponseEntity<Object> export(File file, String fileName) {
/**
* 文件下载，单线程，直接传
* @param file 文件对象
* @param fileName 要保存为的文件名
* @return 文件下载对象
*/
public static ResponseEntity<Object> exportSingleThread(File file, String fileName) {
if (!file.exists()) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("404 FILE NOT FOUND");
}
@@ -58,6 +64,30 @@ public class FileUtil {
* @param file 下载的文件
*/
public static void export(HttpServletRequest request, HttpServletResponse response, File file) {
export(request, response, file, file.getName());
}
/**
* 返回文件给 response，支持断点续传和多线程下载
* @param request 请求对象
* @param response 响应对象
* @param file 下载的文件
* @param fileName 下载的文件名，为空则默认读取文件名称
*/
public static void export(HttpServletRequest request, HttpServletResponse response, File file, String fileName) {
if (!file.exists()) {
try {
response.getWriter().write("404 FILE NOT FOUND");
} catch (IOException e) {
e.printStackTrace();
}
}
if (StringUtils.isNullOrEmpty(fileName)) {
//文件名
fileName = file.getName();
}
String range = request.getHeader(HttpHeaders.RANGE);
String rangeSeparator = "-";
@@ -102,8 +132,6 @@ public class FileUtil {
//要下载的长度（endByte 为总长度 -1，这时候要加回去）
long contentLength = endByte - startByte + 1;
//文件名
String fileName = file.getName();
//文件类型
String contentType = request.getServletContext().getMimeType(fileName);