LiuMangMang/ssh-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge: 修复文件上传临时文件丢失问题

Browse Source
This commit is contained in:
liumangmang
2026-03-18 23:25:37 +08:00
parent e0c734d3d9 e2f600c264
commit 6dbd5ae694
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
backend/src/main/java/com/sshmanager/controller/SftpController.java
View File

@@ -290,11 +290,21 @@ public class SftpController {
@RequestParam String path,
@RequestParam("file") MultipartFile file,
Authentication authentication) {
java.io.File tempFile = null;
try {
Long userId = getCurrentUserId(authentication);
String taskId = UUID.randomUUID().toString();
String taskKey = uploadTaskKey(userId, taskId);
// Save file to persistent location before async processing
java.io.File uploadTempDir = new java.io.File("./data/upload-temp");
if (!uploadTempDir.exists()) {
uploadTempDir.mkdirs();
}
tempFile = new java.io.File(uploadTempDir, taskId + "_" + file.getOriginalFilename());
file.transferTo(tempFile);
final java.io.File savedFile = tempFile;
UploadTaskStatus status = new UploadTaskStatus(taskId, userId, connectionId,
path, file.getOriginalFilename(), file.getSize());
status.setController(this);
@@ -308,11 +318,11 @@ public class SftpController {
try {
SftpService.SftpSession session = getOrCreateSession(connectionId, userId);
String remotePath = (path == null || path.isEmpty() || path.equals("/"))
? "/" + file.getOriginalFilename()
: (path.endsWith("/") ? path + file.getOriginalFilename() : path + "/" + file.getOriginalFilename());
? "/" + savedFile.getName().substring(savedFile.getName().indexOf("_") + 1)
: (path.endsWith("/") ? path + savedFile.getName().substring(savedFile.getName().indexOf("_") + 1) : path + "/" + savedFile.getName().substring(savedFile.getName().indexOf("_") + 1));
AtomicLong transferred = new AtomicLong(0);
try (java.io.InputStream in = file.getInputStream()) {
try (java.io.InputStream in = new java.io.FileInputStream(savedFile)) {
sftpService.upload(session, remotePath, in, new SftpService.TransferProgressListener() {
@Override
public void onStart(long totalBytes) {
@@ -334,10 +344,19 @@ public class SftpController {
existing.disconnect();
}
throw new RuntimeException(e);
} finally {
// Clean up temp file after upload completes
if (savedFile.exists()) {
savedFile.delete();
}
}
});
} catch (Exception e) {
status.markError(e.getMessage() != null ? e.getMessage() : "Upload failed");
// Clean up temp file on error
if (savedFile.exists()) {
savedFile.delete();
}
}
});
status.setFuture(future);
@@ -347,6 +366,10 @@ public class SftpController {
result.put("message", "Upload started");
return ResponseEntity.ok(result);
} catch (Exception e) {
// Clean up temp file if initial save failed
if (tempFile != null && tempFile.exists()) {
tempFile.delete();
}
Map<String, Object> error = new HashMap<>();
error.put("error", e.getMessage());
return ResponseEntity.status(500).body(error);