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

altre modifiche x invio email interno...

Browse Source
This commit is contained in:
Samuele Locatelli
2017-03-16 10:03:16 +01:00
parent 6d957714c0
commit 34bb1a889f
6 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XPST/Properties/PublishProfiles/EQUA.pubxml
+9 -8
View File
@@ -9,10 +9,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<ExcludeApp_Data>True</ExcludeApp_Data>
<DesktopBuildPackageLocation>C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\Release Clienti\XPST.zip</DesktopBuildPackageLocation>
<PackageAsSingleFile>true</PackageAsSingleFile>
@@ -22,21 +18,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<ObjectGroup Name="XPS_data.Properties.Settings.Equa_AnagraficaConnectionString" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_AnagraficaConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
<Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="XPS_data.Properties.Settings.Equa_XPSConnectionString" Order="2" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_XPS_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_XPSConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_XPS_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
<Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="XPS_data.Properties.Settings.si_dt30ConnectionString" Order="3" Enabled="False">
@@ -51,6 +47,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)XPS_data.Properties.Settings.Equa_AnagraficaConnectionString-Web.config Connection String" />
XPST/Properties/PublishProfiles/IIS02.pubxml
+12 -7
View File
@@ -16,28 +16,28 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>steamwarewin\administrator</UserName>
<UserName>jenkins</UserName>
<_SavePWD>True</_SavePWD>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="XPS_data.Properties.Settings.Equa_AnagraficaConnectionString" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_AnagraficaConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
<Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="XPS_data.Properties.Settings.Equa_XPSConnectionString" Order="2" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_XPS_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_XPSConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_XPS_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
<Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="XPS_data.Properties.Settings.si_dt30ConnectionString" Order="3" Enabled="False">
@@ -53,14 +53,19 @@ by editing this MSBuild file. In order to learn more about this please visit htt
</Objects>
</PublishDatabaseSettings>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)XPS_data.Properties.Settings.Equa_AnagraficaConnectionString-Web.config Connection String" />
<MSDeployParameterValue Include="$(DeployParameterPrefix)XPS_data.Properties.Settings.Equa_XPSConnectionString-Web.config Connection String" />
<MSDeployParameterValue Include="$(DeployParameterPrefix)XPS_data.Properties.Settings.Equa_AnagraficaConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
<MSDeployParameterValue Include="$(DeployParameterPrefix)XPS_data.Properties.Settings.Equa_XPSConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
<MSDeployParameterValue Include="$(DeployParameterPrefix)XPS_data.Properties.Settings.si_dt30ConnectionString-Web.config Connection String" />
</ItemGroup>
</Project>
XPST/Properties/PublishProfiles/IIS02.pubxml.user
+1 -1
View File
@@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile>2012-12-21T10:14:32.4948710+01:00</TimeStampOfAssociatedLegacyPublishXmlFile>
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA/bYFd3Gxq0iucbk2ZdN5XwAAAAACAAAAAAADZgAAwAAAABAAAAC/t9Ar6cUWKrivkr9iSVWcAAAAAASAAACgAAAAEAAAADJL/FO/2u+COpTP41fYxTsYAAAA3K+gj2M8Xq2g/ifwl9FPkzTnUTCfyvS8FAAAADGl+pr+jflOweZxTAAej3xlMbA4</EncryptedPassword>
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAgepbcUjBsk6qZB2yYjIK1QAAAAACAAAAAAADZgAAwAAAABAAAABN4RwDSavo32/Gtfqf9jCLAAAAAASAAACgAAAAEAAAAIcgS3Q/xtyYdikT3SZWw5IYAAAAH5FIDK3h0USKi0yl3F4EBsBxBR1LVfRoFAAAAMaGv7QzR8tVIJRhQum7VWIUZJDV</EncryptedPassword>
</PropertyGroup>
</Project>
XPST/Web.EQUA.config
+1
View File
@@ -17,6 +17,7 @@
<appSettings>
<add key="authSite" value="http://192.168.0.201/Equa_Auth/" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="currSite" value="http://192.168.0.201/XPST/" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="mainSite" value="http://192.168.0.201/XPS/" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_logLevel" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_forcedDestEmail" value="equa@fosfatazione.it" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_adminEmail" value="michelangelo@fosfatazione.it" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
XPST/Web.config
+1
View File
@@ -120,6 +120,7 @@
<add key="cookieDayExp" value="365"/>
<add key="authSite" value="http://IIS02/Equa_Auth/"/>
<add key="currSite" value="http://IIS02/XPST/"/>
<add key="mainSite" value="http://IIS02/XPS/"/>
<!--gestione button-->
<add key="autoConfCmd" value="true"/>
<!--gestione pagina-->
XPST/WebUserControls/mod_btnComandi.ascx.cs
+1 -1
View File
@@ -275,7 +275,7 @@ namespace XPST.WebUserControls
{
DS_applicazione.v_commesseRow rigaComm= XPS.obj.taComm.getByCod(comando.valore)[0];
subject += string.Format(" | cliente: {0}", rigaComm.Cliente);
bodyMsg += string.Format("<br/><br/><a href \"{0}\\detComm?CodDDT={1}\">Link diretto al DDT {2} - {3}</a>", memLayer.ML.CRS("currSite"), rigaComm.Cod, rigaComm.DDT, rigaComm.descrizione);
bodyMsg += string.Format("<br/><br/><a href \"{0}\\detComm?CodDDT={1}\">Link diretto al DDT {2} - {3}</a>", memLayer.ML.CRS("mainSite"), rigaComm.Cod, rigaComm.DDT, rigaComm.descrizione);
}
// invio email!
bool fatto = gestEmail.geAuth.mandaEmail(memLayer.ML.confReadString("_emailUser"), emailDest, subject, bodyMsg);