Browse Source

cleaned file download controller

pull/7062/head
AnastasiiaKomar 4 years ago
parent
commit
49f700eba1
  1. 10
      application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java

10
application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java

@ -98,20 +98,16 @@ public class OtaPackageController extends BaseController {
return ResponseEntity.badRequest().build(); return ResponseEntity.badRequest().build();
} }
FileSystemResource resource = new FileSystemResource(otaPackageService.getOtaDataFile(getTenantId(), otaPackageId)); FileSystemResource resource = new FileSystemResource(otaPackageService.getOtaDataFile(getTenantId(), otaPackageId));
String fileName= URLEncoder.encode(otaPackage.getFileName(), StandardCharsets.UTF_8.toString());
return ResponseEntity.ok() return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename*=UTF-8''" + fileName) .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + otaPackage.getFileName())
.header("x-filename", fileName) .header("x-filename", otaPackage.getFileName())
.contentLength(otaPackage.getDataSize()) .contentLength(otaPackage.getDataSize())
.contentType(new MediaType(parseMediaType(otaPackage.getContentType()), StandardCharsets.UTF_8)) .contentType(parseMediaType(otaPackage.getContentType()))
.body(resource); .body(resource);
} catch (Exception e) { } catch (Exception e) {
throw handleException(e); throw handleException(e);
} }
} }
private static String encodeFileName(String fileName) {
return URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20");
}
@ApiOperation(value = "Get OTA Package Info (getOtaPackageInfoById)", @ApiOperation(value = "Get OTA Package Info (getOtaPackageInfoById)",
notes = "Fetch the OTA Package Info object based on the provided OTA Package Id. " + notes = "Fetch the OTA Package Info object based on the provided OTA Package Id. " +

Loading…
Cancel
Save