on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Merge branch 'dev' into feature/blocked-user

Browse Source
This commit is contained in:
on.nemtina 2023-07-12 12:10:40 +05:00
commit 10f8882a5c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AsbCloudInfrastructure/Services/HelpPageService.cs
View File

@ -2,6 +2,7 @@
using AsbCloudApp.Repositories;
using AsbCloudApp.Services;
using System.IO;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
@ -31,6 +32,9 @@ public class HelpPageService : IHelpPageService
this.helpPageRepository = helpPageRepository;
this.fileStorageRepository = fileStorageRepository;
directoryNameHelpPageFiles = configuration.GetValue<string>("DirectoryNameHelpPageFiles");
if (string.IsNullOrWhiteSpace(directoryNameHelpPageFiles))
directoryNameHelpPageFiles = "helpPages";
}
/// <summary>
@ -83,6 +87,8 @@ public class HelpPageService : IHelpPageService
int idCategory,
CancellationToken cancellationToken)
{
urlPage = WebUtility.UrlDecode(urlPage);
var helpPage = await helpPageRepository.GetOrDefaultByUrlPageAndIdCategoryAsync(urlPage,
idCategory,
cancellationToken) ?? throw new ArgumentInvalidException("Справки не существует", nameof(idCategory));

4
AsbCloudWebApi/Controllers/HelpPageController.cs
View File

@ -33,7 +33,7 @@ public class HelpPageController : ControllerBase
/// Загрузка файла справки
/// </summary>
/// <param name="urlPage">Url страницы</param>
/// <param name="idCategory">Id категории файла</param>
/// <param name="idCategory">Id категории файла. Допустимое значение параметра: 20000</param>
/// <param name="file">Файл справки</param>
/// <param name="cancellationToken">Токен для отмены задачи</param>
/// <returns></returns>
@ -70,7 +70,7 @@ public class HelpPageController : ControllerBase
/// Получение файла справки
/// </summary>
/// <param name="urlPage">Url страницы</param>
/// <param name="idCategory">Id категории файла</param>
/// <param name="idCategory">Id категории файла. Допустимое значение параметра: 20000</param>
/// <param name="cancellationToken">Токен для отмены задачи</param>
/// <returns></returns>
[HttpGet]