diff --git a/DDZUGFeRDService/App.config b/DDZUGFeRDService/App.config index e496d645..91adb3bc 100644 --- a/DDZUGFeRDService/App.config +++ b/DDZUGFeRDService/App.config @@ -37,6 +37,9 @@ False + + 1234567890_EXAMPLE_KEY + diff --git a/DDZUGFeRDService/My Project/AssemblyInfo.vb b/DDZUGFeRDService/My Project/AssemblyInfo.vb index dc3c2d34..aeefacd3 100644 --- a/DDZUGFeRDService/My Project/AssemblyInfo.vb +++ b/DDZUGFeRDService/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/DDZUGFeRDService/My Project/Settings.Designer.vb b/DDZUGFeRDService/My Project/Settings.Designer.vb index 66da4ee7..039b8db7 100644 --- a/DDZUGFeRDService/My Project/Settings.Designer.vb +++ b/DDZUGFeRDService/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -134,6 +134,15 @@ Namespace My Return CType(Me("MSSQL_ENABLED"),Boolean) End Get End Property + + _ + Public ReadOnly Property GDPICTURE_KEY() As String + Get + Return CType(Me("GDPICTURE_KEY"),String) + End Get + End Property End Class End Namespace diff --git a/DDZUGFeRDService/My Project/Settings.settings b/DDZUGFeRDService/My Project/Settings.settings index 05b0c648..2358b177 100644 --- a/DDZUGFeRDService/My Project/Settings.settings +++ b/DDZUGFeRDService/My Project/Settings.settings @@ -29,5 +29,8 @@ False + + 1234567890_EXAMPLE_KEY + \ No newline at end of file diff --git a/DDZUGFeRDService/ThreadRunner.vb b/DDZUGFeRDService/ThreadRunner.vb index f0f570aa..1289e5f1 100644 --- a/DDZUGFeRDService/ThreadRunner.vb +++ b/DDZUGFeRDService/ThreadRunner.vb @@ -27,7 +27,7 @@ Public Class ThreadRunner Private Const TIMER_INTERVAL_MS = 10_000 - Public Sub New(LogConfig As LogConfig, Firebird As Firebird, Optional MSSQL As MSSQLServer = Nothing) + Public Sub New(LogConfig As LogConfig, GDPictureKey As String, Firebird As Firebird, Optional MSSQL As MSSQLServer = Nothing) _logConfig = LogConfig _logger = _logConfig.GetLogger() _firebird = Firebird @@ -37,6 +37,7 @@ Public Class ThreadRunner Dim args As New WorkerArgs() args = LoadFolderConfig(args) args = LoadPropertyMapFor(args, "DEFAULT") + args.GDPictureKey = GDPictureKey ' Use MSSQL Server if available If Not IsNothing(_mssql) Then diff --git a/DDZUGFeRDService/ZUGFeRDService.vb b/DDZUGFeRDService/ZUGFeRDService.vb index eb7070ca..cdf5aa3e 100644 --- a/DDZUGFeRDService/ZUGFeRDService.vb +++ b/DDZUGFeRDService/ZUGFeRDService.vb @@ -24,6 +24,7 @@ Public Class ZUGFeRDService Dim oJobInterval As Integer = My.Settings.JOB_INTERVAL Dim oMSSQLConnectionString As String = My.Settings.MSSQL_CONNECTIONSTRING Dim oMSSQLEnabled As Boolean = My.Settings.MSSQL_ENABLED + Dim oGDPictureKey As String = My.Settings.GDPICTURE_KEY _firebird = New Firebird(_logConfig, oDataSource, oDatabase, oUser, oPassword) @@ -37,7 +38,7 @@ Public Class ZUGFeRDService End If Try - _threadRunner = New ThreadRunner(_logConfig, _firebird, _mssql) + _threadRunner = New ThreadRunner(_logConfig, oGDPictureKey, _firebird, _mssql) _threadRunner.Start(oJobInterval) Catch ex As Exception _logger.Error(ex)