MS Common V 1.5 New paths for email-Service
This commit is contained in:
parent
21baf0bad0
commit
a25b517445
@ -5,9 +5,10 @@
|
|||||||
Public Property DocumentPath_DMZ As String = ""
|
Public Property DocumentPath_DMZ As String = ""
|
||||||
Public Property ExportPath_DMZ As String = ""
|
Public Property ExportPath_DMZ As String = ""
|
||||||
Public Property DOCUMENT_PATH_MOVE_AFTSEND As String = ""
|
Public Property DOCUMENT_PATH_MOVE_AFTSEND As String = ""
|
||||||
Public Property SignedMail_Path As String = ""
|
Public Property FINISHED_PATH_EX_DMZ As String = ""
|
||||||
|
Public Property EML_PATH_EX_DMZ As String = ""
|
||||||
Public Property SendingProfile As Integer = 0
|
Public Property SendingProfile As Integer = 0
|
||||||
Public Property SignatureHost As String = ""
|
Public Property SignatureHost As String = ""
|
||||||
|
Public Property NetUse_necessary As Boolean = False
|
||||||
|
Public Property NetUse_Finish As Boolean = False
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@ -264,6 +264,7 @@
|
|||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<None Include="app.config" />
|
||||||
<None Include="My Project\Application.myapp">
|
<None Include="My Project\Application.myapp">
|
||||||
<Generator>MyApplicationCodeGenerator</Generator>
|
<Generator>MyApplicationCodeGenerator</Generator>
|
||||||
<LastGenOutput>Application.Designer.vb</LastGenOutput>
|
<LastGenOutput>Application.Designer.vb</LastGenOutput>
|
||||||
|
|||||||
@ -1,9 +1,28 @@
|
|||||||
Imports System.Drawing
|
Imports System.Drawing
|
||||||
Imports System.IO
|
Imports System.IO
|
||||||
|
Imports System.Security.Cryptography
|
||||||
|
Imports System.Text
|
||||||
Imports DevExpress.Utils.Svg
|
Imports DevExpress.Utils.Svg
|
||||||
Imports EnvelopeGenerator.Common.Constants
|
Imports EnvelopeGenerator.Common.Constants
|
||||||
|
|
||||||
Public Class Helpers
|
Public Class Helpers
|
||||||
|
Private Shared key As String = "$xzBvyPETUS&amm8)D8x#)f;4%;?[BPd" ' Passwort-Schlüssel (16, 24, or 32 bytes)
|
||||||
|
Private Shared iv As String = "1wN&e[zrQ6_B7X/0" ' Initialisierungsvektor (16 bytes)
|
||||||
|
|
||||||
|
' Entschlüsselungsfunktion
|
||||||
|
Public Shared Function Decrypt(cipherText As String) As String
|
||||||
|
Dim aesAlg As Aes = Aes.Create()
|
||||||
|
aesAlg.Key = Encoding.UTF8.GetBytes(key)
|
||||||
|
aesAlg.IV = Encoding.UTF8.GetBytes(iv)
|
||||||
|
Dim decryptor As ICryptoTransform = aesAlg.CreateDecryptor(aesAlg.Key, aesAlg.IV)
|
||||||
|
Dim cipherBytes As Byte() = Convert.FromBase64String(cipherText)
|
||||||
|
Dim msDecrypt As New IO.MemoryStream(cipherBytes)
|
||||||
|
Using csDecrypt As New CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read)
|
||||||
|
Using srDecrypt As New IO.StreamReader(csDecrypt)
|
||||||
|
Return srDecrypt.ReadToEnd()
|
||||||
|
End Using
|
||||||
|
End Using
|
||||||
|
End Function
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
''' Encodes the EnvelopeUUID and the ReceiverSignature into an EnvelopeKey
|
''' Encodes the EnvelopeUUID and the ReceiverSignature into an EnvelopeKey
|
||||||
|
|||||||
@ -9,6 +9,9 @@ Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentException
|
|||||||
Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
|
Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
|
||||||
Imports EnvelopeGenerator.Common.My.Resources
|
Imports EnvelopeGenerator.Common.My.Resources
|
||||||
Imports EnvelopeGenerator.Common.Constants
|
Imports EnvelopeGenerator.Common.Constants
|
||||||
|
Imports DevExpress.XtraBars.Docking
|
||||||
|
Imports System.ServiceModel
|
||||||
|
Imports DevExpress.XtraRichEdit.Export
|
||||||
|
|
||||||
Namespace Jobs
|
Namespace Jobs
|
||||||
Public Class FinalizeDocumentJob
|
Public Class FinalizeDocumentJob
|
||||||
@ -76,16 +79,48 @@ Namespace Jobs
|
|||||||
Logger.Debug("Loading ReportCreator..")
|
Logger.Debug("Loading ReportCreator..")
|
||||||
ReportCreator = New ReportCreator(LogConfig, oState)
|
ReportCreator = New ReportCreator(LogConfig, oState)
|
||||||
|
|
||||||
|
|
||||||
|
If My.Settings.RuninDMZ = True Then
|
||||||
|
If Config.DocumentPath_DMZ <> String.Empty Then
|
||||||
|
Logger.Debug("RuninDMZ - Using DocumentPath_DMZ: [{0}] - Overwrite Document-Path", Config.DocumentPath_DMZ)
|
||||||
|
Config.DocumentPath = Config.DocumentPath_DMZ
|
||||||
|
Config.NetUse_necessary = True
|
||||||
|
Else
|
||||||
|
Config.DocumentPath = Config.DocumentPath
|
||||||
|
End If
|
||||||
|
Else
|
||||||
|
If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
|
||||||
|
Logger.Debug("Using DMZRemotePath: [{0}] - Overwrite Document-Path", Config.DOCUMENT_PATH_MOVE_AFTSEND)
|
||||||
|
Config.DocumentPath = Config.DOCUMENT_PATH_MOVE_AFTSEND
|
||||||
|
Config.NetUse_necessary = True
|
||||||
|
Else
|
||||||
|
Config.DocumentPath = Config.DocumentPath
|
||||||
|
End If
|
||||||
|
End If
|
||||||
Logger.Debug("DocumentPath: [{0}]", Config.DocumentPath)
|
Logger.Debug("DocumentPath: [{0}]", Config.DocumentPath)
|
||||||
If Config.DocumentPath_DMZ <> String.Empty Then
|
If My.Settings.RuninDMZ = True Then
|
||||||
Logger.Debug("DMZ-DocPath configured: [{0}] - Overwrite Document-Path", Config.DocumentPath_DMZ)
|
If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
|
||||||
Config.DocumentPath = Config.DocumentPath_DMZ
|
Logger.Debug("RuninDMZ - FINISHED_PATH_EX_DMZ configured: [{0}]", Config.FINISHED_PATH_EX_DMZ)
|
||||||
|
Config.NetUse_Finish = True
|
||||||
|
End If
|
||||||
|
If Config.ExportPath_DMZ <> String.Empty Then
|
||||||
|
Logger.Debug("RuninDMZ - Using ExportPath_DMZ: [{0}] - Overwrite ExportPath", Config.ExportPath_DMZ)
|
||||||
|
Config.ExportPath = Config.ExportPath_DMZ
|
||||||
|
Else
|
||||||
|
Config.ExportPath = Config.ExportPath
|
||||||
|
End If
|
||||||
|
|
||||||
|
ElseIf Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
|
||||||
|
Logger.Debug("DOCUMENT_PATH_MOVE_AFTSEND configured: [{0}] - Overwrite ExportPath", Config.DOCUMENT_PATH_MOVE_AFTSEND)
|
||||||
|
Config.ExportPath = Config.DOCUMENT_PATH_MOVE_AFTSEND
|
||||||
|
Config.NetUse_Finish = True
|
||||||
|
Else
|
||||||
|
Config.ExportPath = Config.ExportPath
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
Logger.Debug("ExportPath: [{0}]", Config.ExportPath)
|
Logger.Debug("ExportPath: [{0}]", Config.ExportPath)
|
||||||
If Config.ExportPath_DMZ <> String.Empty Then
|
|
||||||
Logger.Debug("DMZ-ExportPath configured: [{0}] - Overwrite ExportPath", Config.ExportPath_DMZ)
|
|
||||||
Config.ExportPath = Config.ExportPath_DMZ
|
|
||||||
End If
|
|
||||||
Dim oCompleteStatus As Integer = Constants.EnvelopeStatus.EnvelopeCompletelySigned
|
Dim oCompleteStatus As Integer = Constants.EnvelopeStatus.EnvelopeCompletelySigned
|
||||||
Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTimeInMinutes}"
|
Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTimeInMinutes}"
|
||||||
Dim oTable = Database.GetDatatable(oSql)
|
Dim oTable = Database.GetDatatable(oSql)
|
||||||
@ -140,8 +175,8 @@ Namespace Jobs
|
|||||||
Logger.Debug("Documents merged.")
|
Logger.Debug("Documents merged.")
|
||||||
|
|
||||||
Dim oOutputDirectoryPath = Config.ExportPath
|
Dim oOutputDirectoryPath = Config.ExportPath
|
||||||
Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
|
|
||||||
|
|
||||||
|
Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
|
||||||
Logger.Info("Writing finalized Pdf to disk..")
|
Logger.Info("Writing finalized Pdf to disk..")
|
||||||
Logger.Info("Output path is [{0}]", oOutputFilePath)
|
Logger.Info("Output path is [{0}]", oOutputFilePath)
|
||||||
|
|
||||||
@ -154,6 +189,22 @@ Namespace Jobs
|
|||||||
|
|
||||||
Logger.Info("Sending final Emails..")
|
Logger.Info("Sending final Emails..")
|
||||||
|
|
||||||
|
If Config.NetUse_Finish = True Then
|
||||||
|
If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
|
||||||
|
If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
|
||||||
|
Dim oReturnPath = MoveFileWithNetUse(oOutputFilePath, Config.FINISHED_PATH_EX_DMZ, My.Settings.NetUse_Usr, My.Settings.NetUse_PW)
|
||||||
|
If oReturnPath <> String.Empty Then
|
||||||
|
oOutputFilePath = oReturnPath
|
||||||
|
If Config.EML_PATH_EX_DMZ <> String.Empty Then
|
||||||
|
oOutputFilePath = oOutputFilePath.Replace(Config.FINISHED_PATH_EX_DMZ, Config.EML_PATH_EX_DMZ)
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
If SendFinalEmails(oEnvelope, oOutputFilePath) = False Then
|
If SendFinalEmails(oEnvelope, oOutputFilePath) = False Then
|
||||||
Throw New ApplicationException("Final emails could not be sent!")
|
Throw New ApplicationException("Final emails could not be sent!")
|
||||||
End If
|
End If
|
||||||
@ -188,6 +239,50 @@ Namespace Jobs
|
|||||||
Return Task.FromResult(True)
|
Return Task.FromResult(True)
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Private Function MoveFileWithNetUse(pSourcePath As String, pDestinationPath As String, pUsername As String, pPassword As String) As String
|
||||||
|
Dim oDectryptedPW = Helpers.Decrypt(My.Settings.NetUse_PW)
|
||||||
|
Dim oFilename = System.IO.Path.GetFileName(pSourcePath)
|
||||||
|
|
||||||
|
Dim netUseCommand As String = $"net use {pDestinationPath} /user:{pUsername} {oDectryptedPW}"
|
||||||
|
|
||||||
|
Dim processInfo As New ProcessStartInfo("cmd.exe", $"/C {netUseCommand}")
|
||||||
|
processInfo.RedirectStandardOutput = True
|
||||||
|
processInfo.UseShellExecute = False
|
||||||
|
processInfo.CreateNoWindow = True
|
||||||
|
|
||||||
|
Using process As Process = Process.Start(processInfo)
|
||||||
|
process.WaitForExit()
|
||||||
|
|
||||||
|
' Prüfe den Rückgabewert des net use Befehls
|
||||||
|
If process.ExitCode = 0 Then
|
||||||
|
' Verschiebe die Datei
|
||||||
|
Try
|
||||||
|
Dim oFilePath As String = pSourcePath
|
||||||
|
|
||||||
|
Dim split As String() = oFilePath.Split("\")
|
||||||
|
Dim parentFolder As String = split(split.Length - 2)
|
||||||
|
pDestinationPath &= "\" + parentFolder
|
||||||
|
If Not System.IO.Directory.Exists(pDestinationPath) Then
|
||||||
|
System.IO.Directory.CreateDirectory(pDestinationPath)
|
||||||
|
End If
|
||||||
|
pDestinationPath &= "\" + oFilename
|
||||||
|
If File.Exists(pDestinationPath) Then
|
||||||
|
File.Delete(pDestinationPath)
|
||||||
|
End If
|
||||||
|
Logger.Info($"MoveFileWithNetUse To {pDestinationPath} ...")
|
||||||
|
System.IO.File.Move(pSourcePath, pDestinationPath)
|
||||||
|
Return pDestinationPath
|
||||||
|
Catch ex As Exception
|
||||||
|
Logger.Error(ex)
|
||||||
|
Return ""
|
||||||
|
End Try
|
||||||
|
|
||||||
|
Else
|
||||||
|
Logger.Warn("Error while connecting to network-path " & pDestinationPath)
|
||||||
|
Return ""
|
||||||
|
End If
|
||||||
|
End Using
|
||||||
|
End Function
|
||||||
Private Function SendFinalEmails(pEnvelope As Envelope, pAttachment As String) As Boolean
|
Private Function SendFinalEmails(pEnvelope As Envelope, pAttachment As String) As Boolean
|
||||||
Dim oMailToCreator = pEnvelope.FinalEmailToCreator
|
Dim oMailToCreator = pEnvelope.FinalEmailToCreator
|
||||||
Dim oMailToReceivers = pEnvelope.FinalEmailToReceivers
|
Dim oMailToReceivers = pEnvelope.FinalEmailToReceivers
|
||||||
@ -199,12 +294,7 @@ Namespace Jobs
|
|||||||
|
|
||||||
If oMailToReceivers <> FinalEmailType.No Then
|
If oMailToReceivers <> FinalEmailType.No Then
|
||||||
Logger.Debug("Sending emails to receivers..")
|
Logger.Debug("Sending emails to receivers..")
|
||||||
If Config.SignedMail_Path <> String.Empty And Config.ExportPath_DMZ <> String.Empty Then
|
|
||||||
Logger.Debug("SignedMailPath configured: [{0}] - Replacing Attachment-Path", Config.SignedMail_Path)
|
|
||||||
Logger.Debug("Attachment-Path BEFORE replace: [{0}]", pAttachment)
|
|
||||||
pAttachment.Replace(Config.ExportPath, Config.SignedMail_Path)
|
|
||||||
Logger.Debug("Attachment-Path AFTER replace: [{0}]", pAttachment)
|
|
||||||
End If
|
|
||||||
|
|
||||||
SendFinalEmailToReceivers(pEnvelope, pAttachment)
|
SendFinalEmailToReceivers(pEnvelope, pAttachment)
|
||||||
End If
|
End If
|
||||||
|
|||||||
@ -23,8 +23,9 @@ Public Class ConfigModel
|
|||||||
.SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0),
|
.SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0),
|
||||||
.SignatureHost = oRow.ItemEx("SIGNATURE_HOST", ""),
|
.SignatureHost = oRow.ItemEx("SIGNATURE_HOST", ""),
|
||||||
.ExternalProgramName = oRow.ItemEx("EXTERNAL_PROGRAM_NAME", ""),
|
.ExternalProgramName = oRow.ItemEx("EXTERNAL_PROGRAM_NAME", ""),
|
||||||
.SignedMail_Path = oRow.ItemEx("SIGNED_MAIL_PATH", ""),
|
.DOCUMENT_PATH_MOVE_AFTSEND = oRow.ItemEx("DOCUMENT_PATH_MOVE_AFTSEND", ""),
|
||||||
.DOCUMENT_PATH_MOVE_AFTSEND = oRow.ItemEx("DOCUMENT_PATH_MOVE_AFTSEND", "")
|
.FINISHED_PATH_EX_DMZ = oRow.ItemEx("FINISHED_PATH_EX_DMZ", ""),
|
||||||
|
.EML_PATH_EX_DMZ = oRow.ItemEx("EML_PATH_EX_DMZ", "")
|
||||||
}
|
}
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
Logger.Error(ex)
|
||||||
|
|||||||
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' indem Sie "*" wie unten gezeigt eingeben:
|
' indem Sie "*" wie unten gezeigt eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.4.0.0")>
|
<Assembly: AssemblyVersion("1.5.0.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.4.0.0")>
|
<Assembly: AssemblyFileVersion("1.5.0.0")>
|
||||||
|
|||||||
@ -15,7 +15,7 @@ Option Explicit On
|
|||||||
Namespace My
|
Namespace My
|
||||||
|
|
||||||
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
||||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"), _
|
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"), _
|
||||||
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
||||||
Partial Friend NotInheritable Class MySettings
|
Partial Friend NotInheritable Class MySettings
|
||||||
Inherits Global.System.Configuration.ApplicationSettingsBase
|
Inherits Global.System.Configuration.ApplicationSettingsBase
|
||||||
@ -53,6 +53,36 @@ Namespace My
|
|||||||
Return defaultInstance
|
Return defaultInstance
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
|
||||||
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
|
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
|
||||||
|
Public ReadOnly Property RuninDMZ() As Boolean
|
||||||
|
Get
|
||||||
|
Return CType(Me("RuninDMZ"),Boolean)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
|
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
|
||||||
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
|
Global.System.Configuration.DefaultSettingValueAttribute("dd-gan\Administrator")> _
|
||||||
|
Public ReadOnly Property NetUse_Usr() As String
|
||||||
|
Get
|
||||||
|
Return CType(Me("NetUse_Usr"),String)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
|
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||||
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
|
Global.System.Configuration.DefaultSettingValueAttribute("sY4vnATDXwosbTJGip6SqA==")> _
|
||||||
|
Public Property NetUse_PW() As String
|
||||||
|
Get
|
||||||
|
Return CType(Me("NetUse_PW"),String)
|
||||||
|
End Get
|
||||||
|
Set
|
||||||
|
Me("NetUse_PW") = value
|
||||||
|
End Set
|
||||||
|
End Property
|
||||||
End Class
|
End Class
|
||||||
End Namespace
|
End Namespace
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,15 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
|
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
|
||||||
<Profiles>
|
<Profiles />
|
||||||
<Profile Name="(Default)" />
|
<Settings>
|
||||||
</Profiles>
|
<Setting Name="RuninDMZ" Type="System.Boolean" Scope="Application">
|
||||||
<Settings />
|
<Value Profile="(Default)">False</Value>
|
||||||
</SettingsFile>
|
</Setting>
|
||||||
|
<Setting Name="NetUse_Usr" Type="System.String" Scope="Application">
|
||||||
|
<Value Profile="(Default)">dd-gan\Administrator</Value>
|
||||||
|
</Setting>
|
||||||
|
<Setting Name="NetUse_PW" Type="System.String" Scope="User">
|
||||||
|
<Value Profile="(Default)">sY4vnATDXwosbTJGip6SqA==</Value>
|
||||||
|
</Setting>
|
||||||
|
</Settings>
|
||||||
|
</SettingsFile>
|
||||||
52
EnvelopeGenerator.Common/app.config
Normal file
52
EnvelopeGenerator.Common/app.config
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<configuration>
|
||||||
|
|
||||||
|
<configSections>
|
||||||
|
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
|
||||||
|
<section name="EnvelopeGenerator.Common.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||||
|
</sectionGroup>
|
||||||
|
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
|
||||||
|
<section name="EnvelopeGenerator.Common.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
|
||||||
|
</sectionGroup>
|
||||||
|
</configSections>
|
||||||
|
<system.diagnostics>
|
||||||
|
<sources>
|
||||||
|
<!-- Dieser Abschnitt definiert die Protokollierungskonfiguration für My.Application.Log -->
|
||||||
|
<source name="DefaultSource" switchName="DefaultSwitch">
|
||||||
|
<listeners>
|
||||||
|
<add name="FileLog"/>
|
||||||
|
<!-- Auskommentierung des nachfolgenden Abschnitts aufheben, um in das Anwendungsereignisprotokoll zu schreiben -->
|
||||||
|
<!--<add name="EventLog"/>-->
|
||||||
|
</listeners>
|
||||||
|
</source>
|
||||||
|
</sources>
|
||||||
|
<switches>
|
||||||
|
<add name="DefaultSwitch" value="Information" />
|
||||||
|
</switches>
|
||||||
|
<sharedListeners>
|
||||||
|
<add name="FileLog"
|
||||||
|
type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
|
||||||
|
initializeData="FileLogWriter"/>
|
||||||
|
<!-- Auskommentierung des nachfolgenden Abschnitts aufheben und APPLICATION_NAME durch den Namen der Anwendung ersetzen, um in das Anwendungsereignisprotokoll zu schreiben -->
|
||||||
|
<!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
|
||||||
|
</sharedListeners>
|
||||||
|
</system.diagnostics>
|
||||||
|
|
||||||
|
<applicationSettings>
|
||||||
|
<EnvelopeGenerator.Common.My.MySettings>
|
||||||
|
<setting name="RuninDMZ" serializeAs="String">
|
||||||
|
<value>False</value>
|
||||||
|
</setting>
|
||||||
|
<setting name="NetUse_Usr" serializeAs="String">
|
||||||
|
<value>dd-gan\Administrator</value>
|
||||||
|
</setting>
|
||||||
|
</EnvelopeGenerator.Common.My.MySettings>
|
||||||
|
</applicationSettings>
|
||||||
|
<userSettings>
|
||||||
|
<EnvelopeGenerator.Common.My.MySettings>
|
||||||
|
<setting name="NetUse_PW" serializeAs="String">
|
||||||
|
<value>sY4vnATDXwosbTJGip6SqA==</value>
|
||||||
|
</setting>
|
||||||
|
</EnvelopeGenerator.Common.My.MySettings>
|
||||||
|
</userSettings>
|
||||||
|
</configuration>
|
||||||
@ -363,6 +363,14 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
If process.ExitCode = 0 Then
|
If process.ExitCode = 0 Then
|
||||||
' Verschiebe die Datei
|
' Verschiebe die Datei
|
||||||
Try
|
Try
|
||||||
|
Dim oFilePath As String = pSourcePath
|
||||||
|
|
||||||
|
Dim split As String() = oFilePath.Split("\")
|
||||||
|
Dim parentFolder As String = split(split.Length - 2)
|
||||||
|
pDestinationPath &= "\" + parentFolder
|
||||||
|
If Not System.IO.Directory.Exists(pDestinationPath) Then
|
||||||
|
System.IO.Directory.CreateDirectory(pDestinationPath)
|
||||||
|
End If
|
||||||
pDestinationPath &= "\" + oFilename
|
pDestinationPath &= "\" + oFilename
|
||||||
If File.Exists(pDestinationPath) Then
|
If File.Exists(pDestinationPath) Then
|
||||||
File.Delete(pDestinationPath)
|
File.Delete(pDestinationPath)
|
||||||
|
|||||||
@ -1,6 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
|
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
|
||||||
|
<section name="EnvelopeGenerator.Service.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||||
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
||||||
@ -13,4 +16,11 @@
|
|||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
|
<applicationSettings>
|
||||||
|
<EnvelopeGenerator.Service.My.MySettings>
|
||||||
|
<setting name="RunInDMZ" serializeAs="String">
|
||||||
|
<value>False</value>
|
||||||
|
</setting>
|
||||||
|
</EnvelopeGenerator.Service.My.MySettings>
|
||||||
|
</applicationSettings>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.5.2.0")>
|
<Assembly: AssemblyVersion("1.6.0.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||||
|
|||||||
@ -15,7 +15,7 @@ Option Explicit On
|
|||||||
Namespace My
|
Namespace My
|
||||||
|
|
||||||
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
||||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"), _
|
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"), _
|
||||||
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
||||||
Partial Friend NotInheritable Class MySettings
|
Partial Friend NotInheritable Class MySettings
|
||||||
Inherits Global.System.Configuration.ApplicationSettingsBase
|
Inherits Global.System.Configuration.ApplicationSettingsBase
|
||||||
@ -53,6 +53,15 @@ Namespace My
|
|||||||
Return defaultInstance
|
Return defaultInstance
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
|
||||||
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
|
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
|
||||||
|
Public ReadOnly Property RunInDMZ() As Boolean
|
||||||
|
Get
|
||||||
|
Return CType(Me("RunInDMZ"),Boolean)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
End Class
|
End Class
|
||||||
End Namespace
|
End Namespace
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,9 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
|
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
|
||||||
<Profiles />
|
<Profiles />
|
||||||
<Settings />
|
<Settings>
|
||||||
|
<Setting Name="RunInDMZ" Type="System.Boolean" Scope="Application">
|
||||||
|
<Value Profile="(Default)">False</Value>
|
||||||
|
</Setting>
|
||||||
|
</Settings>
|
||||||
</SettingsFile>
|
</SettingsFile>
|
||||||
Loading…
x
Reference in New Issue
Block a user