diff --git a/App/EmailProfiler.Service/Config.vb b/App/EmailProfiler.Common/Data/Config.vb similarity index 99% rename from App/EmailProfiler.Service/Config.vb rename to App/EmailProfiler.Common/Data/Config.vb index 16ab445..b548931 100644 --- a/App/EmailProfiler.Service/Config.vb +++ b/App/EmailProfiler.Common/Data/Config.vb @@ -5,9 +5,13 @@ Public Class Config Public Property ConnectionString As String = "" Public Property Debug As Boolean = False + Public Property EmailAccountId As Integer = 0 + Public Property EmailTitlePrefix As String = "EmailProfiler" + Public Property EmailSenderLimitation As String = "" + Public Property UseWindream As Boolean = False ''' @@ -23,6 +27,7 @@ Public Class Config Public Property InfoTemplateId As Integer = 0 Public Property EmailTestReceiver As String = "" + Public Property EmailTestHTML As String = "" ''' diff --git a/App/EmailProfiler.Common/Data/ConfigData.vb b/App/EmailProfiler.Common/Data/ConfigData.vb deleted file mode 100644 index 67e50c3..0000000 --- a/App/EmailProfiler.Common/Data/ConfigData.vb +++ /dev/null @@ -1,39 +0,0 @@ -Imports DigitalData.Modules.Config.ConfigAttributes - -Public Class ConfigData - - Public Property ConnectionString As String = "" - - Public Property Debug As Boolean = False - - Public Property EmailAccountId As Integer = 0 - - Public Property EmailTitlePrefix As String = "EmailProfiler" - - Public Property EmailSenderLimitation As String = "" - - Public Property UseWindream As Boolean = False - - ''' - ''' GUID des EMail Templates das bei Ablehnungsmails verwendet wird. - ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE - ''' - Public Property RejectionTemplateId As Integer = 0 - - ''' - ''' GUID des EMail Templates das bei Info-Mails verwendet wird. - ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE - ''' - Public Property InfoTemplateId As Integer = 0 - - Public Property EmailTestReceiver As String = "" - - Public Property EmailTestHTML As String = "" - - ''' - ''' Enthält die Version des GDPicture Modules, - ''' für das der Lizenzschlüssel aus TBDD_3RD_PARTY_MODULES - ''' gelesen werden soll. - ''' - Public Property GDPictureVersion As String = "" -End Class diff --git a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj index e7ebb3a..d5a646a 100644 --- a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj +++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj @@ -120,7 +120,7 @@ - + diff --git a/App/EmailProfiler.Common/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb index bec79b8..1e0332f 100644 --- a/App/EmailProfiler.Common/clsWorkEmail.vb +++ b/App/EmailProfiler.Common/clsWorkEmail.vb @@ -55,7 +55,7 @@ Public Class clsWorkEmail Private _worked_email As Boolean = False - Sub New(LogConf As LogConfig, ConStr As String, WmConStr As String, pConfigData As ConfigData) + Sub New(LogConf As LogConfig, ConStr As String, WmConStr As String, pConfigData As Config) Try _Logger = LogConf.GetLogger _LogConfig = LogConf diff --git a/App/EmailProfiler.Common/clsWorker.vb b/App/EmailProfiler.Common/clsWorker.vb index dd8cdde..29c7bfe 100644 --- a/App/EmailProfiler.Common/clsWorker.vb +++ b/App/EmailProfiler.Common/clsWorker.vb @@ -24,7 +24,7 @@ Public Class clsWorker Private ReadOnly LocalEmlFile As String = "" - Sub New(pLogConfig As LogConfig, pConnectionString As String, pWindreamConnectionString As String, pPollProfileId As Integer, pConfigData As ConfigData, Optional pLocalEML As String = "") + Sub New(pLogConfig As LogConfig, pConnectionString As String, pWindreamConnectionString As String, pPollProfileId As Integer, pConfigData As Config, Optional pLocalEML As String = "") _Logger = pLogConfig.GetLogger 'ClassEmailImap = New clsEmailIMAP(pLogConfig) _Fetcher = New MailFetcher(pLogConfig) diff --git a/App/EmailProfiler.Form/Config.vb b/App/EmailProfiler.Form/Config.vb deleted file mode 100644 index dd516d9..0000000 --- a/App/EmailProfiler.Form/Config.vb +++ /dev/null @@ -1,29 +0,0 @@ -Imports DigitalData.Modules.Config.ConfigAttributes - -Public Class Config - - Public Property ConnectionString As String = "" - - Public Property Debug As Boolean = False - Public Property EmailAccountId As Integer = 0 - Public Property EmailTitlePrefix As String = "EmailProfiler" - Public Property EmailSenderLimitation As String = "" - Public Property UseWindream As Boolean = False - - ''' - ''' GUID des EMail Templates das bei Ablehnungsmails verwendet wird. - ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE - ''' - Public Property RejectionTemplateId As Integer = 0 - Public Property InfoTemplateId As Integer = 0 - - Public Property EmailTestReceiver As String = "" - Public Property EmailTestHTML As String = "" - - ''' - ''' Enthält die Version des GDPicture Modules, - ''' für das der Lizenzschlüssel aus TBDD_3RD_PARTY_MODULES - ''' gelesen werden soll. - ''' - Public Property GDPictureVersion As String = "" -End Class diff --git a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj index 06886bd..21c6ea3 100644 --- a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj +++ b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj @@ -119,7 +119,6 @@ - Form diff --git a/App/EmailProfiler.Form/frmMain.vb b/App/EmailProfiler.Form/frmMain.vb index 70142d2..8e5aaef 100644 --- a/App/EmailProfiler.Form/frmMain.vb +++ b/App/EmailProfiler.Form/frmMain.vb @@ -12,7 +12,7 @@ Imports EmailProfiler.Common Public Class frmMain Private Logger As Logger Private LogConfig As LogConfig - Private ConfigManager As ConfigManager(Of ConfigData) + Private ConfigManager As ConfigManager(Of Config) Private _database As MSSQLServer Private _Encryption As clsEncryption Private _windream As clsWindream_allgemein @@ -28,7 +28,7 @@ Public Class frmMain Try LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName) _limilab = New Limilab(LogConfig) - ConfigManager = New ConfigManager(Of ConfigData)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath) + ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath) Logger = LogConfig.GetLogger() If ConfigManager.Config.Debug = True Then diff --git a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj index ab31512..2f19d75 100644 --- a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj +++ b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj @@ -96,7 +96,6 @@ - True Application.myapp diff --git a/App/EmailProfiler.Service/MyService.vb b/App/EmailProfiler.Service/MyService.vb index fe53cd3..f13c25c 100644 --- a/App/EmailProfiler.Service/MyService.vb +++ b/App/EmailProfiler.Service/MyService.vb @@ -17,8 +17,8 @@ Public Class MyService Private _DBConfig As ClassDBConfig.Config - Private ConfigManager As ConfigManager(Of ConfigData) - Private _ConfigData As ConfigData + Private ConfigManager As ConfigManager(Of Config) + Private _ConfigData As Config Private Database As MSSQLServer #End Region @@ -31,7 +31,7 @@ Public Class MyService Logger.Info("Service started.") - ConfigManager = New ConfigManager(Of ConfigData)(LogConfig, My.Application.Info.DirectoryPath) + ConfigManager = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath) _ConfigData = ConfigManager.Config If _ConfigData.ConnectionString = String.Empty Then diff --git a/App/wisag_check_Att/Form1.vb b/App/wisag_check_Att/Form1.vb index 87b3906..2c62fb6 100644 --- a/App/wisag_check_Att/Form1.vb +++ b/App/wisag_check_Att/Form1.vb @@ -281,7 +281,7 @@ Public Class Form1 Dim connectionString As String = "Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd" - Dim oConfigData As ConfigData = New ConfigData() With { + Dim oConfigData As Config = New Config() With { .Debug = False, .GDPictureVersion = "11.2024", .UseWindream = False, diff --git a/App/wisag_check_Att/TestClasses/ExtractAttachmentsFromEMLFile.vb b/App/wisag_check_Att/TestClasses/ExtractAttachmentsFromEMLFile.vb index 202af66..2c72289 100644 --- a/App/wisag_check_Att/TestClasses/ExtractAttachmentsFromEMLFile.vb +++ b/App/wisag_check_Att/TestClasses/ExtractAttachmentsFromEMLFile.vb @@ -13,7 +13,7 @@ Public Class ExtractAttachmentsFromEMLFile End Sub - Public Sub CallWorkerProcess(pEMLFilename As String, pConfigData As ConfigData) + Public Sub CallWorkerProcess(pEMLFilename As String, pConfigData As Config) Dim oProfileIdForPolling = 1 Dim oWorker As New clsWorker(_LogConfig,