From da4db76f159ad400cbd91a1b79aa0f24175162d6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 Jan 2022 10:02:38 +0100 Subject: [PATCH] Ancora update url con baseAppPath --- GWMS.UI/GWMS.UI.csproj | 2 +- GWMS.UI/Pages/UserAdmin.razor.cs | 9 +++++++++ GWMS.UI/appsettings.json | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index b946c45..ea5a1a8 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,7 +2,7 @@ net5.0 - 1.0.2201.2109 + 1.0.2201.2110 95c9f021-52d1-4390-a670-5810b7b777b0 true true diff --git a/GWMS.UI/Pages/UserAdmin.razor.cs b/GWMS.UI/Pages/UserAdmin.razor.cs index e8dcc0c..99fcb0a 100644 --- a/GWMS.UI/Pages/UserAdmin.razor.cs +++ b/GWMS.UI/Pages/UserAdmin.razor.cs @@ -298,6 +298,15 @@ namespace GWMS.UI.Pages } string baseUrl = Configuration["BaseUrl"]; + string baseAppPath = Configuration["BaseAppPath"]; + if (!string.IsNullOrEmpty(baseAppPath)) + { + if (baseUrl.EndsWith("/")) + { + baseUrl = baseUrl.Substring(0, baseUrl.Length - 1); + } + baseUrl = $"{baseUrl}{baseAppPath}"; + } qrCodeVal = $"{baseUrl}Identity/Account/LogIn?uid={user.Id}&uem={user.Email}&pag=Transporters"; } }); diff --git a/GWMS.UI/appsettings.json b/GWMS.UI/appsettings.json index 683b813..4519c12 100644 --- a/GWMS.UI/appsettings.json +++ b/GWMS.UI/appsettings.json @@ -37,7 +37,7 @@ "ZCodeUrl": "https://qrcode.steamware.net/", "ChartWaitDelay": 10, "BaseUrl": "https://localhost:44339/", - "BaseAppPath": "", + "BaseAppPath": "/pizzaferri/", "jumpRedir": "~/../../", "logo": "img/LogoPizzaferri.jpg", "ReloadParamTimer": 15000, diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 4a6e79a..595f85a 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

Versione: 1.0.2201.2109

+

Versione: 1.0.2201.2110


Note di rilascio: