diff --git a/Egw.Core/licenseManGLS.cs b/Egw.Core/licenseManGLS.cs
index 616ba977..fccea72c 100644
--- a/Egw.Core/licenseManGLS.cs
+++ b/Egw.Core/licenseManGLS.cs
@@ -30,7 +30,14 @@ namespace Egw.Core
{
string passPhrase = string.Format("{0}|{1}", cliente.PadLeft(50, ':'), applicativo);
plainAuthKey = SteamCrypto.DecryptString(authKey, passPhrase); // uso combinazione cliente+applicativo come passphrase!
- answ = Convert.ToDateTime(plainAuthKey.Replace(string.Format("{0}#{1}-", cliente, applicativo.PadLeft(20, '-')), "").Replace(string.Format("%{0}%", licenze), ""));
+ string datePart = plainAuthKey.Replace($"{cliente}#{applicativo.PadLeft(20, '-')}-", "").Replace($"%{licenze}%", "");
+ //string datePart = plainAuthKey.Replace(string.Format("{0}#{1}-", cliente, applicativo.PadLeft(20, '-')), "").Replace(string.Format("%{0}%", licenze), "");
+ // se non avesse "bonificato" la parte num licenze (es non corrisponde al max) forzo il trim
+ if (datePart.Contains("%"))
+ {
+ datePart = datePart.Substring(0, datePart.IndexOf("%"));
+ }
+ answ = Convert.ToDateTime(datePart);
}
catch (Exception exc)
{
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index 685e408b..9fedb20e 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
net6.0
MP.Land
- 6.15.2207.0510
+ 6.15.2207.0610
diff --git a/MP.Land/Pages/About.razor.cs b/MP.Land/Pages/About.razor.cs
index 523620b5..ef15468e 100644
--- a/MP.Land/Pages/About.razor.cs
+++ b/MP.Land/Pages/About.razor.cs
@@ -14,24 +14,26 @@ using Microsoft.JSInterop;
using MP.Land;
using MP.Land.Shared;
using MP.Land.Data;
+using NLog;
namespace MP.Land.Pages
{
public partial class About
{
- protected string Titolo = "";
- protected string Messaggio = "";
+ private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+ private string Titolo = "";
+ private string Messaggio = "";
- protected string ServerStatus = "SrvState";
- protected string Installazione = "Inst";
- protected string Applicazione = "App";
- protected string Licenze = "#";
- protected DateTime Scadenza = DateTime.Today;
- protected string MastKey = "########################";
+ private string ServerStatus = "SrvState";
+ private string Installazione = "Inst";
+ private string Applicazione = "App";
+ private string Licenze = "#";
+ private DateTime Scadenza = DateTime.Today;
+ private string MastKey = "########################";
- protected string mainCss = "alert alert-info";
- protected string remSrvCss = "bg-danger text-warning";
- protected string expDateCss = "bg-danger text-warning";
+ private string mainCss = "alert alert-info";
+ private string remSrvCss = "bg-danger text-warning";
+ private string expDateCss = "bg-danger text-warning";
protected override async Task OnInitializedAsync()
{
@@ -45,16 +47,23 @@ namespace MP.Land.Pages
int cDelay = 5;
// recupero dati
await Task.Delay(cDelay);
- LicServ.InitAkv();
- Installazione = LicServ.Installazione;
- Applicazione = LicServ.Applicazione;
- MastKey = LicServ.MasterKey;
- await Task.Delay(cDelay);
- var fatto = await LicServ.RefreshLicense();
- await Task.Delay(cDelay);
- Licenze = $"{LicServ.NumLicDb}/{LicServ.NumLicRemote}";
- // verifico stati
- ServerStatus = await LicServ.checkLimanServer();
+ try
+ {
+ LicServ.InitAkv();
+ // verifico stati
+ ServerStatus = await LicServ.checkLimanServer();
+ Installazione = LicServ.Installazione;
+ Applicazione = LicServ.Applicazione;
+ MastKey = LicServ.MasterKey;
+ await Task.Delay(cDelay);
+ var fatto = await LicServ.RefreshLicense();
+ await Task.Delay(cDelay);
+ Licenze = $"{LicServ.NumLicDb}/{LicServ.NumLicRemote}";
+ }
+ catch(Exception exc)
+ {
+ Log.Error($"Eccezione in reloadLicenseData:{Environment.NewLine}{exc}");
+ }
bool okRemoteSrv = ServerStatus == "OK";
bool okScadenza = LicServ.checkLicenseActive(LicServ.MasterKey);
bool okNumLic = (LicServ.NumLicDb <= LicServ.NumLicRemote);
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index a1418a27..e3171d71 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo gestione Programmi MAPO
- Versione: 6.15.2207.0510
+ Versione: 6.15.2207.0610
Note di rilascio:
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 994f4474..63c689bc 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.15.2207.0510
+6.15.2207.0610
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index 006e74f9..c975a95f 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.15.2207.0510
+ 6.15.2207.0610
https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip
https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html
false
diff --git a/MP.Land/appsettings.json b/MP.Land/appsettings.json
index 9bc2485d..a1d65135 100644
--- a/MP.Land/appsettings.json
+++ b/MP.Land/appsettings.json
@@ -18,8 +18,8 @@
"Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
}
//"ConnectionStrings": {
- // "DefaultConnection": "Server=SQL2016PROD;Database=Valvital_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
- // "MP.Land": "Server=SQL2016PROD;Database=Valvital_MoonPro_Prod;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
+ // "DefaultConnection": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
+ // "MP.Land": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
// "Redis": "localhost:6379,defaultDatabase=11,keepAlive=180,asyncTimeout=5000"
//}
}
\ No newline at end of file
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 97915225..296b6349 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,7 +4,7 @@
net6.0
MP.Stats
826e877c-ba70-4253-84cb-d0b1cafd4440
- 6.15.2205.2311
+ 6.15.2207.0510
diff --git a/MP.Stats/Pages/Test.razor.cs b/MP.Stats/Pages/Test.razor.cs
index ab07f3a8..f5af1d3c 100644
--- a/MP.Stats/Pages/Test.razor.cs
+++ b/MP.Stats/Pages/Test.razor.cs
@@ -110,6 +110,7 @@ namespace MP.Stats.Pages
;
private async Task HandleRedraw()
{
+ await Task.Delay(1);
// calcolo hist frequenza con EFCore: https://entityframeworkcore.com/knowledge-base/60871048/group-by-and-to-dictionary-in-ef-core-3-1
randData = RandomizeData();
//var histDict = randData.GroupBy(r => r).Select(g => new
diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user
index 8704b38f..30d093d6 100644
--- a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user
+++ b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user
@@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAACFCXZ0UR7Czo59aaRCHU5QAAAAAASAAACgAAAAEAAAACYlKt9E6s77uEikpKwyhdQYAAAAUwae989LovFbsfjRp69HCVpyUQZbqLyYFAAAAMW8mLSAxWmKaOvB4nkDgUpS27/b
- True|2022-02-26T17:24:32.0833123Z;False|2022-02-26T18:24:15.3994092+01:00;False|2022-02-26T18:23:44.8358586+01:00;True|2021-05-26T19:49:30.0427896+02:00;False|2021-05-26T19:49:14.9065510+02:00;True|2021-05-25T17:48:33.3901785+02:00;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00;
+ True|2022-07-05T08:07:03.1380003Z;True|2022-02-26T18:24:32.0833123+01:00;False|2022-02-26T18:24:15.3994092+01:00;False|2022-02-26T18:23:44.8358586+01:00;True|2021-05-26T19:49:30.0427896+02:00;False|2021-05-26T19:49:14.9065510+02:00;True|2021-05-25T17:48:33.3901785+02:00;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00;
\ No newline at end of file
diff --git a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user
index cccd5396..55d0b44e 100644
--- a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user
+++ b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user
@@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAAB3zVMW24A4himhWJ5CNqgeAAAAAASAAACgAAAAEAAAAA7IL1n8zHn2/ljDNL4/zlsYAAAAgAEg9RYKHV0xl3wnafZiN9Q954GOBAvdFAAAACSBJkwDndNTiIrUuk7zJls84fN1
- True|2022-02-26T17:24:42.6534875Z;True|2021-05-26T19:49:44.3836006+02:00;
+ True|2022-07-05T08:06:48.2207580Z;True|2022-02-26T18:24:42.6534875+01:00;True|2021-05-26T19:49:44.3836006+02:00;
\ No newline at end of file
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index c02f0cfa..836b76e5 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
-
Versione: 6.15.2205.2311
+ Versione: 6.15.2207.0510
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 35604b19..994f4474 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.15.2205.2311
+6.15.2207.0510
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index dac5ff12..fbb961eb 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.15.2205.2311
+ 6.15.2207.0510
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html
false