From 930444f2977b0ff5698023e028e137b16eb27146 Mon Sep 17 00:00:00 2001 From: OCEAN <1010331798@qq.com> Date: Fri, 14 Feb 2025 10:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E6=96=B0=E5=A2=9Epostgresql=E7=9A=84tab?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CNAS_DBSync/frmDatabaseParams.Designer.cs | 276 +++++++++++++++++----- CNAS_DBSync/frmDatabaseParams.cs | 42 ++-- 2 files changed, 233 insertions(+), 85 deletions(-) diff --git a/CNAS_DBSync/frmDatabaseParams.Designer.cs b/CNAS_DBSync/frmDatabaseParams.Designer.cs index 734636f..269c074 100644 --- a/CNAS_DBSync/frmDatabaseParams.Designer.cs +++ b/CNAS_DBSync/frmDatabaseParams.Designer.cs @@ -99,15 +99,15 @@ this.label13 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); this.tabMySql = new System.Windows.Forms.TabPage(); - this.txtMySqlPort = new System.Windows.Forms.TextBox(); + this.txtPostgreSqlPort = new System.Windows.Forms.TextBox(); this.label17 = new System.Windows.Forms.Label(); - this.btnMySqlTest = new System.Windows.Forms.Button(); - this.txtMySqlServer = new System.Windows.Forms.TextBox(); - this.txtMySqlHost = new System.Windows.Forms.TextBox(); + this.btnPostgreSqlTest = new System.Windows.Forms.Button(); + this.txtPostgreSqlServer = new System.Windows.Forms.TextBox(); + this.txtPostgreSqlHost = new System.Windows.Forms.TextBox(); this.label18 = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); - this.txtMySqlPwd = new System.Windows.Forms.TextBox(); - this.txtMySqlUser = new System.Windows.Forms.TextBox(); + this.txtPostgreSqlPwd = new System.Windows.Forms.TextBox(); + this.txtPostgreSqlUser = new System.Windows.Forms.TextBox(); this.label20 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.tabOracle = new System.Windows.Forms.TabPage(); @@ -151,6 +151,18 @@ this.pnlBottom = new System.Windows.Forms.Panel(); this.btnOK = new System.Windows.Forms.Button(); this.pnlTop = new System.Windows.Forms.Panel(); + this.tabPostgreSql = new System.Windows.Forms.TabPage(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label35 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label38 = new System.Windows.Forms.Label(); + this.label39 = new System.Windows.Forms.Label(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label40 = new System.Windows.Forms.Label(); + this.label41 = new System.Windows.Forms.Label(); this.pnlAll.SuspendLayout(); this.pnlCenter.SuspendLayout(); this.tabParamas.SuspendLayout(); @@ -168,6 +180,7 @@ this.groupBox2.SuspendLayout(); this.groupBox1.SuspendLayout(); this.pnlBottom.SuspendLayout(); + this.tabPostgreSql.SuspendLayout(); this.SuspendLayout(); // // pnlAll @@ -226,6 +239,7 @@ this.tabcDS.Controls.Add(this.tabMySql); this.tabcDS.Controls.Add(this.tabOracle); this.tabcDS.Controls.Add(this.tabTxt); + this.tabcDS.Controls.Add(this.tabPostgreSql); this.tabcDS.Dock = System.Windows.Forms.DockStyle.Fill; this.tabcDS.Location = new System.Drawing.Point(4, 5); this.tabcDS.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -366,7 +380,7 @@ this.tabFoxPro.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabFoxPro.Name = "tabFoxPro"; this.tabFoxPro.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabFoxPro.Size = new System.Drawing.Size(966, 518); + this.tabFoxPro.Size = new System.Drawing.Size(968, 521); this.tabFoxPro.TabIndex = 6; this.tabFoxPro.Text = "FoxPro"; this.tabFoxPro.UseVisualStyleBackColor = true; @@ -519,7 +533,7 @@ this.tabAccess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabAccess.Name = "tabAccess"; this.tabAccess.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabAccess.Size = new System.Drawing.Size(966, 518); + this.tabAccess.Size = new System.Drawing.Size(968, 521); this.tabAccess.TabIndex = 1; this.tabAccess.Text = "Access"; this.tabAccess.UseVisualStyleBackColor = true; @@ -673,7 +687,7 @@ this.tabSQLite.Location = new System.Drawing.Point(4, 28); this.tabSQLite.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabSQLite.Name = "tabSQLite"; - this.tabSQLite.Size = new System.Drawing.Size(966, 518); + this.tabSQLite.Size = new System.Drawing.Size(968, 521); this.tabSQLite.TabIndex = 2; this.tabSQLite.Text = "SQLLite"; this.tabSQLite.UseVisualStyleBackColor = true; @@ -825,7 +839,7 @@ this.tabSQLServer.Location = new System.Drawing.Point(4, 28); this.tabSQLServer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabSQLServer.Name = "tabSQLServer"; - this.tabSQLServer.Size = new System.Drawing.Size(966, 518); + this.tabSQLServer.Size = new System.Drawing.Size(968, 521); this.tabSQLServer.TabIndex = 3; this.tabSQLServer.Text = "SQL Server"; this.tabSQLServer.UseVisualStyleBackColor = true; @@ -935,15 +949,15 @@ // // tabMySql // - this.tabMySql.Controls.Add(this.txtMySqlPort); + this.tabMySql.Controls.Add(this.txtPostgreSqlPort); this.tabMySql.Controls.Add(this.label17); - this.tabMySql.Controls.Add(this.btnMySqlTest); - this.tabMySql.Controls.Add(this.txtMySqlServer); - this.tabMySql.Controls.Add(this.txtMySqlHost); + this.tabMySql.Controls.Add(this.btnPostgreSqlTest); + this.tabMySql.Controls.Add(this.txtPostgreSqlServer); + this.tabMySql.Controls.Add(this.txtPostgreSqlHost); this.tabMySql.Controls.Add(this.label18); this.tabMySql.Controls.Add(this.label19); - this.tabMySql.Controls.Add(this.txtMySqlPwd); - this.tabMySql.Controls.Add(this.txtMySqlUser); + this.tabMySql.Controls.Add(this.txtPostgreSqlPwd); + this.tabMySql.Controls.Add(this.txtPostgreSqlUser); this.tabMySql.Controls.Add(this.label20); this.tabMySql.Controls.Add(this.label23); this.tabMySql.Location = new System.Drawing.Point(4, 28); @@ -954,13 +968,13 @@ this.tabMySql.Text = "MySql"; this.tabMySql.UseVisualStyleBackColor = true; // - // txtMySqlPort + // txtPostgreSqlPort // - this.txtMySqlPort.Location = new System.Drawing.Point(129, 221); - this.txtMySqlPort.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtMySqlPort.Name = "txtMySqlPort"; - this.txtMySqlPort.Size = new System.Drawing.Size(472, 28); - this.txtMySqlPort.TabIndex = 35; + this.txtPostgreSqlPort.Location = new System.Drawing.Point(129, 221); + this.txtPostgreSqlPort.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtPostgreSqlPort.Name = "txtPostgreSqlPort"; + this.txtPostgreSqlPort.Size = new System.Drawing.Size(472, 28); + this.txtPostgreSqlPort.TabIndex = 35; // // label17 // @@ -972,32 +986,32 @@ this.label17.TabIndex = 34; this.label17.Text = "端口："; // - // btnMySqlTest + // btnPostgreSqlTest // - this.btnMySqlTest.Location = new System.Drawing.Point(561, 270); - this.btnMySqlTest.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.btnMySqlTest.Name = "btnMySqlTest"; - this.btnMySqlTest.Size = new System.Drawing.Size(118, 36); - this.btnMySqlTest.TabIndex = 36; - this.btnMySqlTest.Text = "测试连接"; - this.btnMySqlTest.UseVisualStyleBackColor = true; - this.btnMySqlTest.Click += new System.EventHandler(this.btnMySqlTest_Click); + this.btnPostgreSqlTest.Location = new System.Drawing.Point(561, 270); + this.btnPostgreSqlTest.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnPostgreSqlTest.Name = "btnPostgreSqlTest"; + this.btnPostgreSqlTest.Size = new System.Drawing.Size(118, 36); + this.btnPostgreSqlTest.TabIndex = 36; + this.btnPostgreSqlTest.Text = "测试连接"; + this.btnPostgreSqlTest.UseVisualStyleBackColor = true; + this.btnPostgreSqlTest.Click += new System.EventHandler(this.btnMySqlTest_Click); // - // txtMySqlServer + // txtPostgreSqlServer // - this.txtMySqlServer.Location = new System.Drawing.Point(129, 90); - this.txtMySqlServer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtMySqlServer.Name = "txtMySqlServer"; - this.txtMySqlServer.Size = new System.Drawing.Size(472, 28); - this.txtMySqlServer.TabIndex = 32; + this.txtPostgreSqlServer.Location = new System.Drawing.Point(129, 90); + this.txtPostgreSqlServer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtPostgreSqlServer.Name = "txtPostgreSqlServer"; + this.txtPostgreSqlServer.Size = new System.Drawing.Size(472, 28); + this.txtPostgreSqlServer.TabIndex = 32; // - // txtMySqlHost + // txtPostgreSqlHost // - this.txtMySqlHost.Location = new System.Drawing.Point(129, 47); - this.txtMySqlHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtMySqlHost.Name = "txtMySqlHost"; - this.txtMySqlHost.Size = new System.Drawing.Size(472, 28); - this.txtMySqlHost.TabIndex = 31; + this.txtPostgreSqlHost.Location = new System.Drawing.Point(129, 47); + this.txtPostgreSqlHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtPostgreSqlHost.Name = "txtPostgreSqlHost"; + this.txtPostgreSqlHost.Size = new System.Drawing.Size(472, 28); + this.txtPostgreSqlHost.TabIndex = 31; // // label18 // @@ -1019,21 +1033,21 @@ this.label19.TabIndex = 29; this.label19.Text = "服务器："; // - // txtMySqlPwd + // txtPostgreSqlPwd // - this.txtMySqlPwd.Location = new System.Drawing.Point(129, 178); - this.txtMySqlPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtMySqlPwd.Name = "txtMySqlPwd"; - this.txtMySqlPwd.Size = new System.Drawing.Size(472, 28); - this.txtMySqlPwd.TabIndex = 34; + this.txtPostgreSqlPwd.Location = new System.Drawing.Point(129, 178); + this.txtPostgreSqlPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtPostgreSqlPwd.Name = "txtPostgreSqlPwd"; + this.txtPostgreSqlPwd.Size = new System.Drawing.Size(472, 28); + this.txtPostgreSqlPwd.TabIndex = 34; // - // txtMySqlUser + // txtPostgreSqlUser // - this.txtMySqlUser.Location = new System.Drawing.Point(129, 133); - this.txtMySqlUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtMySqlUser.Name = "txtMySqlUser"; - this.txtMySqlUser.Size = new System.Drawing.Size(472, 28); - this.txtMySqlUser.TabIndex = 33; + this.txtPostgreSqlUser.Location = new System.Drawing.Point(129, 133); + this.txtPostgreSqlUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtPostgreSqlUser.Name = "txtPostgreSqlUser"; + this.txtPostgreSqlUser.Size = new System.Drawing.Size(472, 28); + this.txtPostgreSqlUser.TabIndex = 33; // // label20 // @@ -1072,7 +1086,7 @@ this.tabOracle.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabOracle.Name = "tabOracle"; this.tabOracle.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabOracle.Size = new System.Drawing.Size(966, 518); + this.tabOracle.Size = new System.Drawing.Size(968, 521); this.tabOracle.TabIndex = 5; this.tabOracle.Text = "Oracle"; this.tabOracle.UseVisualStyleBackColor = true; @@ -1195,7 +1209,7 @@ this.tabTxt.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabTxt.Name = "tabTxt"; this.tabTxt.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabTxt.Size = new System.Drawing.Size(966, 518); + this.tabTxt.Size = new System.Drawing.Size(968, 521); this.tabTxt.TabIndex = 7; this.tabTxt.Text = "TXT"; this.tabTxt.UseVisualStyleBackColor = true; @@ -1300,7 +1314,7 @@ this.tabCnas.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabCnas.Name = "tabCnas"; this.tabCnas.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabCnas.Size = new System.Drawing.Size(984, 562); + this.tabCnas.Size = new System.Drawing.Size(984, 563); this.tabCnas.TabIndex = 1; this.tabCnas.Text = "目标数据库"; this.tabCnas.UseVisualStyleBackColor = true; @@ -1496,6 +1510,126 @@ this.pnlTop.Size = new System.Drawing.Size(992, 7); this.pnlTop.TabIndex = 2; // + // tabPostgreSql + // + this.tabPostgreSql.Controls.Add(this.textBox1); + this.tabPostgreSql.Controls.Add(this.label35); + this.tabPostgreSql.Controls.Add(this.button1); + this.tabPostgreSql.Controls.Add(this.textBox2); + this.tabPostgreSql.Controls.Add(this.textBox3); + this.tabPostgreSql.Controls.Add(this.label38); + this.tabPostgreSql.Controls.Add(this.label39); + this.tabPostgreSql.Controls.Add(this.textBox4); + this.tabPostgreSql.Controls.Add(this.textBox5); + this.tabPostgreSql.Controls.Add(this.label40); + this.tabPostgreSql.Controls.Add(this.label41); + this.tabPostgreSql.Location = new System.Drawing.Point(4, 28); + this.tabPostgreSql.Name = "tabPostgreSql"; + this.tabPostgreSql.Size = new System.Drawing.Size(968, 521); + this.tabPostgreSql.TabIndex = 8; + this.tabPostgreSql.Text = "PostgreSql"; + this.tabPostgreSql.UseVisualStyleBackColor = true; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(145, 221); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(472, 28); + this.textBox1.TabIndex = 46; + // + // label35 + // + this.label35.AutoSize = true; + this.label35.Location = new System.Drawing.Point(78, 227); + this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(62, 18); + this.label35.TabIndex = 44; + this.label35.Text = "端口："; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(577, 270); + this.button1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(118, 36); + this.button1.TabIndex = 47; + this.button1.Text = "测试连接"; + this.button1.UseVisualStyleBackColor = true; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(145, 90); + this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(472, 28); + this.textBox2.TabIndex = 42; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(145, 47); + this.textBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(472, 28); + this.textBox3.TabIndex = 41; + // + // label38 + // + this.label38.AutoSize = true; + this.label38.Location = new System.Drawing.Point(78, 96); + this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label38.Name = "label38"; + this.label38.Size = new System.Drawing.Size(62, 18); + this.label38.TabIndex = 40; + this.label38.Text = "实例："; + // + // label39 + // + this.label39.AutoSize = true; + this.label39.Location = new System.Drawing.Point(60, 53); + this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(80, 18); + this.label39.TabIndex = 39; + this.label39.Text = "服务器："; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(145, 178); + this.textBox4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(472, 28); + this.textBox4.TabIndex = 45; + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(145, 133); + this.textBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(472, 28); + this.textBox5.TabIndex = 43; + // + // label40 + // + this.label40.AutoSize = true; + this.label40.Location = new System.Drawing.Point(78, 182); + this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label40.Name = "label40"; + this.label40.Size = new System.Drawing.Size(62, 18); + this.label40.TabIndex = 38; + this.label40.Text = "密码："; + // + // label41 + // + this.label41.AutoSize = true; + this.label41.Location = new System.Drawing.Point(60, 139); + this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label41.Name = "label41"; + this.label41.Size = new System.Drawing.Size(80, 18); + this.label41.TabIndex = 37; + this.label41.Text = "用户名："; + // // frmDatabaseParams // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); @@ -1537,6 +1671,8 @@ this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.pnlBottom.ResumeLayout(false); + this.tabPostgreSql.ResumeLayout(false); + this.tabPostgreSql.PerformLayout(); this.ResumeLayout(false); } @@ -1612,15 +1748,15 @@ private System.Windows.Forms.Label lblSqliteRemoteUser; private System.Windows.Forms.TextBox txtSqliteRemoteUser; private System.Windows.Forms.TabPage tabMySql; - private System.Windows.Forms.TextBox txtMySqlPort; + private System.Windows.Forms.TextBox txtPostgreSqlPort; private System.Windows.Forms.Label label17; - private System.Windows.Forms.Button btnMySqlTest; - private System.Windows.Forms.TextBox txtMySqlServer; - private System.Windows.Forms.TextBox txtMySqlHost; + private System.Windows.Forms.Button btnPostgreSqlTest; + private System.Windows.Forms.TextBox txtPostgreSqlServer; + private System.Windows.Forms.TextBox txtPostgreSqlHost; private System.Windows.Forms.Label label18; private System.Windows.Forms.Label label19; - private System.Windows.Forms.TextBox txtMySqlPwd; - private System.Windows.Forms.TextBox txtMySqlUser; + private System.Windows.Forms.TextBox txtPostgreSqlPwd; + private System.Windows.Forms.TextBox txtPostgreSqlUser; private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label23; private System.Windows.Forms.TabPage tabOracle; @@ -1665,5 +1801,17 @@ private System.Windows.Forms.Label label31; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.TabPage tabPostgreSql; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label35; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label38; + private System.Windows.Forms.Label label39; + private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.Label label40; + private System.Windows.Forms.Label label41; } } \ No newline at end of file diff --git a/CNAS_DBSync/frmDatabaseParams.cs b/CNAS_DBSync/frmDatabaseParams.cs index e2db149..9873a47 100644 --- a/CNAS_DBSync/frmDatabaseParams.cs +++ b/CNAS_DBSync/frmDatabaseParams.cs @@ -120,11 +120,11 @@ namespace CNAS_DBSync break; case DataSourceType.MySQL: this.tabcDS.SelectedIndex = 5; - this.txtMySqlHost.Text= syncInstrumentItem.SyncInstrumentDSInfo.Host; - this.txtMySqlServer.Text = syncInstrumentItem.SyncInstrumentDSInfo.ServerName; - this.txtMySqlUser.Text = syncInstrumentItem.SyncInstrumentDSInfo.UserId; - this.txtMySqlPwd.Text = syncInstrumentItem.SyncInstrumentDSInfo.UserPwd; - this.txtMySqlPort.Text = syncInstrumentItem.SyncInstrumentDSInfo.Port ; + this.txtPostgreSqlHost.Text= syncInstrumentItem.SyncInstrumentDSInfo.Host; + this.txtPostgreSqlServer.Text = syncInstrumentItem.SyncInstrumentDSInfo.ServerName; + this.txtPostgreSqlUser.Text = syncInstrumentItem.SyncInstrumentDSInfo.UserId; + this.txtPostgreSqlPwd.Text = syncInstrumentItem.SyncInstrumentDSInfo.UserPwd; + this.txtPostgreSqlPort.Text = syncInstrumentItem.SyncInstrumentDSInfo.Port ; break; case DataSourceType.Oracle: this.tabcDS.SelectedIndex = 6; @@ -200,11 +200,11 @@ namespace CNAS_DBSync syncInstrumentItem.SyncInstrumentDSInfo.UserPwd = this.txtSqlServerPwd.Text.Trim(); break; case DataSourceType.MySQL: - syncInstrumentItem.SyncInstrumentDSInfo.Host = this.txtMySqlHost.Text.Trim(); - syncInstrumentItem.SyncInstrumentDSInfo.ServerName = this.txtMySqlServer.Text.Trim(); - syncInstrumentItem.SyncInstrumentDSInfo.UserId = this.txtMySqlUser.Text.Trim(); - syncInstrumentItem.SyncInstrumentDSInfo.UserPwd = this.txtMySqlPwd.Text.Trim(); - syncInstrumentItem.SyncInstrumentDSInfo.Port = this.txtMySqlPort.Text.Trim(); + syncInstrumentItem.SyncInstrumentDSInfo.Host = this.txtPostgreSqlHost.Text.Trim(); + syncInstrumentItem.SyncInstrumentDSInfo.ServerName = this.txtPostgreSqlServer.Text.Trim(); + syncInstrumentItem.SyncInstrumentDSInfo.UserId = this.txtPostgreSqlUser.Text.Trim(); + syncInstrumentItem.SyncInstrumentDSInfo.UserPwd = this.txtPostgreSqlPwd.Text.Trim(); + syncInstrumentItem.SyncInstrumentDSInfo.Port = this.txtPostgreSqlPort.Text.Trim(); break; case DataSourceType.Oracle: syncInstrumentItem.SyncInstrumentDSInfo.Host = this.txtOracleHost.Text.Trim(); @@ -570,7 +570,7 @@ namespace CNAS_DBSync private bool CheckMySqlControl() { - if (this.txtMySqlHost.Text.Trim() != "" || this.txtMySqlServer.Text.Trim() != "" || this.txtMySqlUser.Text.Trim() != "" || this.txtMySqlPwd.Text.Trim() != ""|| this.txtMySqlPort.Text.Trim()!="") + if (this.txtPostgreSqlHost.Text.Trim() != "" || this.txtPostgreSqlServer.Text.Trim() != "" || this.txtPostgreSqlUser.Text.Trim() != "" || this.txtPostgreSqlPwd.Text.Trim() != ""|| this.txtPostgreSqlPort.Text.Trim()!="") return false; else return true; @@ -653,11 +653,11 @@ namespace CNAS_DBSync private void ClearMySQLControl() { - this.txtMySqlHost.Text = ""; - this.txtMySqlServer.Text = ""; - this.txtMySqlUser.Text = ""; - this.txtMySqlPwd.Text = ""; - this.txtMySqlPort.Text = ""; + this.txtPostgreSqlHost.Text = ""; + this.txtPostgreSqlServer.Text = ""; + this.txtPostgreSqlUser.Text = ""; + this.txtPostgreSqlPwd.Text = ""; + this.txtPostgreSqlPort.Text = ""; } private void ClearOracleControl() @@ -862,11 +862,11 @@ namespace CNAS_DBSync if (CnasDataOperationFact.CnasDataOperation().TestConnect(new DataBaseInfo() { - DBHost = this.txtMySqlHost.Text.Trim(), - DBName = this.txtMySqlServer.Text.Trim(), - DBUser = this.txtMySqlUser.Text.Trim(), - DBPwd = this.txtMySqlPwd.Text.Trim(), - DBPort = this.txtMySqlPort.Text.Trim() + DBHost = this.txtPostgreSqlHost.Text.Trim(), + DBName = this.txtPostgreSqlServer.Text.Trim(), + DBUser = this.txtPostgreSqlUser.Text.Trim(), + DBPwd = this.txtPostgreSqlPwd.Text.Trim(), + DBPort = this.txtPostgreSqlPort.Text.Trim() })) MessageBox.Show("连接成功！"); else