diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll
index 430d1770..9f2698bc 100644
Binary files a/CVCncLib/testSam.dll and b/CVCncLib/testSam.dll differ
diff --git a/IOB-WIN/MainForm.cs b/IOB-WIN/MainForm.cs
index 9e2e33dc..fc998003 100644
--- a/IOB-WIN/MainForm.cs
+++ b/IOB-WIN/MainForm.cs
@@ -202,6 +202,33 @@ namespace IOB_WIN
}
}
///
+ /// URL per recuperare i file dell'IOB (SENZA IOB)
+ ///
+ protected string urlDownloadFile
+ {
+ get
+ {
+ string answ = "";
+ try
+ {
+ answ = string.Format(@"http://{0}{1}/IOB/getFiles/", MPIP, MPURL);
+ }
+ catch
+ { }
+ return answ;
+ }
+ }
+ ///
+ /// URL per recuperare i file dell'IOB su CLOUD (SENZA IOB)
+ ///
+ protected string urlDownloadFileCloud
+ {
+ get
+ {
+ return @"http://seriate.steamware.net:8083/MP/IO/IOB/getFiles/";
+ }
+ }
+ ///
/// URL per salvare i file dell'IOB (SENZA IOB)
///
protected string urlUploadFile
@@ -219,13 +246,13 @@ namespace IOB_WIN
}
}
///
- /// URL per salvare i file dell'IOB su CLOUD (seriate) (SENZA IOB)
+ /// URL per salvare i file dell'IOB su CLOUD (SENZA IOB)
///
protected string urlUploadFileCloud
{
get
{
- return @"http://seriate.steamware.net:8082/MP/IO/IOB/uploadFile/";
+ return @"http://seriate.steamware.net:8083/MP/IO/IOB/uploadFile/";
}
}
///
@@ -652,7 +679,7 @@ namespace IOB_WIN
string answ = "";
smallFile currFile = null;
string fileContent = "";
- // ciclo su IOB aperti// avvio child richiesti...
+ // ciclo su IOB configurati
foreach (var currIob in IOB2START)
{
fileEmbed objFiles = new fileEmbed();
@@ -692,8 +719,31 @@ namespace IOB_WIN
}
private void downloadIOBConfToolStripMenuItem_Click(object sender, EventArgs e)
{
- // !!!FARE!!!
// download da su server di TUTTI i file CONF delle IOB
+
+ // ciclo su IOB configurati
+ foreach (var currIob in IOB2START)
+ {
+ fileEmbed objFiles = new fileEmbed();
+ string rawData = "";
+ if (utils.CRB("ConfToCloud"))
+ {
+ // invio su cloud...
+ rawData = utils.callUrl($"{urlDownloadFileCloud}{currIob}");
+ }
+ else
+ {
+ // invio in locale!
+ rawData = utils.callUrl($"{urlDownloadFile}{currIob}");
+ }
+ // deserializzo
+ objFiles = JsonConvert.DeserializeObject(rawData);
+ // salvo!
+ foreach (var item in objFiles.fileList)
+ {
+ fileMover.obj.salvaFileString(utils.confDir, item.fileName, item.content);
+ }
+ }
}
private void sendIOBAssignmentsToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/Jenkinsfile b/Jenkinsfile
index 27fe1098..f93eb771 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=496']) {
+ withEnv(['NEXT_BUILD_NUMBER=497']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'