diff --git a/app/.vs/windream-Result-Handler/DesignTimeBuild/.dtbcache b/app/.vs/windream-Result-Handler/DesignTimeBuild/.dtbcache index 3787187..9cc9692 100644 Binary files a/app/.vs/windream-Result-Handler/DesignTimeBuild/.dtbcache and b/app/.vs/windream-Result-Handler/DesignTimeBuild/.dtbcache differ diff --git a/app/.vs/windream-Result-Handler/v16/Server/sqlite3/db.lock b/app/.vs/windream-Result-Handler/v16/Server/sqlite3/db.lock new file mode 100644 index 0000000..e69de29 diff --git a/app/.vs/windream-Result-Handler/v16/Server/sqlite3/storage.ide b/app/.vs/windream-Result-Handler/v16/Server/sqlite3/storage.ide new file mode 100644 index 0000000..21e2589 Binary files /dev/null and b/app/.vs/windream-Result-Handler/v16/Server/sqlite3/storage.ide differ diff --git a/app/ClassWMResulthandler/My Project/AssemblyInfo.vb b/app/ClassWMResulthandler/My Project/AssemblyInfo.vb index 27b618f..50282c0 100644 --- a/app/ClassWMResulthandler/My Project/AssemblyInfo.vb +++ b/app/ClassWMResulthandler/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/ClassWMResulthandler/clsDateiverarbeitung.vb b/app/ClassWMResulthandler/clsDateiverarbeitung.vb index 4899047..665f4f6 100644 --- a/app/ClassWMResulthandler/clsDateiverarbeitung.vb +++ b/app/ClassWMResulthandler/clsDateiverarbeitung.vb @@ -308,7 +308,7 @@ Public Class clsDateiverarbeitung Logger.Debug("tempFilename: " & tempFilename) 'Überprüfen ob File existiert Do While IO.File.Exists(tempFilename) = True - tempFilename = ZielPfad & "\" & Filename & "~" & version & Extension + tempFilename = ZielPfad & "\" & Filename & "_" & version & Extension version += 1 Loop Logger.Debug("RenameFile - OLDFilename: " & aktfile_Exportresult & " - NEWFilename: " & Path.GetFileName(tempFilename)) @@ -353,7 +353,7 @@ Public Class clsDateiverarbeitung Dim version As Integer = 2 'Überprüfen ob File existiert Do While IO.File.Exists(tempFilename) = True - tempFilename = ZielPfad & "\" & WMvalue & "~" & version & Extension + tempFilename = ZielPfad & "\" & WMvalue & "_" & version & Extension version += 1 Loop File.Copy(copybasefile, tempFilename, True) diff --git a/app/ClassWMResulthandler/clsEmail.vb b/app/ClassWMResulthandler/clsEmail.vb index 470eee4..b173133 100644 --- a/app/ClassWMResulthandler/clsEmail.vb +++ b/app/ClassWMResulthandler/clsEmail.vb @@ -14,66 +14,6 @@ Public Class clsEmail Sub New(MyLogger As LogConfig) Logger = MyLogger.GetLogger() End Sub - Public Function Testmail(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, - AUTH_TYPE As String, Optional attment As String = "") - Try - Dim oReceipiants As String() - If mailto.Contains(";") Then - oReceipiants = mailto.Split(";") - Else - ReDim Preserve oReceipiants(0) - oReceipiants(0) = mailto - End If - For Each oMailReceipiant As String In oReceipiants - Dim sClient = New Mail.SmtpClient(mailsmtp) - Dim mymesssage As New MailMessage - sClient.Port = mailport - If AUTH_TYPE = "SSL" Then - sClient.EnableSsl = True - Else - sClient.EnableSsl = False - End If - - sClient.Credentials = New NetworkCredential(mailUser, mailPW) - sClient.UseDefaultCredentials = False - - mymesssage.Body = $"This is the body (text will be replaced within profile)!
mailsmtp: {mailsmtp}
mailport: {mailport}
mailUser: {mailUser}
mailPW: XXXX
AUTH_TYPE: {AUTH_TYPE}" - Dim htmlView As AlternateView = AlternateView.CreateAlternateViewFromString(mymesssage.Body) - htmlView.ContentType = New System.Net.Mime.ContentType("text/html") - mymesssage.AlternateViews.Add(htmlView) - - mymesssage.From = New MailAddress(mailfrom) - mymesssage.Subject = mailSubject - mymesssage.To.Add(New MailAddress(oMailReceipiant)) - - If attment <> String.Empty Then - Dim oAttment As String = attment.Replace("W:\", "\\windream\objects\") - - If System.IO.File.Exists(oAttment) Then - Logger.Info($"working on attachment {oAttment}...") - Dim oAttachment As New System.Net.Mail.Attachment(oAttment) - - mymesssage.Attachments.Add(oAttachment) - Else - MsgBox($"Attachment {oAttment.ToString} is not existing - Mail won't be send!") - Return False - End If - End If - - - sClient.Send(mymesssage) - Logger.Info($"Email has been send to {oMailReceipiant}!!") - Next - - - Return True - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical) - Return False - End Try - - End Function Public Function Email_Send(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, AUTH_TYPE As String, Optional attment As String = "", Optional Test As Boolean = False) @@ -134,6 +74,7 @@ Public Class clsEmail mymesssage.Subject = mailSubject mymesssage.To.Add(New MailAddress(oMailReceipiant)) sClient.Send(mymesssage) + Logger.Info($"Email successfully send to: [{oMailReceipiant}]!") Next If oError = False Then Return True @@ -147,153 +88,4 @@ Public Class clsEmail End Try End Function - Public Function Email_Send_Independentsoft(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, - AUTH_TYPE As String, Optional attment As String = "") - - - Try - Logger.Debug($"in Email_Send_Independentsoft..") - Dim empfaenger As String() - If mailto.Contains(";") Then - empfaenger = mailto.Split(";") - Else - ReDim Preserve empfaenger(0) - empfaenger(0) = mailto - End If - Dim _error As Boolean = False - 'Für jeden Empfänger eine Neue Mail erzeugen - 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 - Logger.Debug($"Message created..") - Dim textBodyPart As New BodyPart() - textBodyPart.ContentType = New Independentsoft.Email.Mime.ContentType("text", "html", "utf-8") - textBodyPart.ContentTransferEncoding = ContentTransferEncoding.QuotedPrintable - textBodyPart.Body = mailBody - message.BodyParts.Add(textBodyPart) - attment = attment.Replace("W:\", "\\windream\objects\") - If attment <> String.Empty Then - If System.IO.File.Exists(attment) Then - Logger.Info($"working on attachment {attment.ToString}...") - Dim attachment1 As New Independentsoft.Email.Mime.Attachment(attment) - If attment.ToLower.EndsWith("pdf") Then - attachment1.ContentType = New Independentsoft.Email.Mime.ContentType("application", "pdf") - ElseIf attment.ToLower.EndsWith("jpg") Then - attachment1.ContentType = New Independentsoft.Email.Mime.ContentType("application", "jpg") - ElseIf attment.ToLower.EndsWith("docx") Then - attachment1.ContentType = New Independentsoft.Email.Mime.ContentType("application", "MS-word") - End If - message.BodyParts.Add(attachment1) - Else - Logger.Warn($"Attachment {attment.ToString} is not existing - Mail won't be send!") - Return False - End If - End If - Dim client As Smtp.SmtpClient - Try - client = New Smtp.SmtpClient(mailsmtp, mailport) - Catch ex As Exception - Logger.Warn("clsEmail.Create Client: " & ex.Message) - _error = True - Continue For - End Try - 'Try - ' client.Connect() - 'Catch ex As Exception - ' Logger.Warn("clsEmail.Client.Connect: " & ex.Message) - ' _error = True - ' ' Continue For - 'End Try - - If AUTH_TYPE = "SSL" Then - client.EnableSsl = True - ' client.ValidateRemoteCertificate = True - Logger.Info("Authentification via SSL.") - ElseIf AUTH_TYPE = "TLS" Then - ' client.ValidateRemoteCertificate = False - client.StartTls() - client.EnableSsl = False - Logger.Info("Authentification via TLS. SSL disabled") - Else - client.EnableSsl = False - Logger.Info("Authentification NONE. SSL disabled") - End If - Try - client.Connect() - Logger.Info("Connected to Client!") - Catch ex As Exception - Logger.Warn("clsEmail.Client.Connect2: " & ex.Message) - _error = True - ' Continue For - End Try - Try - If mailsmtp.Contains("office365.com") Then - client.Login(mailUser, mailPW, AuthenticationType.None) - Else - client.Login(mailUser, mailPW) - End If - - Logger.Info("Logged in!") - Catch ex As Exception - Try - If mailsmtp.Contains("office365.com") Then - client.Login(mailUser, mailPW, AuthenticationType.Login) - Else - client.Login(mailUser, mailPW, AuthenticationType.None) - End If - - Catch ex1 As Exception - Try - client.Login(mailUser, mailPW, AuthenticationType.Login) - Catch ex2 As Exception - Logger.Warn("clsEmail.Client.Login: " & ex.Message) - _error = True - client.Disconnect() - Continue For - End Try - End Try - End Try - Try - client.Send(message) - Logger.Info("Message to " & _mailempfaenger & " has been send.") - _error = False - Catch ex As Exception - Logger.Warn("clsEmail.Client.Send: " & ex.Message) - Try - client.Login(mailUser, mailPW, AuthenticationType.Login) - client.Send(message) - Catch ex1 As Exception - Logger.Warn("clsEmail.Client.Send2: " & ex.Message) - _error = True - client.Disconnect() - Continue For - End Try - - - - End Try - client.Disconnect() - - Catch ex As Exception - Logger.Error(ex) - _error = True - End Try - Next - - If _error = True Then - Return False - Else - Return True - End If - Catch ex As Exception - Logger.Error(ex) - Return False - End Try - End Function - End Class diff --git a/app/ClassWMResulthandler/clsProfil.vb b/app/ClassWMResulthandler/clsProfil.vb index e94ccc4..299a85b 100644 --- a/app/ClassWMResulthandler/clsProfil.vb +++ b/app/ClassWMResulthandler/clsProfil.vb @@ -144,7 +144,7 @@ Public Class clsProfil Return False End If If windreamSucheErgebnisse.Count > 0 Then - Logger.Info(windreamSucheErgebnisse.Count & " files shall be worked!") + Logger.Info(windreamSucheErgebnisse.Count & " file(s) shall be worked!") Logger.Debug("SELECT * FROM TBWMRH_PROFIL_JOB WHERE AKTIV = 1 AND PROFIL_ID = " & _profGUID & " ORDER BY REIHENFOLGE") Dim DT_PROFIL_JOB As DataTable = _database.Return_Datatable("SELECT * FROM TBWMRH_PROFIL_JOB WHERE AKTIV = 1 AND PROFIL_ID = " & _profGUID & " ORDER BY REIHENFOLGE") @@ -169,7 +169,7 @@ Public Class clsProfil For Each DR_PR_JB As DataRow In DT_PROFIL_JOB.Rows Select Case DR_PR_JB.Item("JOB_TYP").ToString.ToUpper Case "Create Mail Attachment".ToUpper - Logger.Info("JobType: Create Mail Attachment") + Logger.Debug("JobType: Create Mail Attachment") 'XX Dim Email_Empfänger = DR_PR_JB.Item("STRING1") @@ -243,7 +243,7 @@ Public Class clsProfil End If Case "Export HDD".ToUpper - Logger.Info($"{oFileRunNo} JobType: Case Export HDD") + Logger.Debug($"{oFileRunNo} JobType: Case Export HDD") 'Für jedes Dokument in der Windream-Ergebnisliste 'For Each dok As WMObject In windreamSucheErgebnisse ' aktuelles Dokument zum Export bereitstellen @@ -257,7 +257,7 @@ Public Class clsProfil End If 'Next Case "BNS json Download".ToUpper - Logger.Info($"{oFileRunNo} JobType: BNS json Download") + Logger.Debug($"{oFileRunNo} JobType: BNS json Download") FileJobSuccessful = _dateiverarbeitung.BNSjsonDownload(WMdok, DR_PR_JB.Item("STRING1"), DR_PR_JB.Item("STRING2")) 'Case "Send to printer".ToUpper ' Logger.Info("JobType: Send to printer") @@ -393,7 +393,6 @@ Public Class clsProfil If arrValue Is Nothing = False Then - ' MsgBox("now indexing with: " & idxvalue) Dim oErrorOccurred = windream_index.RunIndexing(WMdok, arrIndex, arrValue, _profObjekttyp) ' 07.01.2019: Weitere Jobs bei Fehler in RunIndexing überspringen @@ -644,27 +643,35 @@ Public Class clsProfil Next Case "Send InfoMail with WM-Search".ToUpper Logger.Info("Working on CASE Send InfoMail with WM-Search.... ") - Dim oWMResults As WMObjects = windream.GetSearchDocuments(DR_PR_JB.Item("STRING5")) - If oWMResults Is Nothing Then - Logger.Warn("windreamSucheErgebnisse is nothing ( Send InfoMail with WM-Search)!", True, "clsProfil.Profil_Durchlauf") - Return False - End If - If oWMResults.Count > 0 Then - If _JobWork.New_Mail_with_attachment(DR_PR_JB.Item("STRING1"), DR_PR_JB.Item("STRING2"), DR_PR_JB.Item("STRING3"), DR_PR_JB.Item("STRING4"), clsCURRENT.DT_TBDD_EMAIL, DR_PR_JB.Item("STRING5")) = True Then - FileJobSuccessful = True - If DT_PROFIL_FILE_JOB.Rows.Count > 0 Then - For Each DR_PR_FILE_JOB As DataRow In DT_PROFIL_FILE_JOB.Rows - For Each oWMDoc As WMObject In oWMResults - _dateiverarbeitung.Check_File_job(oWMDoc, DR_PR_FILE_JOB.Item("TYP").ToString.ToLower, DR_PR_FILE_JOB.Item("STRING1").ToString, DR_PR_FILE_JOB.Item("STRING2").ToString, _profObjekttyp, windream_index) - Next + 'Dim oWMResults As WMObjects = windream.GetSearchDocuments(DR_PR_JB.Item("STRING5")) + 'If oWMResults Is Nothing Then + ' Logger.Warn("windreamSucheErgebnisse is nothing ( Send InfoMail with WM-Search)!", True, "clsProfil.Profil_Durchlauf") + ' Return False + 'End If + Try + If windreamSucheErgebnisse.Count > 0 Then + Logger.Debug("windreamSucheErgebnisse.Count > 0 .... ") + If _JobWork.New_Mail_with_attachment(DR_PR_JB.Item("STRING1"), DR_PR_JB.Item("STRING2"), DR_PR_JB.Item("STRING3"), DR_PR_JB.Item("STRING4"), clsCURRENT.DT_TBDD_EMAIL, DR_PR_JB.Item("STRING5")) = True Then + FileJobSuccessful = True + 'If DT_PROFIL_FILE_JOB.Rows.Count > 0 Then + ' For Each DR_PR_FILE_JOB As DataRow In DT_PROFIL_FILE_JOB.Rows + ' For Each oWMDoc As WMObject In oWMResults + ' _dateiverarbeitung.Check_File_job(oWMDoc, DR_PR_FILE_JOB.Item("TYP").ToString.ToLower, DR_PR_FILE_JOB.Item("STRING1").ToString, DR_PR_FILE_JOB.Item("STRING2").ToString, _profObjekttyp, windream_index) + ' Next + + ' Next + 'End If - Next End If - + Else + Logger.Info("Attention: Send InfoMail with WM-Search - windreamSucheErgebnisse.Count = 0") + FileJobSuccessful = False End If - Else - Logger.Info("Send InfoMail with WM-Search - oWMResults.Count = 0") - End If + Catch ex As Exception + Logger.Warn($"Unexpected Error in Case [Send InfoMail with WM-Search] Error: [{ex.Message}]") + FileJobSuccessful = False + End Try + End Select If FileJobSuccessful = True Then diff --git a/app/ClassWMResulthandler/clsWindream_Index.vb b/app/ClassWMResulthandler/clsWindream_Index.vb index 95b57d8..076c2e1 100644 --- a/app/ClassWMResulthandler/clsWindream_Index.vb +++ b/app/ClassWMResulthandler/clsWindream_Index.vb @@ -286,7 +286,7 @@ Public Class clsWindream_Index 'If indexname = "Tournr" Then 'End If - Logger.Info("Indexierung von Index '" & indexname & "'") + Logger.Debug("Indexierung von Index '" & indexname & "'") Dim value = aValues(i) Dim convertValue @@ -562,7 +562,7 @@ Public Class clsWindream_Index End If 'Jetzt die Nachindexierung für Vektor-Felder oDocument.SetVariableValue(aName, myArray) - Logger.Info("'SetVariableValue' für VEKTOR erfolgreich") + Logger.Debug("'SetVariableValue' für VEKTOR erfolgreich") End If Else Logger.Debug("Array der Indexwerte ist leer/Nothing - Keine Nachindexierung") diff --git a/app/DDWDResultHandler/App.config b/app/DDWDResultHandler/App.config index 1b577f1..b64d8b9 100644 --- a/app/DDWDResultHandler/App.config +++ b/app/DDWDResultHandler/App.config @@ -6,9 +6,6 @@
- -
- @@ -17,10 +14,13 @@ - Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + + + 2 @@ -43,11 +43,4 @@ - - - - - - - \ No newline at end of file diff --git a/app/DDWDResultHandler/DDWDResultHandler.vb b/app/DDWDResultHandler/DDWDResultHandler.vb index 5260638..7d9e0b9 100644 --- a/app/DDWDResultHandler/DDWDResultHandler.vb +++ b/app/DDWDResultHandler/DDWDResultHandler.vb @@ -96,7 +96,6 @@ Public Class DDWDResultHandler If My.Settings.SQLSERVER_CS_RH <> "" Then Logger.Info("Thread ResultHandler will now be started for initial Run..") threadResultHandler.RunWorkerAsync() - Logger.Info("Thread PM Refresh will be started after 2mins for initial Run..") End If End If @@ -185,7 +184,7 @@ Public Class DDWDResultHandler End If Next Else - Logger.Info("Keine aktiven Profile WMResulthandler vorhanden") + Logger.Info("Keine aktiven Profile für WMResulthandler vorhanden") notcompleted = True End If 'Try @@ -205,7 +204,7 @@ Public Class DDWDResultHandler threadPMRefresh.RunWorkerAsync() End If Else - Logger.Warn("clsDatabase konnte nicht initialisiert werden!") + Logger.Warn($"clsDatabase konnte nicht initialisiert werden! {My.Settings.SQLSERVER_CS_RH}") notcompleted = True End If Else diff --git a/app/DDWDResultHandler/My Project/AssemblyInfo.vb b/app/DDWDResultHandler/My Project/AssemblyInfo.vb index 2aaf426..e18d1e1 100644 --- a/app/DDWDResultHandler/My Project/AssemblyInfo.vb +++ b/app/DDWDResultHandler/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DDWDResultHandler/My Project/Settings.Designer.vb b/app/DDWDResultHandler/My Project/Settings.Designer.vb index e4aac9b..7775af6 100644 --- a/app/DDWDResultHandler/My Project/Settings.Designer.vb +++ b/app/DDWDResultHandler/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -56,8 +56,8 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ + "rity Info=True;User ID=sa;Password=dd")> _ Public ReadOnly Property SQLSERVER_CS_RH() As String Get Return CType(Me("SQLSERVER_CS_RH"),String) @@ -66,23 +66,21 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ + "rity Info=True;User ID=sa;Password=dd")> _ Public ReadOnly Property SQLSERVER_CS_PMRefresh() As String Get Return CType(Me("SQLSERVER_CS_PMRefresh"),String) End Get End Property - _ - Public Property PMREFRESH_INTERVALL() As String + Global.System.Configuration.DefaultSettingValueAttribute("2")> _ + Public ReadOnly Property PMREFRESH_INTERVALL() As Integer Get - Return CType(Me("PMREFRESH_INTERVALL"),String) + Return CType(Me("PMREFRESH_INTERVALL"),Integer) End Get - Set - Me("PMREFRESH_INTERVALL") = value - End Set End Property End Class End Namespace diff --git a/app/DDWDResultHandler/My Project/Settings.settings b/app/DDWDResultHandler/My Project/Settings.settings index a729f31..329d744 100644 --- a/app/DDWDResultHandler/My Project/Settings.settings +++ b/app/DDWDResultHandler/My Project/Settings.settings @@ -3,10 +3,13 @@ - Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + + + 2 \ No newline at end of file diff --git a/app/DDWDResultHandler/clsPMRefresh.vb b/app/DDWDResultHandler/clsPMRefresh.vb index 50cf76f..5011650 100644 --- a/app/DDWDResultHandler/clsPMRefresh.vb +++ b/app/DDWDResultHandler/clsPMRefresh.vb @@ -75,6 +75,8 @@ Public Class clsPMRefresh Return True Else Logger.Info($"No run of PMRefresh as hour is not in timespan ({CInt(Now.Hour)} >= {oMinHour} And {CInt(Now.Hour)} < {oMaxHour})") + Logger.Info($"Check TBPM_KONFIGURATION Column SERVICE_SCHEDULE") + End If Else Logger.Info($"No run of PMRefresh as today Is Not configured as RUN") @@ -97,6 +99,68 @@ Public Class clsPMRefresh End Try End Function + Public Function GetSearchDocumentsDTviaSQL(ByVal pSQLCommand As String) As DataTable + Dim dtresult As New DataTable + dtresult.Columns.Add("DOC_ID", GetType(Integer)) + dtresult.Columns.Add("PATH", GetType(String)) + dtresult.Columns.Add("CREATED", GetType(String)) + + Try + Dim oSQLRESULT As DataTable = _database.Return_Datatable(pSQLCommand) + If IsNothing(oSQLRESULT) Then + Return dtresult + End If + 'If returnDT = True Then + If oSQLRESULT.Rows.Count > 0 Then + + For Each oDocRow As DataRow In oSQLRESULT.Rows + Dim oDOC_ID As Int64 + Try + oDOC_ID = oDocRow.Item("IDB_OBJ_ID") + Catch ex As Exception + Try + oDOC_ID = oDocRow.Item("DocID") + Catch ex1 As Exception + Logger.Warn("Could not get DocID-Column: " & ex.Message) + Return dtresult + End Try + End Try + Dim oCreated + Try + oCreated = oDocRow.Item("ADDED_WHEN") + Catch ex As Exception + Try + oCreated = oDocRow.Item("AddedWhen") + Catch ex1 As Exception + Logger.Warn($"(GetSearchDocumentsDTviaSQL)Could not get AddedWhen-Column: [{ex.Message}] - SQL-Command: [{pSQLCommand}]") + Return dtresult + End Try + End Try + + Dim oPath As String + Try + oPath = oDocRow.Item("DocRelativePath") + Catch ex As Exception + Try + oPath = oDocRow.Item("FULL_FILENAME") + Catch ex1 As Exception + Logger.Warn($"(GetSearchDocumentsDTviaSQL)Could not get FULL_FILENAME-Column: [{ex.Message}] - SQL-Command: [{pSQLCommand}]") + Return dtresult + End Try + End Try + Logger.Debug($"Adding DocInfo {oDOC_ID.ToString}|{oPath}|{oCreated}") + dtresult.Rows.Add(oDOC_ID, oPath, oCreated) + Next + dtresult.AcceptChanges() + End If + Return dtresult + Catch ex As Exception + Logger.Error(ex) + Logger.Warn($"Error Getting Docs via SLQ ({pSQLCommand})") + Return dtresult + End Try + End Function + Public Function Refresh_Data() Dim oStep As String Try @@ -134,7 +198,13 @@ Public Class clsPMRefresh '---------------------- Die Dateien auslesen ------------------------ Dim oDTWM_Results As DataTable oStep = "4c" - oDTWM_Results = _windream.GetSearchDocumentsDT(WD_Search, oConfigIDXName_DocID, oConfigIDXName_Created, True) + If WD_Search.Contains("wdf") Or WD_Search.Contains("wdfx") Then + oDTWM_Results = _windream.GetSearchDocumentsDT(WD_Search, oConfigIDXName_DocID, oConfigIDXName_Created, True) + Else + Logger.Debug("Search via SQL") + oDTWM_Results = GetSearchDocumentsDTviaSQL(WD_Search) + End If + oStep = "4d" Dim oDocCount As Integer = 0 If IsNothing(oDTWM_Results) Then diff --git a/app/ResultHandler_Konfig/App.config b/app/ResultHandler_Konfig/App.config index cc59468..cab7527 100644 --- a/app/ResultHandler_Konfig/App.config +++ b/app/ResultHandler_Konfig/App.config @@ -8,7 +8,7 @@ - diff --git a/app/ResultHandler_Konfig/My Project/Settings.Designer.vb b/app/ResultHandler_Konfig/My Project/Settings.Designer.vb index 453530b..14ae958 100644 --- a/app/ResultHandler_Konfig/My Project/Settings.Designer.vb +++ b/app/ResultHandler_Konfig/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -57,8 +57,8 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ + "rity Info=True;User ID=sa;Password=dd")> _ Public ReadOnly Property SQLSERVER_CS() As String Get Return CType(Me("SQLSERVER_CS"),String) diff --git a/app/ResultHandler_Konfig/My Project/Settings.settings b/app/ResultHandler_Konfig/My Project/Settings.settings index 0759156..a9bc66e 100644 --- a/app/ResultHandler_Konfig/My Project/Settings.settings +++ b/app/ResultHandler_Konfig/My Project/Settings.settings @@ -5,10 +5,10 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> + <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd diff --git a/app/ResultHandler_Konfig/My Project/licenses.licx b/app/ResultHandler_Konfig/My Project/licenses.licx index 4308626..824a99f 100644 --- a/app/ResultHandler_Konfig/My Project/licenses.licx +++ b/app/ResultHandler_Konfig/My Project/licenses.licx @@ -1 +1 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj b/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj index a54eac4..1a012a8 100644 --- a/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj +++ b/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj @@ -54,17 +54,24 @@ ico638.ico - - - - - - - - + + + + + + + + + + + + ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\..\..\DDMonorepo\Message\bin\Debug\DigitalData.Modules.Messaging.dll + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll diff --git a/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj.bak b/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj.bak new file mode 100644 index 0000000..a54eac4 --- /dev/null +++ b/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj.bak @@ -0,0 +1,235 @@ + + + + + Debug + AnyCPU + {85F6D07F-4C83-41C6-AEF1-66F228C13C25} + WinExe + ResultHandler_Konfig.My.MyApplication + ResultHandler_Konfig + ResultHandler_Konfig + 512 + WindowsForms + v4.6.1 + true + + + + + + AnyCPU + true + full + true + true + bin\Debug\ + ResultHandler_Konfig.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + ResultHandler_Konfig.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + ico638.ico + + + + + + + + + + + + ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll + False + + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll + True + + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll + True + + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll + True + + + + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.8\lib\net45\NLog.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + frmMain.vb + Form + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + True + True + MyDataset.xsd + + + + + frmMain.vb + Designer + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + MyDataset.xsd + + + Designer + MSDataSetGenerator + MyDataset.Designer.vb + + + MyDataset.xsd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {b3190aec-8dc4-4822-9609-54df5b976262} + DD_WMResulthandler + + + + + \ No newline at end of file diff --git a/app/ResultHandler_Konfig/frmMain.Designer.vb b/app/ResultHandler_Konfig/frmMain.Designer.vb index 2239dba..17736d1 100644 --- a/app/ResultHandler_Konfig/frmMain.Designer.vb +++ b/app/ResultHandler_Konfig/frmMain.Designer.vb @@ -238,7 +238,7 @@ Partial Class frmMain Me.Button4 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.EncryptToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.txtTestmail = New System.Windows.Forms.TextBox() + Me.txtTestmailTo = New System.Windows.Forms.TextBox() Me.Label1 = New System.Windows.Forms.Label() Me.btnsendtestmail = New System.Windows.Forms.Button() Me.GUIDTextBox1 = New System.Windows.Forms.TextBox() @@ -2372,7 +2372,7 @@ Partial Class frmMain Me.TabPage4.Controls.Add(Label5) Me.TabPage4.Controls.Add(Me.txtnewpasswort) Me.TabPage4.Controls.Add(Me.Button4) - Me.TabPage4.Controls.Add(Me.txtTestmail) + Me.TabPage4.Controls.Add(Me.txtTestmailTo) Me.TabPage4.Controls.Add(Me.Label1) Me.TabPage4.Controls.Add(Me.btnsendtestmail) Me.TabPage4.Controls.Add(GUIDLabel3) @@ -2490,14 +2490,14 @@ Partial Class frmMain Me.EncryptToolStripMenuItem.Size = New System.Drawing.Size(114, 22) Me.EncryptToolStripMenuItem.Text = "encrypt" ' - 'txtTestmail + 'txtTestmailTo ' - Me.txtTestmail.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ResultHandler_Konfig.My.MySettings.Default, "EmailTestReceipiant", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.txtTestmail.Location = New System.Drawing.Point(78, 347) - Me.txtTestmail.Name = "txtTestmail" - Me.txtTestmail.Size = New System.Drawing.Size(311, 22) - Me.txtTestmail.TabIndex = 29 - Me.txtTestmail.Text = Global.ResultHandler_Konfig.My.MySettings.Default.EmailTestReceipiant + Me.txtTestmailTo.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ResultHandler_Konfig.My.MySettings.Default, "EmailTestReceipiant", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.txtTestmailTo.Location = New System.Drawing.Point(78, 347) + Me.txtTestmailTo.Name = "txtTestmailTo" + Me.txtTestmailTo.Size = New System.Drawing.Size(311, 22) + Me.txtTestmailTo.TabIndex = 29 + Me.txtTestmailTo.Text = Global.ResultHandler_Konfig.My.MySettings.Default.EmailTestReceipiant ' 'Label1 ' @@ -3027,7 +3027,7 @@ Partial Class frmMain Friend WithEvents CHANGED_WHOTextBox As TextBox Friend WithEvents CHANGED_WHENTextBox As TextBox Friend WithEvents btnsendtestmail As Button - Friend WithEvents txtTestmail As TextBox + Friend WithEvents txtTestmailTo As TextBox Friend WithEvents Label1 As Label Friend WithEvents Button4 As Button Friend WithEvents txtnewpasswort As TextBox diff --git a/app/ResultHandler_Konfig/frmMain.resx b/app/ResultHandler_Konfig/frmMain.resx index 1fa529d..21c57e5 100644 --- a/app/ResultHandler_Konfig/frmMain.resx +++ b/app/ResultHandler_Konfig/frmMain.resx @@ -260,7 +260,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAI - DAAAAk1TRnQBSQFMAgEBAwEAAXgBAwF4AQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBAwEAAYABAwGAAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/ResultHandler_Konfig/frmMain.vb b/app/ResultHandler_Konfig/frmMain.vb index a9022f6..d8f3031 100644 --- a/app/ResultHandler_Konfig/frmMain.vb +++ b/app/ResultHandler_Konfig/frmMain.vb @@ -1,5 +1,6 @@ Imports System.ServiceProcess Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Messaging Imports DD_WMResulthandler Imports System.Net.Mail Imports System.Net @@ -8,7 +9,6 @@ Public Class frmMain Private _windream As clsWindream_allgemein Private _database As clsDatabase Private _profil As clsProfil - Private _email As clsEmail Dim MyLogger As LogConfig Dim Logger As Logger Dim switchRecord As Boolean = True @@ -34,7 +34,6 @@ Public Class frmMain Logger = MyLogger.GetLogger() Load_Constring() _database = New clsDatabase(MyLogger) - _email = New clsEmail(MyLogger) Logger.Info("Konfig started: " & Now.ToString) Try ' Windream instanziieren @@ -843,7 +842,7 @@ Public Class frmMain mymesssage.From = New MailAddress(EMAIL_FROMTextBox.Text) mymesssage.Subject = "TestSubject from RAW Method" - mymesssage.To.Add(New MailAddress(txtTestmail.Text)) + mymesssage.To.Add(New MailAddress(txtTestmailTo.Text)) If txtAttachment.Text <> String.Empty Then Dim oAttment As String = txtAttachment.Text.Replace("W:\", "\\windream\objects\") @@ -869,22 +868,21 @@ Public Class frmMain End Sub Private Sub btnsendtestmail_Click(sender As Object, e As EventArgs) Handles btnsendtestmail.Click + Dim _ss2email As New Email(MyLogger) - - If txtTestmail.Text <> String.Empty Then + If txtTestmailTo.Text <> String.Empty Then My.Settings.Save() Dim wrapper As New clsEncryption("!35452didalog=") Dim PWPlain = wrapper.DecryptData(EMAIL_PWTextBox.Text) - - - If _email.Email_Send("Testmail from GUI WMResultHandler", "This is the body (text will be replaced within profile)", txtTestmail.Text, - EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, txtAttachment.Text, True) = True Then + If _ss2email.NewEmail(txtTestmailTo.Text, "Testmail from GUI WMResultHandler", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, + PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "GUI WMRH - Test") = True Then MsgBox("Email(s) has/have been sent successfully.", MsgBoxStyle.Information) Else MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation) End If End If + End Sub Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click