Merge branch 'develop'

This commit is contained in:
Samuele E. Locatelli
2019-12-30 19:55:17 +01:00
2 changed files with 7 additions and 24 deletions
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=149']) {
withEnv(['NEXT_BUILD_NUMBER=151']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'NKC'
+6 -23
View File
@@ -20,31 +20,9 @@ namespace NKC_WF.Controllers
public batchRequest Get()
{
batchRequest answ = new batchRequest();
// in primis: controllo su redis SE HO una richiista CURRENT di processing...
#if false
string redKey = $"{ComLib.currBatchReqKey}";
string redVal = memLayer.ML.getRSV(redKey);
string envNum = redVal;
// se c'è carico "la busta" come ID
if (!string.IsNullOrEmpty(redVal))
{
// cerco in REDIS se ci sia l'item richiesto
redKey = $"{ComLib.redOutPath}:{redVal}";
// leggo da redis la stringa...
redVal = memLayer.ML.getRSV(redKey);
// PROVO a deserializzare...
try
{
answ = JsonConvert.DeserializeObject<batchRequest>(redVal);
// aggiungo LA SUA ENV NUM!!!!
answ.EnvNum = envNum;
}
catch
{ }
}
#endif
string redKey = "";
string redVal = "";
// in primis: controllo su redis SE HO una richiesta CURRENT di processing...
string envNum = ComLib.currBatchReq;
// se c'è carico "la busta" come ID
if (!string.IsNullOrEmpty(envNum))
@@ -63,6 +41,11 @@ namespace NKC_WF.Controllers
catch
{ }
}
// altrimenti NULL!
else
{
answ = null;
}
return answ;
}