diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index cc561157..bf91ac15 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/MP-TAB3/Components/MachineBlock.razor.cs @@ -239,7 +239,7 @@ namespace MP_TAB3.Components // abilitazione disegni... TabDServ.ConfigGetVal("enableDisegno", ref enableDisegno); // se configurata uso cartella virtuale... altrimenti cartella processo - var sImgBasePath = config.GetValue("OptConf:ImgBasePath"); + var sImgBasePath = config.GetValue("ServerConf:ImgBasePath") ?? (config.GetValue("OptConf:ImgBasePath") ?? ""); if (!string.IsNullOrEmpty(sImgBasePath)) { imgBasePath = sImgBasePath; diff --git a/MP-TAB3/Components/PrintMag.razor.cs b/MP-TAB3/Components/PrintMag.razor.cs index a9583eca..f5a7e888 100644 --- a/MP-TAB3/Components/PrintMag.razor.cs +++ b/MP-TAB3/Components/PrintMag.razor.cs @@ -59,7 +59,7 @@ namespace MP_TAB3.Components { await FixQtyUdc(); var currUrl = NavMan.Uri; - string baseUrl = config["OptConf:BaseUrl"]; + string baseUrl = config.GetValue("ServerConf:BaseUrl") ?? (config.GetValue("OptConf:BaseUrl") ?? ""); string UrlTabJumpMag = SMServ.GetConf("UrlTabJumpMag"); if (string.IsNullOrEmpty(UrlTabJumpMag)) { diff --git a/MP-TAB3/Components/TcHistoryFilter.razor.cs b/MP-TAB3/Components/TcHistoryFilter.razor.cs index 81dac351..004c0bab 100644 --- a/MP-TAB3/Components/TcHistoryFilter.razor.cs +++ b/MP-TAB3/Components/TcHistoryFilter.razor.cs @@ -68,8 +68,9 @@ namespace MP_TAB3.Components protected bool ListArtDisabled { get => string.IsNullOrEmpty(SearchVal) || SearchVal.Length < SearchMinChar; } protected Dictionary? ListArticoli { get; set; } = null; protected Dictionary ListArticoliAll { get; set; } = new Dictionary(); - protected Dictionary ListMacchineAll { - get => MServ.DictMacchine; + protected Dictionary ListMacchineAll + { + get => MServ.DictMacchine; set => MServ.DictMacchine = value; } @@ -148,7 +149,8 @@ namespace MP_TAB3.Components protected override async Task OnInitializedAsync() { - BaseAddr = config.GetValue("OptConf:BaseAddr") ?? ""; + // Cerco in ServerConf e se non trovato in OptConf... + BaseAddr = config.GetValue("ServerConf:BaseAddr") ?? (config.GetValue("OptConf:BaseAddr") ?? ""); await ReloadAllData(); } diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index a88f035a..e4c1a447 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2403.109 + 6.16.2403.409 enable MP_TAB3 diff --git a/MP-TAB3/Pages/TCHistory.razor.cs b/MP-TAB3/Pages/TCHistory.razor.cs index 36e58def..fe281c80 100644 --- a/MP-TAB3/Pages/TCHistory.razor.cs +++ b/MP-TAB3/Pages/TCHistory.razor.cs @@ -64,7 +64,7 @@ namespace MP_TAB3.Pages protected override async Task OnInitializedAsync() { - BaseAddr = config.GetValue("OptConf:BaseAddr") ?? ""; + BaseAddr = config.GetValue("ServerConf:BaseAddr") ?? (config.GetValue("OptConf:BaseAddr") ?? ""); await ReloadData(); } diff --git a/MP-TAB3/Program.cs b/MP-TAB3/Program.cs index 205ad048..17e05c6a 100644 --- a/MP-TAB3/Program.cs +++ b/MP-TAB3/Program.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.FileProviders; using MP.Data; using MP.Data.Services; using StackExchange.Redis; +using static Org.BouncyCastle.Math.EC.ECCurve; var builder = WebApplication.CreateBuilder(args); @@ -48,7 +49,8 @@ builder.Services.AddHttpContextAccessor(); var app = builder.Build(); // aggiunt base URL x routing corretto -app.UsePathBase(configuration["OptConf:BaseUrl"]); +var pathBase= configuration.GetValue("ServerConf:BaseUrl") ?? (configuration.GetValue("OptConf:BaseUrl") ?? ""); +app.UsePathBase(pathBase); // Configure the HTTP request pipeline. if (!app.Environment.IsDevelopment()) @@ -63,7 +65,7 @@ app.UseHttpsRedirection(); app.UseStaticFiles(); // gestione static files: https://learn.microsoft.com/en-us/aspnet/core/fundamentals/static-files?view=aspnetcore-8.0 -string BasePathDisegni = configuration.GetValue("OptConf:BasePathDisegni"); +string BasePathDisegni = configuration.GetValue("ServerConf:BasePathDisegni") ?? configuration.GetValue("OptConf:BasePathDisegni")?? ""; if (!string.IsNullOrEmpty(BasePathDisegni)) { // verifico esista folder disegni diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index b25337e5..85b93aad 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2403.109

+

Versione: 6.16.2403.409


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index c16e0fa0..da42783f 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2403.109 +6.16.2403.409 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 43c49b51..cff03e63 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2403.109 + 6.16.2403.409 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false diff --git a/MP-TAB3/appsettings.Production.json b/MP-TAB3/appsettings.Production.json index 546556d7..31316e0a 100644 --- a/MP-TAB3/appsettings.Production.json +++ b/MP-TAB3/appsettings.Production.json @@ -15,14 +15,14 @@ "MP.Mag": "Server=SQL2016DEV;Database=MoonPro_MAG; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;" }, "OptConf": { - "msRefresh": "1100", - "BaseAddr": "https://localhost:7295/MP/TAB3/", - "BaseUrl": "/MP/TAB3", - "ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/", - "ImgStBasePath": "C:\\Steamware\\images\\ST", - "CodModulo": "MoonPro", - "samplerMaxCall": 15, - "BasePathDisegni": "C:\\Steamware\\disegni" + "msRefresh": "1500", + "CodModulo": "MP-TAB3" }, - "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net", + "ServerConf": { + "BaseAddr": "https://iis04.egalware.com/MP/TAB3/", + "BasePathDisegni": "C:\\Steamware\\disegni", + "BaseUrl": "/MP/TAB3", + "ImgBasePath": "https://iis04.egalware.com/MP/images/macchine/small/" + }, + "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net" } diff --git a/MP-TAB3/appsettings.json b/MP-TAB3/appsettings.json index 733c7f28..271a7c7c 100644 --- a/MP-TAB3/appsettings.json +++ b/MP-TAB3/appsettings.json @@ -16,14 +16,14 @@ "MP.Mag": "Server=SQL2016DEV;Database=MoonPro_MAG; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;" }, "OptConf": { - "msRefresh": "1500", + "msRefresh": "1100", + "CodModulo": "MP-TAB3" + }, + "ServerConf": { "BaseAddr": "https://localhost:7295/MP/TAB3/", + "BasePathDisegni": "\\\\iis01\\W$\\Files\\Disegni", "BaseUrl": "/MP/TAB3", - "ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/", - "ImgStBasePath": "C:\\Steamware\\images\\ST", - "CodModulo": "MoonPro", - "samplerMaxCall": 15, - "BasePathDisegni": "\\\\iis01\\W$\\Files\\Disegni" + "ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/" }, "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net", "MailKitMailSettings": { diff --git a/MP.Data/Services/TabDataFeeder.cs b/MP.Data/Services/TabDataFeeder.cs index 6199f72d..d1ec91ce 100644 --- a/MP.Data/Services/TabDataFeeder.cs +++ b/MP.Data/Services/TabDataFeeder.cs @@ -16,7 +16,16 @@ namespace MP.Data.Services // setup canali pub/sub dataPipe = new MessagePipe(redisConn, Constants.TAB_ACT_MSE_DATA_KEY, false); - blinkPipe = new MessagePipe(redisConn, Constants.TAB_ACT_BLINK_KEY, false); + blinkPipe = new MessagePipe(redisConn, Constants.TAB_ACT_BLINK_KEY, false); + + //if (!string.IsNullOrEmpty(configuration.GetValue("OptConf:msRefresh"))) + //{ + // fastRefreshMs = configuration.GetValue("OptConf:msRefresh"); + // if (fastRefreshMs <= 0) + // { + // fastRefreshMs = 1000; + // } + //} // avvio timers... startTimers(); @@ -26,7 +35,7 @@ namespace MP.Data.Services #region Public Properties - public MessagePipe blinkPipe { get; set; } = null!; + public MessagePipe blinkPipe { get; set; } = null!; public MessagePipe dataPipe { get; set; } = null!;