diff --git a/RhSolutions.AddIn/RhSolutions-AddIn.dna b/RhSolutions.AddIn/RhSolutions-AddIn.dna index 63149ff..1ece3ec 100644 --- a/RhSolutions.AddIn/RhSolutions-AddIn.dna +++ b/RhSolutions.AddIn/RhSolutions-AddIn.dna @@ -1,32 +1,26 @@ - - - - - - - + + - diff --git a/RhSolutions.AddIn/RhSolutions.AddIn.csproj b/RhSolutions.AddIn/RhSolutions.AddIn.csproj index ff5db43..d73b404 100644 --- a/RhSolutions.AddIn/RhSolutions.AddIn.csproj +++ b/RhSolutions.AddIn/RhSolutions.AddIn.csproj @@ -14,25 +14,24 @@ - 1701;1702 + 1701;1702 - 1701;1702 + 1701;1702 - 1701;1702 + 1701;1702 - 1701;1702 + 1701;1702 - true + true - diff --git a/RhSolutions.AddIn/Services/DatabaseClient.cs b/RhSolutions.AddIn/Services/DatabaseClient.cs index 3036e51..69f7fc1 100644 --- a/RhSolutions.AddIn/Services/DatabaseClient.cs +++ b/RhSolutions.AddIn/Services/DatabaseClient.cs @@ -1,10 +1,8 @@ using Microsoft.Extensions.Caching.Memory; using Newtonsoft.Json; -using System.Web; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Extensions; namespace RhSolutions.Services; @@ -55,13 +53,13 @@ public class DatabaseClient : IDatabaseClient } else - { - QueryBuilder qb = new() + { + UriBuilder builder = new(@"https://rh.cebotari.ru/api/search") { - {"query", line} + Query = $"query={line.Replace("&", "%26")}" }; - string request = @"https://rh.cebotari.ru/api/search" + qb.ToQueryString(); - + string request = builder.Uri.AbsoluteUri; + if (!_memoryCache.TryGetValue(line, out IEnumerable products)) { var response = await _httpClient.GetAsync(request);