lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-08 00:49:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 优化文件保存逻辑

Browse Source
This commit is contained in:
zhouhao
2023-07-18 14:18:10 +08:00
parent 0c3c488276
commit a51463cf7d
2 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hsweb-system/hsweb-system-file/src/main/java/org/hswebframework/web/file/FileUploadProperties.java
View File

@@ -113,15 +113,17 @@ public class FileUploadProperties {
info.location = staticLocation + "/" + filePath + "/" + fileName;
info.savePath = absPath + "/" + fileName;
info.relativeLocation = filePath + "/" + fileName;
return info;
}
@Getter
@Setter
public static class StaticFileInfo {
private String savePath;
private String relativeLocation;
private String location;
}
}

55
hsweb-system/hsweb-system-file/src/main/java/org/hswebframework/web/file/service/LocalFileStorageService.java
View File

@@ -24,12 +24,14 @@ public class LocalFileStorageService implements FileStorageService {
@Override
public Mono<String> saveFile(FilePart filePart) {
FileUploadProperties.StaticFileInfo info = properties.createStaticSavePath(filePart.filename());
File file = new File(info.getSavePath());
return (filePart)
.transferTo(file)
.then(Mono.fromRunnable(()->properties.applyFilePermission(file)))
.thenReturn(info.getLocation());
return createStaticFileInfo(filePart.filename())
.flatMap(into -> {
File file = new File(info.getSavePath());
return (filePart)
.transferTo(file)
.then(Mono.fromRunnable(() -> properties.applyFilePermission(file)))
.thenReturn(info.getLocation());
});
}
private static final OpenOption[] FILE_CHANNEL_OPTIONS = {
@@ -37,30 +39,33 @@ public class LocalFileStorageService implements FileStorageService {
StandardOpenOption.TRUNCATE_EXISTING,
StandardOpenOption.WRITE};
protected Mono<FileUploadProperties.StaticFileInfo> createStaticFileInfo(String fileName) {
return Mono.just(properties.createStaticSavePath(fileName));
}
@Override
@SneakyThrows
public Mono<String> saveFile(InputStream inputStream, String fileType) {
String fileName = "_temp" + (fileType.startsWith(".") ? fileType : "." + fileType);
FileUploadProperties.StaticFileInfo info = properties.createStaticSavePath(fileName);
return Mono
.fromCallable(() -> {
try (ReadableByteChannel input = Channels.newChannel(inputStream);
FileChannel output = FileChannel.open(Paths.get(info.getSavePath()), FILE_CHANNEL_OPTIONS)) {
long size = (input instanceof FileChannel ? ((FileChannel) input).size() : Long.MAX_VALUE);
long totalWritten = 0;
while (totalWritten < size) {
long written = output.transferFrom(input, totalWritten, size - totalWritten);
if (written <= 0) {
break;
return createStaticFileInfo(fileName)
.flatMap(info -> Mono
.fromCallable(() -> {
try (ReadableByteChannel input = Channels.newChannel(inputStream);
FileChannel output = FileChannel.open(Paths.get(info.getSavePath()), FILE_CHANNEL_OPTIONS)) {
long size = (input instanceof FileChannel ? ((FileChannel) input).size() : Long.MAX_VALUE);
long totalWritten = 0;
while (totalWritten < size) {
long written = output.transferFrom(input, totalWritten, size - totalWritten);
if (written <= 0) {
break;
}
totalWritten += written;
}
return info.getLocation();
}
totalWritten += written;
}
return info.getLocation();
}
})
.doOnSuccess((ignore)-> properties.applyFilePermission(new File(info.getSavePath())))
.subscribeOn(Schedulers.boundedElastic());
})
.doOnSuccess((ignore) -> properties.applyFilePermission(new File(info.getSavePath())))
.subscribeOn(Schedulers.boundedElastic()));
}
}