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

Ok init con salvataggio memoria + parametri

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-11-11 16:07:03 +01:00
parent aa59ee74db
commit d55cc2efa3
4 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IOB-WIN.csproj
+2 -2
View File
@@ -83,8 +83,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>ExtLib\krcc.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.8.1911.1252, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.8.1911.1252\lib\net40\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.8.1911.1256, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.8.1911.1256\lib\net40\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
IOB-WIN/IobGeneric.cs
+50 -2
View File
@@ -651,9 +651,37 @@ namespace IOB_WIN
// infine se obj memoria valido salvo in MP-IO x sue applicazioni
if (memMap != null)
{
// invio su cloud...
// invio su cloud conf memoria...
string rawData = JsonConvert.SerializeObject(memMap);
utils.callUrl($"{urlSaveMemMap}", rawData);
// salvo ANCHE come parametri i valori...
objItem currItem = new objItem();
List<objItem> allParam = new List<objItem>();
// valori WRITE
foreach (var item in memMap.mMapWrite)
{
currItem = new objItem()
{
uid = item.Value.name,
name = !string.IsNullOrEmpty(item.Value.description) ? item.Value.description : item.Value.name,
writable = true
};
allParam.Add(currItem);
}
// valori READ
foreach (var item in memMap.mMapRead)
{
currItem = new objItem()
{
uid = item.Value.name,
name = !string.IsNullOrEmpty(item.Value.description) ? item.Value.description : item.Value.name,
writable = false
};
allParam.Add(currItem);
}
// invio su cloud parametri!
rawData = JsonConvert.SerializeObject(allParam);
utils.callUrl($"{urlSaveAllParams}", rawData);
}
}
catch (Exception exc)
@@ -2146,7 +2174,27 @@ namespace IOB_WIN
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, machineName);
answ = string.Format(@"http://{0}{1}{2}/saveConf/{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB);
}
catch (Exception exc)
{
lgError(exc, "Errore in composizione urlSaveMemConf");
}
return answ;
}
}
/// <summary>
/// URL per salvataggio dati PARAMETRI IOB...
/// </summary>
public string urlSaveAllParams
{
get
{
string answ = "";
try
{
string machineName = Environment.MachineName;
answ = string.Format(@"http://{0}{1}{2}/upsertObjItems/{3}", cIobConf.serverData.MPIP, cIobConf.serverData.MPURL, cIobConf.serverData.CMDALIVE, cIobConf.codIOB);
}
catch (Exception exc)
{
IOB-WIN/packages.config
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autoupdater.NET.Official" version="1.5.1" targetFramework="net40-client" />
<package id="MapoSDK" version="6.8.1911.1252" targetFramework="net40-client" />
<package id="MapoSDK" version="6.8.1911.1256" targetFramework="net40-client" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40-client" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40-client" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40-client" />
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=507']) {
withEnv(['NEXT_BUILD_NUMBER=508']) {
// 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'