Merge branch 'release/AddConfMaxAge'

MON:
- fix: parametro MaxAge usato anche x redis - cambio maxAge a 2000ms
2022-07-15 17:36:41 +02:00 · 2022-07-15 17:36:21 +02:00 · 2022-07-15 17:23:58 +02:00 · 2022-07-15 17:16:43 +02:00 · 2022-07-15 17:15:57 +02:00 · 2022-07-15 17:14:44 +02:00
24 changed files with 80 additions and 57 deletions
@@ -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",
@@ -259,7 +259,14 @@ namespace MP.Mon.Components
            {
                double cTimeMin = currTimeMin != null ? (double)currTimeMin : 0;
                tSpan = TimeSpan.FromMinutes(cTimeMin);
-                answ = $"{tSpan:mm}:{tSpan:ss}";
+                if (tSpan.TotalHours < 1)
+                {
+                    answ = $"{tSpan:mm}:{tSpan:ss}";
+                }
+                else
+                {
+                    answ = $"{tSpan.TotalHours:N0}h {tSpan:mm}:{tSpan:ss}";
+                }
            }
            catch
            { }
@@ -117,6 +117,8 @@ namespace MP.Mon.Data

        public async Task<List<MappaStatoExpl>> MseGetAll()
        {
+            int maxAge = 2000;
+            int.TryParse(_configuration.GetValue<string>("ServerConf:maxAge"), out maxAge);
            Stopwatch stopWatch = new Stopwatch();
            stopWatch.Start();
            List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
@@ -131,10 +133,10 @@ namespace MP.Mon.Data
            }
            else
            {
-                result = await Task.FromResult(dbController.MseGetAll());
+                result = await Task.FromResult(dbController.MseGetAll(maxAge));
                // serializzp e salvo...
                rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(redisMseKey, rawData, TimeSpan.FromSeconds(2));
+                await redisDb.StringSetAsync(redisMseKey, rawData, TimeSpan.FromMilliseconds(maxAge));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
                Log.Debug($"Read from DB: {ts.TotalMilliseconds}ms");
@@ -4,7 +4,7 @@
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2207.1308</Version>
+    <Version>6.15.2207.1517</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -7,6 +7,7 @@
 <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="google" content="notranslate">
    <base href="~/" />
    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
    <link rel="stylesheet" href="css/site.css" />
@@ -28,24 +29,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.1517</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.15.2207.1308
+6.15.2207.1517
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.1308</version>
+  <version>6.15.2207.1517</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>
@@ -11,5 +11,8 @@
    "MP.Mon": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
    "MP.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
    "Redis": "localhost:6379,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
+  },
+  "ServerConf": {
+    "maxAge": "2000"
  }
 }
@@ -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	d5d47076df	Merge branch 'release/AddConfMaxAge'	2022-07-15 17:36:41 +02:00
Samuele Locatelli	612c3c95f7	MON: - fix: parametro MaxAge usato anche x redis - cambio maxAge a 2000ms	2022-07-15 17:36:21 +02:00
Samuele Locatelli	dddac15b52	MON: - update x conf maxAge da appsetting.json	2022-07-15 17:23:58 +02:00
Samuele Locatelli	a315e4f0ef	Merge tag 'FixDisplayMonHours' into develop Update x display ore in MON	2022-07-15 17:16:43 +02:00
Samuele Locatelli	d71e9465e5	Merge branch 'release/FixDisplayMonHours'	2022-07-15 17:15:57 +02:00
Samuele Locatelli	876197b0ac	Update display MON x vedere HH	2022-07-15 17:14:44 +02:00
Samuele Locatelli	cd07a940d0	Merge tag 'UpdateLand4WCS' into develop update x compatibilità con nuovi metodi WebConfigSetter	2022-07-14 17:55:44 +02:00
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