diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58dbdb0..e120478 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,7 +104,6 @@ variables:
Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd;
echo "replace completati"
-
stages:
- build
- staging
diff --git a/EgwProxy.DataLayer/DbConfig.cs b/EgwProxy.DataLayer/DbConfig.cs
index d16f027..f7e5bd3 100644
--- a/EgwProxy.DataLayer/DbConfig.cs
+++ b/EgwProxy.DataLayer/DbConfig.cs
@@ -25,8 +25,11 @@ namespace EgwProxy.DataLayer
public static string ADMIN_CONNECTION_STRING { get; set; } = "";
///
- /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;uid=root;pwd=Egalware_24068!;)
+ /// DB Connection string, per effettuare migration riportare valore connessione admin cablato
+ /// DB Manu: server=localhost;port=3306;database=EgtBwDb_000102;uid=root;pwd=Egalware_24068!;
+ /// DB Sam: server=localhost;port=3306;database=EgtBwDb_000470;uid=root;pwd=Egalware_24068!;
+ /// DB Lovato: server=localhost;port=3306;database=EgtBwDb_000656;uid=root;pwd=Egalware_24068!;
///
- public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000470;uid=root;pwd=Egalware_24068!";
+ public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000656;uid=root;pwd=Egalware_24068!";
}
}
diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj
index c076ef7..995c63f 100644
--- a/MagMan.UI/MagMan.UI.csproj
+++ b/MagMan.UI/MagMan.UI.csproj
@@ -2,7 +2,7 @@
net6.0
- 1.0.2405.0717
+ 1.0.2405.2316
enable
enable
true
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 6a72a58..d09e7f9 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MagMan - Wood Warehouse Management System
- Versione: 1.0.2405.0717
+ Versione: 1.0.2405.2316
Note di rilascio:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 5ee0b99..2fbede5 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2405.0717
+1.0.2405.2316
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index c499feb..0e22a91 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.0.2405.0717
+ 1.0.2405.2316
http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip
http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html
false
diff --git a/TestConsoleApp/Program.cs b/TestConsoleApp/Program.cs
index 3fe46e0..e08961c 100644
--- a/TestConsoleApp/Program.cs
+++ b/TestConsoleApp/Program.cs
@@ -15,7 +15,10 @@ namespace DemoApp
static async Task Main(string[] args)
{
- bool execTop = false;
+ // indica se eseguire step check syncro remota dati via REST
+ bool testSync = false;
+ // indica se eseguire step check syncro dati LOG da DB a REST remoti
+ bool testDbLog = true;
// num chiave
int keyNum = 470;
@@ -23,8 +26,9 @@ namespace DemoApp
// Indirizzo server (DEBUG)
string servAddr = "localhost:7207";
- // token di auth
- string commToken = "91f4fec6-7e9c-4130-9df2-702d729ccdd3";
+ // token di auth nostro
+ //string commToken = "e7a81d7a-6fb4-412e-b361-cac7dda517d6";
+ string commToken = "79840ba7-00c1-407f-8372-5b60238c04fa";
#else
// Indirizzo server (RELEASE)
string servAddr = "magman.egalware.com";
@@ -47,7 +51,7 @@ namespace DemoApp
string esito = servOk ? "OK" : "KO";
Console.WriteLine($"Esito controllo server: {esito}");
// se richiesto eseguo tutto sennò salto
- if (execTop)
+ if (testSync)
{
Console.WriteLine("Premere un tasto per lettura archivio materiali");
@@ -198,47 +202,50 @@ namespace DemoApp
var resAliasSend = commLib.AliasSend(alias2send);
}
- // carico dal DB primi 50 rec e li invio 10 alla volta...
- LogMachineController lmc = new LogMachineController();
- int num2send = 2000;
- int batchSize = 100;
- int numSent = 0;
-
- MagmanController mContr = new MagmanController(servAddr, commToken);
-
- // sistemo proj x sync online
- var syncRes = mContr.ProjAllSyncro();
- // sistemo dati mancanti...
- lmc.TryFixProjCloudId();
-
- var recList = lmc.GetUnsentAsc(num2send);
- // ciclo!
- while (numSent < num2send)
+ if (testDbLog)
{
- var currList = recList
- .Skip(numSent)
- .Take(batchSize)
- .ToList();
- // converto il blocco
- var listDto = currList
- .Select(x => LogMachineController.ConvToItemDto(x))
- .ToList();
- // invio!
- var res = await commLib.LogMachineSendAsync(listDto);
- if (res)
+ // carico dal DB primi 2000 rec e li invio 100 alla volta...
+ LogMachineController lmc = new LogMachineController();
+ int num2send = 2000;
+ int batchSize = 100;
+ int numSent = 0;
+
+ MagmanController mContr = new MagmanController(servAddr, commToken);
+
+ // sistemo proj x sync online
+ var syncRes = mContr.ProjAllSyncro();
+ // sistemo dati mancanti...
+ lmc.TryFixProjCloudId();
+
+ var recList = lmc.GetUnsentAsc(num2send);
+ // ciclo!
+ while (numSent < num2send)
{
- // registro dati inviati...
- lmc.SetDtSent(currList);
- Console.WriteLine($"Inviati {batchSize}rec | {numSent} --> {numSent + batchSize}");
- numSent += batchSize;
- }
- else
- {
- Console.WriteLine($"Errore in invio logMacchina");
+ var currList = recList
+ .Skip(numSent)
+ .Take(batchSize)
+ .ToList();
+ // converto il blocco
+ var listDto = currList
+ .Select(x => LogMachineController.ConvToItemDto(x))
+ .ToList();
+ // invio!
+ var res = await commLib.LogMachineSendAsync(listDto);
+ if (res)
+ {
+ // registro dati inviati...
+ lmc.SetDtSent(currList);
+ Console.WriteLine($"Inviati {batchSize}rec | {numSent} --> {numSent + batchSize}");
+ numSent += batchSize;
+ }
+ else
+ {
+ Console.WriteLine($"Errore in invio logMacchina");
+ }
}
+ Console.WriteLine(sep);
+ Console.WriteLine();
}
- Console.WriteLine(sep);
- Console.WriteLine();
Console.WriteLine("Enter to close");
answ = Console.ReadLine();