From e3b232158db8dc7b813ca1c9ffe26ac4f8a3e950 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 6 Nov 2019 12:03:41 +0100 Subject: [PATCH] Fix download files --- CVCncLib/testSam.dll | Bin 967680 -> 967680 bytes IOB-WIN/MainForm.cs | 58 ++++++++++++++++++++++++++++++++++++++++--- Jenkinsfile | 2 +- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index 430d17709cce58bf0fb0aa80e2906c8ccda257b9..9f2698bc16c444897eaf27c71a025d3eb1ee095a 100644 GIT binary patch delta 152 zcmZqZux{wEp3uR3Xvv|*?$&O`)^4WOZsyi*mey|8)^4`eZuZu0j@E9@)^4uWZtkt! zJcbJej{5ZGExNnXah0m7la=ze_VzOid4QOA` ziwm`j3^Ab)N`jhcb%uLFnY<^eAwRUxhs>c2hs>c3x6Gjq{0;-FrM;KSunrj{>v=*r zsr-&ks(AvA8eWcs0RR91Lpoelb7gXKTytS + /// 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'