Egalware/SSC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gestione traduzioni (mancava serializzazione in redis x flags)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-06-04 14:30:21 +02:00
parent f5cd102e96
commit 7ca8b5b662
8 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.FileListAbsolute.txt
+2 -2
View File
@@ -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
CMS_SC/Resources/FlagList.map
+2 -2
View File
@@ -1,3 +1,3 @@
#Elenco delel associazioni lingua - flag
IT:flag-it
EN:flag-us
IT|flag-it
EN|flag-us
CMS_SC/Web.config
-9
View File
@@ -24,8 +24,6 @@
<add key="redisDb" value="8" />
<add key="cacheOnRedis" value="true" />
<!--Impostazione gestione serializzazione variabili in sessione (es per Redis)-->
<add key="serializeSession" value="true" />
<add key="disable_singleton" value="true" />
<add key="errorPageRedirect" value="./Reset?Action=CDV" />
<add key="maxAgeAppConf_min" value="15" />
<add key="SC_RedEnab" value="true" />
@@ -46,14 +44,7 @@
<!--area auth-->
<add key="authSenzaDominio" value="true" />
<add key="autoEnrollEnabled" value="false" />
<add key="SuperAdminRole" value="SuperAdmin" />
<add key="CapoOfficinaRole" value="CapoOfficina" />
<add key="CapoGruppo" value="CapoOfficina" />
<add key="DerogaRole" value="Deroga" />
<add key="AnagAdminRole" value="CqSetSC" />
<add key="CollaudatoreRole" value="User" />
<!--gestione auth dispositivi-->
<add key="AuthCookieName" value="AuthDeviceCMS_SC" />
<add key="defaultDomain" value="steamwarewin" />
<add key="enablePlain" value="true" />
<add key="urlGestUtenti" value="UserAdmin" />
CMS_SC/WebUserControls/mod_textTrans.ascx.cs
+22 -5
View File
@@ -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<string, string>)memLayer.ML.objCacheObj("FlagList.map");
if (memLayer.ML.cacheOnRedis)
{
answ = JsonConvert.DeserializeObject<Dictionary<string, string>>(memLayer.ML.objCacheObj("FlagList.map").ToString());
}
else
{
answ = (Dictionary<string, string>)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;
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/CMS_SC.dll.config
+3 -5
View File
@@ -24,8 +24,7 @@
<add key="redisDb" value="8" />
<add key="cacheOnRedis" value="true" />
<!--Impostazione gestione serializzazione variabili in sessione (es per Redis)-->
<add key="serializeSession" value="true" />
<add key="disable_singleton" value="true" />
<!--<add key="serializeSession" value="true" />-->
<add key="errorPageRedirect" value="./Reset?Action=CDV" />
<add key="maxAgeAppConf_min" value="15" />
<add key="SC_RedEnab" value="true" />
@@ -46,14 +45,13 @@
<!--area auth-->
<add key="authSenzaDominio" value="true" />
<add key="autoEnrollEnabled" value="false" />
<add key="SuperAdminRole" value="SuperAdmin" />
<!--<add key="SuperAdminRole" value="SuperAdmin" />
<add key="CapoOfficinaRole" value="CapoOfficina" />
<add key="CapoGruppo" value="CapoOfficina" />
<add key="DerogaRole" value="Deroga" />
<add key="AnagAdminRole" value="CqSetSC" />
<add key="CollaudatoreRole" value="User" />
<add key="CollaudatoreRole" value="User" />-->
<!--gestione auth dispositivi-->
<add key="AuthCookieName" value="AuthDeviceCMS_SC" />
<add key="defaultDomain" value="steamwarewin" />
<add key="enablePlain" value="true" />
<add key="urlGestUtenti" value="UserAdmin" />
CMS_SC/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'