diff --git a/src/main/java/run/halo/app/model/dto/BackupDTO.java b/src/main/java/run/halo/app/model/dto/BackupDTO.java index 3784d770f..45bc3df41 100644 --- a/src/main/java/run/halo/app/model/dto/BackupDTO.java +++ b/src/main/java/run/halo/app/model/dto/BackupDTO.java @@ -9,8 +9,11 @@ import lombok.Data; @Data public class BackupDTO { + @Deprecated private String downloadUrl; + private String downloadLink; + private String filename; private Long updateTime; diff --git a/src/main/java/run/halo/app/service/impl/BackupServiceImpl.java b/src/main/java/run/halo/app/service/impl/BackupServiceImpl.java index d8f4b9fcf..f137051b6 100644 --- a/src/main/java/run/halo/app/service/impl/BackupServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/BackupServiceImpl.java @@ -206,7 +206,6 @@ public class BackupServiceImpl implements BackupService { try { // Delete backup file Files.delete(backupPath); - } catch (NoSuchFileException e) { throw new NotFoundException("The file " + filename + " was not found", e); } catch (IOException e) { @@ -226,16 +225,13 @@ public class BackupServiceImpl implements BackupService { String backupFileName = backupPath.getFileName().toString(); BackupDTO backup = new BackupDTO(); backup.setDownloadUrl(buildDownloadUrl(backupFileName)); + backup.setDownloadLink(backup.getDownloadLink()); backup.setFilename(backupFileName); try { backup.setUpdateTime(Files.getLastModifiedTime(backupPath).toMillis()); - } catch (IOException e) { - throw new ServiceException("Failed to get last modified time of " + backupPath.toString(), e); - } - try { backup.setFileSize(Files.size(backupPath)); } catch (IOException e) { - throw new ServiceException("Failed to get file size " + backupPath.toString(), e); + throw new ServiceException("Failed to access file " + backupPath.toString(), e); } return backup;