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

Merge pull request 'Исправление метода получения файла' (#73) from feature/fix_help_pages into dev

Browse Source 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/73
This commit is contained in:
Никита Фролов 2023-07-11 13:42:25 +05:00
commit b7d9ec8183
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsbCloudInfrastructure/Services/HelpPageService.cs
View File

@ -2,6 +2,7 @@
using AsbCloudApp.Repositories; using AsbCloudApp.Repositories;
using AsbCloudApp.Services; using AsbCloudApp.Services;
using System.IO; using System.IO;
using System.Net;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@ -86,6 +87,8 @@ public class HelpPageService : IHelpPageService
int idCategory, int idCategory,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
urlPage = WebUtility.UrlDecode(urlPage);
var helpPage = await helpPageRepository.GetOrDefaultByUrlPageAndIdCategoryAsync(urlPage, var helpPage = await helpPageRepository.GetOrDefaultByUrlPageAndIdCategoryAsync(urlPage,
idCategory, idCategory,
cancellationToken) ?? throw new ArgumentInvalidException("Справки не существует", nameof(idCategory)); cancellationToken) ?? throw new ArgumentInvalidException("Справки не существует", nameof(idCategory));

2
AsbCloudWebApi/Controllers/HelpPageController.cs
View File

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