Merge branch 'release/UpdateLand4WCS'

Update LAND:
- spostamento aree conf server in apposito blocco - implementaizone compatibile con WebConfigSetter
2022-07-14 17:55:28 +02:00 · 2022-07-14 17:54:59 +02:00 · 2022-07-13 09:49:43 +02:00 · 2022-07-13 09:49:33 +02:00 · 2022-07-13 09:49:16 +02:00 · 2022-07-13 09:06:08 +02:00
29 changed files with 90 additions and 75 deletions
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
@@ -12,14 +12,14 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.7" />
        <PackageReference Include="NLog" Version="5.0.1" />
    </ItemGroup>
 </Project>
@@ -118,7 +118,7 @@ else // disegno box non cliccabile e licenza mancante

    protected string fullUrl(string relUrl)
    {
-        return $"{Configuration["BaseUrl"]}{relUrl}";
+        return $"{Configuration["ServerConf:BaseUrl"]}{relUrl}";
    }

    protected MarkupString traduci(string lemma)
@@ -81,12 +81,12 @@ namespace MP.Land.Components

        protected string fullUrl(string relUrl)
        {
-            return $"{Configuration["BaseUrl"]}{relUrl}";
+            return $"{Configuration["ServerConf:BaseUrl"]}{relUrl}";
        }

        protected string localPath(string localRepo)
        {
-            return @$"{Configuration["downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
+            return @$"{Configuration["ServerConf:downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
        }

        protected override void OnInitialized()
@@ -3,7 +3,7 @@
    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
        <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.15.2207.0718</Version>
+        <Version>6.15.2207.1417</Version>
    </PropertyGroup>

    <ItemGroup>
@@ -121,7 +121,7 @@ namespace MP.Land.Pages

        protected string localPath(string localRepo)
        {
-            return @$"{Configuration["downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
+            return @$"{Configuration["ServerConf:downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
        }

        protected override void OnInitialized()
@@ -34,7 +34,7 @@ namespace MP.Land.Pages

        protected string BaseUrlTab
        {
-            get => $"{Configuration["BaseUrl"]}{Configuration["QrJumpPath"]}";
+            get => $"{Configuration["ServerConf:BaseUrl"]}{Configuration["QrJumpPath"]}";
        }

        [Inject]
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.15.2207.0718</h4>
+    <h4>Versione: 6.15.2207.1417</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.15.2207.0718
+6.15.2207.1417
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.0718</version>
+  <version>6.15.2207.1417</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
@@ -1,21 +1,23 @@
 {
-    "DetailedErrors": true,
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "Environment": "Steam PROD",
-    "BaseUrl": "https://iis02.egalware.com/",
-    "AllowedHosts": "*",
-    "QrJumpPath": "MP/TAB/jumper?",
-    "downloadPath": "C:\\Steamware\\installers\\MP",
-    "appVers": "stable",
-    "ConnectionStrings": {
-        "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
-        "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
-        "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
    }
+  },
+  "Environment": "Steam PROD",
+  "AllowedHosts": "*",
+  "QrJumpPath": "MP/TAB/jumper?",
+  "appVers": "stable",
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
+    "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
+  },
+  "ServerConf": {
+    "BaseUrl": "https://iis02.egalware.com/",
+    "downloadPath": "C:\\Steamware\\installers\\MP"
+  }
 }
@@ -8,5 +8,8 @@
    }
  },
  "Environment": "Steam DEV",
-  "BaseUrl": "https://iis01.egalware.com/"
+  "ServerConf": {
+    "BaseUrl": "https://iis01.egalware.com/",
+    "downloadPath": "C:\\Steamware\\installers\\MP"
+  }
 }
@@ -7,15 +7,17 @@
    }
  },
  "AllowedHosts": "*",
-  "BaseUrl": "https://localhost:44309/",
  "QrJumpPath": "MP/TAB/jumper?",
  "Environment": "Steam DEV",
-  "downloadPath": "C:\\Steamware\\installers\\MP",
  "appVers": "stable",
  "ConnectionStrings": {
    "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
    "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
    "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
+  },
+  "ServerConf": {
+    "BaseUrl": "https://localhost:44309/",
+    "downloadPath": "C:\\Steamware\\installers\\MP"
  }
  //"ConnectionStrings": {
  //  "DefaultConnection": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
@@ -1,6 +1,6 @@
 <div class="px-2">
    <img class="logoImg img-fluid" src="images/LogoMapo.png" height="24" />
-    <span class="mainHead p-3"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
+    <span class="mainHead p-3 align-middle"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
 </div>
 <div class="px-2">
    <span id="text-white text-right">
@@ -1,6 +1,10 @@
-<div class="row p-5 m-5 bg-light">
-    <div class="col-12 text-center mt-5 py-5 alert alert-primary">
+<div class="row p-5 m-5 alert alert-primary">
+    <div class="col-6 text-center mt-4 py-3 bg-light">
+        <h1>MAPO MON</h1>
+        EgalWare MES suite <img class="logoImg img-fluid" src="images/logoCliente.png" />
+    </div>
+    <div class="col-6 text-center mt-4 py-3  bg-light">
        <h3>loading data</h3>
-        <i class="fas fa-spinner fa-spin fa-5x"></i>
+        <i class="fas fa-spinner fa-spin fa-4x"></i>
    </div>
 </div>
@@ -122,7 +122,7 @@ namespace MP.Mon.Data
            List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
            // cerco in redis...
            RedisValue rawData = await redisDb.StringGetAsync(redisMseKey);
-            if (rawData != RedisValue.Null || rawData != RedisValue.EmptyString)
+            if (!string.IsNullOrEmpty($"{rawData}"))
            {
                result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>($"{rawData}");
                stopWatch.Stop();
@@ -4,7 +4,7 @@
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2207.1308</Version>
+    <Version>6.15.2207.1309</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -5,7 +5,6 @@
 <PageTitle>MP MON</PageTitle>

 <div class="row statusMap mx-1 my-1">
-
    @if (listMSE == null)
    {
        <div class="col-12">
@@ -20,11 +20,11 @@ namespace MP.Mon.Pages
        public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
        {
            listMSE = null;
-            await Task.Delay(1);
+            await Task.Delay(10);
            Log.Info("Elapsed Slow Timer --> full page reload");
            // dispongo i vari timers...
            disposeTimers();
-            await Task.Delay(1);
+            await Task.Delay(10);
            // reload pagina
            NavManager.NavigateTo(NavManager.Uri);
        }
@@ -157,12 +157,14 @@ namespace MP.Mon.Pages
        protected override async Task OnInitializedAsync()
        {
            await setupConf();
-            //await ReloadData();
            MMDataService.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage;
            MMDataService.blinkPipe.EA_NewMessage += BlinkPipe_EA_NewMessage;
+            Random rnd = new Random();
+            await Task.Delay(rnd.Next(1000, 1200));
            StartTimer();
        }

+
        #endregion Protected Methods

        #region Private Fields
@@ -211,7 +213,6 @@ namespace MP.Mon.Pages
        /// <exception cref="NotImplementedException"></exception>
        private void DataPipe_EA_NewMessage(object? sender, EventArgs e)
        {
-            //fastTimer.Stop();
            PubSubEventArgs currArgs = (PubSubEventArgs)e;
            // conversione on-the-fly List<string> --> allarmi
            if (!string.IsNullOrEmpty(currArgs.newMessage))
@@ -239,12 +240,13 @@ namespace MP.Mon.Pages
            }
            InvokeAsync(() =>
            {
+#if false
                // attesa random 0-50ms...
                Random rnd = new Random();
-                Task.Delay(rnd.Next(5, 50));
+                Task.Delay(rnd.Next(5, 50)); 
+#endif
                StateHasChanged();
            });
-            //fastTimer.Start();
        }

        private void disposeTimers()
@@ -28,24 +28,28 @@
        <a class="dismiss">🗙</a>
    </div>

+    <script src="_framework/blazor.server.js" autostart="false"></script>
    @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@
    <script>
-        Blazor.start().then(() => {
-            Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
-                get() {
-                    return this.__reconnectionDisplay;
-                },
-                set(value) {
-                    this.__reconnectionDisplay = {
-                        show: () => value.show(),
-                        update: (d) => value.update(d),
-                        rejected: (d) => document.location.reload()
+        Blazor.start({
+            reconnectionOptions: {
+                maxRetries: 300,
+                retryIntervalMilliseconds: 2000
+            }
+        }).then(() => {
+                Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
+                    get() {
+                        return this.__reconnectionDisplay;
+                    },
+                    set(value) {
+                        this.__reconnectionDisplay = {
+                            show: () => value.show(),
+                            update: (d) => value.update(d),
+                            rejected: (d) => document.location.reload()
+                        }
                    }
-                }
+                });
            });
-        });
    </script>
-
-    <script src="_framework/blazor.server.js"></script>
 </body>
 </html>
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.15.2207.1308</h4>
+    <h4>Versione: 6.15.2207.1309</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.15.2207.1308
+6.15.2207.1309
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.1308</version>
+  <version>6.15.2207.1309</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
@@ -13,14 +13,14 @@ main {
    /*border-bottom: 1px solid #696969;*/
    color: #696969;
    font-size: 1.4em;
-    height: 3rem;
+    height: 2.6rem;
    display: flex;
    align-items: center;
    justify-content: space-evenly;
 }

 .mainHead{
-    font-size: 1.7rem;
+    font-size: 1.6rem;
 }

 .top-row ::deep a,
@@ -308,7 +308,7 @@ a,
 /* Gestione size caratteri */
 .mainHead,
 .logoImg {
-  height: 1.6em;
+  height: 1.5em;
 }
@media all and (min-width: 425px) {
  .mainHead {
@@ -4,7 +4,7 @@
        <TargetFramework>net6.0</TargetFramework>
        <RootNamespace>MP.Stats</RootNamespace>
        <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.15.2207.0718</Version>
+        <Version>6.15.2207.1309</Version>
    </PropertyGroup>

    <ItemGroup>
@@ -188,7 +188,7 @@
      <PackageReference Include="ElmahCore" Version="2.1.2" />
      <PackageReference Include="ElmahCore.Common" Version="2.1.2" />
      <PackageReference Include="ElmahCore.Sql" Version="2.1.2" />
-      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
+      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.7" />
      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
      <PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
    </ItemGroup>
@@ -42,7 +42,6 @@
        //        rejected: (d) => document.location.reload()
        //    };
        //});
-
        Blazor.start().then(() => {
            Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
                get() {
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.15.2207.0718</h4>
+    <h4>Versione: 6.15.2207.1309</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.15.2207.0718
+6.15.2207.1309
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.0718</version>
+  <version>6.15.2207.1309</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
Author	SHA1	Message	Date
Samuele Locatelli	d2f7dd53f3	Merge branch 'release/UpdateLand4WCS'	2022-07-14 17:55:28 +02:00
Samuele Locatelli	8c75556240	Update LAND: - spostamento aree conf server in apposito blocco - implementaizone compatibile con WebConfigSetter	2022-07-14 17:54:59 +02:00
Samuele Locatelli	a025057865	Merge tag 'FixRedisNugetStat' into develop Cambio modalità auto-reconnect e tentativi	2022-07-13 09:49:43 +02:00
Samuele Locatelli	c5ebcd5b40	Merge branch 'release/FixRedisNugetStat'	2022-07-13 09:49:33 +02:00
Samuele Locatelli	df1526d522	MP MON: - cambio gestione auto-reconnect: più tentativi, per 10 minuti	2022-07-13 09:49:16 +02:00
Samuele Locatelli	fb88e6e30d	Merge tag 'FixRedisNugetStats' into develop Fix nuget stats	2022-07-13 09:06:08 +02:00
Samuele Locatelli	e83945488d	Merge branch 'release/FixRedisNugetStats'	2022-07-13 09:05:53 +02:00
Samuele Locatelli	23835d330d	Fix nuget redis x STATS	2022-07-13 09:05:36 +02:00
Samuele Locatelli	b57885576e	Merge tag 'FixRedisRegression' into develop Update x fix regressione valore redis mal testato	2022-07-13 08:58:13 +02:00
Samuele Locatelli	417ea1a77d	Merge branch 'release/FixRedisRegression'	2022-07-13 08:57:59 +02:00
Samuele Locatelli	335fdf78f0	Correzione regressione test valori redis	2022-07-13 08:57:33 +02:00
Samuele Locatelli	d50e5a6860	Merge tag 'UpdatePack' into develop Update nuget e eliminazione warnings	2022-07-13 08:29:21 +02:00