From 6e7670f6677929d5431ad058232fc78f9677c825 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Tue, 24 Sep 2024 17:48:29 +0200 Subject: [PATCH 1/2] Service GDPicture --- .../EnvelopeGenerator.Service.vbproj | 14 +++- .../My Project/AssemblyInfo.vb | 4 +- EnvelopeGenerator.Service/Scheduler.vb | 65 ++++++++++--------- EnvelopeGenerator.Service/Service.vb | 3 +- EnvelopeGenerator.Service/packages.config | 2 + 5 files changed, 52 insertions(+), 36 deletions(-) diff --git a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj index f4d0f95e..59e955a6 100644 --- a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj +++ b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj @@ -14,6 +14,8 @@ v4.8 true + + AnyCPU @@ -66,9 +68,8 @@ ..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll - - False - D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll @@ -177,4 +178,11 @@ + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + + \ No newline at end of file diff --git a/EnvelopeGenerator.Service/My Project/AssemblyInfo.vb b/EnvelopeGenerator.Service/My Project/AssemblyInfo.vb index 94cf9c00..e2ef66b7 100644 --- a/EnvelopeGenerator.Service/My Project/AssemblyInfo.vb +++ b/EnvelopeGenerator.Service/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/EnvelopeGenerator.Service/Scheduler.vb b/EnvelopeGenerator.Service/Scheduler.vb index 98b30906..a6cf19ad 100644 --- a/EnvelopeGenerator.Service/Scheduler.vb +++ b/EnvelopeGenerator.Service/Scheduler.vb @@ -26,47 +26,52 @@ Public Class Scheduler End Sub Public Async Function Start(pInterval As Integer) As Task - Logger.Debug("Starting Scheduler..") + Try + Logger.Debug("Starting Scheduler..") - Dim oProperties As New NameValueCollection() + Dim oProperties As New NameValueCollection() - Scheduler = Await SchedulerBuilder.Create(oProperties). - UseDefaultThreadPool(Sub(x) x.MaxConcurrency = 5). - BuildScheduler() + Scheduler = Await SchedulerBuilder.Create(oProperties). + UseDefaultThreadPool(Sub(x) x.MaxConcurrency = 5). + BuildScheduler() - Dim oJobKey = New JobKey(JobName) - Dim oJobData = New JobDataMap() From { - {Common.Constants.GDPICTURE, LicenseKey}, - {Common.Constants.LOGCONFIG, LogConfig}, - {Common.Constants.DATABASE, ConnectionString}, - {Common.Constants.IGNORED_LABELS, _ignoredLabels} - } + Dim oJobKey = New JobKey(JobName) + Dim oJobData = New JobDataMap() From { + {Common.Constants.GDPICTURE, LicenseKey}, + {Common.Constants.LOGCONFIG, LogConfig}, + {Common.Constants.DATABASE, ConnectionString}, + {Common.Constants.IGNORED_LABELS, _ignoredLabels} + } - Logger.Debug("Initialized Job [{0}]", JobName) + Logger.Debug("Initialized Job [{0}]", JobName) - Dim oJob As IJobDetail = JobBuilder.Create(Of FinalizeDocumentJob). - UsingJobData(oJobData). - WithIdentity(oJobKey). - Build() + Dim oJob As IJobDetail = JobBuilder.Create(Of FinalizeDocumentJob). + UsingJobData(oJobData). + WithIdentity(oJobKey). + Build() - Dim oTrigger As ITrigger = TriggerBuilder.Create(). - ForJob(oJobKey). - WithIdentity($"{JobName}-trigger"). - WithSimpleSchedule(Sub(s) s. - RepeatForever(). - WithIntervalInMinutes(pInterval)). - StartNow(). - Build() + Dim oTrigger As ITrigger = TriggerBuilder.Create(). + ForJob(oJobKey). + WithIdentity($"{JobName}-trigger"). + WithSimpleSchedule(Sub(s) s. + RepeatForever(). + WithIntervalInMinutes(pInterval)). + StartNow(). + Build() - Logger.Debug("Initialized Trigger") + Logger.Debug("Initialized Trigger") - Await Scheduler.ScheduleJob(oJob, oTrigger) + Await Scheduler.ScheduleJob(oJob, oTrigger) - Logger.Debug("Job scheduled.") + Logger.Debug("Job scheduled.") - Await Scheduler.Start() + Await Scheduler.Start() + + Logger.Info("Scheduler started!") + Catch ex As Exception + Logger.Error(ex) + End Try - Logger.Info("Scheduler started!") End Function Public Async Function [Stop]() As Task diff --git a/EnvelopeGenerator.Service/Service.vb b/EnvelopeGenerator.Service/Service.vb index 0d69b896..4989049c 100644 --- a/EnvelopeGenerator.Service/Service.vb +++ b/EnvelopeGenerator.Service/Service.vb @@ -37,13 +37,14 @@ Public Class Service TempFiles.Create() ' === Initialize Databases === - Logger.Info("Inititalize Databases") + Logger.Info("Inititalize Database ...") If Config.ConnectionString = String.Empty Then Throw New ApplicationException("Connection String is empty!") End If Database = New MSSQLServer(LogConfig, Config.ConnectionString) + Logger.Debug("Database initialized") If Database.DBInitialized = False Then Throw New ApplicationException("Database connection could not be established!") diff --git a/EnvelopeGenerator.Service/packages.config b/EnvelopeGenerator.Service/packages.config index 18eb1a41..220017c0 100644 --- a/EnvelopeGenerator.Service/packages.config +++ b/EnvelopeGenerator.Service/packages.config @@ -1,5 +1,7 @@  + + From c9ba7eeaf9f2be8ac5e07cf5d64a98d7f347240c Mon Sep 17 00:00:00 2001 From: Developer01 Date: Sun, 13 Oct 2024 17:38:31 +0200 Subject: [PATCH 2/2] MS --- EnvelopeGenerator.Common/Constants.vb | 2 ++ EnvelopeGenerator.Common/Entities/DbConfig.vb | 2 +- EnvelopeGenerator.Common/Strings/Envelope.en.resx | 3 +++ EnvelopeGenerator.Common/Strings/Envelope.resx | 3 +++ .../Strings/Envelope1.Designer.vb | 9 +++++++++ .../Controllers/EnvelopeEditorController.vb | 6 +++++- .../EnvelopeGenerator.Form.vbproj | 13 +++++++------ EnvelopeGenerator.Form/app.config | 2 +- EnvelopeGenerator.Form/frmEnvelopeEditor.resx | 2 +- EnvelopeGenerator.Form/packages.config | 4 ++-- 10 files changed, 34 insertions(+), 12 deletions(-) diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb index 16a19e08..4fe3a7fc 100644 --- a/EnvelopeGenerator.Common/Constants.vb +++ b/EnvelopeGenerator.Common/Constants.vb @@ -17,6 +17,7 @@ AccessCodeIncorrect = 2003 DocumentOpened = 2004 DocumentSigned = 2005 + DocumentForwarded = 4001 SignatureConfirmed = 2006 DocumentRejected = 2007 MessageInvitationSent = 3001 ' Wird von Trigger verwendet @@ -94,6 +95,7 @@ DocumentDeleted DocumentCompleted DocumentAccessCodeReceived + DocumentForwarded End Enum #End Region diff --git a/EnvelopeGenerator.Common/Entities/DbConfig.vb b/EnvelopeGenerator.Common/Entities/DbConfig.vb index 6089dfc8..6f93198c 100644 --- a/EnvelopeGenerator.Common/Entities/DbConfig.vb +++ b/EnvelopeGenerator.Common/Entities/DbConfig.vb @@ -1,5 +1,5 @@ Public Class DbConfig - Public Property ExternalProgramName As String = "Sign Flow" + Public Property ExternalProgramName As String = "signFLOW" Public Property DocumentPathOrigin As String = "" Public Property DocumentPath As String = "" Public Property ExportPath As String = "" diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index c2932954..2935748f 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -138,6 +138,9 @@ Document could not be saved! + + Document forwarded to receiver: {0} + Edit Envelope diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index eb742922..e6af1714 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -138,6 +138,9 @@ Dokument konnte nicht gespeichert werden! + + Umschlag an Empfänger {0} weitergeleitet. + Bearbeite Umschlag diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index 2abe44d8..bfdf860a 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -127,6 +127,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Umschlag an Empfänger {0} weitergeleitet. ähnelt. + ''' + Public Shared ReadOnly Property Document_forwarded() As String + Get + Return ResourceManager.GetString("Document forwarded", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Bearbeite Umschlag ähnelt. ''' diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb index 8dfbbaf5..8f52ebb5 100644 --- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb +++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb @@ -158,6 +158,7 @@ Public Class EnvelopeEditorController Dim oTempFilePath = Path.Combine(oTempFiles.TempPath, Guid.NewGuid().ToString + oFileInfo.Extension) Await Helpers.CopyFileAsync(oFileInfo.FullName, oTempFilePath) + 'File.Copy(oFileInfo.FullName, oTempFilePath, True) Dim oFileInfoTemp = New FileInfo(oTempFilePath) @@ -175,6 +176,7 @@ Public Class EnvelopeEditorController Catch ex As Exception Logger.Error(ex) + Logger.Warn($"error in CreateDocument: {ex.Message}") Return Nothing End Try End Function @@ -288,7 +290,9 @@ Public Class EnvelopeEditorController #End Region Private Function GetEnvelopePath(pEnvelope As Envelope) As String Try - Dim oEnvelopePath As String = Path.Combine(State.DbConfig.DocumentPath, pEnvelope.Uuid) + Dim oTempFiles As New TempFiles(State.LogConfig) + Dim oTempFolderPath = oTempFiles.TempPath + Dim oEnvelopePath As String = Path.Combine(oTempFolderPath, pEnvelope.Uuid) If Not Directory.Exists(oEnvelopePath) Then Directory.CreateDirectory(oEnvelopePath) diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index 2b33ca79..1bf6b84d 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -71,8 +71,9 @@ - - ..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + False + ..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll ..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll @@ -99,8 +100,8 @@ False ..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll - - ..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll ..\packages\NLog.5.0.5\lib\net46\NLog.dll @@ -271,12 +272,12 @@ - + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - +