|
|
@ -277,11 +277,14 @@ public class ImageController extends BaseController { |
|
|
} |
|
|
} |
|
|
tbImageService.putETag(cacheKey, descriptor.getEtag()); |
|
|
tbImageService.putETag(cacheKey, descriptor.getEtag()); |
|
|
var result = ResponseEntity.ok() |
|
|
var result = ResponseEntity.ok() |
|
|
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + fileName) |
|
|
|
|
|
.header("x-filename", fileName) |
|
|
|
|
|
.header("Content-Type", descriptor.getMediaType()) |
|
|
.header("Content-Type", descriptor.getMediaType()) |
|
|
.contentLength(data.length) |
|
|
.contentLength(data.length) |
|
|
.eTag(descriptor.getEtag()); |
|
|
.eTag(descriptor.getEtag()); |
|
|
|
|
|
if (!cacheKey.isPublic()) { |
|
|
|
|
|
result |
|
|
|
|
|
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + fileName) |
|
|
|
|
|
.header("x-filename", fileName); |
|
|
|
|
|
} |
|
|
if (systemImagesBrowserTtlInMinutes > 0 && imageInfo.getTenantId().isSysTenantId()) { |
|
|
if (systemImagesBrowserTtlInMinutes > 0 && imageInfo.getTenantId().isSysTenantId()) { |
|
|
result.cacheControl(CacheControl.maxAge(systemImagesBrowserTtlInMinutes, TimeUnit.MINUTES)); |
|
|
result.cacheControl(CacheControl.maxAge(systemImagesBrowserTtlInMinutes, TimeUnit.MINUTES)); |
|
|
} else if (tenantImagesBrowserTtlInMinutes > 0 && !imageInfo.getTenantId().isSysTenantId()) { |
|
|
} else if (tenantImagesBrowserTtlInMinutes > 0 && !imageInfo.getTenantId().isSysTenantId()) { |
|
|
|