dev #1
@@ -1,6 +1,7 @@
|
||||
package ru.soune.nocopy.adminpanel.client;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
@@ -23,6 +24,6 @@ public interface DashBoardAppClient {
|
||||
@PostMapping("api/internal/data-control")
|
||||
Map<String, Object> internalDataControl(@RequestBody BaseRequest request);
|
||||
|
||||
@GetMapping("api/internal/data-download/{fileId}")
|
||||
public ResponseEntity<StreamingResponseBody> download(@PathVariable String fileId);
|
||||
@GetMapping("/internal/data-download/{fileId}")
|
||||
ResponseEntity<Resource> download(@PathVariable String fileId);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package ru.soune.nocopy.adminpanel.controller;
|
||||
|
||||
import feign.FeignException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.adminpanel.client.DashBoardAppClient;
|
||||
@@ -128,6 +130,10 @@ public class AdminController {
|
||||
.build());
|
||||
}
|
||||
|
||||
try {
|
||||
return dashBoardAppClient.download(fileId);
|
||||
} catch (FeignException.NotFound e) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user