diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index 99d39398..c26d17b5 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -48,18 +48,18 @@ On - - - - - - - - - - - - + + + + + + + + + + + + D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj.bak b/Controls.DocumentViewer/DocumentViewer.vbproj.bak new file mode 100644 index 00000000..99d39398 --- /dev/null +++ b/Controls.DocumentViewer/DocumentViewer.vbproj.bak @@ -0,0 +1,180 @@ + + + + + Debug + AnyCPU + {0958CDDF-4A16-41F6-8837-8335F71D599C} + Library + + + DigitalData.Controls.DocumentViewer + DigitalData.Controls.DocumentViewer + 512 + Windows + v4.6.1 + true + + + AnyCPU + true + full + true + true + bin\Debug\ + DigitalData.Controls.DocumentViewer.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + DigitalData.Controls.DocumentViewer.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + + + + + + + + + + + + D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll + + + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Independentsoft.Msg.dll + + + + ..\packages\NLog.4.6.7\lib\net45\NLog.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DocumentViewer.vb + + + UserControl + + + frmViewerPrint.vb + + + Form + + + frmViewerSettings.vb + + + Form + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + DocumentViewer.vb + + + frmViewerPrint.vb + + + frmViewerSettings.vb + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + + {903B2D7D-3B80-4BE9-8713-7447B704E1B0} + Logging + + + + \ No newline at end of file diff --git a/Controls.DocumentViewer/My Project/licenses.licx b/Controls.DocumentViewer/My Project/licenses.licx index 6d20af11..93bd4e76 100644 --- a/Controls.DocumentViewer/My Project/licenses.licx +++ b/Controls.DocumentViewer/My Project/licenses.licx @@ -1 +1 @@ -DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.DocumentViewer/My Project/licenses.licx.bak b/Controls.DocumentViewer/My Project/licenses.licx.bak new file mode 100644 index 00000000..6d20af11 --- /dev/null +++ b/Controls.DocumentViewer/My Project/licenses.licx.bak @@ -0,0 +1 @@ +DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.LookupGrid/My Project/licenses.licx b/Controls.LookupGrid/My Project/licenses.licx index fb064627..e69de29b 100644 --- a/Controls.LookupGrid/My Project/licenses.licx +++ b/Controls.LookupGrid/My Project/licenses.licx @@ -1 +0,0 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.LookupGrid/My Project/licenses.licx.bak b/Controls.LookupGrid/My Project/licenses.licx.bak index 6d8ceb1f..fb064627 100644 --- a/Controls.LookupGrid/My Project/licenses.licx.bak +++ b/Controls.LookupGrid/My Project/licenses.licx.bak @@ -1,5 +1 @@ -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/DDEmailService/App.config b/DDEmailService/App.config new file mode 100644 index 00000000..731f6de6 --- /dev/null +++ b/DDEmailService/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/DDEmailService/DDEmailService.vbproj b/DDEmailService/DDEmailService.vbproj new file mode 100644 index 00000000..10331743 --- /dev/null +++ b/DDEmailService/DDEmailService.vbproj @@ -0,0 +1,125 @@ + + + + + Debug + AnyCPU + {83ED2617-B398-4859-8F59-B38F8807E83E} + WinExe + DDEmailService.Service1 + DDEmailService + DDEmailService + 512 + Console + v4.6.1 + true + + + AnyCPU + true + full + true + true + bin\Debug\ + DDEmailService.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + DDEmailService.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + + + + + + + + + + + + + + + + + + + + + + + True + Application.myapp + + + ProjectInstaller.vb + + + Component + + + Component + + + Service1.vb + + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + ProjectInstaller.vb + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + \ No newline at end of file diff --git a/DDEmailService/My Project/Application.Designer.vb b/DDEmailService/My Project/Application.Designer.vb new file mode 100644 index 00000000..88dd01c7 --- /dev/null +++ b/DDEmailService/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/DDEmailService/My Project/Application.myapp b/DDEmailService/My Project/Application.myapp new file mode 100644 index 00000000..602de37e --- /dev/null +++ b/DDEmailService/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + false + false + 0 + true + 0 + 3 + true + diff --git a/DDEmailService/My Project/AssemblyInfo.vb b/DDEmailService/My Project/AssemblyInfo.vb new file mode 100644 index 00000000..aeec5c32 --- /dev/null +++ b/DDEmailService/My Project/AssemblyInfo.vb @@ -0,0 +1,35 @@ +Imports System +Imports System.Reflection +Imports System.Runtime.InteropServices + +' Allgemeine Informationen über eine Assembly werden über die folgenden +' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +' die einer Assembly zugeordnet sind. + +' Werte der Assemblyattribute überprüfen + + + + + + + + + + +'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird. + + +' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +' +' Hauptversion +' Nebenversion +' Buildnummer +' Revision +' +' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +' übernehmen, indem Sie "*" eingeben: +' + + + diff --git a/DDEmailService/My Project/Resources.Designer.vb b/DDEmailService/My Project/Resources.Designer.vb new file mode 100644 index 00000000..c23c8759 --- /dev/null +++ b/DDEmailService/My Project/Resources.Designer.vb @@ -0,0 +1,62 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My.Resources + + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DDEmailService.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set(ByVal value As Global.System.Globalization.CultureInfo) + resourceCulture = value + End Set + End Property + End Module +End Namespace diff --git a/DDEmailService/My Project/Resources.resx b/DDEmailService/My Project/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/DDEmailService/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/DDEmailService/My Project/Settings.Designer.vb b/DDEmailService/My Project/Settings.Designer.vb new file mode 100644 index 00000000..864ec6d4 --- /dev/null +++ b/DDEmailService/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + _ + Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) + +#Region "My.Settings Auto-Save Functionality" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property + End Class +End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.DDEmailService.My.MySettings + Get + Return Global.DDEmailService.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/DDEmailService/My Project/Settings.settings b/DDEmailService/My Project/Settings.settings new file mode 100644 index 00000000..85b890b3 --- /dev/null +++ b/DDEmailService/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/DDEmailService/ProjectInstaller.Designer.vb b/DDEmailService/ProjectInstaller.Designer.vb new file mode 100644 index 00000000..6dcd0922 --- /dev/null +++ b/DDEmailService/ProjectInstaller.Designer.vb @@ -0,0 +1,44 @@ + Partial Class ProjectInstaller + Inherits System.Configuration.Install.Installer + + 'Installer überschreibt den Löschvorgang zum Bereinigen der Komponentenliste. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Komponenten-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich. + 'Das Bearbeiten ist mit dem Komponenten-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.ServiceProcessInstaller1 = New System.ServiceProcess.ServiceProcessInstaller() + Me.ServiceInstaller1 = New System.ServiceProcess.ServiceInstaller() + ' + 'ServiceProcessInstaller1 + ' + Me.ServiceProcessInstaller1.Password = Nothing + Me.ServiceProcessInstaller1.Username = Nothing + ' + 'ServiceInstaller1 + ' + Me.ServiceInstaller1.ServiceName = "Service1" + ' + 'ProjectInstaller + ' + Me.Installers.AddRange(New System.Configuration.Install.Installer() {Me.ServiceProcessInstaller1, Me.ServiceInstaller1}) + + End Sub + + Friend WithEvents ServiceProcessInstaller1 As ServiceProcess.ServiceProcessInstaller + Friend WithEvents ServiceInstaller1 As ServiceProcess.ServiceInstaller +End Class diff --git a/DDEmailService/ProjectInstaller.resx b/DDEmailService/ProjectInstaller.resx new file mode 100644 index 00000000..323abb16 --- /dev/null +++ b/DDEmailService/ProjectInstaller.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 197, 17 + + + False + + \ No newline at end of file diff --git a/DDEmailService/ProjectInstaller.vb b/DDEmailService/ProjectInstaller.vb new file mode 100644 index 00000000..733dfc0c --- /dev/null +++ b/DDEmailService/ProjectInstaller.vb @@ -0,0 +1,16 @@ +Imports System.ComponentModel +Imports System.Configuration.Install + +Public Class ProjectInstaller + + Public Sub New() + MyBase.New() + + 'Dieser Aufruf ist für den Komponenten-Designer erforderlich. + InitializeComponent() + + 'Initialisierungscode nach dem Aufruf von InitializeComponent hinzufügen + + End Sub + +End Class diff --git a/DDEmailService/Service1.Designer.vb b/DDEmailService/Service1.Designer.vb new file mode 100644 index 00000000..1ca347fd --- /dev/null +++ b/DDEmailService/Service1.Designer.vb @@ -0,0 +1,48 @@ +Imports System.ServiceProcess + + _ +Partial Class Service1 + Inherits System.ServiceProcess.ServiceBase + + 'UserService überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + ' Der Haupteinstiegspunkt für den Prozess + _ + _ + Shared Sub Main() + Dim ServicesToRun() As System.ServiceProcess.ServiceBase + + ' Innerhalb eines Prozesses können mehrere NT-Dienste ausgeführt werden. Um einen + ' weiteren Dienst zu diesem Prozess hinzuzufügen, ändern Sie die folgende Zeile, + ' um ein zweites Dienstobjekt zu erstellen. Zum Beispiel + ' + ' ServicesToRun = New System.ServiceProcess.ServiceBase () {New Service1, New MySecondUserService} + ' + ServicesToRun = New System.ServiceProcess.ServiceBase() {New Service1} + + System.ServiceProcess.ServiceBase.Run(ServicesToRun) + End Sub + + 'Wird vom Komponenten-Designer benötigt. + Private components As System.ComponentModel.IContainer + + ' Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich. + ' Das Bearbeiten ist mit dem Komponenten-Designer möglich. + ' Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + components = New System.ComponentModel.Container() + Me.ServiceName = "Service1" + End Sub + +End Class diff --git a/DDEmailService/Service1.vb b/DDEmailService/Service1.vb new file mode 100644 index 00000000..ae82c66a --- /dev/null +++ b/DDEmailService/Service1.vb @@ -0,0 +1,18 @@ +Imports System.ComponentModel +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Messaging +Imports DigitalData.EMLProfiler +Imports System.IO +Public Class Service1 + + Protected Overrides Sub OnStart(ByVal args() As String) + ' Code zum Starten des Dienstes hier einfügen. Diese Methode sollte Vorgänge + ' ausführen, damit der Dienst gestartet werden kann. + End Sub + + Protected Overrides Sub OnStop() + ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen. + End Sub + +End Class diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 5c42c033..6f94ebfd 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -102,6 +102,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.GraphQLTest", "GU EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.DocumentViewerTest", "GUIs.Test.DocumentViewerTest\GUIs.Test.DocumentViewerTest.vbproj", "{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "DDEmailService\DDEmailService.vbproj", "{83ED2617-B398-4859-8F59-B38F8807E83E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -264,6 +266,10 @@ Global {F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Release|Any CPU.Build.0 = Release|Any CPU + {83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -308,6 +314,7 @@ Global {B29ED6D4-839B-413A-A485-B10F4A4788EA} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {609B09B4-AD1E-40F7-8899-A6685924621C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} + {83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286} diff --git a/DD_CommunicationService/DD_CommunicationService.vbproj b/DD_CommunicationService/DD_CommunicationService.vbproj index 178372b1..12a90bf1 100644 --- a/DD_CommunicationService/DD_CommunicationService.vbproj +++ b/DD_CommunicationService/DD_CommunicationService.vbproj @@ -59,6 +59,9 @@ ..\Message\bin\Debug\DigitalData.Modules.Messaging.dll + + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\FirebirdSql.Data.FirebirdClient.dll + ..\Modules.Logging\bin\Debug\NLog.dll diff --git a/DD_CommunicationService/MyComService.vb b/DD_CommunicationService/MyComService.vb index d6e55905..860e1297 100644 --- a/DD_CommunicationService/MyComService.vb +++ b/DD_CommunicationService/MyComService.vb @@ -10,7 +10,7 @@ Public Class MyComService Private _firebird As Firebird Private _MSSQL As MSSQLServer Private _Email As Email - Private _EmailAlt As clsEmail + 'Private _EmailAlt As clsEmail Public Shared threadEmailQueue As BackgroundWorker Protected Overrides Sub OnStart(ByVal args() As String) ' Code zum Starten des Dienstes hier einfügen. Diese Methode sollte Vorgänge @@ -28,7 +28,7 @@ Public Class MyComService _firebird = New Firebird(MyLoConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW) End If _Email = New Email(MyLoConfig) - _EmailAlt = New clsEmail(MyLoConfig) + '_EmailAlt = New clsEmail(MyLoConfig) If My.Settings.SQLSERVER_CS <> String.Empty Then _MSSQL = New MSSQLServer(MyLoConfig, My.Settings.SQLSERVER_CS) End If @@ -82,6 +82,9 @@ Public Class MyComService Else MyLoConfig.Debug = False End If + If threadEmailQueue.IsBusy Then + Exit Sub + End If _Email = New Email(MyLoConfig) If My.Settings.FB_ConnString <> String.Empty Then _firebird = New Firebird(MyLoConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW) @@ -190,11 +193,11 @@ Public Class MyComService 'End If Dim oSendResult As Boolean = False - oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment) - If oSendResult = False Then - oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString) + ' oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment) + ' If oSendResult = False Then + oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString) - End If + ' End If If oSendResult = True Then Dim upd = $"UPDATE TBEDM_EMAIL_QUEUE SET EMAIL_SENT = CURRENT_TIMESTAMP,COMMENT = '{oComment}' WHERE GUID = {oGUID}" If upd.Contains(",COMMENT = ''") Then @@ -303,10 +306,10 @@ Public Class MyComService End Try Dim oSendResult As Boolean = False - oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment) - If oSendResult = False Then - oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString) - End If + 'oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment) + 'If oSendResult = False Then + oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString) + ' End If If oSendResult = True Then Dim oUpdCommand = "UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE() WHERE GUID = " & oGUID _MSSQL.NewExecutenonQuery(oUpdCommand) diff --git a/LookupControlGui/LookupControlGui.vbproj b/LookupControlGui/LookupControlGui.vbproj index e7f8927a..7c499cbe 100644 --- a/LookupControlGui/LookupControlGui.vbproj +++ b/LookupControlGui/LookupControlGui.vbproj @@ -47,10 +47,10 @@ On - - - - + + + + diff --git a/LookupControlGui/LookupControlGui.vbproj.bak b/LookupControlGui/LookupControlGui.vbproj.bak new file mode 100644 index 00000000..e7f8927a --- /dev/null +++ b/LookupControlGui/LookupControlGui.vbproj.bak @@ -0,0 +1,132 @@ + + + + + Debug + AnyCPU + {B65E24B3-D334-455D-A0BF-B33B8358B013} + WinExe + LookupControlGui.My.MyApplication + LookupControlGui + LookupControlGui + 512 + WindowsForms + v4.6.1 + true + + + AnyCPU + true + full + true + true + bin\Debug\ + LookupControlGui.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + LookupControlGui.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + Form1.vb + Form + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + Form1.vb + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + {3dcd6d1a-c830-4241-b7e4-27430e7ea483} + LookupControl + + + + \ No newline at end of file