Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into Donati

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-11-21 11:29:41 +01:00
parent 271447935e eb968b72da
commit d82aba92b9
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=636']) {
withEnv(['NEXT_BUILD_NUMBER=637']) {
// env.versionNumber = VersionNumber(versionNumberString : '4.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '4.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP/Controllers/HomeController.cs
+7 -11
View File
@@ -29,18 +29,14 @@ namespace MP.Controllers
ViewBag.UrlMpMON = ctx.stp_AKV_getByKey("UrlMpMON").ToList<AnagKeyValue>()[0].valString;
ViewBag.UrlMpTAB = ctx.stp_AKV_getByKey("UrlMpTAB").ToList<AnagKeyValue>()[0].valString;
}
catch
catch(Exception exc)
{
ViewBag.UrlMpSite = "../MP/SITE";
ViewBag.UrlMpAdmin = "../MP/ADM";
ViewBag.UrlMpIO = "../MP/IO";
ViewBag.UrlMpMON = "../MP/MON";
ViewBag.UrlMpTAB = "../MP/TAB";
//ViewBag.UrlMpSite = "../SITE";
//ViewBag.UrlMpAdmin = "../ADM";
//ViewBag.UrlMpIO = "../IO";
//ViewBag.UrlMpMON = "../MON";
//ViewBag.UrlMpTAB = "../TAB";
logger.lg.scriviLog(string.Format("Eccezione in composizione HOME page LAND:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
ViewBag.UrlMpSite = WebConfigurationManager.AppSettings["UrlMpSite"];//"../MP/SITE";
ViewBag.UrlMpAdmin = WebConfigurationManager.AppSettings["UrlMpAdmin"];//"../MP/ADM";
ViewBag.UrlMpIO = WebConfigurationManager.AppSettings["UrlMpIO"];//"../MP/IO";
ViewBag.UrlMpMON = WebConfigurationManager.AppSettings["UrlMpMON"];//"../MP/MON";
ViewBag.UrlMpTAB = WebConfigurationManager.AppSettings["UrlMpTAB"];//"../MP/TAB";
}
}
return View();
MP/Web.Jetco.config
+5
View File
@@ -4,6 +4,11 @@
<appSettings>
<add key="appVers" value="Jetco" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="Environment" value="Jetco - Prod" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="UrlMpSite" value="../SITE" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="UrlMpAdmin" value="../ADM" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="UrlMpIO" value="../IO" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="UrlMpMON" value="../MON" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="UrlMpTAB" value="../TAB" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_smtpCli" value="smtp.gmail.com" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_emailUser" value="steamwarebot@gmail.com" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_emailPwd" value="drmfsls16" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
MP/Web.config
+6
View File
@@ -24,6 +24,12 @@
<add key="UpdateToDefault" value="true" />
<add key="refreshShort" value="50000" />
<add key="refreshLong" value="300000" />
<!--URL se DB non andasse..-->
<add key="UrlMpSite" value="../MP/SITE" />
<add key="UrlMpAdmin" value="../MP/ADM" />
<add key="UrlMpIO" value="../MP/IO" />
<add key="UrlMpMON" value="../MP/MON" />
<add key="UrlMpTAB" value="../MP/TAB" />
<!--gestione timeout "esteso" x chiamate SQL critiche, in secondi -->
<add key="sqlLongCommandTimeout" value="600" />
<!--conf base-->