DDZUGFeRDSErvice: Version 1.1.0.0
This commit is contained in:
parent
204151b78c
commit
0c8a4fb8e3
@ -37,6 +37,9 @@
|
|||||||
<setting name="MSSQL_ENABLED" serializeAs="String">
|
<setting name="MSSQL_ENABLED" serializeAs="String">
|
||||||
<value>False</value>
|
<value>False</value>
|
||||||
</setting>
|
</setting>
|
||||||
|
<setting name="GDPICTURE_KEY" serializeAs="String">
|
||||||
|
<value>1234567890_EXAMPLE_KEY</value>
|
||||||
|
</setting>
|
||||||
</DDZUGFeRDService.My.MySettings>
|
</DDZUGFeRDService.My.MySettings>
|
||||||
</applicationSettings>
|
</applicationSettings>
|
||||||
<system.data>
|
<system.data>
|
||||||
|
|||||||
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.0.0.0")>
|
<Assembly: AssemblyVersion("1.1.0.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||||
|
|||||||
11
DDZUGFeRDService/My Project/Settings.Designer.vb
generated
11
DDZUGFeRDService/My Project/Settings.Designer.vb
generated
@ -15,7 +15,7 @@ Option Explicit On
|
|||||||
Namespace My
|
Namespace My
|
||||||
|
|
||||||
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
||||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"), _
|
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"), _
|
||||||
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
||||||
Partial Friend NotInheritable Class MySettings
|
Partial Friend NotInheritable Class MySettings
|
||||||
Inherits Global.System.Configuration.ApplicationSettingsBase
|
Inherits Global.System.Configuration.ApplicationSettingsBase
|
||||||
@ -134,6 +134,15 @@ Namespace My
|
|||||||
Return CType(Me("MSSQL_ENABLED"),Boolean)
|
Return CType(Me("MSSQL_ENABLED"),Boolean)
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
|
||||||
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
|
Global.System.Configuration.DefaultSettingValueAttribute("1234567890_EXAMPLE_KEY")> _
|
||||||
|
Public ReadOnly Property GDPICTURE_KEY() As String
|
||||||
|
Get
|
||||||
|
Return CType(Me("GDPICTURE_KEY"),String)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
End Class
|
End Class
|
||||||
End Namespace
|
End Namespace
|
||||||
|
|
||||||
|
|||||||
@ -29,5 +29,8 @@
|
|||||||
<Setting Name="MSSQL_ENABLED" Type="System.Boolean" Scope="Application">
|
<Setting Name="MSSQL_ENABLED" Type="System.Boolean" Scope="Application">
|
||||||
<Value Profile="(Default)">False</Value>
|
<Value Profile="(Default)">False</Value>
|
||||||
</Setting>
|
</Setting>
|
||||||
|
<Setting Name="GDPICTURE_KEY" Type="System.String" Scope="Application">
|
||||||
|
<Value Profile="(Default)">1234567890_EXAMPLE_KEY</Value>
|
||||||
|
</Setting>
|
||||||
</Settings>
|
</Settings>
|
||||||
</SettingsFile>
|
</SettingsFile>
|
||||||
@ -27,7 +27,7 @@ Public Class ThreadRunner
|
|||||||
|
|
||||||
Private Const TIMER_INTERVAL_MS = 10_000
|
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
|
_logConfig = LogConfig
|
||||||
_logger = _logConfig.GetLogger()
|
_logger = _logConfig.GetLogger()
|
||||||
_firebird = Firebird
|
_firebird = Firebird
|
||||||
@ -37,6 +37,7 @@ Public Class ThreadRunner
|
|||||||
Dim args As New WorkerArgs()
|
Dim args As New WorkerArgs()
|
||||||
args = LoadFolderConfig(args)
|
args = LoadFolderConfig(args)
|
||||||
args = LoadPropertyMapFor(args, "DEFAULT")
|
args = LoadPropertyMapFor(args, "DEFAULT")
|
||||||
|
args.GDPictureKey = GDPictureKey
|
||||||
|
|
||||||
' Use MSSQL Server if available
|
' Use MSSQL Server if available
|
||||||
If Not IsNothing(_mssql) Then
|
If Not IsNothing(_mssql) Then
|
||||||
|
|||||||
@ -24,6 +24,7 @@ Public Class ZUGFeRDService
|
|||||||
Dim oJobInterval As Integer = My.Settings.JOB_INTERVAL
|
Dim oJobInterval As Integer = My.Settings.JOB_INTERVAL
|
||||||
Dim oMSSQLConnectionString As String = My.Settings.MSSQL_CONNECTIONSTRING
|
Dim oMSSQLConnectionString As String = My.Settings.MSSQL_CONNECTIONSTRING
|
||||||
Dim oMSSQLEnabled As Boolean = My.Settings.MSSQL_ENABLED
|
Dim oMSSQLEnabled As Boolean = My.Settings.MSSQL_ENABLED
|
||||||
|
Dim oGDPictureKey As String = My.Settings.GDPICTURE_KEY
|
||||||
|
|
||||||
_firebird = New Firebird(_logConfig, oDataSource, oDatabase, oUser, oPassword)
|
_firebird = New Firebird(_logConfig, oDataSource, oDatabase, oUser, oPassword)
|
||||||
|
|
||||||
@ -37,7 +38,7 @@ Public Class ZUGFeRDService
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Try
|
Try
|
||||||
_threadRunner = New ThreadRunner(_logConfig, _firebird, _mssql)
|
_threadRunner = New ThreadRunner(_logConfig, oGDPictureKey, _firebird, _mssql)
|
||||||
_threadRunner.Start(oJobInterval)
|
_threadRunner.Start(oJobInterval)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
_logger.Error(ex)
|
_logger.Error(ex)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user