From f7a9c72821467ff027a44ea12e0673acfe0fcd66 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 6 Aug 2025 16:13:13 +0200 Subject: [PATCH] Update nuget x gestione risposte complete di environmetn --- EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj | 2 +- EgwCoreLib.Lux.Data/Services/ImageCacheService.cs | 13 +++++++------ Lux.API/Lux.API.csproj | 10 ++-------- Lux.API/Services/ExternalMessageProcessor.cs | 6 +++--- Lux.UI/Lux.UI.csproj | 4 ++-- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 8 files changed, 18 insertions(+), 23 deletions(-) diff --git a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj index d9baabcb..9d5cc78d 100644 --- a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj +++ b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj @@ -21,6 +21,6 @@ - + diff --git a/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs b/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs index fe91f4ff..3f2dd039 100644 --- a/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs +++ b/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs @@ -143,10 +143,10 @@ namespace EgwCoreLib.Lux.Data.Services /// /// /// - public async Task SaveBomAsync(string imgId, string bomContent) + public async Task SaveBomAsync(string imgId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS env, string bomContent) { // salvo img in cache - string currKey = $"{redisBaseKey}:BOM:{imgId.Replace("/", ":")}"; + string currKey = $"{redisBaseKey}:{env}:BOM:{imgId.Replace("/", ":")}"; var done = await _redisService.SetAsync(currKey, bomContent); // invio notifica nuova svg generata sul canale... viene inviato solo svg con ID nel canale string notifyChannel = $"{bomChannel}:{imgId}"; @@ -160,10 +160,10 @@ namespace EgwCoreLib.Lux.Data.Services /// /// /// - public bool SaveSvg(string imgId, string svgContent) + public bool SaveSvg(string imgId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS env, string svgContent) { // salvo img in cache - string currKey = $"{redisBaseKey}:Images:{imgId.Replace("/", ":")}"; + string currKey = $"{redisBaseKey}:{env}:Images:{imgId.Replace("/", ":")}"; var done = _redisService.Set(currKey, svgContent); // invio notifica nuova imgsvg sul canale... viene "reimbustata" string notifyChannel = $"svg-gen:{imgId}"; @@ -175,11 +175,12 @@ namespace EgwCoreLib.Lux.Data.Services /// Salva e invia su channel img redis SVG per il doc richiesto /// /// + /// /// - public async Task SaveSvgAsync(string imgId, string svgContent) + public async Task SaveSvgAsync(string imgId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS env, string svgContent) { // salvo img in cache - string currKey = $"{redisBaseKey}:Images:{imgId.Replace("/", ":")}"; + string currKey = $"{redisBaseKey}:{env}:Images:{imgId.Replace("/", ":")}"; var done = await _redisService.SetAsync(currKey, svgContent); // invio notifica nuova svg generata sul canale... viene inviato solo svg con ID nel canale string notifyChannel = $"{svgChannel}:{imgId}"; diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 5dcf6752..d784faf2 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2508.0615 + 0.9.2508.0616 @@ -58,7 +58,7 @@ - + @@ -69,12 +69,6 @@ - - - ExtLib\EgwMultiEngineManager.dll - - - PreserveNewest diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs index 46b413dd..ca7fab53 100644 --- a/Lux.API/Services/ExternalMessageProcessor.cs +++ b/Lux.API/Services/ExternalMessageProcessor.cs @@ -42,14 +42,14 @@ namespace Lux.API.Services // salvo SVG string newSvg = retData.Args["Svg"]; string UID = retData.Args["UID"]; - await _cacheService.SaveSvgAsync(UID, newSvg); + await _cacheService.SaveSvgAsync(UID, retData.Environment, newSvg); } - else if(retData.Args.ContainsKey("BOM")) + if(retData.Args.ContainsKey("BOM")) { // salvo BOM ricevuta string newBom = retData.Args["BOM"]; string UID = retData.Args["UID"]; - await _cacheService.SaveBomAsync(UID, newBom); + await _cacheService.SaveBomAsync(UID, retData.Environment, newBom); } } } diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index ac36d74e..be96bac5 100644 --- a/Lux.UI/Lux.UI.csproj +++ b/Lux.UI/Lux.UI.csproj @@ -5,7 +5,7 @@ enable enable aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50 - 0.9.2508.0615 + 0.9.2508.0616 @@ -19,7 +19,7 @@ - + diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 1b6c8537..5f84353f 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 0.9.2508.0615

+

Versione: 0.9.2508.0616


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 6145ce47..ea57fdd8 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2508.0615 +0.9.2508.0616 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 4281ab18..1d6816bc 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2508.0615 + 0.9.2508.0616 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false