diff --git a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool.v11.suo b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool.v11.suo index a85fb9a4..22539a54 100644 Binary files a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool.v11.suo and b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool.v11.suo differ diff --git a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.Designer.cs b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.Designer.cs index 734db00c..c97f14ea 100644 --- a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.Designer.cs +++ b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.Designer.cs @@ -40,6 +40,8 @@ private void InitializeComponent() this.lbSavePath = new System.Windows.Forms.Label(); this.txtProjectPath = new System.Windows.Forms.TextBox(); this.gbConn = new System.Windows.Forms.GroupBox(); + this.txtTip = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); this.gbBuild = new System.Windows.Forms.GroupBox(); this.txtEntitySuffix = new System.Windows.Forms.TextBox(); this.lbEntityBean = new System.Windows.Forms.Label(); @@ -58,8 +60,6 @@ private void InitializeComponent() this.lnkOpenFolder = new System.Windows.Forms.LinkLabel(); this.lnkCopyPath = new System.Windows.Forms.LinkLabel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.label1 = new System.Windows.Forms.Label(); - this.txtTip = new System.Windows.Forms.Label(); this.gbConn.SuspendLayout(); this.gbBuild.SuspendLayout(); this.SuspendLayout(); @@ -80,7 +80,10 @@ private void InitializeComponent() "Xml", "FoxPro", "PostgreSQL", - "DB2"}); + "DB2", + "FireBird", + "DaMeng", + "KingBaseES"}); this.ddlDBType.Location = new System.Drawing.Point(104, 47); this.ddlDBType.Name = "ddlDBType"; this.ddlDBType.Size = new System.Drawing.Size(199, 20); @@ -188,6 +191,28 @@ private void InitializeComponent() this.gbConn.TabStop = false; this.gbConn.Text = "Connection Config"; // + // txtTip + // + this.txtTip.AutoSize = true; + this.txtTip.ForeColor = System.Drawing.Color.Red; + this.txtTip.Location = new System.Drawing.Point(102, 109); + this.txtTip.Name = "txtTip"; + this.txtTip.Size = new System.Drawing.Size(23, 12); + this.txtTip.TabIndex = 1; + this.txtTip.Text = "..."; + this.txtTip.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.ForeColor = System.Drawing.Color.Red; + this.label1.Location = new System.Drawing.Point(31, 109); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(65, 12); + this.label1.TabIndex = 1; + this.label1.Text = "信息提示："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // gbBuild // this.gbBuild.Controls.Add(this.txtEntitySuffix); @@ -390,28 +415,6 @@ private void InitializeComponent() this.lnkCopyPath.Text = "复制完整路径"; this.lnkCopyPath.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkCopyPath_LinkClicked); // - // label1 - // - this.label1.AutoSize = true; - this.label1.ForeColor = System.Drawing.Color.Red; - this.label1.Location = new System.Drawing.Point(31, 109); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(65, 12); - this.label1.TabIndex = 1; - this.label1.Text = "信息提示："; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // txtTip - // - this.txtTip.AutoSize = true; - this.txtTip.ForeColor = System.Drawing.Color.Red; - this.txtTip.Location = new System.Drawing.Point(102, 109); - this.txtTip.Name = "txtTip"; - this.txtTip.Size = new System.Drawing.Size(23, 12); - this.txtTip.TabIndex = 1; - this.txtTip.Text = "..."; - this.txtTip.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // OpForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -427,7 +430,7 @@ private void InitializeComponent() this.Name = "OpForm"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "CYQ.Data 配置工具 V2.2"; + this.Text = "CYQ.Data 配置工具 V2.3"; this.Load += new System.EventHandler(this.OpForm_Load); this.gbConn.ResumeLayout(false); this.gbConn.PerformLayout(); diff --git a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.cs b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.cs index 6ec42167..a282b0c5 100644 --- a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.cs +++ b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.cs @@ -163,7 +163,7 @@ private void ddlProvider_SelectedIndexChanged(object sender, EventArgs e) switch (index) { case 0: - txtConn.Text = "server=.;database=demo;uid=sa;pwd=123456"; + txtConn.Text = "provider=ms;server=.;database=demo;uid=sa;pwd=123456"; txtTip.Text = ""; break; case 1: @@ -171,7 +171,7 @@ private void ddlProvider_SelectedIndexChanged(object sender, EventArgs e) txtTip.Text = ""; break; case 2: - txtConn.Text = "host=127.0.0.1;Port=3306;Database=demo;uid=sa;pwd=123456"; + txtConn.Text = "provider=mysql;host=127.0.0.1;Port=3306;Database=demo;uid=sa;pwd=123456"; txtTip.Text = "该功能引用：MySql.Data.dll"; break; case 3: @@ -179,7 +179,7 @@ private void ddlProvider_SelectedIndexChanged(object sender, EventArgs e) txtTip.Text = "该功能引用：System.Data.SQLite.dll（注意x86或x64的区别）"; break; case 4: - txtConn.Text = "Data Source=127.0.0.1;Port=5000;UID=sa;PWD='123456';Database='Demo'"; + txtConn.Text = "provider=sybase;Data Source=127.0.0.1;Port=5000;UID=sa;PWD='123456';Database='Demo'"; txtTip.Text = "该功能引用：Sybase.AdoNet2.AseClient.dll（Sybase软件安装目录下有）"; break; case 5: @@ -203,13 +203,25 @@ private void ddlProvider_SelectedIndexChanged(object sender, EventArgs e) txtTip.Text = ""; break; case 10: - txtConn.Text = "server=.;port=5432;database=xx;uid=xx;pwd=xx"; + txtConn.Text = "provider=postgre;server=.;port=5432;database=xx;uid=xx;pwd=xx"; txtTip.Text = "该功能引用：Npgsql.dll"; break; - case 11: + case 11://db2 txtConn.Text = "Provider=IBMDADB2.IBMDBCL1;Data Source=dbname;Persist Security Info=True;User ID=username;pwd=123456;Location=ip"; txtTip.Text = "该功能引用：IBM.Data.DB2.dll（DB2软件安装目录下有）"; break; + case 12://firebird + txtConn.Text = "provider=firebird;user id=SYSDBA;password=123456;database={0}test.dbf;server type=Default;data source=127.0.0.1;port number=3050"; + txtTip.Text = "该功能引用：FirebirdSql.Data.FirebirdClient.dll"; + break; + case 13://dameng + txtConn.Text = "provider=dameng;user id=SYSDBA;password=123456789;data source=127.0.0.1;port number=3050;schema=test;"; + txtTip.Text = "该功能引用：DmProvider.dll"; + break; + case 14://kingbasees + txtConn.Text = "provider=kingbasees;server=127.0.0.1;User Id=system;Password=123456;Database=test;Port=54321;schema=public;"; + txtTip.Text = "该功能引用：Kdbndp.dll"; + break; } //} @@ -250,13 +262,13 @@ private void btnBuild_Click(object sender, EventArgs e) { System.IO.Directory.CreateDirectory(path); } - catch(Exception err) + catch (Exception err) { MessageBox.Show(err.Message, "Tip"); return; } } - + string name = SaveConfig(); btnBuild.Enabled = false; Thread thread = new Thread(new ParameterizedThreadStart(BuildCSCode.Create)); @@ -327,12 +339,12 @@ private void lnkOpenFolder_LinkClicked(object sender, LinkLabelLinkClickedEventA private void btnOpenProjectFolder_Click(object sender, EventArgs e) { - string path=txtProjectPath.Text.Trim(); + string path = txtProjectPath.Text.Trim(); if (!string.IsNullOrEmpty(path)) { if (!System.IO.Directory.Exists(path)) { - MessageBox.Show("Directory not Exists :" + path,"Tip"); + MessageBox.Show("Directory not Exists :" + path, "Tip"); return; } System.Diagnostics.Process.Start(path); diff --git a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.resx b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.resx index 7ce03af8..e641aef8 100644 --- a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.resx +++ b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/OpForm.resx @@ -120,4 +120,7 @@ 17, 17 + + 17, 17 + \ No newline at end of file diff --git a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/Properties/AssemblyInfo.cs b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/Properties/AssemblyInfo.cs index e100cdcd..4fbb3d71 100644 --- a/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/Properties/AssemblyInfo.cs +++ b/ProjectTool/src/CYQ.Data.ProjectTool/CYQ.Data.ProjectTool/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ [assembly: AssemblyTitle("CYQ.Data 数据层(ORM)框架 项目配置工具")] [assembly: AssemblyDescription("论坛：http://www.cyqdata.com/cyqdata")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("秋式软件 （2022-09-26）")] +[assembly: AssemblyCompany("秋式软件 （2023-12-25）")] [assembly: AssemblyProduct("CYQ.Data 数据层(ORM)框架 项目配置工具")] [assembly: AssemblyCopyright("版权所有 (C) 秋式软件 2010-2020")] [assembly: AssemblyTrademark("CYQ.Data.ProjectTool")] @@ -29,5 +29,5 @@ // 内部版本号 // 修订号 // -[assembly: AssemblyVersion("2.2.0.0")] -[assembly: AssemblyFileVersion("2.2.0.0")] +[assembly: AssemblyVersion("2.3.0.0")] +[assembly: AssemblyFileVersion("2.3.0.0")]