From 0cd61aa4276e8c87e63fea7a37fb985593ccbda7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC=20=D0=A5=D0=B0=D1=80=D0=BB?= =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= Date: Tue, 9 May 2023 21:59:06 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D1=82=D0=B0=20=D0=B2=D0=B5=D0=B1=D0=BF=D1=80=D0=B8=D0=BB=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractFoodOrdersClientApp/APIClient.cs | 2 + .../Controllers/HomeController.cs | 3 +- .../appsettings.json | 2 +- .../AbstractFoodOrdersRestApi.csproj | 15 +++ .../AbstractFoodOrdersRestApi/Program.cs | 7 +- .../Properties/Resources.Designer.cs | 63 +++++++++++ .../Properties/Resources.resx | 101 ++++++++++++++++++ 7 files changed, 184 insertions(+), 9 deletions(-) create mode 100644 FoodOrders/AbstractFoodOrdersRestApi/Properties/Resources.Designer.cs create mode 100644 FoodOrders/AbstractFoodOrdersRestApi/Properties/Resources.resx diff --git a/FoodOrders/AbstractFoodOrdersClientApp/APIClient.cs b/FoodOrders/AbstractFoodOrdersClientApp/APIClient.cs index b8e9d42..9dac8cc 100644 --- a/FoodOrders/AbstractFoodOrdersClientApp/APIClient.cs +++ b/FoodOrders/AbstractFoodOrdersClientApp/APIClient.cs @@ -33,7 +33,9 @@ namespace AbstractFoodOrdersClientApp { var json = JsonConvert.SerializeObject(model); var data = new StringContent(json, Encoding.UTF8, "application/json"); + var response = _client.PostAsync(requestUrl, data); + var result = response.Result.Content.ReadAsStringAsync().Result; if (!response.Result.IsSuccessStatusCode) { diff --git a/FoodOrders/AbstractFoodOrdersClientApp/Controllers/HomeController.cs b/FoodOrders/AbstractFoodOrdersClientApp/Controllers/HomeController.cs index edb5d47..43c36a7 100644 --- a/FoodOrders/AbstractFoodOrdersClientApp/Controllers/HomeController.cs +++ b/FoodOrders/AbstractFoodOrdersClientApp/Controllers/HomeController.cs @@ -99,8 +99,7 @@ namespace AbstractFoodOrdersClientApp.Controllers { throw new Exception("Введите логин, пароль и ФИО"); } - APIClient.PostRequest("api/client/register", new - ClientBindingModel + APIClient.PostRequest("api/client/register", new ClientBindingModel { ClientFIO = fio, Email = login, diff --git a/FoodOrders/AbstractFoodOrdersClientApp/appsettings.json b/FoodOrders/AbstractFoodOrdersClientApp/appsettings.json index c66fcc8..d08c5ea 100644 --- a/FoodOrders/AbstractFoodOrdersClientApp/appsettings.json +++ b/FoodOrders/AbstractFoodOrdersClientApp/appsettings.json @@ -7,5 +7,5 @@ }, "AllowedHosts": "*", - "IPAddress": "https://localhost:5079/" + "IPAddress": "https://localhost:7198/" } diff --git a/FoodOrders/AbstractFoodOrdersRestApi/AbstractFoodOrdersRestApi.csproj b/FoodOrders/AbstractFoodOrdersRestApi/AbstractFoodOrdersRestApi.csproj index 6a22053..8049631 100644 --- a/FoodOrders/AbstractFoodOrdersRestApi/AbstractFoodOrdersRestApi.csproj +++ b/FoodOrders/AbstractFoodOrdersRestApi/AbstractFoodOrdersRestApi.csproj @@ -18,4 +18,19 @@ + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + diff --git a/FoodOrders/AbstractFoodOrdersRestApi/Program.cs b/FoodOrders/AbstractFoodOrdersRestApi/Program.cs index 3240a74..a7e3f6b 100644 --- a/FoodOrders/AbstractFoodOrdersRestApi/Program.cs +++ b/FoodOrders/AbstractFoodOrdersRestApi/Program.cs @@ -22,12 +22,7 @@ builder.Services.AddControllers(); builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(c => { - c.SwaggerDoc("v1", new OpenApiInfo - { - Title = "AbstractFoodOrdersRestApi", - Version - = "v1" - }); + c.SwaggerDoc("v1", new OpenApiInfo { Title = "AbstractFoodOrdersRestApi", Version = "v1" }); }); var app = builder.Build(); diff --git a/FoodOrders/AbstractFoodOrdersRestApi/Properties/Resources.Designer.cs b/FoodOrders/AbstractFoodOrdersRestApi/Properties/Resources.Designer.cs new file mode 100644 index 0000000..3c3bbe8 --- /dev/null +++ b/FoodOrders/AbstractFoodOrdersRestApi/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace AbstractFoodOrdersRestApi.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AbstractFoodOrdersRestApi.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/FoodOrders/AbstractFoodOrdersRestApi/Properties/Resources.resx b/FoodOrders/AbstractFoodOrdersRestApi/Properties/Resources.resx new file mode 100644 index 0000000..4fdb1b6 --- /dev/null +++ b/FoodOrders/AbstractFoodOrdersRestApi/Properties/Resources.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file