From 65c041b7117f7dc31764720d953abc0db2feecb8 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 24 Apr 2024 11:35:30 +0200
Subject: [PATCH] Fix conf lettura parametri

---
 MP-TAB3/MP-TAB3.csproj             |  2 +-
 MP-TAB3/Resources/ChangeLog.html   |  2 +-
 MP-TAB3/Resources/VersNum.txt      |  2 +-
 MP-TAB3/Resources/manifest.xml     |  2 +-
 MP-TAB3/appsettings.json           |  3 ++-
 MP.Data/Services/TabDataService.cs | 18 +++++++++++++++++-
 MP.Stats/MP.Stats.csproj           |  4 ++--
 MP.Stats/Resources/ChangeLog.html  |  2 +-
 MP.Stats/Resources/VersNum.txt     |  2 +-
 MP.Stats/Resources/manifest.xml    |  2 +-
 10 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index d259ee90..011e25a8 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2404.1509</Version>
+      <Version>6.16.2404.2411</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 25d26709..febfdeff 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2404.1509</h4>
+    <h4>Versione: 6.16.2404.2411</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 551b3798..bddef924 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2404.1509
+6.16.2404.2411
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index fc184916..ed11a243 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2404.1509</version>
+  <version>6.16.2404.2411</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB3/appsettings.json b/MP-TAB3/appsettings.json
index 0bd1bb47..d0de5c91 100644
--- a/MP-TAB3/appsettings.json
+++ b/MP-TAB3/appsettings.json
@@ -17,7 +17,8 @@
   },
   "OptConf": {
     "msRefresh": "1100",
-    "CodModulo": "MP-TAB3"
+    "CodModulo": "MP-TAB3",
+    "CodModuloParam": "MoonPro"
   },
   "ServerConf": {
     "BaseAddr": "https://localhost:7295/MP/TAB3/",
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index e869fa4b..198c42c2 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -73,6 +73,7 @@ namespace MP.Data.Services
                 Log.Info(sb.ToString());
                 // sistemo i parametri x redHas...
                 CodModulo = _configuration.GetValue<string>("OptConf:CodModulo");
+                CodModuloParam = _configuration.GetValue<string>("OptConf:CodModuloParam");
                 MpIoNS = _configuration.GetValue<string>("ServerConf:MpIoNS");
                 var cstringArray = ConnStr.Split(";");
                 foreach (var item in cstringArray)
@@ -1047,7 +1048,7 @@ namespace MP.Data.Services
             sw.Start();
             List<ObjItemDTO>? result = new List<ObjItemDTO>();
             // cerco in redis...
-            string currKey = redHash($"CurrentParameters:{idxMacchina}");
+            string currKey = redHashParam($"CurrentParameters:{idxMacchina}");
             RedisValue rawData = redisDb.StringGet(currKey);
             if (rawData.HasValue)
             {
@@ -3221,6 +3222,7 @@ namespace MP.Data.Services
         private static Logger Log = LogManager.GetCurrentClassLogger();
 
         private string CodModulo = "";
+        private string CodModuloParam = "";
         private string MpIoNS = "";
 
         private string ConnStr = "";
@@ -3322,6 +3324,20 @@ namespace MP.Data.Services
 
             return result;
         }
+        private string redHashParam(string keyName)
+        {
+            string result = keyName;
+            try
+            {
+                result = $"{CodModuloParam}:{DataSource}:{DataBase}:{keyName}".Replace("\\", "_");
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Errore in redHashParam{Environment.NewLine}{exc}");
+            }
+
+            return result;
+        }
 
         private string redHashMpIO(string keyName)
         {
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index db9d32d6..f67a0e50 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2404.0510</Version>
-        <Version>6.16.2404.0510</Version>
+        <Version>6.16.2404.1616</Version>
+        <Version>6.16.2404.1616</Version>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591</NoWarn>
     </PropertyGroup>
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index ae62c63d..e7ccfa0d 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2404.0510</h4>
+    <h4>Versione: 6.16.2404.1616</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 58cd5a92..a3d398a6 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2404.0510
+6.16.2404.1616
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index e51f8a4b..cd0ba20d 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2404.0510</version>
+  <version>6.16.2404.1616</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>
