From 1d88a8467cc0412a4178b251c60d6048e479a0eb Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 17 Apr 2020 11:55:33 +0200 Subject: [PATCH] MS EmailFunctions - ZuGferd Service - Windream --- GUIs.Test.ZUGFeRDTest/Form1.vb | 2 +- Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb | 5 ++--- .../EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb | 15 +++++++++------ Modules.Jobs/My Project/AssemblyInfo.vb | 2 +- Modules.Messaging/Email.vb | 18 ++++++++++-------- Modules.Windream/DDWindream.zip | Bin 0 -> 9665 bytes Modules.Windream/My Project/AssemblyInfo.vb | 2 +- Modules.Windream/Windream.vb | 1 + Services.EmailService/EmailService.vb | 8 +++++--- .../My Project/AssemblyInfo.vb | 2 +- Services.ZUGFeRDService/App.config | 5 ++++- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/Settings.Designer.vb | 9 +++++++++ .../My Project/Settings.settings | 3 +++ Services.ZUGFeRDService/ThreadRunner.vb | 2 +- Services.ZUGFeRDService/ZUGFeRDService.vb | 2 +- 16 files changed, 50 insertions(+), 28 deletions(-) create mode 100644 Modules.Windream/DDWindream.zip diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb index fb8d9661..45fa9cd5 100644 --- a/GUIs.Test.ZUGFeRDTest/Form1.vb +++ b/GUIs.Test.ZUGFeRDTest/Form1.vb @@ -88,7 +88,7 @@ Public Class Form1 args = LoadFolderConfig(args) args = LoadPropertyMapFor(args, "DEFAULT") - Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, _mssql) + Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, 1, _mssql) job.Start(args) End Sub diff --git a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb index 45c844aa..a34d866e 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb @@ -62,7 +62,7 @@ Public Class EmailFunctions _logger.Error(ex) End Try End Sub - Public Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, pEmailData As EmailData, SourceProcedure As String) + Public Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, pEmailData As EmailData, SourceProcedure As String, pEmailAccountId As Integer) If pEmailData Is Nothing Then _logger.Warn("EmailData is empty. Email will not be sent!") Exit Sub @@ -73,7 +73,6 @@ Public Class EmailFunctions Dim oReference = MessageId Dim oEmailTo = "" Dim oSubject = EmailStrings.EMAIL_SUBJECT - Dim oAccountId = 1 Dim oCreatedWho = "ZUGFeRD Service" Dim oFinalBodyText = String.Format(EmailStrings.EMAIL_WRAPPING_TEXT, BodyText) @@ -119,7 +118,7 @@ Public Class EmailFunctions ,EMAIL_ATTMT1) VALUES (77 - ,{oAccountId} + ,{pEmailAccountId} ,{oHistoryID} ,'{MessageId}' ,77 diff --git a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb index 0ebbc5a4..dbd3f404 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -34,15 +34,18 @@ Public Class ImportZUGFeRDFiles Private ReadOnly _zugferd As ZUGFeRDInterface Private ReadOnly _firebird As Firebird Private ReadOnly _filesystem As Filesystem.File + Private ReadOnly _EmailOutAccountId As Integer Private ReadOnly _mssql As MSSQLServer Private ReadOnly _email As EmailFunctions - Public Sub New(LogConfig As LogConfig, Firebird As Firebird, Optional MSSQL As MSSQLServer = Nothing) + + Public Sub New(LogConfig As LogConfig, Firebird As Firebird, pEmailOutAccount As Integer, Optional MSSQL As MSSQLServer = Nothing) _logConfig = LogConfig _logger = LogConfig.GetLogger() _firebird = Firebird _filesystem = New Filesystem.File(_logConfig) _mssql = MSSQL + _EmailOutAccountId = pEmailOutAccount _email = New EmailFunctions(LogConfig, _mssql, _firebird) _logger.Debug("Registering GDPicture License") @@ -467,7 +470,7 @@ Public Class ImportZUGFeRDFiles Dim oBody = EmailStrings.EMAIL_MD5_ERROR Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MD5HashException") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MD5HashException", _EmailOutAccountId) AddRejectedState(oMessageId, "MD5HashException", "Die gesendete Rechnung wurde bereits verarbeitet!", "") Catch ex As InvalidFerdException _logger.Error(ex) @@ -477,7 +480,7 @@ Public Class ImportZUGFeRDFiles _firebird.ExecuteNonQuery(oSQL) Dim oBody = EmailStrings.EMAIL_INVALID_DOCUMENT Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "InvalidFerdException") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "InvalidFerdException", _EmailOutAccountId) AddRejectedState(oMessageId, "InvalidFerdException", "Inkorrekte Formate", "") Catch ex As TooMuchFerdsException _logger.Error(ex) @@ -487,7 +490,7 @@ Public Class ImportZUGFeRDFiles _firebird.ExecuteNonQuery(oSQL) Dim oBody = EmailStrings.EMAIL_TOO_MUCH_FERDS Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "TooMuchFerdsException") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId) AddRejectedState(oMessageId, "TooMuchFerdsException", "Email enthielt mehr als ein ZUGFeRD-Dokument", "") Catch ex As NoFerdsException _logger.Error(ex) @@ -497,7 +500,7 @@ Public Class ImportZUGFeRDFiles _firebird.ExecuteNonQuery(oSQL) Dim oBody = EmailStrings.EMAIL_NO_FERDS Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "NoFerdsException") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId) AddRejectedState(oMessageId, "NoFerdsException", " Email enthielt keine ZUGFeRD-Dokumente", "") Catch ex As MissingValueException _logger.Error(ex) @@ -512,7 +515,7 @@ Public Class ImportZUGFeRDFiles Dim oBody = CreateBodyForMissingProperties(ex.File.Name, oMissingProperties) Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MissingValueException") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MissingValueException", _EmailOutAccountId) AddRejectedState(oMessageId, "MissingValueException", "Es fehlten ZugferdSpezifikationen", oMessage) Catch ex As Exception diff --git a/Modules.Jobs/My Project/AssemblyInfo.vb b/Modules.Jobs/My Project/AssemblyInfo.vb index 8ad76b2c..bb2bef03 100644 --- a/Modules.Jobs/My Project/AssemblyInfo.vb +++ b/Modules.Jobs/My Project/AssemblyInfo.vb @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern ' übernehmen, indem Sie "*" eingeben: - + diff --git a/Modules.Messaging/Email.vb b/Modules.Messaging/Email.vb index de8a6dc1..1d9dd7b5 100644 --- a/Modules.Messaging/Email.vb +++ b/Modules.Messaging/Email.vb @@ -261,6 +261,7 @@ Public Class Email AUTH_TYPE As String, SENDER_INSTANCE As String, Optional attachmentString As String = "", Optional Test As Boolean = False) Dim myClient As Net.Mail.SmtpClient Dim myMesssage As New MailMessage + Try Dim oError As Boolean = False Dim oReceipiants As String() @@ -361,7 +362,7 @@ Public Class Email End Function Public Function New_EmailISoft(ByVal mailSubject As String, ByVal mailBody As String, mailto As String, - mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String, + from_mailaddress As String, from_name As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String, AUTH_TYPE As String, SENDER_INSTANCE As String, Optional attment As String = "") Try ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 @@ -378,16 +379,17 @@ Public Class Email For Each _mailempfaenger As String In empfaenger _logger.Debug($"Working on email for {_mailempfaenger}..") Try - Dim message As New Message() - message.From = New Mailbox(mailfrom, mailfrom) - message.[To].Add(New Mailbox(_mailempfaenger)) - message.Subject = mailSubject + Dim oMessage As New Message() + oMessage.From = New Mailbox(from_mailaddress, from_name) + + oMessage.[To].Add(New Mailbox(_mailempfaenger)) + oMessage.Subject = mailSubject _logger.Debug($"Message created..") Dim textBodyPart As New BodyPart() textBodyPart.ContentType = New ContentType("text", "html", "utf-8") textBodyPart.ContentTransferEncoding = ContentTransferEncoding.QuotedPrintable textBodyPart.Body = mailBody - message.BodyParts.Add(textBodyPart) + oMessage.BodyParts.Add(textBodyPart) If attment <> String.Empty Then If System.IO.File.Exists(attment) Then Dim attachment1 As New Independentsoft.Email.Mime.Attachment(attment) @@ -398,7 +400,7 @@ Public Class Email ElseIf attment.ToLower.EndsWith("docx") Then attachment1.ContentType = New ContentType("application", "MS-word") End If - message.BodyParts.Add(attachment1) + oMessage.BodyParts.Add(attachment1) Else _logger.Warn($"Attachment {attment.ToString} is not existing!") End If @@ -469,7 +471,7 @@ Public Class Email End Try End Try Try - client.Send(message) + client.Send(oMessage) _logger.Info("Message to " & _mailempfaenger & " has been send.") _error = False Catch ex As Exception diff --git a/Modules.Windream/DDWindream.zip b/Modules.Windream/DDWindream.zip new file mode 100644 index 0000000000000000000000000000000000000000..eea90865643ee9e55851d1141e5f58f9525c16bf GIT binary patch literal 9665 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 z000317yyq - + diff --git a/Modules.Windream/Windream.vb b/Modules.Windream/Windream.vb index 0893f0c4..b7d30b6e 100644 --- a/Modules.Windream/Windream.vb +++ b/Modules.Windream/Windream.vb @@ -595,6 +595,7 @@ Public Class Windream If TestFolderExists(oCurrentPath) = False Then oFolderObject = Session.GetNewWMObjectFS(WMEntityFolder, oCurrentPath, WMObjectEditModeNoEdit) + _logger.Info($"new Folder [{oCurrentPath}] has been created!") End If Next diff --git a/Services.EmailService/EmailService.vb b/Services.EmailService/EmailService.vb index 57352603..c74effaa 100644 --- a/Services.EmailService/EmailService.vb +++ b/Services.EmailService/EmailService.vb @@ -29,7 +29,7 @@ Public Class EmailService Try ' === Initialize Logger === - _LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log")) + _LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, "Digital Data", "EmailService") _LogConfig.Debug = My.Settings.DEBUG _Logger = _LogConfig.GetLogger() @@ -203,7 +203,7 @@ Public Class EmailService End If Dim oEmailTo, oSubject, oBody As String - Dim oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment + Dim oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment, ofromName Dim oAccountId, oGuid, oJobId As Integer For Each oEmailToRow As DataRow In oEmailQueue.Rows @@ -224,6 +224,7 @@ Public Class EmailService Select Case Database Case DatabaseType.Firebird oMailFrom = oAccountRow.Item("EMAIL_FROM") + ofromName = oMailFrom oMailSMTP = oAccountRow.Item("SERVER_OUT") oMailport = oAccountRow.Item("PORT_OUT") oMailUser = oAccountRow.Item("EMAIL_USER") @@ -232,6 +233,7 @@ Public Class EmailService Case DatabaseType.MSSQL oMailFrom = oAccountRow.Item("EMAIL_FROM") + ofromName = oAccountRow.Item("EMAIL_FROM_NAME") oMailSMTP = oAccountRow.Item("EMAIL_SMTP") oMailport = oAccountRow.Item("PORT") oMailUser = oAccountRow.Item("EMAIL_USER") @@ -296,7 +298,7 @@ Public Class EmailService End If Dim oEmailSent As Boolean = False - oEmailSent = _Email.New_EmailISoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEmailService", oAttachment) + oEmailSent = _Email.New_EmailISoft(oSubject, oBody, oEmailTo, oMailFrom, ofromName, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEmailService", oAttachment) If oEmailSent Then diff --git a/Services.EmailService/My Project/AssemblyInfo.vb b/Services.EmailService/My Project/AssemblyInfo.vb index aeec5c32..683cbc22 100644 --- a/Services.EmailService/My Project/AssemblyInfo.vb +++ b/Services.EmailService/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/Services.ZUGFeRDService/App.config b/Services.ZUGFeRDService/App.config index 3caf5e6e..470c29cc 100644 --- a/Services.ZUGFeRDService/App.config +++ b/Services.ZUGFeRDService/App.config @@ -32,7 +32,7 @@ 10 - + False @@ -40,6 +40,9 @@ 1234567890_EXAMPLE_KEY + + 1 + diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index 301b5af9..6826f9b4 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/Services.ZUGFeRDService/My Project/Settings.Designer.vb b/Services.ZUGFeRDService/My Project/Settings.Designer.vb index 039b8db7..23e76424 100644 --- a/Services.ZUGFeRDService/My Project/Settings.Designer.vb +++ b/Services.ZUGFeRDService/My Project/Settings.Designer.vb @@ -143,6 +143,15 @@ Namespace My Return CType(Me("GDPICTURE_KEY"),String) End Get End Property + + _ + Public ReadOnly Property MSSQLEmailOutAccountID() As Integer + Get + Return CType(Me("MSSQLEmailOutAccountID"),Integer) + End Get + End Property End Class End Namespace diff --git a/Services.ZUGFeRDService/My Project/Settings.settings b/Services.ZUGFeRDService/My Project/Settings.settings index 2358b177..15771199 100644 --- a/Services.ZUGFeRDService/My Project/Settings.settings +++ b/Services.ZUGFeRDService/My Project/Settings.settings @@ -32,5 +32,8 @@ 1234567890_EXAMPLE_KEY + + 1 + \ No newline at end of file diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb index 8650ce47..d312fd77 100644 --- a/Services.ZUGFeRDService/ThreadRunner.vb +++ b/Services.ZUGFeRDService/ThreadRunner.vb @@ -112,7 +112,7 @@ Public Class ThreadRunner Dim args As WorkerArgs = e.Argument _logger.Debug("Background worker running..") - Dim job As New ImportZUGFeRDFiles(_logConfig, _firebird, _mssql) + Dim job As New ImportZUGFeRDFiles(_logConfig, _firebird, My.Settings.MSSQLEmailOutAccountID, _mssql) job.Start(args) Catch ex As Exception _logger.Warn("Background worker failed!") diff --git a/Services.ZUGFeRDService/ZUGFeRDService.vb b/Services.ZUGFeRDService/ZUGFeRDService.vb index 7240e66e..bce07056 100644 --- a/Services.ZUGFeRDService/ZUGFeRDService.vb +++ b/Services.ZUGFeRDService/ZUGFeRDService.vb @@ -12,7 +12,7 @@ Public Class ZUGFeRDService Private _threadRunner As ThreadRunner Protected Overrides Sub OnStart(ByVal args() As String) - _logConfig = New LogConfig(PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log")) + _logConfig = New LogConfig(PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, "Digital Data", "DDZUGFeRDService") _logConfig.Debug = True _logger = _logConfig.GetLogger() _logger.Info($"{My.Settings.SERVICE_NAME} is starting.")