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

Merge branch 'release/FixTransportHttps'

Browse Source
This commit is contained in:
Samuele Locatelli
2021-08-23 11:58:04 +02:00
parent 80f0adaf2d b07bf1b64c
commit b33769d6a1
10 changed files with 64 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CVCncLib/CVCncLib.dll
BIN
View File
Binary file not shown.
IOB-WIN-NEXT/DATA/CONF/PIZ03.ini
+1 -1
View File
@@ -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/
IOB-WIN-NEXT/DATA/CONF/PIZ03.json
+3 -3
View File
@@ -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",
IOB-WIN-NEXT/DATA/CONF/PIZ08.ini
+1 -1
View File
@@ -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/
IOB-WIN-NEXT/DATA/CONF/PIZ08.json
+3 -3
View File
@@ -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",
IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+18 -18
View File
@@ -223,24 +223,6 @@
</Compile>
<Compile Include="UAClient.cs" />
<Compile Include="utils.cs" />
<None Include="DATA\CONF\PIZ03.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ08_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ08.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ08.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IobOpcUaClient.Config.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@@ -358,6 +340,24 @@
<None Include="DATA\CONF\IMI_50.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ03_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ08.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ08.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PIZ08_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\TEST.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
IOB-WIN-NEXT/IobConfiguration.cs
+10 -1
View File
@@ -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
/// </summary>
public string MPURL { get; set; } = "";
/// <summary>
/// Indica il metodo di trasporto http/https
/// </summary>
public string TRANSP { get; set; } = "http";
#endregion Public Properties
}
}
IOB-WIN-NEXT/IobGeneric.cs
+26 -28
View File
@@ -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...
IOB-WIN-NEXT/IobMTC.cs
+1 -1
View File
@@ -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)
{
IOB-WIN-NEXT/IobOpcUa.cs
+1 -1
View File
@@ -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)
{