Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/ModConfUpload01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-10-22 15:18:34 +02:00
parent 7b7a34eea7 14305fd85b
commit e976ddf0c6
5 changed files with 34 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/App.config
+1 -1
View File
@@ -94,7 +94,7 @@
<add key="MMapR" value="MMapR.map" />
<add key="MMapW" value="MMapW.map" />
<add key="AUpdAsAdm" value="true" />
<add key="ConfToCloud" value="true" />
<add key="ConfToCloud" value="false" />
<add key="CacheConfToCloudDuratHour" value="24" />
<!--logging-->
<add key="recTime" value="true" />
IOB-WIN-NEXT/DATA/CONF/FTP_SONATEST.ini
+4 -4
View File
@@ -6,7 +6,7 @@ PING_MS_TIMEOUT=500
[MACHINE]
VENDOR=TEST_FTP
MODEL=SONATEST_VEO
MODEL=TRUESCALE_FTP
[CNC]
IP=10.74.82.204
@@ -70,7 +70,7 @@ NAME=master
; Tags manuali
[TAGS]
Customer=IMI-Remosa
Customer=SteamWare
HostOS=WIN
HostName=MAPO-SRV-60
HostAddr=192.168.0.12
HostName=IOB-WIN-SIMULA
HostAddr=10.74.82.76
IOB-WIN-NEXT/DATA/CONF/FTP_SONATEST.json
-1
View File
@@ -20,7 +20,6 @@
"LocalDir": "c:\\Steamware\\FTP\\SONATEST"
}
}
]
}
]
IOB-WIN-NEXT/IobNet/Ftp.cs
+1 -1
View File
@@ -290,7 +290,6 @@ namespace IOB_WIN_NEXT.IobNet
// verifico di avere compiti da svolgere...
if (currFtpTaskList != null && currFtpTaskList.ListTask != null && currFtpTaskList.ListTask.Count > 0)
{
string sVal = "";
foreach (var srvFtp in currFtpTaskList.ListTask)
{
// verifico eventuale veto all'esecuzione...
@@ -316,6 +315,7 @@ namespace IOB_WIN_NEXT.IobNet
}
else
{
// FixMe ToDo verificare se necessario...
//connectionOk = false;
//tryDisconnect();
lgError($"Impossibile connettersi al server {srvFtp.ServerAddr}");
IOB-WIN-NEXT/MainForm.cs
+28 -49
View File
@@ -267,6 +267,8 @@ namespace IOB_WIN_NEXT
#region Protected Fields
protected static string baseUrl = @"https://liman.egalware.com/MP/IO/";
/// <summary>
/// Ramo applicazione (x update)
/// </summary>
@@ -359,34 +361,6 @@ namespace IOB_WIN_NEXT
}
}
protected static string baseUrl = @"https://liman.egalware.com/MP/IO/";
//protected static string baseUrl = @"https://seriate.steamware.net:8083/MP/IO/";
/// <summary>
/// URL per recuperare i file dell'IOB su CLOUD (SENZA IOB)
/// </summary>
protected static string urlDownloadFileCloud
{
get
{
return $"{baseUrl}IOB/getFiles/";
//return @"http://seriate.steamware.net:8083/MP/IO/IOB/getFiles/";
}
}
/// <summary>
/// URL per salvare i file dell'IOB su CLOUD (SENZA IOB)
/// </summary>
protected static string urlUploadFileCloud
{
get
{
return $"{baseUrl}IOB/uploadFile/";
//return @"http://seriate.steamware.net:8083/MP/IO/IOB/uploadFile/";
}
}
protected bool pingDisabled
{
get
@@ -410,17 +384,18 @@ namespace IOB_WIN_NEXT
/// URL per recuperare i file dell'IOB (SENZA IOB)
/// </summary>
protected string urlDownloadFile
{
get => $"http://{MPIP}{MPURL}/IOB/getFiles/";
}
/// <summary>
/// URL per recuperare i file dell'IOB su CLOUD (SENZA IOB)
/// </summary>
protected string urlDownloadFileCloud
{
get
{
string answ = "";
try
{
answ = string.Format(@"http://{0}{1}/IOB/getFiles/", MPIP, MPURL);
}
catch
{ }
return answ;
return $"{baseUrl}IOB/getFiles/";
}
}
@@ -467,17 +442,16 @@ namespace IOB_WIN_NEXT
/// </summary>
protected string urlUploadFile
{
get
{
string answ = "";
try
{
answ = string.Format(@"http://{0}{1}/IOB/uploadFile/", MPIP, MPURL);
}
catch
{ }
return answ;
}
get => $"http://{MPIP}{MPURL}/IOB/uploadFile/";
}
/// <summary>
/// URL per salvare i file dell'IOB su CLOUD (SENZA IOB)
/// </summary>
protected string urlUploadFileCloud
{
get => $"{baseUrl}IOB/uploadFile/";
}
#endregion Protected Properties
@@ -1238,7 +1212,7 @@ namespace IOB_WIN_NEXT
redisMan.setRSV(redKey, newMD5, ttlSec);
}
}
// invio solo se encessario
// invio solo se necessario
if (needSend)
{
if (utils.CRB("ConfToCloud"))
@@ -1248,8 +1222,13 @@ namespace IOB_WIN_NEXT
}
else
{
// invio in locale!
// provo invio locale
answ = utils.callUrl($"{urlUploadFile}{currIob}", rawData);
// se va male invio cloud...
if (answ.ToUpper() != "OK")
{
answ = utils.callUrl($"{urlUploadFileCloud}{currIob}", rawData);
}
}
}
}