diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.FileListAbsolute.txt b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.FileListAbsolute.txt index 51a543f..d0b3942 100644 --- a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.FileListAbsolute.txt +++ b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.FileListAbsolute.txt @@ -81,7 +81,6 @@ C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Deb C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\System.Threading.Tasks.Extensions.dll C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\Pipelines.Sockets.Unofficial.dll C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\System.Runtime.InteropServices.RuntimeInformation.dll -C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\netstandard.dll C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\System.Net.Sockets.dll C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\SteamWare.pdb C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\SteamWare.xml @@ -91,7 +90,6 @@ C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Deb C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\NLog.xml C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\StackExchange.Redis.xml C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\Newtonsoft.Json.xml -C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\System.Memory.xml C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\System.Threading.Channels.xml C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\System.Threading.Tasks.Extensions.xml C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\Pipelines.Sockets.Unofficial.xml @@ -100,3 +98,5 @@ C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\obj\Deb C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.csproj.CopyComplete C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.dll C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.pdb +C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +C:\Users\samuele.steamw\Documents\VisualStudioProject\CMS-SC\CMS-SC-Data\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml diff --git a/CMS_SC/Resources/FlagList.map b/CMS_SC/Resources/FlagList.map index 17bd65f..ca3d6f7 100644 --- a/CMS_SC/Resources/FlagList.map +++ b/CMS_SC/Resources/FlagList.map @@ -1,3 +1,3 @@ #Elenco delel associazioni lingua - flag -IT:flag-it -EN:flag-us \ No newline at end of file +IT|flag-it +EN|flag-us \ No newline at end of file diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config index 2b54338..4ee5a4f 100644 --- a/CMS_SC/Web.config +++ b/CMS_SC/Web.config @@ -24,8 +24,6 @@ - - @@ -46,14 +44,7 @@ - - - - - - - diff --git a/CMS_SC/WebUserControls/mod_textTrans.ascx.cs b/CMS_SC/WebUserControls/mod_textTrans.ascx.cs index 92782aa..ec81d51 100644 --- a/CMS_SC/WebUserControls/mod_textTrans.ascx.cs +++ b/CMS_SC/WebUserControls/mod_textTrans.ascx.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using Newtonsoft.Json; using SteamWare; namespace CMS_SC.WebUserControls @@ -20,13 +21,29 @@ namespace CMS_SC.WebUserControls // se trovo da cache restituisco... if (memLayer.ML.isInCacheObject("FlagList.map")) { - answ = (Dictionary)memLayer.ML.objCacheObj("FlagList.map"); + if (memLayer.ML.cacheOnRedis) + { + answ = JsonConvert.DeserializeObject>(memLayer.ML.objCacheObj("FlagList.map").ToString()); + } + else + { + answ = (Dictionary)memLayer.ML.objCacheObj("FlagList.map"); + } } // altrimenti rileggo.... else { - answ= getDictFromFile("FlagList.map"); - memLayer.ML.setCacheVal("FlagList.map", answ); + answ = getDictFromFile("FlagList.map"); + // salvo serializzando se necessario + if (memLayer.ML.cacheOnRedis) + { + string serVal = JsonConvert.SerializeObject(answ); + memLayer.ML.setCacheVal("FlagList.map", serVal, true); + } + else + { + memLayer.ML.setCacheVal("FlagList.map", answ, true); + } } return answ; } @@ -54,7 +71,7 @@ namespace CMS_SC.WebUserControls // se la linea non è commento e non è vuota... if (line.Length > 0 && line[0] != '#') { - string[] tokens = line.Split(':'); + string[] tokens = line.Split('|'); answ.Add(tokens[0], tokens[1]); } } @@ -130,7 +147,7 @@ namespace CMS_SC.WebUserControls } idx++; } - catch(Exception exc) + catch (Exception exc) { logger.lg.scriviLog(exc.ToString(), tipoLog.EXCEPTION); strLenght = 0; diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 093983a..e67982c 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll.config b/CMS_SC/bin/CMS_SC.dll.config index 2b54338..97d62fc 100644 --- a/CMS_SC/bin/CMS_SC.dll.config +++ b/CMS_SC/bin/CMS_SC.dll.config @@ -24,8 +24,7 @@ - - + @@ -46,14 +45,13 @@ - + - diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index 446f167..6ada036 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/Jenkinsfile b/Jenkinsfile index d06c214..c218e45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4259']) { + withEnv(['NEXT_BUILD_NUMBER=4261']) { // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC'