diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 62556098..25929d8c 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 8bbdd73c..a70f98fd 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("3.2.1")] +[assembly: AssemblyInformationalVersion("3.2.2")] [assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index d40e2672..c1ad8c62 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.1.*")] +[assembly: AssemblyVersion("3.2.2.*")] diff --git a/nsw/Source/bsmd.herberg.FormService/FormService.cs b/nsw/Source/bsmd.herberg.FormService/FormService.cs index f8fcc53a..a0911b6f 100644 --- a/nsw/Source/bsmd.herberg.FormService/FormService.cs +++ b/nsw/Source/bsmd.herberg.FormService/FormService.cs @@ -1,19 +1,18 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Diagnostics; -using System.Linq; using System.IO; using System.ServiceProcess; -using System.Text; using System.Timers; -using System.Threading.Tasks; + using log4net; using bsmd.database; using bsmd.herberg.FormService.WebReference; +// temporary +using System.Security.Cryptography.X509Certificates; +using System.Net.Security; + namespace bsmd.herberg.FormService { public partial class FormService : ServiceBase @@ -39,6 +38,7 @@ namespace bsmd.herberg.FormService FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location); string version = fvi.FileVersion; this._log.InfoFormat("Starting EU-NOAD FormService. v.{0}", version); + this.DoOnce(); } @@ -58,9 +58,19 @@ namespace bsmd.herberg.FormService public void DoOnce() { + this.IgnoreSSLCertificate(); this._timer_Elapsed(null, null); } + private void IgnoreSSLCertificate() + { + System.Net.ServicePointManager.ServerCertificateValidationCallback = delegate (object sender, X509Certificate certificate, + X509Chain chain, SslPolicyErrors sslPolicyErrors) + { + return true; + }; + } + void _timer_Elapsed(object sender, ElapsedEventArgs e) { lock (this._timerlock)