diff --git a/CVCncLib/CVCncLib.dll b/CVCncLib/CVCncLib.dll index f3a876fe..fa1d7911 100644 Binary files a/CVCncLib/CVCncLib.dll and b/CVCncLib/CVCncLib.dll differ diff --git a/IOB-WIN-NEXT/DATA/CONF/PIZ03.ini b/IOB-WIN-NEXT/DATA/CONF/PIZ03.ini index 234c7957..80985a66 100644 --- a/IOB-WIN-NEXT/DATA/CONF/PIZ03.ini +++ b/IOB-WIN-NEXT/DATA/CONF/PIZ03.ini @@ -16,7 +16,7 @@ SLOT=0 [SERVER] ;MPIP=https://localhost:44339 -MPIP=http://gwms.egalware.com +MPIP=https://gwms.egalware.com MPURL=/api CMDBASE=/IOB/input/ CMDFLOG=/IOB/flog/ diff --git a/IOB-WIN-NEXT/DATA/CONF/PIZ03.json b/IOB-WIN-NEXT/DATA/CONF/PIZ03.json index b325a67f..a28052db 100644 --- a/IOB-WIN-NEXT/DATA/CONF/PIZ03.json +++ b/IOB-WIN-NEXT/DATA/CONF/PIZ03.json @@ -67,9 +67,9 @@ "period": 60, "factor": 1 }, - "TE04": { + "Temp01": { "name": "TE04", - "description": "Temperatura Cavitazione Pompa A", + "description": "Temperatura Torcia Aria Fredda", "memAddr": "DB85.DBB12", "tipoMem": "Real", "index": 12, @@ -122,7 +122,7 @@ "period": 60, "factor": 1 }, - "TT17": { + "Temp02": { "name": "TT17", "description": "Temperatura Spurgo Torcia Serbatoio", "memAddr": "DB85.DBB36", diff --git a/IOB-WIN-NEXT/DATA/CONF/PIZ08.ini b/IOB-WIN-NEXT/DATA/CONF/PIZ08.ini index be8fd4eb..7904e679 100644 --- a/IOB-WIN-NEXT/DATA/CONF/PIZ08.ini +++ b/IOB-WIN-NEXT/DATA/CONF/PIZ08.ini @@ -16,7 +16,7 @@ SLOT=0 [SERVER] ;MPIP=https://localhost:44339 -MPIP=http://gwms.egalware.com +MPIP=https://gwms.egalware.com MPURL=/api CMDBASE=/IOB/input/ CMDFLOG=/IOB/flog/ diff --git a/IOB-WIN-NEXT/DATA/CONF/PIZ08.json b/IOB-WIN-NEXT/DATA/CONF/PIZ08.json index b325a67f..a28052db 100644 --- a/IOB-WIN-NEXT/DATA/CONF/PIZ08.json +++ b/IOB-WIN-NEXT/DATA/CONF/PIZ08.json @@ -67,9 +67,9 @@ "period": 60, "factor": 1 }, - "TE04": { + "Temp01": { "name": "TE04", - "description": "Temperatura Cavitazione Pompa A", + "description": "Temperatura Torcia Aria Fredda", "memAddr": "DB85.DBB12", "tipoMem": "Real", "index": 12, @@ -122,7 +122,7 @@ "period": 60, "factor": 1 }, - "TT17": { + "Temp02": { "name": "TT17", "description": "Temperatura Spurgo Torcia Serbatoio", "memAddr": "DB85.DBB36", diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index 7c147ad9..897e6301 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -223,24 +223,6 @@ - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - Always @@ -358,6 +340,24 @@ Always + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always diff --git a/IOB-WIN-NEXT/IobConfiguration.cs b/IOB-WIN-NEXT/IobConfiguration.cs index 895b5dd7..a79c864b 100644 --- a/IOB-WIN-NEXT/IobConfiguration.cs +++ b/IOB-WIN-NEXT/IobConfiguration.cs @@ -150,7 +150,11 @@ namespace IOB_WIN_NEXT { if (!string.IsNullOrEmpty(MPIP_)) { - MPIP = MPIP_.Replace("http://", ""); // tolgo http... + if (MPIP_.StartsWith("https://")) + { + TRANSP = "https"; + } + MPIP = MPIP_.Replace($"{TRANSP}://", ""); // tolgo http/https... } MPURL = MPURL_; CMDBASE = CMDBASE_; @@ -241,6 +245,11 @@ namespace IOB_WIN_NEXT /// public string MPURL { get; set; } = ""; + /// + /// Indica il metodo di trasporto http/https + /// + public string TRANSP { get; set; } = "http"; + #endregion Public Properties } } \ No newline at end of file diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs index d18da6e3..22155326 100644 --- a/IOB-WIN-NEXT/IobGeneric.cs +++ b/IOB-WIN-NEXT/IobGeneric.cs @@ -536,7 +536,7 @@ namespace IOB_WIN_NEXT address = IPAddress.Loopback; int maxRetry = maxPingRetry + 1; int numRetry = 1; ; - string ipAdrr = cIobConf.serverData.MPIP.Replace("http://", "").Replace("https://", ""); + string ipAdrr = cIobConf.serverData.MPIP.Replace($"{cIobConf.serverData.TRANSP}://", ""); IPAddress.TryParse(ipAdrr, out address); try { @@ -1195,7 +1195,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = string.Format(@"http://{0}{1}{2}/savePzCountInc/{3}?qty=", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/savePzCountInc/{cIobConf.codIOB}?qty="; } catch (Exception exc) { @@ -1212,7 +1212,7 @@ namespace IOB_WIN_NEXT { get { - return string.Format(@"http://{0}{1}{2}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE); + return $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}"; } } @@ -1223,7 +1223,7 @@ namespace IOB_WIN_NEXT { get { - string answ = $"http://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMD_FORCLE_SPLIT_ODL}{cIobConf.codIOB}?doConfirm=true&qtyFromLast=true&roundStep=500"; + string answ = $"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMD_FORCLE_SPLIT_ODL}{cIobConf.codIOB}?doConfirm=true&qtyFromLast=true&roundStep=500"; // se richiesto inviare Key Richiesta --> accodo! if (sendKeyRichiesta) { @@ -1243,7 +1243,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = string.Format(@"http://{0}{1}{2}/getCurrODL/{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/getCurrODL/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -1263,7 +1263,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = string.Format(@"http://{0}{1}{2}/getObjItems2Write/{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/getObjItems2Write/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -1283,7 +1283,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = $@"http://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/getCounter/{cIobConf.codIOB}"; + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/getCounter/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -1303,7 +1303,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = $@"http://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/getCounterTCRec/{cIobConf.codIOB}"; + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/getCounterTCRec/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -1323,7 +1323,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = string.Format(@"http://{0}{1}{2}/getTask2Exe/{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/getTask2Exe/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -1340,7 +1340,7 @@ namespace IOB_WIN_NEXT { get { - return string.Format(@"http://{0}{1}{2}{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMD_IDLE_TIME, cIobConf.codIOB); + return $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMD_IDLE_TIME}{cIobConf.codIOB}"; } } @@ -1351,7 +1351,7 @@ namespace IOB_WIN_NEXT { get { - return string.Format(@"http://{0}{1}{2}{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMD_ODL_STARTED, cIobConf.codIOB); + return $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMD_ODL_STARTED}{cIobConf.codIOB}"; } } @@ -1362,7 +1362,7 @@ namespace IOB_WIN_NEXT { get { - return string.Format(@"http://{0}{1}{2}{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDENABLED, cIobConf.codIOB); + return $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDENABLED}{cIobConf.codIOB}"; } } @@ -1376,11 +1376,11 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = string.Format(@"http://{0}{1}{2}{3}&mac={4}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDREBO, cIobConf.codIOB, GetMACAddress()); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDREBO}{cIobConf.codIOB}&mac={GetMACAddress()}"; } catch { - answ = string.Format(@"http://{0}{1}{2}{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDREBO, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDREBO}{cIobConf.codIOB}"; } return answ; } @@ -1396,7 +1396,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = string.Format(@"http://{0}{1}{2}/remTask2Exe/{3}?taskName=", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/remTask2Exe/{cIobConf.codIOB}?taskName="; } catch (Exception exc) { @@ -1417,8 +1417,7 @@ namespace IOB_WIN_NEXT try { string machineName = Environment.MachineName; - string apiCall = "setObjItems"; - answ = string.Format(@"http://{0}{1}{2}/{3}/{4}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, apiCall, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/setObjItems/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -1439,7 +1438,7 @@ namespace IOB_WIN_NEXT try { string machineName = Environment.MachineName; - answ = string.Format(@"http://{0}{1}{2}/saveConf/{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/saveConf/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -1459,7 +1458,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = string.Format(@"http://{0}{1}{2}/sendAlarmBankUpdate/{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/sendAlarmBankUpdate/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -1480,7 +1479,7 @@ namespace IOB_WIN_NEXT try { string machineName = Environment.MachineName; - answ = string.Format(@"http://{0}{1}{2}/setM2IOB/{3}?IOB_name={4}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB, machineName); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/setM2IOB/{cIobConf.codIOB}?IOB_name={machineName}"; } catch (Exception exc) { @@ -1500,7 +1499,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = string.Format(@"http://{0}{1}{2}/addOptPar/{3}?", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/addOptPar/{cIobConf.codIOB}?"; } catch (Exception exc) { @@ -1520,7 +1519,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = $@"http://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/setCounter/{cIobConf.codIOB}?counter="; + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/setCounter/{cIobConf.codIOB}?counter="; } catch (Exception exc) { @@ -1540,7 +1539,7 @@ namespace IOB_WIN_NEXT string answ = ""; try { - answ = $@"http://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/setCounter/MAC_{cIobConf.codIOB}?counter="; + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/setCounter/MAC_{cIobConf.codIOB}?counter="; } catch (Exception exc) { @@ -1561,8 +1560,7 @@ namespace IOB_WIN_NEXT try { string machineName = Environment.MachineName; - string apiCall = "upsertObjItems"; - answ = string.Format(@"http://{0}{1}{2}/{3}/{4}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, apiCall, cIobConf.codIOB); + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/upsertObjItems/{cIobConf.codIOB}"; } catch (Exception exc) { @@ -5006,7 +5004,7 @@ namespace IOB_WIN_NEXT // verifico la parte di link "tipoComando" string tipoComando = tipoUrl == urlType.FLog ? cIobConf.serverData.CMDFLOG_JSON : cIobConf.serverData.CMDBASE_JSON; // URL base x input - string answ = string.Format(@"http://{0}{1}{2}{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, tipoComando, cIobConf.codIOB); + string answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{tipoComando}{cIobConf.codIOB}"; return answ; } @@ -5018,7 +5016,7 @@ namespace IOB_WIN_NEXT public string urlFLog(string queueVal) { // URL base x input - string answ = string.Format(@"http://{0}{1}{2}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDFLOG); + string answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDFLOG}"; // decodifica valore! string[] valori = qDecodeIN(queueVal); // aggiungo macchina e valore... @@ -5036,7 +5034,7 @@ namespace IOB_WIN_NEXT public string urlInput(string queueVal) { // URL base x input - string answ = string.Format(@"http://{0}{1}{2}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDBASE); + string answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDBASE}"; // decodifica valore! string[] valori = qDecodeIN(queueVal); // aggiungo macchina e valore... diff --git a/IOB-WIN-NEXT/IobMTC.cs b/IOB-WIN-NEXT/IobMTC.cs index bdd86066..c7286912 100644 --- a/IOB-WIN-NEXT/IobMTC.cs +++ b/IOB-WIN-NEXT/IobMTC.cs @@ -165,7 +165,7 @@ namespace IOB_WIN_NEXT try { string machineName = Environment.MachineName; - answ = $@"http://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/saveDataItems/{cIobConf.codIOB}"; + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/saveDataItems/{cIobConf.codIOB}"; } catch (Exception exc) { diff --git a/IOB-WIN-NEXT/IobOpcUa.cs b/IOB-WIN-NEXT/IobOpcUa.cs index 0a27201d..526cee7c 100644 --- a/IOB-WIN-NEXT/IobOpcUa.cs +++ b/IOB-WIN-NEXT/IobOpcUa.cs @@ -202,7 +202,7 @@ namespace IOB_WIN_NEXT try { string machineName = Environment.MachineName; - answ = $@"http://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/saveDataItems/{cIobConf.codIOB}"; + answ = $@"{cIobConf.serverData.TRANSP}://{cIobConf.serverData.MPIP}{cIobConf.serverData.MPURL}{cIobConf.serverData.CMDALIVE}/saveDataItems/{cIobConf.codIOB}"; } catch (Exception exc) {