From 82248f10686581bc2a0c6290bb36e82c7c0876d1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 4 Mar 2024 11:34:06 +0100 Subject: [PATCH 1/5] fix calcolo url logout --- .../Components/Gen/NavMenuHorizontal.razor | 2 +- .../Components/Gen/NavMenuHorizontal.razor.cs | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor index a8f0658..3d3374f 100644 --- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor +++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor @@ -128,7 +128,7 @@
  • -
    +
    • diff --git a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs index ac14dde..5d120be 100644 --- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs +++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs @@ -237,26 +237,11 @@ namespace WebDoorCreator.UI.Components.Gen return answ; } - protected string actionUrl + protected string logoutUrl { get { -#if false - string baseUrl = Url.Content("~/"); -#endif - string answ = $"{baseUrl}/Identity/Account/LogOut"; -#if false - string answ = ""; - if (NavManager.Uri.Contains("/WDC/UI")) - { - answ = $"{baseUrl}/Identity/Account/LogOut"; - } - else - { - answ = "/Identity/Account/LogOut"; - } -#endif - return answ; + return $"{baseUrl}/Identity/Account/LogOut"; } } From 9bf93c49962467fb1d7850c79efdfc007dfd04dc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 4 Mar 2024 11:34:13 +0100 Subject: [PATCH 2/5] reorg config vari --- WebDoorCreator.UI/appsettings.Production.json | 8 ++++---- WebDoorCreator.UI/appsettings.Staging.json | 5 +++++ WebDoorCreator.UI/appsettings.json | 3 --- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/WebDoorCreator.UI/appsettings.Production.json b/WebDoorCreator.UI/appsettings.Production.json index 4947734..6d5ef22 100644 --- a/WebDoorCreator.UI/appsettings.Production.json +++ b/WebDoorCreator.UI/appsettings.Production.json @@ -6,15 +6,15 @@ "Microsoft.AspNetCore": "Warning" } }, - "RuntimeOpt": { - "MaxDayCalcCache": 7, - "BaseUrl": "/UI" - }, "ConnectionStrings": { "Redis": "wdc-u-redis-01.ovh:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Identity.DB": "Server=WDC-W-SQL-01\\SQLEXPRESS;Database=DCA_WebDoorCreator; User ID=steamware;Password=viadante16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;", "WDC.DB": "Server=WDC-W-SQL-01\\SQLEXPRESS;Database=DCA_WebDoorCreator; User ID=steamware;Password=viadante16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;" }, + "RuntimeOpt": { + "MaxDayCalcCache": 28, + "BaseUrl": "/UI" + }, "CompoBaseDirs": { "CurrCompoDir": "U:\\WebDoorSync\\CurrentComp\\Compo", "NewCompoDir": "U:\\WebDoorSync\\NewComp\\Compo" diff --git a/WebDoorCreator.UI/appsettings.Staging.json b/WebDoorCreator.UI/appsettings.Staging.json index dcfedf3..9d65b32 100644 --- a/WebDoorCreator.UI/appsettings.Staging.json +++ b/WebDoorCreator.UI/appsettings.Staging.json @@ -6,6 +6,11 @@ "Microsoft.AspNetCore": "Warning" } }, + "ConnectionStrings": { + "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", + "Identity.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;", + "WDC.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;" + }, "RuntimeOpt": { "MaxDayCalcCache": 7, "BaseUrl": "/WDC/UI" diff --git a/WebDoorCreator.UI/appsettings.json b/WebDoorCreator.UI/appsettings.json index dda1594..c8ffb65 100644 --- a/WebDoorCreator.UI/appsettings.json +++ b/WebDoorCreator.UI/appsettings.json @@ -10,9 +10,6 @@ "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Identity.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;", "WDC.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;" - //"Redis": "nkcredis.steamware.net:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", - //"Identity.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;", - //"WDC.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;" }, "ExternalProviders": { "MailKit": { From 16248e23466e9b530a0f05026f21e4fed1ae8d2d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 8 Mar 2024 19:01:18 +0100 Subject: [PATCH 3/5] update conf x ricalcolo SVG --- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- WebDoorCreator.UI/Controllers/DoorImageController.cs | 2 ++ WebDoorCreator.UI/WebDoorCreator.UI.csproj | 2 +- WebDoorCreator.UI/appsettings.Staging.json | 2 +- WebDoorCreator.UI/appsettings.json | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index fc0496c..cd89f61 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ WebDoorCreator - Egalware -

    Version: 0.9.2403.0411

    +

    Version: 0.9.2403.0818


    Release note:
    • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index d70aaa2..8eaa5d0 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2403.0411 +0.9.2403.0818 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 7fd56c7..f50849e 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2403.0411 + 0.9.2403.0818 http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html false diff --git a/WebDoorCreator.UI/Controllers/DoorImageController.cs b/WebDoorCreator.UI/Controllers/DoorImageController.cs index 9798cae..60a6abd 100644 --- a/WebDoorCreator.UI/Controllers/DoorImageController.cs +++ b/WebDoorCreator.UI/Controllers/DoorImageController.cs @@ -86,6 +86,7 @@ namespace WebDoorCreator.UI.Controllers List doorIdList = new List() { $"{DoorId}" }; // chiamo reset richieste var list2Proc = await QDService.ResetQueueByDoorList(doorIdList); + await Task.Delay(WaitReloadSvg); // recupero DDF ed invio x processing if (DoorId > 0) @@ -93,6 +94,7 @@ namespace WebDoorCreator.UI.Controllers string currDDF = await WDService.DoorOpGetDDF(DoorId); // versione corrente del DDF generato int currVers = await QDService.SendCalcReq(DoorId, currDDF); + await Task.Delay(WaitReloadSvg); } // attende ... diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj index 3d619b6..5169812 100644 --- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj +++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj @@ -3,7 +3,7 @@ net6.0 enable - 0.9.2403.0411 + 0.9.2403.0818 enable aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608 diff --git a/WebDoorCreator.UI/appsettings.Staging.json b/WebDoorCreator.UI/appsettings.Staging.json index 9d65b32..a36887b 100644 --- a/WebDoorCreator.UI/appsettings.Staging.json +++ b/WebDoorCreator.UI/appsettings.Staging.json @@ -7,7 +7,7 @@ } }, "ConnectionStrings": { - "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", + "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Identity.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;", "WDC.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;" }, diff --git a/WebDoorCreator.UI/appsettings.json b/WebDoorCreator.UI/appsettings.json index c8ffb65..24b1d50 100644 --- a/WebDoorCreator.UI/appsettings.json +++ b/WebDoorCreator.UI/appsettings.json @@ -29,7 +29,7 @@ "DisableWDCMigrate": true }, "RuntimeOpt": { - "WaitReloadSvg": 200, + "WaitReloadSvg": 100, "VetoRemoveProcessing": 5, "MaxDayCalcCache": 7, "BaseUrl": "/WDC/UI", From c35eb000023a52f52e152d4370ad5a21f462148f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 8 Mar 2024 19:10:19 +0100 Subject: [PATCH 4/5] Semaforo (maybe) x evitare doppio ricalcolo --- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 4 ++-- .../Controllers/DoorImageController.cs | 18 ++++++++++++++++-- WebDoorCreator.UI/WebDoorCreator.UI.csproj | 2 +- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index cd89f61..2b721c3 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ WebDoorCreator - Egalware -

      Version: 0.9.2403.0818

      +

      Version: 0.9.2403.0819


      Release note:
      • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 8eaa5d0..5dd980f 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2403.0818 +0.9.2403.0819 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index f50849e..631d4ef 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,7 +1,7 @@ - 0.9.2403.0818 - http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip + 0.9.2403.0819 + http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.API.zip http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html false diff --git a/WebDoorCreator.UI/Controllers/DoorImageController.cs b/WebDoorCreator.UI/Controllers/DoorImageController.cs index 60a6abd..5004f40 100644 --- a/WebDoorCreator.UI/Controllers/DoorImageController.cs +++ b/WebDoorCreator.UI/Controllers/DoorImageController.cs @@ -13,6 +13,8 @@ namespace WebDoorCreator.UI.Controllers { #region Public Constructors + private static List DoorIdProc = new List(); + public DoorImageController(IConfiguration configuration, QueueDataService cQDService, WebDoorCreatorService cWDCService) { Log.Info("Starting DoorImageController"); @@ -41,8 +43,16 @@ namespace WebDoorCreator.UI.Controllers // se fosse vuoto... if (string.IsNullOrEmpty(svgContent)) { - // richiede ricalcolo img - svgContent = await SendRecalcReq(DoorId); + if (DoorIdProc.Contains(DoorId)) + { + DoorIdProc.Remove(DoorId); + } + else + { + DoorIdProc.Add(DoorId); + // richiede ricalcolo img + svgContent = await SendRecalcReq(DoorId); + } } // se fosse vuoto... if (string.IsNullOrEmpty(svgContent)) @@ -50,6 +60,10 @@ namespace WebDoorCreator.UI.Controllers // legge img vuota svgContent = QDService.DoorGetMissingSvg(); } + else + { + DoorIdProc.Remove(DoorId); + } var result = System.Text.Encoding.UTF8.GetBytes(svgContent); return File(result, "image/svg+xml"); } diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj index 5169812..bac46f1 100644 --- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj +++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj @@ -3,7 +3,7 @@ net6.0 enable - 0.9.2403.0818 + 0.9.2403.0819 enable aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608 From 179565d47d413fe7b76a51328a7e7fe0d6592e4b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 9 Mar 2024 09:26:38 +0100 Subject: [PATCH 5/5] fix staging conf --- Resources/manifest.xml | 2 +- WebDoorCreator.UI/appsettings.Staging.json | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 631d4ef..77b7353 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,7 +1,7 @@ 0.9.2403.0819 - http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.API.zip + http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html false diff --git a/WebDoorCreator.UI/appsettings.Staging.json b/WebDoorCreator.UI/appsettings.Staging.json index a36887b..1012e14 100644 --- a/WebDoorCreator.UI/appsettings.Staging.json +++ b/WebDoorCreator.UI/appsettings.Staging.json @@ -7,9 +7,10 @@ } }, "ConnectionStrings": { - "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", - "Identity.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;", - "WDC.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;" + "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG" + //"Redis": "nkcredis.steamware.net:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG" + //"Identity.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;", + //"WDC.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;" }, "RuntimeOpt": { "MaxDayCalcCache": 7,