diff --git a/ToolCollection/My Project/Settings.Designer.vb b/ToolCollection/My Project/Settings.Designer.vb index c4eb03f..9668660 100644 --- a/ToolCollection/My Project/Settings.Designer.vb +++ b/ToolCollection/My Project/Settings.Designer.vb @@ -670,8 +670,8 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security "& _ + "Info=True;User ID=sa;Password=dd;Encrypt=False")> _ Public ReadOnly Property DDECMConString() As String Get Return CType(Me("DDECMConString"),String) diff --git a/ToolCollection/My Project/Settings.settings b/ToolCollection/My Project/Settings.settings index d9ba8f3..ac8abb3 100644 --- a/ToolCollection/My Project/Settings.settings +++ b/ToolCollection/My Project/Settings.settings @@ -161,10 +161,10 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> + <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - 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;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False @Domain#@User#@PW diff --git a/ToolCollection/app.config b/ToolCollection/app.config index aaf7023..aa8ef12 100644 --- a/ToolCollection/app.config +++ b/ToolCollection/app.config @@ -11,7 +11,7 @@
- diff --git a/ToolCollection/frmNIHauptseite.vb b/ToolCollection/frmNIHauptseite.vb index 1359f0a..23ea244 100644 --- a/ToolCollection/frmNIHauptseite.vb +++ b/ToolCollection/frmNIHauptseite.vb @@ -155,7 +155,7 @@ Public Class frmNIHauptseite Me.GridView1.Columns("Aktiv").Width = 70 Me.GridView1.Columns("Name").Width = 400 - Me.GridView1.Columns("Objekttyp").Width = 265 + Me.GridView1.Columns("Objekttyp").Width = 245 End Sub diff --git a/ToolCollection/frmStart.Designer.vb b/ToolCollection/frmStart.Designer.vb index f762d25..693f258 100644 --- a/ToolCollection/frmStart.Designer.vb +++ b/ToolCollection/frmStart.Designer.vb @@ -63,6 +63,7 @@ Partial Class frmStart Me.TimerNIRestart = New System.Windows.Forms.Timer(Me.components) Me.TimerErrorLog = New System.Windows.Forms.Timer(Me.components) Me.TimerDeleteLogfiles = New System.Windows.Forms.Timer(Me.components) + Me.ToolStripStatusLabel_ConnectionString = New System.Windows.Forms.ToolStripStatusLabel() Me.StatusStrip1.SuspendLayout() Me.menHauptmenü.SuspendLayout() Me.Panel1.SuspendLayout() @@ -75,7 +76,7 @@ Partial Class frmStart ' 'StatusStrip1 ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Status_Machine, Me.ToolStripStatusLabel2, Me.tslblVersion, Me.ToolStripStatusLabel_LogDeleteTime}) + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Status_Machine, Me.ToolStripStatusLabel2, Me.tslblVersion, Me.ToolStripStatusLabel_LogDeleteTime, Me.ToolStripStatusLabel_ConnectionString}) Me.StatusStrip1.Location = New System.Drawing.Point(0, 613) Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode @@ -93,7 +94,7 @@ Partial Class frmStart Me.Status_Machine.Image = CType(resources.GetObject("Status_Machine.Image"), System.Drawing.Image) Me.Status_Machine.Margin = New System.Windows.Forms.Padding(10, 3, 0, 2) Me.Status_Machine.Name = "Status_Machine" - Me.Status_Machine.Size = New System.Drawing.Size(139, 20) + Me.Status_Machine.Size = New System.Drawing.Size(140, 20) Me.Status_Machine.Text = "ToolStripStatusLabel1" Me.Status_Machine.ToolTipText = "Client-Name" ' @@ -104,7 +105,7 @@ Partial Class frmStart Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) Me.ToolStripStatusLabel2.Image = CType(resources.GetObject("ToolStripStatusLabel2.Image"), System.Drawing.Image) Me.ToolStripStatusLabel2.Name = "ToolStripStatusLabel2" - Me.ToolStripStatusLabel2.Size = New System.Drawing.Size(139, 20) + Me.ToolStripStatusLabel2.Size = New System.Drawing.Size(140, 20) Me.ToolStripStatusLabel2.Text = "ToolStripStatusLabel1" Me.ToolStripStatusLabel2.ToolTipText = "Aktueller Benutzer" ' @@ -114,7 +115,7 @@ Partial Class frmStart Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) Me.tslblVersion.Name = "tslblVersion" - Me.tslblVersion.Size = New System.Drawing.Size(123, 20) + Me.tslblVersion.Size = New System.Drawing.Size(124, 20) Me.tslblVersion.Text = "ToolStripStatusLabel1" Me.tslblVersion.ToolTipText = "Aktueller Benutzer" ' @@ -149,20 +150,20 @@ Partial Class frmStart ' Me.ÜbersichtToolStripMenuItem.Image = Global.ToolCollection.My.Resources.Resources.Auslesen1 Me.ÜbersichtToolStripMenuItem.Name = "ÜbersichtToolStripMenuItem" - Me.ÜbersichtToolStripMenuItem.Size = New System.Drawing.Size(149, 22) + Me.ÜbersichtToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ÜbersichtToolStripMenuItem.Text = "Übersicht" ' 'BeendenToolStripMenuItem ' Me.BeendenToolStripMenuItem.Name = "BeendenToolStripMenuItem" - Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(149, 22) + Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.BeendenToolStripMenuItem.Text = "Beenden" ' 'ZeigeLogFileToolStripMenuItem ' Me.ZeigeLogFileToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ÖffneLogverzeichnisToolStripMenuItem}) Me.ZeigeLogFileToolStripMenuItem.Name = "ZeigeLogFileToolStripMenuItem" - Me.ZeigeLogFileToolStripMenuItem.Size = New System.Drawing.Size(149, 22) + Me.ZeigeLogFileToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ZeigeLogFileToolStripMenuItem.Text = "Zeige Log-File" ' 'ÖffneLogverzeichnisToolStripMenuItem @@ -451,6 +452,15 @@ Partial Class frmStart ' Me.TimerDeleteLogfiles.Interval = 1000 ' + 'ToolStripStatusLabel_ConnectionString + ' + Me.ToolStripStatusLabel_ConnectionString.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) + Me.ToolStripStatusLabel_ConnectionString.Name = "ToolStripStatusLabel_ConnectionString" + Me.ToolStripStatusLabel_ConnectionString.Size = New System.Drawing.Size(129, 20) + Me.ToolStripStatusLabel_ConnectionString.Text = "Datenbankverbindung" + ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -518,4 +528,5 @@ Partial Class frmStart Friend WithEvents TimerErrorLog As Timer Friend WithEvents TimerDeleteLogfiles As Timer Friend WithEvents ToolStripStatusLabel_LogDeleteTime As ToolStripStatusLabel + Friend WithEvents ToolStripStatusLabel_ConnectionString As ToolStripStatusLabel End Class diff --git a/ToolCollection/frmStart.resx b/ToolCollection/frmStart.resx index 1c385eb..3d73fd5 100644 --- a/ToolCollection/frmStart.resx +++ b/ToolCollection/frmStart.resx @@ -124,28 +124,28 @@ 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 + CebOM54n/eSouhlrbUcAAAAASUVORK5CYII= @@ -159,7 +159,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO - FAAAAk1TRnQBSQFMAgEBCQEAAVgBAwFYAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + FAAAAk1TRnQBSQFMAgEBCQEAAWABAwFgAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/ToolCollection/frmStart.vb b/ToolCollection/frmStart.vb index a50e1ca..37c7ec0 100644 --- a/ToolCollection/frmStart.vb +++ b/ToolCollection/frmStart.vb @@ -4,6 +4,7 @@ Imports System.Globalization Imports DigitalData.Modules.Logging Imports System.IO Imports DigitalData.Modules.Database +Imports System.Text.RegularExpressions Public Class frmStart Private _MyLogger As LogConfig @@ -113,13 +114,13 @@ Public Class frmStart End Sub Private Sub TimerDeleteLogfiles_Tick(sender As Object, e As EventArgs) Handles TimerDeleteLogfiles.Tick - Try - Delete_Logfiles() - ' Nächstes Intervall wieder 24h - TimerDeleteLogfiles.Interval = 24 * 60 * 60 * 1000 - Catch ex As Exception - _Logger.Error("Fehler beim automatischen Löschen: " & ex.Message) - End Try + Try + Delete_LogFiles() + ' Nächstes Intervall wieder 24h + TimerDeleteLogfiles.Interval = 24 * 60 * 60 * 1000 + Catch ex As Exception + _Logger.Error("Fehler beim automatischen Löschen: " & ex.Message) + End Try End Sub Private Sub FMStart_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing @@ -175,6 +176,11 @@ Public Class frmStart Else Me.ToolStripStatusLabel_LogDeleteTime.Text = "Automatisches Löschen von Logs ist inaktiv." End If + + Dim connectionString As String = My.Settings.DDECMConString + connectionString = Regex.Replace(connectionString, "(?i)(password|pwd)\s*=\s*[^;]*", "$1=******") + Me.ToolStripStatusLabel_ConnectionString.Text = $"Datenbankverbindung: {connectionString}" + ' timUhrzeit.Start() TimerErrorLog.Start()