From 2019386a71b932804e7806d782d9c071d61b3e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Wed, 22 Dec 2021 15:58:49 +0500 Subject: [PATCH 1/2] fix AdminCompanyController.Get*(). Include CompanyType --- AsbCloudWebApi/Controllers/AdminCompanyController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsbCloudWebApi/Controllers/AdminCompanyController.cs b/AsbCloudWebApi/Controllers/AdminCompanyController.cs index b412120c..0608d32a 100644 --- a/AsbCloudWebApi/Controllers/AdminCompanyController.cs +++ b/AsbCloudWebApi/Controllers/AdminCompanyController.cs @@ -13,7 +13,7 @@ namespace AsbCloudWebApi.Controllers public AdminCompanyController(ICrudService service) : base(service) { - + service.Includes.Add("CompanyType"); } } } From a59b1897ce0ea0b699fcaf9e0258327a359a18db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Wed, 22 Dec 2021 15:59:02 +0500 Subject: [PATCH 2/2] Restore https --- AsbCloudWebApi/Startup.cs | 9 ++++++++- AsbCloudWebApi/appsettings.json | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/AsbCloudWebApi/Startup.cs b/AsbCloudWebApi/Startup.cs index 6828163f..c825a98a 100644 --- a/AsbCloudWebApi/Startup.cs +++ b/AsbCloudWebApi/Startup.cs @@ -49,7 +49,14 @@ namespace AsbCloudWebApi "http://localhost:3000", "http://0.0.0.0:5000", "http://*:5000", - "http://localhost:5000" + "http://localhost:5000", + + "https://0.0.0.0:3000", + "https://*:3000", + "https://localhost:3000", + "https://0.0.0.0:5001", + "https://*:5001", + "https://localhost:5001" ) .AllowCredentials(); }); diff --git a/AsbCloudWebApi/appsettings.json b/AsbCloudWebApi/appsettings.json index 55675a79..94dd47d4 100644 --- a/AsbCloudWebApi/appsettings.json +++ b/AsbCloudWebApi/appsettings.json @@ -12,6 +12,5 @@ "ServerConnection": "Host=192.168.1.70;Database=postgres;Username=postgres;Password=q;Persist Security Info=True", "LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True" }, - "AllowedHosts": "*", - "Urls": "http://0.0.0.0:5000" + "AllowedHosts": "*" }