diff --git a/LiMan.Api/Startup.cs b/LiMan.Api/Startup.cs
index bdab739..8bd50b7 100644
--- a/LiMan.Api/Startup.cs
+++ b/LiMan.Api/Startup.cs
@@ -40,19 +40,20 @@ namespace LiMan.Serv
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
- if (env.IsDevelopment())
+ if (env.IsDevelopment() || env.IsStaging())
{
app.UseDeveloperExceptionPage();
- }
- app.UseSwagger(c =>
- {
- c.RouteTemplate = "/swagger/{documentName}/swagger.json";
- });
- app.UseSwaggerUI(c =>
- {
- c.SwaggerEndpoint("v1/swagger.json", "LiMan.Api");
- });
+ // valido solo in sviluppo
+ app.UseSwagger(c =>
+ {
+ c.RouteTemplate = "/swagger/{documentName}/swagger.json";
+ });
+ app.UseSwaggerUI(c =>
+ {
+ c.SwaggerEndpoint("v1/swagger.json", "LiMan.Api");
+ });
+ }
app.UseHttpsRedirection();
diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html
index c5c3cd9..9585749 100644
--- a/LiMan.Transfer/Resources/ChangeLog.html
+++ b/LiMan.Transfer/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
License Manager
- Versione: 1.1.2202.1114
+ Versione: 1.1.2203.0218
Note di rilascio:
diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt
index 95995d5..58cba93 100644
--- a/LiMan.Transfer/Resources/VersNum.txt
+++ b/LiMan.Transfer/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2202.1114
+1.1.2203.0218
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
index 003aa03..7b3f78e 100644
--- a/LiMan.Transfer/Resources/manifest.xml
+++ b/LiMan.Transfer/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.1.2202.1114
+ 1.1.2203.0218
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html
false
diff --git a/LiMan.UI/Data/LiManDataService.cs b/LiMan.UI/Data/LiManDataService.cs
index d8ea730..5d1b201 100644
--- a/LiMan.UI/Data/LiManDataService.cs
+++ b/LiMan.UI/Data/LiManDataService.cs
@@ -1,4 +1,8 @@
-using Microsoft.Extensions.Caching.Distributed;
+using Core;
+using Core.DTO;
+using LiMan.DB.DBModels;
+using Microsoft.AspNetCore.Identity.UI.Services;
+using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
@@ -7,13 +11,8 @@ using NLog;
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity.UI.Services;
-using Core;
-using Core.DTO;
-using LiMan.DB.DBModels;
namespace LiMan.UI.Data
{
@@ -41,12 +40,6 @@ namespace LiMan.UI.Data
#endregion Private Fields
- #region Protected Fields
-
- protected static string connStringBBM = "";
-
- #endregion Protected Fields
-
#region Public Fields
public static GLS.Controllers.LicManController dbControllerGLS;
@@ -84,6 +77,16 @@ namespace LiMan.UI.Data
#region Private Methods
+ ///
+ /// Hash Redis contenente i dati MP di una specifico TYPE (es StatusMacchina, StateMachineIngressi, ...)
+ ///
+ ///
+ ///
+ private static string mHash(string dataType)
+ {
+ return $"DATA:{dataType}";
+ }
+
private DistributedCacheEntryOptions cacheOpt(bool fastCache)
{
var numSecAbsExp = fastCache ? chAbsExp : chAbsExp * 10;
@@ -105,17 +108,6 @@ namespace LiMan.UI.Data
#region Internal Methods
- ///
- /// Effettua sblocco di una licenza impostando data veto a oggi
- ///
- ///
- ///
- public async Task AttivazioneUnlock(int idxSubLic)
- {
- bool fatto = dbControllerNext.AttivazioniUnlock(idxSubLic);
- await Task.Delay(1);
- return fatto;
- }
///
/// Effettua sblocco di una licenza impostando data veto a oggi
///
@@ -132,16 +124,6 @@ namespace LiMan.UI.Data
#region Public Methods
- ///
- /// Hash Redis contenente i dati MP di una specifico TYPE (es StatusMacchina, StateMachineIngressi, ...)
- ///
- ///
- ///
- public static string mHash(string dataType)
- {
- return $"DATA:{dataType}";
- }
-
public async Task> ApplicazioniGLSGetAll()
{
List dbResult = new List();
@@ -224,6 +206,18 @@ namespace LiMan.UI.Data
return await Task.FromResult(done);
}
+ ///
+ /// Effettua sblocco di una licenza impostando data veto a oggi
+ ///
+ ///
+ ///
+ public async Task AttivazioneUnlock(int idxSubLic)
+ {
+ bool fatto = dbControllerNext.AttivazioniUnlock(idxSubLic);
+ await Task.Delay(1);
+ return fatto;
+ }
+
///
/// Recupera attivazioni data licenza
///
@@ -252,6 +246,23 @@ namespace LiMan.UI.Data
dbControllerGLS.Dispose();
}
+ ///
+ /// Elenco file registrati dato ticket id
+ ///
+ /// Identificativo del ticket
+ ///
+ public async Task> FileGetFilt(int idxTicket)
+ {
+ List dbResult = new List();
+ Stopwatch stopWatch = new Stopwatch();
+ stopWatch.Start();
+ dbResult = dbControllerNext.FileGetFilt(idxTicket);
+ stopWatch.Stop();
+ TimeSpan ts = stopWatch.Elapsed;
+ Log.Trace($"Effettuata lettura da DB per FileGetFilt: {ts.TotalMilliseconds} ms");
+ return await Task.FromResult(dbResult);
+ }
+
public async Task> InstallazioniGLSGetAll()
{
List dbResult = new List();
@@ -540,24 +551,6 @@ namespace LiMan.UI.Data
return await Task.FromResult(dbResult);
}
- ///
- /// Elenco file registrati dato ticket id
- ///
- /// Identificativo del ticket
- ///
- public async Task> FileGetFilt(int idxTicket)
- {
- List dbResult = new List();
- Stopwatch stopWatch = new Stopwatch();
- stopWatch.Start();
- dbResult = dbControllerNext.FileGetFilt(idxTicket);
- stopWatch.Stop();
- TimeSpan ts = stopWatch.Elapsed;
- Log.Trace($"Effettuata lettura da DB per FileGetFilt: {ts.TotalMilliseconds} ms");
- return await Task.FromResult(dbResult);
-
- }
-
public async Task LicenzeNextUpdate(DB.DBModels.LicenzaModel currItem)
{
bool done = false;
@@ -594,6 +587,59 @@ namespace LiMan.UI.Data
return answ;
}
+ ///
+ /// Recupera elenco Tickets filtrato
+ ///
+ ///
+ ///
+ public async Task> TicketsGetAll()
+ {
+ Stopwatch stopWatch = new Stopwatch();
+ List dbResult = new List();
+ stopWatch.Start();
+ dbResult = dbControllerNext.TicketGetAll(false, 1000);
+ stopWatch.Stop();
+ TimeSpan ts = stopWatch.Elapsed;
+ Log.Trace($"Effettuata lettura da DB per TicketsGetAll: {ts.TotalMilliseconds} ms");
+ return await Task.FromResult(dbResult);
+ }
+
+ ///
+ /// Recupera elenco Tickets filtrato
+ ///
+ ///
+ ///
+ public async Task> TicketsGetFilt(SelectNext CurrFilter)
+ {
+ Stopwatch stopWatch = new Stopwatch();
+ List dbResult = new List();
+ stopWatch.Start();
+ dbResult = dbControllerNext.TicketGetFiltAllLic(CurrFilter.OnlyActive, Core.TipologiaTicket.ND, CurrFilter.ApplicazioneSel, CurrFilter.InstallazioneSel, 1000);
+ stopWatch.Stop();
+ TimeSpan ts = stopWatch.Elapsed;
+ Log.Trace($"Effettuata lettura da DB per TicketsGetFilt: {ts.TotalMilliseconds} ms");
+ return await Task.FromResult(dbResult);
+ }
+
+ ///
+ /// Ricerca ticket filtrati
+ ///
+ ///
+ ///
+ ///
+ ///
+ public async Task> TicketsGetFilt(bool onlyOpen, string CodApp, string CodInst)
+ {
+ Stopwatch stopWatch = new Stopwatch();
+ List dbResult = new List();
+ stopWatch.Start();
+ dbResult = dbControllerNext.TicketGetFilt(onlyOpen, CodApp, CodInst);
+ stopWatch.Stop();
+ TimeSpan ts = stopWatch.Elapsed;
+ Log.Trace($"Effettuata lettura da DB per TicketsGetFilt: {ts.TotalMilliseconds} ms");
+ return await Task.FromResult(dbResult);
+ }
+
///
/// Aggiornamentos tato ticket
///
@@ -615,60 +661,6 @@ namespace LiMan.UI.Data
return await Task.FromResult(fatto);
}
-
- ///
- /// Recupera elenco Tickets filtrato
- ///
- ///
- ///
- public async Task> TicketsGetFilt(SelectNext CurrFilter)
- {
- Stopwatch stopWatch = new Stopwatch();
- List dbResult = new List();
- stopWatch.Start();
- dbResult = dbControllerNext.TicketGetFiltAllLic(CurrFilter.OnlyActive, Core.TipologiaTicket.ND, CurrFilter.ApplicazioneSel, CurrFilter.InstallazioneSel, 1000);
- stopWatch.Stop();
- TimeSpan ts = stopWatch.Elapsed;
- Log.Trace($"Effettuata lettura da DB per TicketsGetFilt: {ts.TotalMilliseconds} ms");
- return await Task.FromResult(dbResult);
- }
-
- ///
- /// Recupera elenco Tickets filtrato
- ///
- ///
- ///
- public async Task> TicketsGetAll()
- {
- Stopwatch stopWatch = new Stopwatch();
- List dbResult = new List();
- stopWatch.Start();
- dbResult = dbControllerNext.TicketGetAll(false, 1000);
- stopWatch.Stop();
- TimeSpan ts = stopWatch.Elapsed;
- Log.Trace($"Effettuata lettura da DB per TicketsGetAll: {ts.TotalMilliseconds} ms");
- return await Task.FromResult(dbResult);
- }
-
- ///
- /// Ricerca ticket filtrati
- ///
- ///
- ///
- ///
- ///
- public async Task> TicketsGetFilt(bool onlyOpen,string CodApp, string CodInst)
- {
- Stopwatch stopWatch = new Stopwatch();
- List dbResult = new List();
- stopWatch.Start();
- dbResult = dbControllerNext.TicketGetFilt(onlyOpen,CodApp,CodInst);
- stopWatch.Stop();
- TimeSpan ts = stopWatch.Elapsed;
- Log.Trace($"Effettuata lettura da DB per TicketsGetFilt: {ts.TotalMilliseconds} ms");
- return await Task.FromResult(dbResult);
- }
-
#endregion Public Methods
}
}
\ No newline at end of file
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index 5ef230a..4e06a52 100644
--- a/LiMan.UI/LiMan.UI.csproj
+++ b/LiMan.UI/LiMan.UI.csproj
@@ -2,7 +2,7 @@
net6.0
- 1.1.2202.1114
+ 1.1.2203.0218
LiMan.UI
LiMan.UI
diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html
index 07ef8ff..c9a6241 100644
--- a/LiMan.UI/Resources/ChangeLog.html
+++ b/LiMan.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
License Manager
-
Versione: 1.1.2202.1114
+ Versione: 1.1.2203.0218
Note di rilascio:
-
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index 95995d5..58cba93 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2202.1114
+1.1.2203.0218
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index 9f3569d..db19d56 100644
--- a/LiMan.UI/Resources/manifest.xml
+++ b/LiMan.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.1.2202.1114
+ 1.1.2203.0218
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html
false