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

Compare commits

base: Egalware/mapo-mono:2024/01/09
Branches Tags
Egalware/mapo-mono:main Egalware/mapo-mono:develop Egalware/mapo-mono:Componente-DetailOverview Egalware/mapo-mono:feature/LuaPreliminaryTest
Egalware/mapo-mono:AutoSave_2024/10/01 Egalware/mapo-mono:2024/01/09 Egalware/mapo-mono:AutoSave_2024/03/08 Egalware/mapo-mono:AutoSave_2024/02/02
...
compare: Egalware/mapo-mono:develop
Branches Tags
Egalware/mapo-mono:develop Egalware/mapo-mono:main Egalware/mapo-mono:Componente-DetailOverview Egalware/mapo-mono:feature/LuaPreliminaryTest
Egalware/mapo-mono:AutoSave_2024/10/01 Egalware/mapo-mono:2024/01/09 Egalware/mapo-mono:AutoSave_2024/03/08 Egalware/mapo-mono:AutoSave_2024/02/02

12 Commits
2024/01/09 ... develop

Author SHA1 Message Date
samuele 39609693a8 Aggiunte altre info pagina hw (predisposto x includere liberire classi base x gestione) 2024-09-25 11:55:17 +02:00
samuele 774cc5951a Merge tag 'AddRetryMysql' into develop 
Aggiunto retry DB MySql x errori + fix conf gestione dietro lb.ufficio x
DB
 2024-04-15 19:35:38 +02:00
samuele 4ce79a88c3 Merge branch 'release/AddRetryMysql' 2024-04-15 19:35:11 +02:00
samuele d1dc1436bb Refresh generale 2024-04-15 19:34:39 +02:00
samuele 3f889940b9 Aggiunta opzione x riprovare chiamata in caso di errore connessione x 10 sec 2024-04-15 19:34:36 +02:00
samuele 257ad739df Update puntamento DB su lb ufficio 2024-04-15 19:34:17 +02:00
samuele badd6d16f7 Update x pulizia (ulteriore) file log x decoder 2024-04-15 11:16:50 +02:00
samuele 7d84defb68 Fix config x DB Cluster in ufficio 2024-04-12 16:21:27 +02:00
samuele dd212d5c1b Merge tag 'AddSentinelLocalhost' into develop 
Aggiunto sentinel su localhost
 2024-03-16 12:06:55 +01:00
samuele 3b62b84bc2 Merge branch 'release/AddSentinelLocalhost' 2024-03-16 12:06:46 +01:00
samuele cc74087ba0 Fix UI x usare redis sentinel da localhost 2024-03-16 12:06:14 +01:00
samuele 326c35cc0d Fix configurazione redis su sentinel server 2024-03-15 17:35:45 +01:00
33 changed files with 355 additions and 245 deletions
Expand all files Collapse all files
MP.MONO.ADAPTER.OLD/appsettings.json
+1 -1
View File
@@ -7,7 +7,7 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=nkc.password", "Redis": "redis01.ufficio:26379,serviceName=devel,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=nkc.password",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Egalware_24068!;sslmode=None;", "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Egalware_24068!;sslmode=None;",
MP.MONO.ADAPTER.OPC/appsettings.json
+1 -1
View File
@@ -6,7 +6,7 @@
} }
}, },
"ConnectionStrings": { "ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Redis": "redis01.ufficio:26379,serviceName=devel,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;", "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;",
MP.MONO.ADAPTER.OPC/appsettings.office.json
+1 -1
View File
@@ -6,7 +6,7 @@
} }
}, },
"ConnectionStrings": { "ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Redis": "redis01.ufficio:26379,serviceName=devel,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;", "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;",
MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2308.2118</Version> <Version>1.2.2409.2509</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
MP.MONO.ANALYZER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body> <body>
<i>MAPO-MONO</i> <i>MAPO-MONO</i>
<h4>Version: 1.2.2308.2118</h4> <h4>Version: 1.2.2409.2509</h4>
<br /> Release Note: <br /> Release Note:
<ul> <ul>
<li> <li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2308.2118 1.2.2409.2509
MP.MONO.ANALYZER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<item> <item>
<version>1.2.2308.2118</version> <version>1.2.2409.2509</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url> <url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog> <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory> <mandatory>false</mandatory>
MP.MONO.Core/MachineDataValidator.cs
+2
View File
@@ -164,6 +164,7 @@ namespace MP.MONO.Core
public static Dictionary<string, string> netInfo = new Dictionary<string, string>(); public static Dictionary<string, string> netInfo = new Dictionary<string, string>();
public static Dictionary<string, string> osInfo = new Dictionary<string, string>(); public static Dictionary<string, string> osInfo = new Dictionary<string, string>();
public static Dictionary<string, string> ramInfo = new Dictionary<string, string>(); public static Dictionary<string, string> ramInfo = new Dictionary<string, string>();
public static Dictionary<string, string> volInfo = new Dictionary<string, string>();
/// <summary> /// <summary>
/// Predispone elenco dati di test /// Predispone elenco dati di test
@@ -178,6 +179,7 @@ namespace MP.MONO.Core
netInfo = await MachineInfo.GetInfo("NET"); netInfo = await MachineInfo.GetInfo("NET");
osInfo = await MachineInfo.GetInfo("OS"); osInfo = await MachineInfo.GetInfo("OS");
ramInfo = await MachineInfo.GetInfo("RAM"); ramInfo = await MachineInfo.GetInfo("RAM");
volInfo = await MachineInfo.GetInfo("VOL");
testData = biosInfo.Concat(cpuInfo).Concat(netInfo).Concat(osInfo).Concat(ramInfo).GroupBy(ele => ele.Key).ToDictionary(ele => ele.Key, ele => ele.First().Value); testData = biosInfo.Concat(cpuInfo).Concat(netInfo).Concat(osInfo).Concat(ramInfo).GroupBy(ele => ele.Key).ToDictionary(ele => ele.Key, ele => ele.First().Value);
return testData; return testData;
} }
MP.MONO.Core/MachineInfo.cs
+206 -173
View File
@@ -40,6 +40,10 @@ namespace MP.MONO.Core
outInfo = await GetRamInfo(); outInfo = await GetRamInfo();
break; break;
case "VOL":
outInfo = await GetVolumeInfo();
break;
default: default:
break; break;
} }
@@ -56,8 +60,6 @@ namespace MP.MONO.Core
#region Private Methods #region Private Methods
/// <summary> /// <summary>
/// Info BIOS /// Info BIOS
/// </summary> /// </summary>
@@ -65,7 +67,7 @@ namespace MP.MONO.Core
private static async Task<Dictionary<string, string>> GetBiosInfo() private static async Task<Dictionary<string, string>> GetBiosInfo()
{ {
ManagementObjectCollection moc; ManagementObjectCollection moc;
var Processor = new Dictionary<string, string>(); Dictionary<string, string> DictParam = new Dictionary<string, string>();
try try
{ {
@@ -74,25 +76,213 @@ namespace MP.MONO.Core
catch catch
{ {
Log.Error("Error: WMI API Not loaded."); Log.Error("Error: WMI API Not loaded.");
return Processor; return DictParam;
} }
foreach (ManagementObject obj in moc) foreach (ManagementObject obj in moc)
{ {
searchWmiParam(Processor, obj, "Manufacturer", "Manufacturer"); searchWmiParam(DictParam, obj, "Manufacturer", "Manufacturer");
searchWmiParam(Processor, obj, "ReleaseDate", "ReleaseDate"); searchWmiParam(DictParam, obj, "ReleaseDate", "ReleaseDate");
searchWmiParam(Processor, obj, "SMBIOSBIOSVersion", "SMBIOSBIOSVersion"); searchWmiParam(DictParam, obj, "SMBIOSBIOSVersion", "SMBIOSBIOSVersion");
searchWmiParam(Processor, obj, "SMBIOSMajorVersion", "SMBIOSMajorVersion"); searchWmiParam(DictParam, obj, "SMBIOSMajorVersion", "SMBIOSMajorVersion");
searchWmiParam(Processor, obj, "SMBIOSMinorVersion", "SMBIOSMinorVersion"); searchWmiParam(DictParam, obj, "SMBIOSMinorVersion", "SMBIOSMinorVersion");
searchWmiParam(Processor, obj, "SoftwareElementID", "SoftwareElementID"); searchWmiParam(DictParam, obj, "SoftwareElementID", "SoftwareElementID");
searchWmiParam(Processor, obj, "SoftwareElementState", "SoftwareElementState"); searchWmiParam(DictParam, obj, "SoftwareElementState", "SoftwareElementState");
searchWmiParam(Processor, obj, "SystemBiosMajorVersion", "SystemBiosMajorVersion"); searchWmiParam(DictParam, obj, "SystemBiosMajorVersion", "SystemBiosMajorVersion");
searchWmiParam(Processor, obj, "SystemBiosMajorVersion", "SystemBiosMajorVersion"); searchWmiParam(DictParam, obj, "SystemBiosMajorVersion", "SystemBiosMajorVersion");
searchWmiParam(Processor, obj, "SystemBiosMinorVersion", "SystemBiosMinorVersion"); searchWmiParam(DictParam, obj, "SystemBiosMinorVersion", "SystemBiosMinorVersion");
searchWmiParam(Processor, obj, "BiosVersion", "Version"); searchWmiParam(DictParam, obj, "BiosVersion", "Version");
} }
await Task.Delay(1); await Task.Delay(1);
return Processor; return DictParam;
}
/// <summary>
/// Info processore
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetCpuInfo()
{
ManagementObjectCollection moc;
Dictionary<string, string> DictParam = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select * from Win32_Processor").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return DictParam;
}
foreach (ManagementObject obj in moc)
{
searchWmiParam(DictParam, obj, "AddressWidth", "AddressWidth");
searchWmiParam(DictParam, obj, "Architecture", "Architecture");
searchWmiParam(DictParam, obj, "CurrentClockSpeed", "CurrentClockSpeed");
searchWmiParam(DictParam, obj, "CurrentVoltage", "CurrentVoltage");
searchWmiParam(DictParam, obj, "DataWidth", "DataWidth");
searchWmiParam(DictParam, obj, "Description", "Description");
searchWmiParam(DictParam, obj, "ExtClock", "ExtClock");
searchWmiParam(DictParam, obj, "Family", "Family");
searchWmiParam(DictParam, obj, "L2CacheSize", "L2CacheSize");
searchWmiParam(DictParam, obj, "L3CacheSize", "L3CacheSize");
searchWmiParam(DictParam, obj, "Level", "Level");
searchWmiParam(DictParam, obj, "LoadPercentage", "LoadPercentage");
searchWmiParam(DictParam, obj, "Manufacturer", "Manufacturer");
searchWmiParam(DictParam, obj, "NumberOfCores", "NumberOfCores");
searchWmiParam(DictParam, obj, "NumberOfLogicalProcessors", "NumberOfLogicalProcessors");
searchWmiParam(DictParam, obj, "ProcessorId", "ProcessorId");
searchWmiParam(DictParam, obj, "ProcessorType", "ProcessorType");
searchWmiParam(DictParam, obj, "Revision", "Revision");
searchWmiParam(DictParam, obj, "Role", "Role");
searchWmiParam(DictParam, obj, "SocketDesignation", "SocketDesignation");
searchWmiParam(DictParam, obj, "SystemName", "SystemName");
searchWmiParam(DictParam, obj, "CpuVersion", "Version");
}
await Task.Delay(1);
return DictParam;
}
/// <summary>
/// Info Networking
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetNetInfo()
{
ManagementObjectCollection moc;
Dictionary<string, string> DictParam = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select * from Win32_NetworkAdapter WHERE NetEnabled = 'true'").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return DictParam;
}
foreach (ManagementObject obj in moc)
{
searchWmiParam(DictParam, obj, "AdapterType", "AdapterType");
searchWmiParam(DictParam, obj, "Description", "Description");
searchWmiParam(DictParam, obj, "GUID", "GUID");
searchWmiParam(DictParam, obj, "MACAddress", "MACAddress");
searchWmiParam(DictParam, obj, "Manufacturer", "Manufacturer");
searchWmiParam(DictParam, obj, "Name", "Name");
searchWmiParam(DictParam, obj, "SystemName", "SystemName");
searchWmiParam(DictParam, obj, "PhysicalAdapter", "PhysicalAdapter");
searchWmiParam(DictParam, obj, "ProductName", "ProductName");
searchWmiParam(DictParam, obj, "ServiceName", "ServiceName");
}
await Task.Delay(1);
return DictParam;
}
/// <summary>
/// Info OS
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetOsInfo()
{
ManagementObjectCollection moc;
Dictionary<string, string> DictParam = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select * from Win32_OperatingSystem").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return DictParam;
}
foreach (ManagementObject obj in moc)
{
searchWmiParam(DictParam, obj, "Caption", "Caption");
searchWmiParam(DictParam, obj, "Version", "Version");
searchWmiParam(DictParam, obj, "MaxNumberOfProcesses", "MaxNumberOfProcesses");
searchWmiParam(DictParam, obj, "MaxProcessMemorySize", "MaxProcessMemorySize");
searchWmiParam(DictParam, obj, "OSArchitecture", "OSArchitecture");
searchWmiParam(DictParam, obj, "SerialNumber", "SerialNumber");
searchWmiParam(DictParam, obj, "BuildNumber", "BuildNumber");
searchWmiParam(DictParam, obj, "RegisteredUser", "RegisteredUser");
}
await Task.Delay(1);
return DictParam;
}
/// <summary>
/// Info RAM
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetRamInfo()
{
ManagementObjectCollection moc;
Dictionary<string, string> DictParam = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select * from Win32_PhysicalMemory").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return DictParam;
}
foreach (ManagementObject obj in moc)
{
searchWmiParam(DictParam, obj, "DeviceLocator", "DeviceLocator");
searchWmiParam(DictParam, obj, "DataWidth", "DataWidth");
searchWmiParam(DictParam, obj, "ConfiguredVoltage", "ConfiguredVoltage");
searchWmiParam(DictParam, obj, "FormFactor", "FormFactor");
searchWmiParam(DictParam, obj, "ConfiguredClockSpeed", "ConfiguredClockSpeed");
searchWmiParam(DictParam, obj, "MaxVoltage", "MaxVoltage");
searchWmiParam(DictParam, obj, "MinVoltage", "MinVoltage");
searchWmiParam(DictParam, obj, "Speed", "Speed");
searchWmiParam(DictParam, obj, "SMBIOSMemoryType", "SMBIOSMemoryType");
searchWmiParam(DictParam, obj, "PartNumber", "PartNumber");
}
await Task.Delay(1);
return DictParam;
}
/// <summary>
/// Info Volumes (HDD/SSD)
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetVolumeInfo()
{
ManagementObjectCollection moc;
Dictionary<string, string> DictParam = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select DriveLetter, DeviceID from Win32_Volume").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return DictParam;
}
foreach (ManagementObject obj in moc)
{
// mi limito al disco "C:"
string sDrive = "DriveLetter";
var objVal = $"{obj[sDrive]}";
if (objVal == "C:")
{
searchWmiParam(DictParam, obj, "DeviceID", "DeviceID");
searchWmiParam(DictParam, obj, "DriveLetter", "DriveLetter");
}
}
await Task.Delay(1);
return DictParam;
} }
/// <summary> /// <summary>
@@ -114,163 +304,6 @@ namespace MP.MONO.Core
{ } { }
} }
/// <summary>
/// Info processore
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetCpuInfo()
{
ManagementObjectCollection moc;
var Processor = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select * from Win32_Processor").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return Processor;
}
foreach (ManagementObject obj in moc)
{
searchWmiParam(Processor, obj, "AddressWidth", "AddressWidth");
searchWmiParam(Processor, obj, "Architecture", "Architecture");
searchWmiParam(Processor, obj, "CurrentClockSpeed", "CurrentClockSpeed");
searchWmiParam(Processor, obj, "CurrentVoltage", "CurrentVoltage");
searchWmiParam(Processor, obj, "DataWidth", "DataWidth");
searchWmiParam(Processor, obj, "Description", "Description");
searchWmiParam(Processor, obj, "ExtClock", "ExtClock");
searchWmiParam(Processor, obj, "Family", "Family");
searchWmiParam(Processor, obj, "L2CacheSize", "L2CacheSize");
searchWmiParam(Processor, obj, "L3CacheSize", "L3CacheSize");
searchWmiParam(Processor, obj, "Level", "Level");
searchWmiParam(Processor, obj, "LoadPercentage", "LoadPercentage");
searchWmiParam(Processor, obj, "Manufacturer", "Manufacturer");
searchWmiParam(Processor, obj, "NumberOfCores", "NumberOfCores");
searchWmiParam(Processor, obj, "NumberOfLogicalProcessors", "NumberOfLogicalProcessors");
searchWmiParam(Processor, obj, "ProcessorId", "ProcessorId");
searchWmiParam(Processor, obj, "ProcessorType", "ProcessorType");
searchWmiParam(Processor, obj, "Revision", "Revision");
searchWmiParam(Processor, obj, "Role", "Role");
searchWmiParam(Processor, obj, "SocketDesignation", "SocketDesignation");
searchWmiParam(Processor, obj, "SystemName", "SystemName");
searchWmiParam(Processor, obj, "CpuVersion", "Version");
}
await Task.Delay(1);
return Processor;
}
/// <summary>
/// Info Networking
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetNetInfo()
{
ManagementObjectCollection moc;
var Processor = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select * from Win32_NetworkAdapter WHERE NetEnabled = 'true'").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return Processor;
}
foreach (ManagementObject obj in moc)
{
searchWmiParam(Processor, obj, "AdapterType", "AdapterType");
searchWmiParam(Processor, obj, "Description", "Description");
searchWmiParam(Processor, obj, "GUID", "GUID");
searchWmiParam(Processor, obj, "MACAddress", "MACAddress");
searchWmiParam(Processor, obj, "Manufacturer", "Manufacturer");
searchWmiParam(Processor, obj, "Name", "Name");
searchWmiParam(Processor, obj, "SystemName", "SystemName");
searchWmiParam(Processor, obj, "PhysicalAdapter", "PhysicalAdapter");
searchWmiParam(Processor, obj, "ProductName", "ProductName");
searchWmiParam(Processor, obj, "ServiceName", "ServiceName");
}
await Task.Delay(1);
return Processor;
}
/// <summary>
/// Info OS
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetOsInfo()
{
ManagementObjectCollection moc;
var Processor = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select * from Win32_OperatingSystem").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return Processor;
}
foreach (ManagementObject obj in moc)
{
searchWmiParam(Processor, obj, "Caption", "Caption");
searchWmiParam(Processor, obj, "Version", "Version");
searchWmiParam(Processor, obj, "MaxNumberOfProcesses", "MaxNumberOfProcesses");
searchWmiParam(Processor, obj, "MaxProcessMemorySize", "MaxProcessMemorySize");
searchWmiParam(Processor, obj, "OSArchitecture", "OSArchitecture");
searchWmiParam(Processor, obj, "SerialNumber", "SerialNumber");
searchWmiParam(Processor, obj, "BuildNumber", "BuildNumber");
}
await Task.Delay(1);
return Processor;
}
/// <summary>
/// Info RAM
/// </summary>
/// <returns></returns>
private static async Task<Dictionary<string, string>> GetRamInfo()
{
ManagementObjectCollection moc;
var Processor = new Dictionary<string, string>();
try
{
moc = new ManagementObjectSearcher("select * from Win32_PhysicalMemory").Get();
}
catch
{
Log.Error("Error: WMI API Not loaded.");
return Processor;
}
foreach (ManagementObject obj in moc)
{
searchWmiParam(Processor, obj, "DeviceLocator", "DeviceLocator");
searchWmiParam(Processor, obj, "DataWidth", "DataWidth");
searchWmiParam(Processor, obj, "ConfiguredVoltage", "ConfiguredVoltage");
searchWmiParam(Processor, obj, "FormFactor", "FormFactor");
searchWmiParam(Processor, obj, "ConfiguredClockSpeed", "ConfiguredClockSpeed");
searchWmiParam(Processor, obj, "MaxVoltage", "MaxVoltage");
searchWmiParam(Processor, obj, "MinVoltage", "MinVoltage");
searchWmiParam(Processor, obj, "Speed", "Speed");
searchWmiParam(Processor, obj, "SMBIOSMemoryType", "SMBIOSMemoryType");
searchWmiParam(Processor, obj, "PartNumber", "PartNumber");
}
await Task.Delay(1);
return Processor;
}
#endregion Private Methods #endregion Private Methods
} }
} }
MP.MONO.DECODER/MP.MONO.DECODER.csproj
+25 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2308.2118</Version> <Version>1.2.2409.2509</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -48,12 +48,36 @@
<None Update="logs\.placeholder.file"> <None Update="logs\.placeholder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="logs\2024-04-12.000.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="logs\stderr.log"> <None Update="logs\stderr.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="logs\stdin.log"> <None Update="logs\stdin.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="logs\stdout-20220406T180136.000.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="logs\stdout-20240412T141651.019.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="logs\stdout-20240412T142243.257.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="logs\stdout-20240412T142458.717.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="logs\stdout-20240412T142500.902.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="logs\stdout-20240412T142502.436.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="logs\stdout-20240412T142503.297.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="logs\stdout.log"> <None Update="logs\stdout.log">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
MP.MONO.DECODER/Program.cs
+33 -1
View File
@@ -100,6 +100,8 @@ int DbSampleInt = 60;
int BlinkPeriodMSec = 1000; int BlinkPeriodMSec = 1000;
bool AlarmLogActive = false; bool AlarmLogActive = false;
int NumDay2Keep = 180; int NumDay2Keep = 180;
string LogFolder = Path.Combine(Directory.GetCurrentDirectory(), config["OptPar:LogFolder"]);
int LogMaxAgeDays = config.GetValue<int>("OptPar:LogMaxAgeDays");
setupConf(); setupConf();
// datetime dell'inizio esecuzione task... x usare un semaforo di veto doppia esecuzione entro 30 sec // datetime dell'inizio esecuzione task... x usare un semaforo di veto doppia esecuzione entro 30 sec
@@ -122,6 +124,8 @@ Thread threadDbMaint = new Thread(dbMaintenance);
threadDbMaint.Start(); threadDbMaint.Start();
Thread threadPersistCount = new Thread(persistCount); Thread threadPersistCount = new Thread(persistCount);
threadPersistCount.Start(); threadPersistCount.Start();
Thread cleanupLog = new Thread(cleanupOldLog);
cleanupLog.Start();
/* -------------------------------- /* --------------------------------
* Setup Gestione Counters * Setup Gestione Counters
@@ -410,6 +414,34 @@ void setupConf()
} }
} }
/// <summary>
/// Esecuzione pulizia cartella log
/// </summary>
void cleanupOldLog()
{
// esecuzione ogni ora +/- 1 min
int minPeriod = 1000 * 60 * 59;
int maxPeriod = 1000 * 60 * 61;
do
{
DateTime limit = DateTime.Now.AddDays(-LogMaxAgeDays);
// cerco file + vecchi di
var file2check = Directory
.EnumerateFiles(LogFolder, "*.log", SearchOption.TopDirectoryOnly)
.Select(file => new FileInfo(file))
.Where(fInfo => fInfo.LastWriteTime < limit && fInfo.Name.Length > 10)
.ToList();
// cerco e se NON si tratta dei 3 file standard --> elimino!
foreach (var item in file2check)
{
Log.Info($"Deleting old logfile: {item.Name}");
item.Delete();
}
// attesa random di circa 1 minuti x calcolare...
Thread.Sleep(rand.Next(minPeriod, maxPeriod));
} while (true);
}
/// <summary> /// <summary>
/// Test di uguaglianza tra 2 dizionari... /// Test di uguaglianza tra 2 dizionari...
/// </summary> /// </summary>
@@ -1046,7 +1078,7 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
{ {
await Task.Run(() => await Task.Run(() =>
{ {
_= checkCeasedAlarm(item); _ = checkCeasedAlarm(item);
}); });
} }
// Loggo quanto fatto // Loggo quanto fatto
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body> <body>
<i>MAPO-MONO</i> <i>MAPO-MONO</i>
<h4>Version: 1.2.2308.2118</h4> <h4>Version: 1.2.2409.2509</h4>
<br /> Release Note: <br /> Release Note:
<ul> <ul>
<li> <li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2308.2118 1.2.2409.2509
MP.MONO.DECODER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<item> <item>
<version>1.2.2308.2118</version> <version>1.2.2409.2509</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url> <url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog> <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory> <mandatory>false</mandatory>
MP.MONO.DECODER/appsettings.json
+5 -3
View File
@@ -7,14 +7,14 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Redis": "redis01.ufficio:26379,serviceName=devel,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;", "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;",
"MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;" "MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;"
}, },
"DbConfig": { "DbConfig": {
"Server": "10.74.82.230", "Server": "lb.ufficio",
"nKey": "MONO", "nKey": "MONO",
"sKey": "Calcium0xide-CaO" "sKey": "Calcium0xide-CaO"
}, },
@@ -44,6 +44,8 @@
"DbSampleInt": 60, "DbSampleInt": 60,
"BlinkPeriodMSec": 3000, "BlinkPeriodMSec": 3000,
"NumDay2Keep": 365, "NumDay2Keep": 365,
"LogDurationLimitMs": 1500 "LogDurationLimitMs": 1500,
"LogFolder": "logs",
"LogMaxAgeDays": 15
} }
} }
MP.MONO.DECODER/appsettings.office.json
+1 -1
View File
@@ -7,7 +7,7 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Redis": "redis01.ufficio:26379,serviceName=devel,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;", "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;",
MP.MONO.Data/AdminContext.cs
+6 -1
View File
@@ -51,7 +51,12 @@ namespace MP.MONO.Data
if (!optionsBuilder.IsConfigured) if (!optionsBuilder.IsConfigured)
{ {
var serverVersion = ServerVersion.AutoDetect(connString); var serverVersion = ServerVersion.AutoDetect(connString);
optionsBuilder.UseMySql(connString, serverVersion); ;
optionsBuilder.UseMySql(connString, serverVersion, options => options.EnableRetryOnFailure(
maxRetryCount: 5,
maxRetryDelay: TimeSpan.FromSeconds(10),
errorNumbersToAdd: null)
);
} }
} }
MP.MONO.Data/MapoMonoContext.cs
+5 -1
View File
@@ -163,7 +163,11 @@ namespace MP.MONO.Data
if (!optionsBuilder.IsConfigured) if (!optionsBuilder.IsConfigured)
{ {
var serverVersion = ServerVersion.AutoDetect(connString); var serverVersion = ServerVersion.AutoDetect(connString);
optionsBuilder.UseMySql(connString, serverVersion); optionsBuilder.UseMySql(connString, serverVersion, options => options.EnableRetryOnFailure(
maxRetryCount: 5,
maxRetryDelay: TimeSpan.FromSeconds(10),
errorNumbersToAdd: null)
);
} }
} }
MP.MONO.Data/UserIdentityDbContext.cs
+5 -1
View File
@@ -46,7 +46,11 @@ namespace MP.MONO.Data
if (!optionsBuilder.IsConfigured) if (!optionsBuilder.IsConfigured)
{ {
var serverVersion = ServerVersion.AutoDetect(connString); var serverVersion = ServerVersion.AutoDetect(connString);
optionsBuilder.UseMySql(connString, serverVersion); optionsBuilder.UseMySql(connString, serverVersion, options => options.EnableRetryOnFailure(
maxRetryCount: 5,
maxRetryDelay: TimeSpan.FromSeconds(10),
errorNumbersToAdd: null)
);
} }
} }
MP.MONO.SIM/MP.MONO.SIM.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2308.2118</Version> <Version>1.2.2409.2509</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
MP.MONO.SIM/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body> <body>
<i>MAPO-MONO</i> <i>MAPO-MONO</i>
<h4>Version: 1.2.2308.2118</h4> <h4>Version: 1.2.2409.2509</h4>
<br /> Release Note: <br /> Release Note:
<ul> <ul>
<li> <li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2308.2118 1.2.2409.2509
MP.MONO.SIM/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<item> <item>
<version>1.2.2308.2118</version> <version>1.2.2409.2509</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url> <url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog> <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory> <mandatory>false</mandatory>
MP.MONO.SIM/appsettings.json
+2 -3
View File
@@ -7,15 +7,14 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=30000,syncTimeout=30000,asyncTimeout=30000,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Redis": "redis01.ufficio:26379,serviceName=devel,DefaultDatabase=7,connectTimeout=30000,syncTimeout=30000,asyncTimeout=30000,abortConnect=false,ssl=false",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;", "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;",
"MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;" "MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;"
}, },
"DbConfig": { "DbConfig": {
"Server": "10.74.82.230", "Server": "lb.ufficio",
//"Server": "localhost",
"nKey": "MONO", "nKey": "MONO",
"sKey": "M3T@n0-CH4" "sKey": "M3T@n0-CH4"
}, },
MP.MONO.UI/MP.MONO.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2308.2118</Version> <Version>1.2.2409.2510</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
MP.MONO.UI/Pages/Info.razor
+5 -5
View File
@@ -48,24 +48,24 @@
<div> <div>
<DisplayInfo ParamName="CPU Info" currInfo="@cpuInfo" btnType="btn-primary" showSection="@showCpu"></DisplayInfo> <DisplayInfo ParamName="CPU Info" currInfo="@cpuInfo" btnType="btn-primary" showSection="@showCpu"></DisplayInfo>
</div> </div>
</div> </div>
<div class="col-4"> <div class="col-4">
<div> <div>
<DisplayInfo ParamName="NET Info" currInfo="@netInfo" btnType="btn-primary" showSection="@showNet"></DisplayInfo> <DisplayInfo ParamName="NET Info" currInfo="@netInfo" btnType="btn-primary" showSection="@showNet"></DisplayInfo>
</div> </div>
<div class="pt-1"> <div class="pt-1">
<DisplayInfo ParamName="OS Info" currInfo="@osInfo" btnType="btn-primary mb-1" showSection="@showOs"></DisplayInfo> <DisplayInfo ParamName="OS Info" currInfo="@osInfo" btnType="btn-primary mb-1" showSection="@showOs"></DisplayInfo>
</div> </div>
<div class="pt-1">
<DisplayInfo ParamName="VOLUME Info" currInfo="@volInfo" btnType="btn-primary mb-1" showSection="@showVol"></DisplayInfo>
</div>
</div> </div>
<div class="col-4"> <div class="col-4">
<div> <div>
<DisplayInfo ParamName="BIOS Info" currInfo="@biosInfo" btnType="btn-primary" showSection="@showBios"></DisplayInfo> <DisplayInfo ParamName="RAM Info" currInfo="@ramInfo" btnType="btn-primary mb-1" showSection="@showRam"></DisplayInfo>
</div> </div>
<div class="pt-1"> <div class="pt-1">
<DisplayInfo ParamName="RAM Info" currInfo="@ramInfo" btnType="btn-primary mb-1" showSection="@showRam"></DisplayInfo> <DisplayInfo ParamName="BIOS Info" currInfo="@biosInfo" btnType="btn-primary" showSection="@showBios"></DisplayInfo>
</div> </div>
</div> </div>
</div> </div>
MP.MONO.UI/Pages/Info.razor.cs
+4
View File
@@ -38,6 +38,7 @@ namespace MP.MONO.UI.Pages
netInfo = MachineDataValidator.netInfo; netInfo = MachineDataValidator.netInfo;
osInfo = MachineDataValidator.osInfo; osInfo = MachineDataValidator.osInfo;
ramInfo = MachineDataValidator.ramInfo; ramInfo = MachineDataValidator.ramInfo;
volInfo = MachineDataValidator.volInfo;
// check licenze // check licenze
licOk = await MachineDataValidator.testCurrInfo(); licOk = await MachineDataValidator.testCurrInfo();
} }
@@ -53,12 +54,14 @@ namespace MP.MONO.UI.Pages
private Dictionary<string, string> netInfo = new Dictionary<string, string>(); private Dictionary<string, string> netInfo = new Dictionary<string, string>();
private Dictionary<string, string> osInfo = new Dictionary<string, string>(); private Dictionary<string, string> osInfo = new Dictionary<string, string>();
private Dictionary<string, string> ramInfo = new Dictionary<string, string>(); private Dictionary<string, string> ramInfo = new Dictionary<string, string>();
private Dictionary<string, string> volInfo = new Dictionary<string, string>();
private bool showBios = false; private bool showBios = false;
private bool showCpu = false; private bool showCpu = false;
private bool showKeyMan = false; private bool showKeyMan = false;
private bool showNet = false; private bool showNet = false;
private bool showOs = false; private bool showOs = false;
private bool showRam = false; private bool showRam = false;
private bool showVol = false;
#endregion Private Fields #endregion Private Fields
@@ -105,6 +108,7 @@ namespace MP.MONO.UI.Pages
showNet = true; showNet = true;
showOs = true; showOs = true;
showRam = true; showRam = true;
showVol = true;
} }
private void ToggleKeyMan() private void ToggleKeyMan()
MP.MONO.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body> <body>
<i>MAPO-MONO</i> <i>MAPO-MONO</i>
<h4>Version: 1.2.2308.2118</h4> <h4>Version: 1.2.2409.2510</h4>
<br /> Release Note: <br /> Release Note:
<ul> <ul>
<li> <li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2308.2118 1.2.2409.2510
MP.MONO.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<item> <item>
<version>1.2.2308.2118</version> <version>1.2.2409.2510</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url> <url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog> <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory> <mandatory>false</mandatory>
MP.MONO.UI/appsettings.json
+3 -2
View File
@@ -7,14 +7,15 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Redis": "localhost:26379,serviceName=devel,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;", "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;",
"MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;" "MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;"
}, },
"DbConfig": { "DbConfig": {
"Server": "10.74.82.230", "Server": "mdb.ufficio",
//"Server": "10.74.82.230",
"nKey": "MONO", "nKey": "MONO",
"sKey": "Calcium0xide-CaO" "sKey": "Calcium0xide-CaO"
}, },
MP.MONO.UI/appsettings.ufficio.json
+1 -1
View File
@@ -7,7 +7,7 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG", "Redis": "localhost:26379,serviceName=devel,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;", "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;", "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Seriate_24068!;sslmode=None;",
MP.MONO.UI/temp/InfoData.json
+33 -33
View File
@@ -2,55 +2,55 @@
"AdapterType": "Ethernet 802.3", "AdapterType": "Ethernet 802.3",
"AddressWidth": "64", "AddressWidth": "64",
"Architecture": "9", "Architecture": "9",
"BiosVersion": "_ASUS_ - 1072009", "BiosVersion": "ALASKA - 1072009",
"BuildNumber": "19045", "BuildNumber": "22631",
"Caption": "Microsoft Windows 10 Pro", "Caption": "Microsoft Windows 11 Pro N",
"ConfiguredClockSpeed": "2400", "ConfiguredClockSpeed": "3600",
"ConfiguredVoltage": "1200", "ConfiguredVoltage": "1200",
"CpuVersion": "Modello 1, Stepping 0", "CpuVersion": "Modello 1, Stepping 0",
"CurrentClockSpeed": "2200", "CurrentClockSpeed": "3501",
"CurrentVoltage": "12", "CurrentVoltage": "11",
"DataWidth": "64", "DataWidth": "64",
"Description": "AMD64 Family 23 Model 17 Stepping 0", "Description": "AMD64 Family 23 Model 113 Stepping 0",
"DeviceLocator": "ChannelA-DIMM0", "DeviceLocator": "DIMM 1",
"ExtClock": "100", "ExtClock": "100",
"Family": "107", "Family": "107",
"FormFactor": "12", "FormFactor": "8",
"GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}", "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}",
"L2CacheSize": "2048", "L2CacheSize": "8192",
"L3CacheSize": "4096", "L3CacheSize": "65536",
"Level": "23", "Level": "23",
"LoadPercentage": "43", "LoadPercentage": "9",
"MACAddress": "4C:ED:FB:D9:78:83", "MACAddress": "0C:9D:92:B8:FD:E8",
"Manufacturer": "American Megatrends Inc.", "Manufacturer": "American Megatrends International, LLC.",
"MaxNumberOfProcesses": "4294967295", "MaxNumberOfProcesses": "4294967295",
"MaxProcessMemorySize": "137438953344", "MaxProcessMemorySize": "137438953344",
"MaxVoltage": "1200", "MaxVoltage": "1200",
"MinVoltage": "1200", "MinVoltage": "1200",
"Name": "Realtek PCIe GbE Family Controller", "Name": "ASUS XG-C100C 10G PCI-E Network Adapter",
"NumberOfCores": "4", "NumberOfCores": "16",
"NumberOfLogicalProcessors": "8", "NumberOfLogicalProcessors": "32",
"OSArchitecture": "64 bit", "OSArchitecture": "64 bit",
"PartNumber": "8ATF1G64HZ-2G3E1 ", "PartNumber": "CMK64GX4M2D3600C18",
"PhysicalAdapter": "True", "PhysicalAdapter": "True",
"ProcessorId": "178BFBFF00810F10", "ProcessorId": "178BFBFF00870F10",
"ProcessorType": "3", "ProcessorType": "3",
"ProductName": "Realtek PCIe GbE Family Controller", "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter",
"ReleaseDate": "20190521000000.000000+000", "ReleaseDate": "20210521000000.000000+000",
"Revision": "4352", "Revision": "28928",
"Role": "CPU", "Role": "CPU",
"SerialNumber": "00330-80951-85780-AA242", "SerialNumber": "00332-00330-00000-AA008",
"ServiceName": "rt640x64", "ServiceName": "aqnic650",
"SMBIOSBIOSVersion": "X505ZA.311", "SMBIOSBIOSVersion": "F33",
"SMBIOSMajorVersion": "3", "SMBIOSMajorVersion": "3",
"SMBIOSMemoryType": "26", "SMBIOSMemoryType": "26",
"SMBIOSMinorVersion": "1", "SMBIOSMinorVersion": "3",
"SocketDesignation": "FP5", "SocketDesignation": "AM4",
"SoftwareElementID": "X505ZA.311", "SoftwareElementID": "F33",
"SoftwareElementState": "3", "SoftwareElementState": "3",
"Speed": "2400", "Speed": "3600",
"SystemBiosMajorVersion": "5", "SystemBiosMajorVersion": "5",
"SystemBiosMinorVersion": "13", "SystemBiosMinorVersion": "17",
"SystemName": "EGALW-NB-004", "SystemName": "WRKST-R9-SAM",
"Version": "10.0.19045" "Version": "10.0.22631"
} }