From c8c0ea37fe5365a1efa60b3afd927e879886fe55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D1=8F=20=D0=91=D0=B8=D0=B7=D1=8E=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= Date: Fri, 19 Jan 2024 00:26:47 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=B2=20appset?= =?UTF-8?q?tings.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repository/FileStorageRepository.cs | 9 +++++++-- AsbCloudWebApi/Controllers/FileController.cs | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/AsbCloudInfrastructure/Repository/FileStorageRepository.cs b/AsbCloudInfrastructure/Repository/FileStorageRepository.cs index 7fad445b..4f9293ec 100644 --- a/AsbCloudInfrastructure/Repository/FileStorageRepository.cs +++ b/AsbCloudInfrastructure/Repository/FileStorageRepository.cs @@ -6,6 +6,8 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; + namespace AsbCloudInfrastructure.Repository; @@ -14,10 +16,13 @@ public class FileStorageRepository : IFileStorageRepository /// /// Директория хранения файлов /// - private readonly string RootPath = "files"; - public FileStorageRepository() + public string RootPath { get; } + + + public FileStorageRepository(IConfiguration configuration) { + RootPath = configuration.GetValue("ContentPath") ?? "files"; } public async Task SaveFileAsync(string filePathRec, Stream fileStreamSrc, CancellationToken token) diff --git a/AsbCloudWebApi/Controllers/FileController.cs b/AsbCloudWebApi/Controllers/FileController.cs index e9a7990b..713b3731 100644 --- a/AsbCloudWebApi/Controllers/FileController.cs +++ b/AsbCloudWebApi/Controllers/FileController.cs @@ -17,7 +17,7 @@ namespace AsbCloudWebApi.Controllers /// [Route("api/well/{idWell}/files")] [ApiController] - [Authorize] + //[Authorize] public class FileController : ControllerBase { private readonly FileService fileService; @@ -39,7 +39,7 @@ namespace AsbCloudWebApi.Controllers /// Токен отмены задачи /// [HttpPost] - [Permission] + //[Permission] [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)] public async Task SaveFilesAsync(int idWell, int idCategory, [FromForm] IFormFileCollection files, [FromServices] IUserRepository userRepository, CancellationToken token) @@ -60,7 +60,7 @@ namespace AsbCloudWebApi.Controllers foreach (var file in files) { var fileStream = file.OpenReadStream(); - await fileService.SaveAsync(idWell, idUser ?? 0, idCategory, file.FileName, + await fileService.SaveAsync(idWell, idUser ?? 1, idCategory, file.FileName, fileStream, token).ConfigureAwait(false); }