github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Set key filed on UploadResult

pull/137/head
johnniang 2019-03-27 15:38:26 +08:00
parent e60460362b
commit 69b77ac245
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/cc/ryanc/halo/filehandler/LocalFileHandler.java
View File

@ -120,6 +120,7 @@ public class LocalFileHandler implements FileHandler {
UploadResult uploadResult = new UploadResult();
uploadResult.setFilename(basename);
uploadResult.setFilePath(subFilePath);
uploadResult.setKey(subFilePath);
uploadResult.setSuffix(extension);
uploadResult.setMediaType(MediaType.valueOf(Objects.requireNonNull(file.getContentType())));
uploadResult.setSize(file.getSize());

9
src/main/java/cc/ryanc/halo/filehandler/QnYunFileHandler.java
View File

@ -74,7 +74,11 @@ public class QnYunFileHandler implements FileHandler {
// Create temp path
Path tmpPath = Paths.get(System.getProperty("java.io.tmpdir"), bucket);
try {
String basename = FilenameUtils.getBasename(file.getOriginalFilename());
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
// Get file recorder for temp directory
FileRecorder fileRecorder = new FileRecorder(tmpPath.toFile());
// Get upload manager
@ -96,9 +100,10 @@ public class QnYunFileHandler implements FileHandler {
// Build upload result
UploadResult result = new UploadResult();
result.setFilename(putSet.getHash());
result.setFilename(basename);
result.setFilePath(filePath);
result.setSuffix(FilenameUtils.getExtension(file.getOriginalFilename()));
result.setKey(putSet.getKey());
result.setSuffix(extension);
result.setWidth(putSet.getWidth());
result.setHeight(putSet.getHeight());
result.setMediaType(MediaType.valueOf(Objects.requireNonNull(file.getContentType())));

3
src/main/java/cc/ryanc/halo/filehandler/UpYunFileHandler.java
View File

@ -66,7 +66,7 @@ public class UpYunFileHandler implements FileHandler {
// Get md5 value of the file
String md5OfFile = DigestUtils.md5DigestAsHex(file.getInputStream());
// Build file path
String upFilePath = ossSource + md5OfFile + '.' + extension;
String upFilePath = StringUtils.appendIfMissing(ossSource, "/") + md5OfFile + '.' + extension;
// Set md5Content
upYun.setContentMD5(md5OfFile);
// Write file
@ -81,6 +81,7 @@ public class UpYunFileHandler implements FileHandler {
UploadResult uploadResult = new UploadResult();
uploadResult.setFilename(basename);
uploadResult.setFilePath(filePath);
uploadResult.setKey(upFilePath);
uploadResult.setMediaType(MediaType.valueOf(Objects.requireNonNull(file.getContentType())));
uploadResult.setSuffix(extension);
uploadResult.setSize(file.getSize());