Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prima vers land da completare

Browse Source
This commit is contained in:
Samuele Locatelli
2021-09-18 10:55:24 +02:00
parent 031676d783
commit f04d739e7b
36 changed files with 464 additions and 3227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-LAND.sln
-6
View File
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31229.75
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.FileData", "MP.FileData\MP.FileData.csproj", "{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Land", "MP.Land\MP.Land.csproj", "{D949AB45-9B65-4594-A97E-182BC3831707}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.AppAuth", "MP.AppAuth\MP.AppAuth.csproj", "{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}"
@@ -15,10 +13,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Release|Any CPU.Build.0 = Release|Any CPU
{D949AB45-9B65-4594-A97E-182BC3831707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D949AB45-9B65-4594-A97E-182BC3831707}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D949AB45-9B65-4594-A97E-182BC3831707}.Release|Any CPU.ActiveCfg = Release|Any CPU
MP.AppAuth/Controllers/AppAuthController.cs
+70
View File
@@ -0,0 +1,70 @@
using Microsoft.Extensions.Configuration;
using NLog;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MP.AppAuth.Controllers
{
public class AppAuthController : IDisposable
{
#region Private Fields
private static IConfiguration _configuration;
private static AppAuthContext dbCtx;
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
#endregion Private Fields
#region Public Constructors
public AppAuthController(IConfiguration configuration)
{
_configuration = configuration;
dbCtx = new AppAuthContext(configuration);
Log.Info("Avviata classe AppAuthController");
}
#endregion Public Constructors
#region Public Methods
public void Dispose()
{
// Clear database context
dbCtx.Dispose();
}
public void ResetController()
{
dbCtx = new AppAuthContext(_configuration);
Log.Info("Effettuato reset AppAuthController");
}
/// <summary>
/// Annulla modifiche su una specifica entity (cancel update)
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool RollBackEntity(object item)
{
bool answ = false;
try
{
if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified)
{
dbCtx.Entry(item).Reload();
}
}
catch (Exception exc)
{
Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}");
}
return answ;
}
#endregion Public Methods
}
}
MP.AppAuth/DatabaseModels/AnagraficaEventi.cs
-26
View File
@@ -1,26 +0,0 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
{
public partial class AnagraficaEventi
{
public AnagraficaEventi()
{
EventLists = new HashSet<EventList>();
TransizioneIngressis = new HashSet<TransizioneIngressi>();
TransizioneStatis = new HashSet<TransizioneStati>();
}
public int IdxTipo { get; set; }
public string Nome { get; set; }
public string TabAzione { get; set; }
public string Azione { get; set; }
public virtual ICollection<EventList> EventLists { get; set; }
public virtual ICollection<TransizioneIngressi> TransizioneIngressis { get; set; }
public virtual ICollection<TransizioneStati> TransizioneStatis { get; set; }
}
}
MP.AppAuth/DatabaseModels/FamigliaTipoIngressi.cs
-22
View File
@@ -1,22 +0,0 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
{
public partial class FamigliaTipoIngressi
{
public FamigliaTipoIngressi()
{
Macchine2FamigliaIngressis = new HashSet<Macchine2FamigliaIngressi>();
TransizioneIngressis = new HashSet<TransizioneIngressi>();
}
public int IdxFamigliaIngresso { get; set; }
public string DescrizioneIngresso { get; set; }
public virtual ICollection<Macchine2FamigliaIngressi> Macchine2FamigliaIngressis { get; set; }
public virtual ICollection<TransizioneIngressi> TransizioneIngressis { get; set; }
}
}
MP.AppAuth/DatabaseModels/FamiglieMacchine.cs
-24
View File
@@ -1,24 +0,0 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
{
public partial class FamiglieMacchine
{
public FamiglieMacchine()
{
Macchine2FamiglieMacchines = new HashSet<Macchine2FamiglieMacchine>();
TransizioneStatis = new HashSet<TransizioneStati>();
}
public int IdxFamiglia { get; set; }
public string Descrizione { get; set; }
public bool? HasIob { get; set; }
public bool? HasUdi { get; set; }
public virtual ICollection<Macchine2FamiglieMacchine> Macchine2FamiglieMacchines { get; set; }
public virtual ICollection<TransizioneStati> TransizioneStatis { get; set; }
}
}
MP.AppAuth/DatabaseModels/Lingue.cs
-20
View File
@@ -1,20 +0,0 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
{
public partial class Lingue
{
public Lingue()
{
Vocabolarios = new HashSet<Vocabolario>();
}
public string Lingua { get; set; }
public string DescrizioneLingua { get; set; }
public virtual ICollection<Vocabolario> Vocabolarios { get; set; }
}
}
MP.AppAuth/DatabaseModels/Macchine.cs
-52
View File
@@ -1,52 +0,0 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
{
public partial class Macchine
{
public Macchine()
{
DiarioDiBordos = new HashSet<DiarioDiBordo>();
EventLists = new HashSet<EventList>();
Gruppi2Macchines = new HashSet<Gruppi2Macchine>();
Macchine2FamigliaIngressis = new HashSet<Macchine2FamigliaIngressi>();
Macchine2SlaveIdxMacchinaNavigations = new HashSet<Macchine2Slave>();
Macchine2SlaveIdxMacchinaSlaveNavigations = new HashSet<Macchine2Slave>();
Mappas = new HashSet<Mappa>();
Odls = new HashSet<Odl>();
PostazioniMapos = new HashSet<PostazioniMapo>();
PromesseOdls = new HashSet<PromesseOdl>();
TempiCicloRilevatis = new HashSet<TempiCicloRilevati>();
TempiCicloTeoricis = new HashSet<TempiCicloTeorici>();
}
public string IdxMacchina { get; set; }
public string CodMacchina { get; set; }
public string Nome { get; set; }
public string Descrizione { get; set; }
public string Note { get; set; }
public string Url { get; set; }
public string Locazione { get; set; }
public string Css { get; set; }
public int RowNum { get; set; }
public int ColNum { get; set; }
public virtual Macchine2FamiglieMacchine Macchine2FamiglieMacchine { get; set; }
public virtual StatoMacchine StatoMacchine { get; set; }
public virtual ICollection<DiarioDiBordo> DiarioDiBordos { get; set; }
public virtual ICollection<EventList> EventLists { get; set; }
public virtual ICollection<Gruppi2Macchine> Gruppi2Macchines { get; set; }
public virtual ICollection<Macchine2FamigliaIngressi> Macchine2FamigliaIngressis { get; set; }
public virtual ICollection<Macchine2Slave> Macchine2SlaveIdxMacchinaNavigations { get; set; }
public virtual ICollection<Macchine2Slave> Macchine2SlaveIdxMacchinaSlaveNavigations { get; set; }
public virtual ICollection<Mappa> Mappas { get; set; }
public virtual ICollection<Odl> Odls { get; set; }
public virtual ICollection<PostazioniMapo> PostazioniMapos { get; set; }
public virtual ICollection<PromesseOdl> PromesseOdls { get; set; }
public virtual ICollection<TempiCicloRilevati> TempiCicloRilevatis { get; set; }
public virtual ICollection<TempiCicloTeorici> TempiCicloTeoricis { get; set; }
}
}
MP.AppAuth/MP.AppAuth.csproj
-1
View File
@@ -5,7 +5,6 @@
</PropertyGroup>
<ItemGroup>
<Folder Include="Controllers\" />
<Folder Include="Migrations\" />
</ItemGroup>
MP.AppAuth/ModelBuilderExtensions.cs
+28
View File
@@ -0,0 +1,28 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MP.AppAuth
{
public static class ModelBuilderExtensions
{
#region Public Methods
/// <summary>
/// Estensione per seed iniziale dei dati nel DB
/// </summary>
/// <param name="modelBuilder"></param>
public static void Seed(this ModelBuilder modelBuilder)
{
//// inizializzazione dei valori di default x MACCHINA
//modelBuilder.Entity<MacchinaModel>().HasData(
// new MacchinaModel { IdxMacchina = "0", RuleName = "0", Descrizione = "--- Tutte ---", Nome = "--- Tutte ---", BasePath = "", ImgUrl = "", Note = "", ShowOrder = 0 }
// );
}
#endregion Public Methods
}
}
MP.AppAuth/DatabaseModels/AnagArticoli.cs → MP.AppAuth/Models/AnagArticoli.cs
+7 -13
View File
@@ -3,26 +3,20 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagArticoli
{
public AnagArticoli()
{
DiarioDiBordos = new HashSet<DiarioDiBordo>();
Odls = new HashSet<Odl>();
}
#region Public Properties
public string CodArticolo { get; set; }
public string Disegno { get; set; }
public string DescArticolo { get; set; }
public string CurrRev { get; set; }
public string ProdRev { get; set; }
public string DescArticolo { get; set; }
public string Disegno { get; set; }
public bool? FlagIsNew { get; set; }
public string ProdRev { get; set; }
public string Tipo { get; set; }
public virtual StActual StActual { get; set; }
public virtual ICollection<DiarioDiBordo> DiarioDiBordos { get; set; }
public virtual ICollection<Odl> Odls { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/AnagClassiTempo.cs → MP.AppAuth/Models/AnagClassiTempo.cs
+6 -2
View File
@@ -3,11 +3,15 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagClassiTempo
{
#region Public Properties
public string ClasseTempo { get; set; }
public string Descrizione { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/AnagKeyValue.cs → MP.AppAuth/Models/AnagKeyValue.cs
+10 -6
View File
@@ -3,14 +3,18 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagKeyValue
{
public string NomeVar { get; set; }
public int? ValInt { get; set; }
public double? ValFloat { get; set; }
public string ValString { get; set; }
#region Public Properties
public string Descrizione { get; set; }
public string NomeVar { get; set; }
public double? ValFloat { get; set; }
public int? ValInt { get; set; }
public string ValString { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/AnagraficaCausaliScarto.cs → MP.AppAuth/Models/AnagraficaCausaliScarto.cs
+5 -8
View File
@@ -3,20 +3,17 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagraficaCausaliScarto
{
public AnagraficaCausaliScarto()
{
RegistroScartis = new HashSet<RegistroScarti>();
}
#region Public Properties
public string Causale { get; set; }
public string Descrizione { get; set; }
public string CssClass { get; set; }
public string Descrizione { get; set; }
public string Icona { get; set; }
public virtual ICollection<RegistroScarti> RegistroScartis { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/AnagraficaFlussi.cs → MP.AppAuth/Models/AnagraficaFlussi.cs
+6 -2
View File
@@ -3,11 +3,15 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagraficaFlussi
{
#region Public Properties
public string CodFlux { get; set; }
public string DescrFlux { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/AnagraficaGruppi.cs → MP.AppAuth/Models/AnagraficaGruppi.cs
+13 -8
View File
@@ -3,24 +3,29 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagraficaGruppi
{
#region Public Constructors
public AnagraficaGruppi()
{
Gruppi2Macchines = new HashSet<Gruppi2Macchine>();
Gruppi2Operatoris = new HashSet<Gruppi2Operatori>();
PromesseOdls = new HashSet<PromesseOdl>();
}
public string CodGruppo { get; set; }
public string TipoGruppo { get; set; }
public string DescrGruppo { get; set; }
public bool SelEnabled { get; set; }
#endregion Public Constructors
#region Public Properties
public string CodGruppo { get; set; }
public string DescrGruppo { get; set; }
public virtual ICollection<Gruppi2Macchine> Gruppi2Macchines { get; set; }
public virtual ICollection<Gruppi2Operatori> Gruppi2Operatoris { get; set; }
public virtual ICollection<PromesseOdl> PromesseOdls { get; set; }
public bool SelEnabled { get; set; }
public string TipoGruppo { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/AnagraficaIngressi.cs → MP.AppAuth/Models/AnagraficaIngressi.cs
+7 -3
View File
@@ -3,12 +3,16 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagraficaIngressi
{
#region Public Properties
public string Descrizione { get; set; }
public int IdxFamigliaIngresso { get; set; }
public int ValoreIngresso { get; set; }
public string Descrizione { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/AnagraficaMicroStati.cs → MP.AppAuth/Models/AnagraficaMicroStati.cs
+7 -3
View File
@@ -3,12 +3,16 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagraficaMicroStati
{
#region Public Properties
public string Descrizione { get; set; }
public int IdxFamigliaIngresso { get; set; }
public int IdxMicroStato { get; set; }
public string Descrizione { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/AnagraficaOperatori.cs → MP.AppAuth/Models/AnagraficaOperatori.cs
+14 -13
View File
@@ -3,28 +3,29 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class AnagraficaOperatori
{
#region Public Constructors
public AnagraficaOperatori()
{
DiarioDiBordos = new HashSet<DiarioDiBordo>();
EventLists = new HashSet<EventList>();
Gruppi2Operatoris = new HashSet<Gruppi2Operatori>();
StatoMacchines = new HashSet<StatoMacchine>();
}
public int MatrOpr { get; set; }
public string Cognome { get; set; }
public string Nome { get; set; }
public bool? IsAdmin { get; set; }
#endregion Public Constructors
#region Public Properties
public string AuthKey { get; set; }
public string CodOprExt { get; set; }
public virtual ICollection<DiarioDiBordo> DiarioDiBordos { get; set; }
public virtual ICollection<EventList> EventLists { get; set; }
public string Cognome { get; set; }
public virtual ICollection<Gruppi2Operatori> Gruppi2Operatoris { get; set; }
public virtual ICollection<StatoMacchine> StatoMacchines { get; set; }
public bool? IsAdmin { get; set; }
public int MatrOpr { get; set; }
public string Nome { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/Config.cs → MP.AppAuth/Models/Config.cs
+7 -3
View File
@@ -3,13 +3,17 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class Config
{
#region Public Properties
public string Chiave { get; set; }
public string Note { get; set; }
public string Valore { get; set; }
public string ValoreStd { get; set; }
public string Note { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/DatiMacchine.cs → MP.AppAuth/Models/DatiMacchine.cs
+15 -11
View File
@@ -3,21 +3,25 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class DatiMacchine
{
public string IdxMacchina { get; set; }
public bool? PalletChange { get; set; }
#region Public Properties
public string CodArticoloA { get; set; }
public string CodArticoloB { get; set; }
public string SerialPort { get; set; }
public int? RefreshPeriod { get; set; }
public bool? Simulazione { get; set; }
public bool? SimplePallet { get; set; }
public bool? InsEnabled { get; set; }
public bool SLogEnabled { get; set; }
public bool? IsTrigerDbon { get; set; }
public bool HasCounter { get; set; }
public string IdxMacchina { get; set; }
public bool? InsEnabled { get; set; }
public bool? IsTrigerDbon { get; set; }
public bool? PalletChange { get; set; }
public int? RefreshPeriod { get; set; }
public string SerialPort { get; set; }
public bool? SimplePallet { get; set; }
public bool? Simulazione { get; set; }
public bool SLogEnabled { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/Models/FamigliaTipoIngressi.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth.Models
{
public partial class FamigliaTipoIngressi
{
#region Public Properties
public string DescrizioneIngresso { get; set; }
public int IdxFamigliaIngresso { get; set; }
#endregion Public Properties
}
}
MP.AppAuth/Models/FamiglieMacchine.cs
+19
View File
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth.Models
{
public partial class FamiglieMacchine
{
#region Public Properties
public string Descrizione { get; set; }
public bool? HasIob { get; set; }
public bool? HasUdi { get; set; }
public int IdxFamiglia { get; set; }
#endregion Public Properties
}
}
MP.AppAuth/DatabaseModels/Gruppi2Macchine.cs → MP.AppAuth/Models/Gruppi2Macchine.cs
+7 -4
View File
@@ -3,14 +3,17 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class Gruppi2Macchine
{
public string IdxMacchina { get; set; }
public string CodGruppo { get; set; }
#region Public Properties
public string CodGruppo { get; set; }
public virtual AnagraficaGruppi CodGruppoNavigation { get; set; }
public string IdxMacchina { get; set; }
public virtual Macchine IdxMacchinaNavigation { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/Gruppi2Operatori.cs → MP.AppAuth/Models/Gruppi2Operatori.cs
+7 -4
View File
@@ -3,14 +3,17 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class Gruppi2Operatori
{
public int MatrOpr { get; set; }
public string CodGruppo { get; set; }
#region Public Properties
public string CodGruppo { get; set; }
public virtual AnagraficaGruppi CodGruppoNavigation { get; set; }
public int MatrOpr { get; set; }
public virtual AnagraficaOperatori MatrOprNavigation { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/KeepAlive.cs → MP.AppAuth/Models/KeepAlive.cs
+8 -4
View File
@@ -3,13 +3,17 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class KeepAlive
{
public string IdxMacchina { get; set; }
public DateTime? DataOraServer { get; set; }
#region Public Properties
public DateTime? DataOraMacchina { get; set; }
public DateTime? DataOraServer { get; set; }
public DateTime? DataOraStart { get; set; }
public string IdxMacchina { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/LinkMenuJqm.cs → MP.AppAuth/Models/LinkMenuJqm.cs
+9 -5
View File
@@ -3,15 +3,19 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class LinkMenuJqm
{
#region Public Properties
public string Icona { get; set; }
public int IdxLink { get; set; }
public string TipoLink { get; set; }
public string NavigateUrl { get; set; }
public int? Ordine { get; set; }
public string Testo { get; set; }
public string NavigateUrl { get; set; }
public string Icona { get; set; }
public string TipoLink { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/DatabaseModels/ListValue.cs → MP.AppAuth/Models/ListValue.cs
+8 -4
View File
@@ -3,14 +3,18 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class ListValue
{
public string TableName { get; set; }
#region Public Properties
public string FieldName { get; set; }
public string Value { get; set; }
public string Label { get; set; }
public int? Ordinal { get; set; }
public string TableName { get; set; }
public string Value { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/Models/Macchine.cs
+35
View File
@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth.Models
{
public partial class Macchine
{
#region Public Constructors
public Macchine()
{
Gruppi2Macchines = new HashSet<Gruppi2Macchine>();
}
#endregion Public Constructors
#region Public Properties
public string CodMacchina { get; set; }
public int ColNum { get; set; }
public string Css { get; set; }
public string Descrizione { get; set; }
public virtual ICollection<Gruppi2Macchine> Gruppi2Macchines { get; set; }
public string IdxMacchina { get; set; }
public string Locazione { get; set; }
public string Nome { get; set; }
public string Note { get; set; }
public int RowNum { get; set; }
public string Url { get; set; }
#endregion Public Properties
}
}
MP.AppAuth/DatabaseModels/UpdMan.cs → MP.AppAuth/Models/UpdMan.cs
+11 -7
View File
@@ -3,16 +3,20 @@ using System.Collections.Generic;
#nullable disable
namespace MP.AppAuth
namespace MP.AppAuth.Models
{
public partial class UpdMan
{
#region Public Properties
public string AppName { get; set; }
public string ManifestUrl { get; set; }
public bool? IsAuth { get; set; }
public string LocalRepo { get; set; }
public string PackName { get; set; }
public string LicenseKey { get; set; }
public string AppUrl { get; set; }
public bool? IsAuth { get; set; }
public string LicenseKey { get; set; }
public string LocalRepo { get; set; }
public string ManifestUrl { get; set; }
public string PackName { get; set; }
#endregion Public Properties
}
}
}
MP.AppAuth/MoonProContext.cs
+1 -2944
View File
File diff suppressed because it is too large Load Diff
MP.Land/Data/AppAuthService.cs
+101
View File
@@ -0,0 +1,101 @@
using Microsoft.Extensions.Configuration;
using System;
using Microsoft.Extensions.Logging;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using NLog;
using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Caching.Memory;
namespace MP.Land.Data
{
public class AppAuthService : IDisposable
{
#region Private Fields
private static IConfiguration _configuration;
private static ILogger<AppAuthService> _logger;
private static List<MP.AppAuth.Models.Macchine> ElencoMacchine = new List<MP.AppAuth.Models.Macchine>();
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
private readonly IDistributedCache distributedCache;
private readonly IMemoryCache memoryCache;
/// <summary>
/// Durata assoluta massima della cache
/// </summary>
private int chAbsExp = 15;
/// <summary>
/// Durata della cache in modalità inattiva (non acceduta) prima di venire rimossa
/// NON estende oltre il tempo massimo di validità della cache (chAbsExp)
/// </summary>
private int chSliExp = 5;
#endregion Private Fields
#region Public Fields
public static AppAuth.Controllers.AppAuthController dbController;
#endregion Public Fields
#region Public Constructors
public AppAuthService(IConfiguration configuration, ILogger<AppAuthService> logger, IMemoryCache memoryCache, IDistributedCache distributedCache)
{
_logger = logger;
_configuration = configuration;
// conf cache
this.memoryCache = memoryCache;
this.distributedCache = distributedCache;
// conf DB
string connStr = _configuration.GetConnectionString("MP.Land");
if (string.IsNullOrEmpty(connStr))
{
_logger.LogError("ConnString empty!");
}
else
{
dbController = new AppAuth.Controllers.AppAuthController(configuration);
_logger.LogInformation("DbController OK");
}
}
#endregion Public Constructors
#region Private Properties
private DistributedCacheEntryOptions cacheOpt
{
get
{
return new DistributedCacheEntryOptions().SetAbsoluteExpiration(DateTime.Now.AddMinutes(chAbsExp)).SetSlidingExpiration(TimeSpan.FromMinutes(chSliExp));
}
}
private DistributedCacheEntryOptions cacheOptLong
{
get
{
return new DistributedCacheEntryOptions().SetAbsoluteExpiration(DateTime.Now.AddMinutes(chAbsExp * 10)).SetSlidingExpiration(TimeSpan.FromMinutes(chSliExp));
}
}
#endregion Private Properties
#region Public Methods
public void Dispose()
{
throw new NotImplementedException();
}
#endregion Public Methods
}
}
MP.Land/MP.Land.csproj
+40 -26
View File
@@ -1,33 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>MP.Land</RootNamespace>
<Version>1.1.2109.1719</Version>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>MP.Land</RootNamespace>
<Version>1.1.2109.1810</Version>
</PropertyGroup>
<ItemGroup>
<Content Remove="Components\CodArtSelector.razor" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Components\ArchiveStatus.razor.cs" />
<Compile Remove="Components\FileEditor.razor.cs" />
<Compile Remove="Components\TagSearch.razor.cs" />
<Compile Remove="Data\FileArchDataService.cs" />
<Compile Remove="Pages\Archive.razor.cs" />
<Compile Remove="Pages\Setup.razor.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DiffMatchPatch" Version="1.0.3" />
<PackageReference Include="Majorsoft.Blazor.Components.Debounce" Version="1.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
</ItemGroup>
<ItemGroup>
<Content Remove="Components\ArchiveStatus.razor" />
<Content Remove="Components\CodArtSelector.razor" />
<Content Remove="Components\FileEditor.razor" />
<Content Remove="Components\TagSearch.razor" />
<Content Remove="Pages\Archive.razor" />
<Content Remove="Pages\Setup.razor" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MP.FileData\MP.FileData.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DiffMatchPatch" Version="1.0.3" />
<PackageReference Include="Majorsoft.Blazor.Components.Debounce" Version="1.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
</Target>
<ItemGroup>
<ProjectReference Include="..\MP.AppAuth\MP.AppAuth.csproj" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
</Target>
</Project>
MP.Land/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo gestione Programmi MAPO</i>
<h4>Versione: 1.1.2109.1719</h4>
<h4>Versione: 1.1.2109.1810</h4>
<br />
Note di rilascio:
<ul>
MP.Land/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2109.1719
1.1.2109.1810
MP.Land/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2109.1719</version>
<version>1.1.2109.1810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Land.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Land/Startup.cs
+3 -3
View File
@@ -208,7 +208,7 @@ namespace MP.Land
{
//options.Configuration = "localhost:6379";
options.ConfigurationOptions = new StackExchange.Redis.ConfigurationOptions() { KeepAlive = 180, DefaultDatabase = 5, EndPoints = { { "localhost", 6379 } } };
options.InstanceName = "MP:Prog";
options.InstanceName = "MP:Land";
});
services.AddLocalization();
@@ -223,8 +223,8 @@ namespace MP.Land
services.AddSingleton<IConfiguration>(Configuration);
//services.AddTransient<Services.BlazorTimer>();
//services.AddSingleton<FileArchDataService>();
services.AddScoped<FileArchDataService>();
//services.AddSingleton<AppAuthService>();
services.AddScoped<AppAuthService>();
services.AddScoped<MessageService>();
}