diff --git a/Bin/Debug/SuperDesign/RaUI.dll b/Bin/Debug/SuperDesign/RaUI.dll index 2f7842c..8915a92 100644 Binary files a/Bin/Debug/SuperDesign/RaUI.dll and b/Bin/Debug/SuperDesign/RaUI.dll differ diff --git a/Bin/Debug/SuperDesign/RaUI.xml b/Bin/Debug/SuperDesign/RaUI.xml index 292be97..d11e54d 100644 --- a/Bin/Debug/SuperDesign/RaUI.xml +++ b/Bin/Debug/SuperDesign/RaUI.xml @@ -1251,11 +1251,16 @@ 取消事件 + + + 是否跳过相同文件,默认不跳过(根据文件大小和修改时间来判断) + + 大文件按流复制文件,支持自动创建目标文件夹。 true：复制成功 false：复制失败 - 原始文件路径 + 原始文件路径 复制目标文件路径 携带的参数(可选) @@ -1753,6 +1758,11 @@ XML + + + Json + + 对象值 @@ -2962,127 +2972,6 @@ 全屏平铺 - - - 设置管理类,快速添加设置。 - - - - - 设置管理类,快速添加设置。 - - - - - 设置管理类,快速添加设置。 - - - - - - 存储类型 - - - - - 配置存储路径 - - - - - 设置XML内容 - - - - - 添加控件 - - - - - - - - 设置值 - - - - - - - - 添加控件 - - - - - - - - - - 添加控件 - - - - - - - - - 添加控件 - - - - - - - - - 添加控件 - - - - - - - - - 添加控件 - - - - - - - - - 添加控件 - - - - - - - - - 添加控件 - - - - - - - - - 读取配置 - - - - - 保存配置 - - 音频播放类 @@ -3634,6 +3523,142 @@ + + + 超级文件搜索 + + + + + 取消选项 + + + + + 不取消,继续 + + + + + 只取消当前目录 + + + + + 取消后面的所有搜索 + + + + + 是否取消 + + + + + + + + + 是否将该文件添加到结果 + + + + 搜索文件事件 + + + + + + + + + + + + + 搜索目录事件 + + + + + + + + + + + + + 错误事件 + + + + + 是否查找搜索子目录 + + + + + 查找发现的文件列表 + + + + + 查找发现的目录列表 + + + + + 结果对应的文件数量 + + + + + 结果对应的目录数量 + + + + + 结果对应的文件+目录数量 + + + + + + + + + + 搜索查找文件 + + + + + + + 搜索查找文件 + + + + + + + 获取指定文件夹下的文件列表,支持多个扩展名获取,支持获取子文件夹的数据 + + + + 是否获取子文件夹数据 + + + + + 获取指定文件夹下的文件列表,支持多个扩展名获取(子文件夹里的文件不会去获取)。如果 + 文件夹不存在,则获取空列表(本函数不会返回null值) + + 要获取的文件夹路径 + 要获取的扩展名列表(例如:*.mp3;*.wav) + + 用于取得一个文本文件的编码方式(Encoding)。 @@ -13853,6 +13878,11 @@ + + + 是否将时间类型转为时间戳 + + 输出多条件搜索。 @@ -13867,6 +13897,12 @@ + + + 根据输入的内容,生成Json数据 + + + 获取插入SQL语句 @@ -15024,6 +15060,13 @@ 超时时间 + + + + + 超时时间 + 重试次数 + 以post方式获取网页源码 @@ -15059,6 +15102,11 @@ + + + 重试次数 + + 头信息 @@ -18126,6 +18174,11 @@ 版本 + + + 版本类型 + + 更新日期 @@ -20968,6 +21021,12 @@ + + + + + + @@ -24063,16 +24122,21 @@ 存储类型 - + 配置存储路径 - + 设置XML内容 + + + 获取/设置配置的内容(适用于xml和json) + + 添加控件 @@ -24190,6 +24254,81 @@ 保存配置 + + + 保存到内存中的对象 + + + + + 读取内容到内存中 + + + + + 从内存中读取配置 + + + + + + + + 从内存中读取配置 + + + + + + + + 从内存中读取配置 + + + + + + + + 从内存中读取配置 + + + + + + + + 从内存中读取配置 + + + + + + + + 从内存中读取配置 + + + + + + + + 从内存中读取配置 + + + + + + + 从内存中读取配置 + + + + + + + 类 名:ColorHSL @@ -30355,12 +30494,12 @@ - Automatically sets the size of the label by content size + 根据内容大小自动设置标签的大小 - Automatically sets the height of the label by content height (width is not effected). + 根据内容高度自动设置标签的高度（宽度不受影响）。 diff --git a/Bin/Debug/SuperDesign/RySmartEditor.exe b/Bin/Debug/SuperDesign/RySmartEditor.exe index 5a9119d..e8f9465 100644 Binary files a/Bin/Debug/SuperDesign/RySmartEditor.exe and b/Bin/Debug/SuperDesign/RySmartEditor.exe differ diff --git a/Bin/Debug/SuperDesign/SuperDesign.exe b/Bin/Debug/SuperDesign/SuperDesign.exe index 1d74512..a15b6de 100644 Binary files a/Bin/Debug/SuperDesign/SuperDesign.exe and b/Bin/Debug/SuperDesign/SuperDesign.exe differ diff --git a/Bin/Debug/SuperDesign/cUpdate.dat b/Bin/Debug/SuperDesign/cUpdate.dat index 32681a8..bee6f3b 100644 --- a/Bin/Debug/SuperDesign/cUpdate.dat +++ b/Bin/Debug/SuperDesign/cUpdate.dat @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c94c7e5..a3efb25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ -## :date:2025-08-26 星期二更新 +## :date:2026-04-11 星期六更新 + +### RySmartEditor V1.0.2604.1101 +- :cactus:[新增]新增支持站点禁用功能。 + +### SuperDesign V3.0.2604.1101 +- :cactus:[新增]更新dll版本功能新增进度展示,并提示替换的dll数量。 +- :lady_beetle:[修复]修复生成C#代码时,多行Cookie和PostData生成错误的BUG。 +- :lady_beetle:[修复]修复更新引用dll时,如果dll不存在,会更新失败的BUG。 + +## :date:2025-08-26 星期二更新 ### RySmartEditor V1.0.2508.2601 - :100:[改进]改进上传FTP流畅性。 diff --git a/Source/RySmartEditor/API/Itrycn_Info.cs b/Source/RySmartEditor/API/Itrycn_Info.cs index 3c99220..57fea54 100644 --- a/Source/RySmartEditor/API/Itrycn_Info.cs +++ b/Source/RySmartEditor/API/Itrycn_Info.cs @@ -230,6 +230,7 @@ namespace 开发辅助工具.Manager mySQL.AddField("localPath", ""); mySQL.AddField("ftpId", 0); mySQL.AddField("ftpDir", ""); + mySQL.AddField("Disabled", 0); mySQL.AddField("addTime", DateTime.Now); mySQL.AddField("editTime", DateTime.Now); db.CreateDb(mySQL); diff --git a/Source/RySmartEditor/FrmSetting.cs b/Source/RySmartEditor/FrmSetting.cs index 4307d72..08afe23 100644 --- a/Source/RySmartEditor/FrmSetting.cs +++ b/Source/RySmartEditor/FrmSetting.cs @@ -28,7 +28,15 @@ namespace 开发辅助工具.Manager OlvSiteName.AspectGetter = delegate (object x) { return ((SiteInfo)x).Name; }; OlvSitePath.AspectGetter = delegate (object x) { return ((SiteInfo)x).LocalPath; }; OlvSiteFTP.AspectGetter = delegate (object x) { return ((SiteInfo)x).FtpName; }; + LvSite.FormatRow += LvSite_FormatRow; } + + private void LvSite_FormatRow(object sender, BrightIdeasSoftware.FormatRowEventArgs e) + { + var row = (SiteInfo)e.Model; + if (row.Disabled) { e.Item.ForeColor = Color.Gray; } + } + private void BtnCancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; @@ -273,7 +281,8 @@ namespace 开发辅助工具.Manager Name = row["name"].ToString(), LocalPath = row["localPath"].ToString(), FtpId = row["ftpId"].ToInt(), - FtpName= ftpname + FtpName= ftpname, + Disabled=row["Disabled"].ToInt() == 1 }); } } @@ -357,5 +366,6 @@ namespace 开发辅助工具.Manager public string FtpDir { get; set; } = ""; public string FtpName { get; set; } = ""; public int FtpId { get; set; } = 0; + public bool Disabled { get; set; } = false; } } diff --git a/Source/RySmartEditor/Properties/AssemblyInfo.cs b/Source/RySmartEditor/Properties/AssemblyInfo.cs index 4fa8f7f..4baa420 100644 --- a/Source/RySmartEditor/Properties/AssemblyInfo.cs +++ b/Source/RySmartEditor/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2508.2601")] -[assembly: AssemblyFileVersion("1.0.2508.2601")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.2604.1101")] +[assembly: AssemblyFileVersion("1.0.2604.1101")] \ No newline at end of file diff --git a/Source/RySmartEditor/Site/FrmAddSite.Designer.cs b/Source/RySmartEditor/Site/FrmAddSite.Designer.cs index 692379e..5288a2e 100644 --- a/Source/RySmartEditor/Site/FrmAddSite.Designer.cs +++ b/Source/RySmartEditor/Site/FrmAddSite.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.label1 = new System.Windows.Forms.Label(); this.TxtName = new ryControls.TextBoxEx2(); this.label2 = new System.Windows.Forms.Label(); @@ -41,6 +42,7 @@ this.BtnOK = new ryControls.ButtonEx(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); this.BtnClearFtp = new ryControls.ButtonEx(); + this.ChkDisabled = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // label1 @@ -57,7 +59,9 @@ this.TxtName.BackColor = System.Drawing.Color.White; this.TxtName.EmptyText = ""; this.TxtName.Location = new System.Drawing.Point(11, 24); + this.TxtName.LongTime = 2000; this.TxtName.MaxLength = 999999999; + this.TxtName.MaxUndoRedoSteps = 50; this.TxtName.Multiline = false; this.TxtName.Name = "TxtName"; this.TxtName.OnlyNumeric = false; @@ -88,7 +92,9 @@ this.TxtLocalPath.BackColor = System.Drawing.Color.White; this.TxtLocalPath.EmptyText = ""; this.TxtLocalPath.Location = new System.Drawing.Point(11, 75); + this.TxtLocalPath.LongTime = 2000; this.TxtLocalPath.MaxLength = 999999999; + this.TxtLocalPath.MaxUndoRedoSteps = 50; this.TxtLocalPath.Multiline = false; this.TxtLocalPath.Name = "TxtLocalPath"; this.TxtLocalPath.OnlyNumeric = false; @@ -150,7 +156,9 @@ this.TxtFtpDir.BackColor = System.Drawing.Color.White; this.TxtFtpDir.EmptyText = ""; this.TxtFtpDir.Location = new System.Drawing.Point(221, 126); + this.TxtFtpDir.LongTime = 2000; this.TxtFtpDir.MaxLength = 999999999; + this.TxtFtpDir.MaxUndoRedoSteps = 50; this.TxtFtpDir.Multiline = false; this.TxtFtpDir.Name = "TxtFtpDir"; this.TxtFtpDir.OnlyNumeric = false; @@ -200,11 +208,22 @@ this.BtnClearFtp.UseVisualStyleBackColor = true; this.BtnClearFtp.Click += new System.EventHandler(this.BtnClearFtp_Click); // + // ChkDisabled + // + this.ChkDisabled.AutoSize = true; + this.ChkDisabled.Location = new System.Drawing.Point(11, 164); + this.ChkDisabled.Name = "ChkDisabled"; + this.ChkDisabled.Size = new System.Drawing.Size(48, 16); + this.ChkDisabled.TabIndex = 43; + this.ChkDisabled.Text = "禁用"; + this.ChkDisabled.UseVisualStyleBackColor = true; + // // FrmAddSite // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(442, 203); + this.Controls.Add(this.ChkDisabled); this.Controls.Add(this.BtnClearFtp); this.Controls.Add(this.BtnCancel); this.Controls.Add(this.BtnOK); @@ -243,5 +262,6 @@ private ryControls.ButtonEx BtnOK; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; private ryControls.ButtonEx BtnClearFtp; + private System.Windows.Forms.CheckBox ChkDisabled; } } \ No newline at end of file diff --git a/Source/RySmartEditor/Site/FrmAddSite.cs b/Source/RySmartEditor/Site/FrmAddSite.cs index c8bd332..7e661c0 100644 --- a/Source/RySmartEditor/Site/FrmAddSite.cs +++ b/Source/RySmartEditor/Site/FrmAddSite.cs @@ -45,6 +45,7 @@ namespace 开发辅助工具.Manager.Site TxtLocalPath.Text = reader["localPath"].ToString(); DtFtp.selectId = reader["ftpId"].ToString(); TxtFtpDir.Text = reader["ftpDir"].ToString(); + ChkDisabled.Checked = reader["Disabled"].ToInt() == 1; #endregion } ds.Dispose(); @@ -70,6 +71,7 @@ namespace 开发辅助工具.Manager.Site mySQL.AddField("localPath", TxtLocalPath.Text.Trim('\\')); mySQL.AddField("ftpId",DtFtp.selectId.ToInt()); mySQL.AddField("ftpDir", TxtFtpDir.Text); + mySQL.AddField("Disabled", ChkDisabled.Checked?1:0); //DataProvider mydb = new DataProvider(); IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType); if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1) diff --git a/Source/RySmartEditor/SmartEditor/FrmFileBrowser.cs b/Source/RySmartEditor/SmartEditor/FrmFileBrowser.cs index f6a99e4..2718a5a 100644 --- a/Source/RySmartEditor/SmartEditor/FrmFileBrowser.cs +++ b/Source/RySmartEditor/SmartEditor/FrmFileBrowser.cs @@ -481,7 +481,7 @@ namespace SuperDesign.Tools.SmartEditor UploadInfo uploadinfo = null; IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType); if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1) { - DataSet ds = db.ReadData("select * from Site"); + DataSet ds = db.ReadData("select * from Site where Disabled<>1"); if (ds.HaveData()) { for (int i = 0; i < ds.Tables[0].Rows.Count; i++) { DataRow reader = ds.Tables[0].Rows[i]; diff --git a/Source/RySmartEditor/SmartEditor/FrmFileBrowser_New.cs b/Source/RySmartEditor/SmartEditor/FrmFileBrowser_New.cs index 6eef58b..5bf467f 100644 --- a/Source/RySmartEditor/SmartEditor/FrmFileBrowser_New.cs +++ b/Source/RySmartEditor/SmartEditor/FrmFileBrowser_New.cs @@ -489,7 +489,7 @@ namespace SuperDesign.Tools.SmartEditor string FilePath = model.FullName; SiteInfo SiteInfo = new SiteInfo(); UploadInfo uploadinfo = null; - DataSet ds = db.ReadData("select * from Site"); + DataSet ds = db.ReadData("select * from Site where Disabled<>1"); if (ds.HaveData()) { for (int i = 0; i < ds.Tables[0].Rows.Count; i++) @@ -1223,7 +1223,7 @@ namespace SuperDesign.Tools.SmartEditor IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType); if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1) { - DataSet ds = db.ReadData("select * from Site"); + DataSet ds = db.ReadData("select * from Site where Disabled<>1"); if (ds.HaveData()) { for (int m = 0; m < list.Count; m++) @@ -1297,7 +1297,7 @@ namespace SuperDesign.Tools.SmartEditor // continue ; //} string FilePath = model.FullName; - DataSet ds = db.ReadData("select * from Site"); + DataSet ds = db.ReadData("select * from Site where Disabled<>1"); if (ds.HaveData()) { for (int m = 0; m < list.Count; m++) @@ -1348,7 +1348,7 @@ namespace SuperDesign.Tools.SmartEditor string FilePath = files[f]; SiteInfo SiteInfo = new SiteInfo(); UploadInfo uploadinfo = null; - DataSet ds = db.ReadData("select * from Site"); + DataSet ds = db.ReadData("select * from Site where Disabled<>1"); if (ds.HaveData()) { for (int i = 0; i < ds.Tables[0].Rows.Count; i++) @@ -1441,7 +1441,7 @@ namespace SuperDesign.Tools.SmartEditor IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType); if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1) { - DataSet ds = db.ReadData("select * from Site"); + DataSet ds = db.ReadData("select * from Site where Disabled<>1"); if (ds.HaveData()) { for (int m = 0; m < list.Count; m++) diff --git a/Source/RySmartEditor/SmartEditor/FrmFileEditor.cs b/Source/RySmartEditor/SmartEditor/FrmFileEditor.cs index e1fe850..115d8d5 100644 --- a/Source/RySmartEditor/SmartEditor/FrmFileEditor.cs +++ b/Source/RySmartEditor/SmartEditor/FrmFileEditor.cs @@ -149,7 +149,7 @@ namespace 开发辅助工具.Tools.SmartEditor IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType); if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1) { - DataSet ds = db.ReadData("select * from Site"); + DataSet ds = db.ReadData("select * from Site where Disabled<>1"); if (ds.HaveData()) { for (int i = 0; i < ds.Tables[0].Rows.Count; i++) @@ -305,7 +305,7 @@ namespace 开发辅助工具.Tools.SmartEditor IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType); if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1) { - DataSet ds = db.ReadData("select * from Site"); + DataSet ds = db.ReadData("select * from Site where Disabled<>1"); if (ds.HaveData()) { FrmUploadProg frm = new FrmUploadProg(); diff --git a/Source/开发辅助工具/Manager/RyProject.cs b/Source/开发辅助工具/Manager/RyProject.cs index e75341d..3afde56 100644 --- a/Source/开发辅助工具/Manager/RyProject.cs +++ b/Source/开发辅助工具/Manager/RyProject.cs @@ -46,6 +46,18 @@ namespace 开发辅助工具.Manager /// [Description("状态变化时激发")] public event StringEventHandler OnStateChanged; + /// + /// 传输进度 + /// + /// 当前传输完成的值 + /// 全部值,为-1表示无法获取 + /// 当前传输的百分比,为-1表示无法获取 + /// 携带的参数(可选) + public delegate void TranProgressHandler(long curValue, long totalValue, double percent); + /// + /// 文件传输进度 + /// + public event TranProgressHandler OnReplaceDllProgress; public RyProject() { UpdateSetting(); @@ -92,7 +104,7 @@ namespace 开发辅助工具.Manager var path_list = ReferenceDllPath.Replace("\r", "").Split('\n'); //var find = false; var result = ""; - var Min_Ver = RySoft.GetVersionStr(dll_full_path); + var Min_Ver =System.IO.File.Exists(dll_full_path)?RySoft.GetVersionStr(dll_full_path):"0.0.0.0"; var Min_dt=RyFiles.GetFileDate(dll_full_path); #region 在引用文件夹查找是否有该dll,有则使用引用文件夹里的dll for (int m = 0; m < path_list.Length; m++) @@ -192,6 +204,7 @@ namespace 开发辅助工具.Manager } return _rel_path; } + public int ReplaceDllCount { get; set; } = 0; /// /// 更新dll版本,如果全部复制成功，则返回0,否则返回错误个数 /// @@ -199,6 +212,8 @@ namespace 开发辅助工具.Manager { var _error_str = ""; int error = 0; + int replace_count = 0; + ReplaceDllCount = 0; Updates("",folder); Updates("x86", folder+"\\x86"); Updates("x64", folder + "\\x64"); @@ -206,8 +221,10 @@ namespace 开发辅助工具.Manager { if (!System.IO.Directory.Exists(_path)) { return; } var files = System.IO.Directory.GetFiles(_path, "*.dll"); + OnReplaceDllProgress?.Invoke(0, files.Length, 0); for (int i = 0; i < files.Length; i++) { + OnReplaceDllProgress?.Invoke(i, files.Length, i/ (float)files.Length); string filename = System.IO.Path.GetFileName(files[i]); var dllpath = GetDllPath(foldername, files[i]); if (dllpath.Length>0) @@ -222,17 +239,32 @@ namespace 开发辅助工具.Manager if (RyFiles.CopyFolder(sourch_folder + "\\x64\\", _path + "\\x64\\") != 0) { _error_str += sourch_folder + "\\x64\\*\r\n"; error++; } } - if (dllpath!= files[i] && !RyFiles.CopyBigFile(dllpath, files[i])) - { _error_str += files[i]+ "\r\n"; error++; } + if (dllpath!= files[i]) + { + if (!RyFiles.CopyBigFile(dllpath, files[i])) + { + _error_str += files[i] + "\r\n"; error++; + } + else + { + replace_count++; + } + } var dll_xml_path = System.IO.Path.GetDirectoryName(dllpath) +"\\"+ System.IO.Path.GetFileNameWithoutExtension(dllpath) + ".xml"; if (System.IO.File.Exists(dll_xml_path)) { var to_xml_path = System.IO.Path.GetDirectoryName(files[i]) + "\\" + System.IO.Path.GetFileNameWithoutExtension(files[i]) + ".xml"; - if (dll_xml_path.ToLower()!=to_xml_path.ToLower() && !RyFiles.CopyBigFile(dll_xml_path, to_xml_path)) - { _error_str += files[i] + "\r\n"; error++; } + if (dll_xml_path.ToLower()!=to_xml_path.ToLower()) + { + if (!RyFiles.CopyBigFile(dll_xml_path, to_xml_path)) + { + _error_str += files[i] + "\r\n"; error++; + } + } } } } + OnReplaceDllProgress?.Invoke(files.Length, files.Length,1); var dirs = System.IO.Directory.GetDirectories(_path); for (int i = 0; i < dirs.Length; i++) { @@ -240,6 +272,7 @@ namespace 开发辅助工具.Manager } } error_str = _error_str; + ReplaceDllCount = replace_count; return error; } /// @@ -248,6 +281,10 @@ namespace 开发辅助工具.Manager public int UpdateCSproj(string folder) { int error = 0; + if(System.IO.File.Exists(folder) && System.IO.Path.GetExtension(folder)== ".csproj") + { + SetCSproj(folder, ""); + } Updates(folder); void Updates(string _path) { @@ -276,7 +313,7 @@ namespace 开发辅助工具.Manager var xmlnsm = new XmlNamespaceManager(xml.NameTable); xmlnsm.AddNamespace("d", xml.DocumentElement.NamespaceURI); //var root = @"d:Project//d:ItemGroup//d:Reference"; - if (_project_Eng_name != "") + if (_project_Eng_name.Length>0) { SetValue(@"d:Project//d:PropertyGroup//d:RootNamespace", _project_Eng_name.Replace(" ", ""));//命名空间名 SetValue(@"d:Project//d:PropertyGroup//d:AssemblyName", _project_Eng_name.Replace(" ", ""));//程序集名称 diff --git a/Source/开发辅助工具/Properties/AssemblyInfo.cs b/Source/开发辅助工具/Properties/AssemblyInfo.cs index c1e1cff..2eb87f6 100644 --- a/Source/开发辅助工具/Properties/AssemblyInfo.cs +++ b/Source/开发辅助工具/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.2508.2601")] -[assembly: AssemblyFileVersion("3.0.2508.2601")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.2604.1101")] +[assembly: AssemblyFileVersion("3.0.2604.1101")] \ No newline at end of file diff --git a/Source/开发辅助工具/Properties/Resources.Designer.cs b/Source/开发辅助工具/Properties/Resources.Designer.cs index c8b6dae..6b46122 100644 --- a/Source/开发辅助工具/Properties/Resources.Designer.cs +++ b/Source/开发辅助工具/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SuperDesign.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Source/开发辅助工具/Properties/Settings.Designer.cs b/Source/开发辅助工具/Properties/Settings.Designer.cs index 9bf16b6..f172a39 100644 --- a/Source/开发辅助工具/Properties/Settings.Designer.cs +++ b/Source/开发辅助工具/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace SuperDesign.Properties { [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.14.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Source/开发辅助工具/SuperDesign.csproj.user b/Source/开发辅助工具/SuperDesign.csproj.user index 62c4d01..63f1b18 100644 --- a/Source/开发辅助工具/SuperDesign.csproj.user +++ b/Source/开发辅助工具/SuperDesign.csproj.user @@ -1,7 +1,7 @@ - get "E:\My Datas\My Codes\毕方项目\CSharp\SuperDesign\Source\开发辅助工具\SuperDesign.csproj" + get "E:\My Datas\My Codes\毕方项目\CSharp\数据库备份工具\Source\DatabaseBackup\DatabaseBackup.csproj" ShowAllFiles diff --git a/Source/开发辅助工具/Tools/FrmCreateProject.cs b/Source/开发辅助工具/Tools/FrmCreateProject.cs index 56c6763..0844526 100644 --- a/Source/开发辅助工具/Tools/FrmCreateProject.cs +++ b/Source/开发辅助工具/Tools/FrmCreateProject.cs @@ -198,6 +198,33 @@ namespace 开发辅助工具.Tools ryCommon.RyFiles.WriteAllText(source_folder + "\\Properties\\AssemblyInfo.cs", AssemblyInfo, Encoding.UTF8); #endregion #region 替换命名空间 + SuperFileSearch superFileSearch = new SuperFileSearch(); + superFileSearch.Search(source_folder, "*.cs"); + for (int i = 0; i < superFileSearch.ResultFiles.Count; i++) + { + var file_content = ryCommon.RyFiles.ReadAllLines(superFileSearch.ResultFiles[i].FullName); + if(file_content!=null && file_content.Length>0) + { + var have_changed = false; + for (int f = 0; f < file_content.Length; f++) + { + if (file_content[f].Trim().StartsWith("namespace ")) + { + file_content[f] = file_content[f].Replace("Itrycn_Project2", project_Eng_name); + have_changed = true; + } + else if(file_content[f].Trim().StartsWith("using ")) + { + file_content[f] = file_content[f].Replace("Itrycn_Project2", project_Eng_name); + have_changed = true; + } + } + if(have_changed) + { + RyFiles.WriteAllLines(superFileSearch.ResultFiles[i].FullName, file_content, new UTF8Encoding(encoderShouldEmitUTF8Identifier: false)); + } + } + } //var Resources = ryCommon.RyFiles.ReadAllText(source_folder + "\\Properties\\Resources.Designer.cs"); //Resources = Resources.Replace("Itrycn_Project.Properties", project_Eng_name.Replace(" ", "") + ".Properties"); //Resources = Resources.Replace("Itrycn_Project2.Properties", project_Eng_name.Replace(" ", "") + ".Properties"); diff --git a/Source/开发辅助工具/Tools/FrmProject.Designer.cs b/Source/开发辅助工具/Tools/FrmProject.Designer.cs index 408794e..8d503c1 100644 --- a/Source/开发辅助工具/Tools/FrmProject.Designer.cs +++ b/Source/开发辅助工具/Tools/FrmProject.Designer.cs @@ -77,6 +77,10 @@ this.TxtName = new ryControls.TextBoxEx2(); this.label1 = new System.Windows.Forms.Label(); this.tabPage3 = new System.Windows.Forms.TabPage(); + this.label7 = new System.Windows.Forms.Label(); + this.LvProjectBuild = new BrightIdeasSoftware.ObjectListView(); + this.olvProjectName = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); + this.olvPlatform = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.BtnSave2 = new ryControls.ButtonEx(); this.panel1 = new System.Windows.Forms.Panel(); this.tabPage4 = new System.Windows.Forms.TabPage(); @@ -96,10 +100,7 @@ this.生成Html日志并上传到服务器ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.BtnPublishLogs = new ryControls.ButtonEx(); this.timer1 = new System.Windows.Forms.Timer(this.components); - this.label7 = new System.Windows.Forms.Label(); - this.LvProjectBuild = new BrightIdeasSoftware.ObjectListView(); - this.olvProjectName = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); - this.olvPlatform = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); ((System.ComponentModel.ISupportInitialize)(this.table1)).BeginInit(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -107,11 +108,11 @@ this.tabPage2.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.LvProjectBuild)).BeginInit(); this.panel1.SuspendLayout(); this.tabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.LvUpdateLogList)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.LvProjectBuild)).BeginInit(); this.SuspendLayout(); // // BtnCustomMessageBox @@ -399,6 +400,7 @@ // this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.progressBar1); this.groupBox1.Controls.Add(this.ChkPackByLite); this.groupBox1.Controls.Add(this.BtnRepairFolder); this.groupBox1.Controls.Add(this.BtnUpdateDllVer); @@ -451,6 +453,7 @@ this.chromeTabControl1.Controls.Add(this.tabPage3); this.chromeTabControl1.Controls.Add(this.tabPage4); this.chromeTabControl1.Cursor = System.Windows.Forms.Cursors.Default; + this.chromeTabControl1.DrawTabBorder = true; this.chromeTabControl1.ItemSize = new System.Drawing.Size(100, 25); this.chromeTabControl1.Location = new System.Drawing.Point(3, 205); this.chromeTabControl1.Name = "chromeTabControl1"; @@ -458,7 +461,6 @@ this.chromeTabControl1.ShowAddButton = false; this.chromeTabControl1.ShowCloseButton = false; this.chromeTabControl1.Size = new System.Drawing.Size(1041, 500); - this.chromeTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.chromeTabControl1.TabContextMenuStrip = null; this.chromeTabControl1.TabIndex = 29; this.chromeTabControl1.TabMaxWidth = 100; @@ -738,6 +740,48 @@ this.tabPage3.Text = "C#编译选项"; this.tabPage3.UseVisualStyleBackColor = true; // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(11, 61); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(65, 12); + this.label7.TabIndex = 39; + this.label7.Text = "打包前编译"; + // + // LvProjectBuild + // + this.LvProjectBuild.AllColumns.Add(this.olvProjectName); + this.LvProjectBuild.AllColumns.Add(this.olvPlatform); + this.LvProjectBuild.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.LvProjectBuild.CellEditUseWholeCell = false; + this.LvProjectBuild.CheckBoxes = true; + this.LvProjectBuild.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.olvProjectName, + this.olvPlatform}); + this.LvProjectBuild.Cursor = System.Windows.Forms.Cursors.Default; + this.LvProjectBuild.FullRowSelect = true; + this.LvProjectBuild.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.LvProjectBuild.HideSelection = false; + this.LvProjectBuild.Location = new System.Drawing.Point(12, 76); + this.LvProjectBuild.Name = "LvProjectBuild"; + this.LvProjectBuild.Size = new System.Drawing.Size(391, 344); + this.LvProjectBuild.TabIndex = 38; + this.LvProjectBuild.UseCompatibleStateImageBehavior = false; + this.LvProjectBuild.View = System.Windows.Forms.View.Details; + this.LvProjectBuild.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.LvProjectBuild_ItemChecked); + // + // olvProjectName + // + this.olvProjectName.Text = "项目"; + this.olvProjectName.Width = 180; + // + // olvPlatform + // + this.olvPlatform.Text = "平台"; + this.olvPlatform.Width = 130; + // // BtnSave2 // this.BtnSave2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -943,47 +987,13 @@ this.timer1.Interval = 1000; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // - // label7 + // progressBar1 // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(11, 61); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(65, 12); - this.label7.TabIndex = 39; - this.label7.Text = "打包前编译"; - // - // LvProjectBuild - // - this.LvProjectBuild.AllColumns.Add(this.olvProjectName); - this.LvProjectBuild.AllColumns.Add(this.olvPlatform); - this.LvProjectBuild.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.LvProjectBuild.CellEditUseWholeCell = false; - this.LvProjectBuild.CheckBoxes = true; - this.LvProjectBuild.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.olvProjectName, - this.olvPlatform}); - this.LvProjectBuild.Cursor = System.Windows.Forms.Cursors.Default; - this.LvProjectBuild.FullRowSelect = true; - this.LvProjectBuild.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.LvProjectBuild.HideSelection = false; - this.LvProjectBuild.Location = new System.Drawing.Point(12, 76); - this.LvProjectBuild.Name = "LvProjectBuild"; - this.LvProjectBuild.Size = new System.Drawing.Size(391, 344); - this.LvProjectBuild.TabIndex = 38; - this.LvProjectBuild.UseCompatibleStateImageBehavior = false; - this.LvProjectBuild.View = System.Windows.Forms.View.Details; - this.LvProjectBuild.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.LvProjectBuild_ItemChecked); - // - // olvProjectName - // - this.olvProjectName.Text = "项目"; - this.olvProjectName.Width = 180; - // - // olvPlatform - // - this.olvPlatform.Text = "平台"; - this.olvPlatform.Width = 130; + this.progressBar1.Location = new System.Drawing.Point(851, 23); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(161, 22); + this.progressBar1.TabIndex = 32; + this.progressBar1.Visible = false; // // FrmProject // @@ -1014,13 +1024,13 @@ this.tabPage1.PerformLayout(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.LvProjectBuild)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tabPage4.ResumeLayout(false); this.tabPage4.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.LvUpdateLogList)).EndInit(); this.contextMenuStrip1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.LvProjectBuild)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1099,5 +1109,6 @@ private BrightIdeasSoftware.ObjectListView LvProjectBuild; private BrightIdeasSoftware.OLVColumn olvProjectName; private BrightIdeasSoftware.OLVColumn olvPlatform; + private System.Windows.Forms.ProgressBar progressBar1; } } \ No newline at end of file diff --git a/Source/开发辅助工具/Tools/FrmProject.cs b/Source/开发辅助工具/Tools/FrmProject.cs index e86be3f..9e11a73 100644 --- a/Source/开发辅助工具/Tools/FrmProject.cs +++ b/Source/开发辅助工具/Tools/FrmProject.cs @@ -1147,6 +1147,7 @@ namespace 开发辅助工具.Tools private void BtnUpdateDllVer_Click(object sender, EventArgs e) { + progressBar1.Visible = true; BtnUpdateDllVer.Enabled = false; int error = 0; RyProject project = new RyProject @@ -1154,6 +1155,7 @@ namespace 开发辅助工具.Tools CopyDllToBin = true, ChangedOutputPath = false }; + project.OnReplaceDllProgress += Project_OnReplaceDllProgress; var bf_folder = GetBFFolderPath(); var _error_str = ""; if (bf_folder != "") @@ -1166,9 +1168,17 @@ namespace 开发辅助工具.Tools error += project.UpdateDlls(debug_path, out _error_str); } BtnUpdateDllVer.Enabled = true; + progressBar1.Visible = false; if (error == 0) { - MessageBox.Show("更新dll完成。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + if (project.ReplaceDllCount == 0) + { + MessageBox.Show("没有发现需要替换的文件。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("更新dll完成,共替换" + project.ReplaceDllCount + "个dll文件。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + } } else { @@ -1176,6 +1186,12 @@ namespace 开发辅助工具.Tools } } + private void Project_OnReplaceDllProgress(long curValue, long totalValue, double percent) + { + progressBar1.Value = (percent * 100).ToInt(); + Application.DoEvents(); + } + private void BtnRepairFolder_Click(object sender, EventArgs e) { var _path = GetBFFolderPath(); diff --git a/Source/开发辅助工具/Tools/FrmProject.resx b/Source/开发辅助工具/Tools/FrmProject.resx index ac855d7..f20cfb5 100644 --- a/Source/开发辅助工具/Tools/FrmProject.resx +++ b/Source/开发辅助工具/Tools/FrmProject.resx @@ -126,6 +126,9 @@ 285, 17 + + 285, 17 + 392, 17 diff --git a/Source/开发辅助工具/Tools/FrmWebGet.cs b/Source/开发辅助工具/Tools/FrmWebGet.cs index fb39e65..5d48a9e 100644 --- a/Source/开发辅助工具/Tools/FrmWebGet.cs +++ b/Source/开发辅助工具/Tools/FrmWebGet.cs @@ -1744,10 +1744,10 @@ namespace 开发辅助工具.Tools builder.Append(" Encoding = System.Text.Encoding.GetEncoding( \"" + this.CbbEncoding.Text.Trim() + "\"),//URL 可选项 默认为Get \r\n"); } builder.Append(" Method = \"" + item.Method + "\",//URL 可选项 默认为Get \r\n"); - builder.Append(" Cookie = \"" + item.Cookie.Replace("\n", "\"+\n \"") + "\",//字符串Cookie 可选项 \r\n"); + builder.Append(" Cookie = \"" + item.Cookie.Replace("\"", "\\\"").Replace("\r\n", "\""+"+\r\n +\"") + "\",//字符串Cookie 可选项 \r\n"); builder.Append(" Referer =\"" + item.Referer + "\",//来源URL 可选项 \r\n"); builder.Append(" Accept = \"" + item.Accept + "\",//Accept 可选项 \r\n"); - builder.Append(" Postdata = \"" + item.Postdata.Replace("\n", "\"+\n \"") + "\",//Post数据 可选项GET时不需要写 \r\n"); + builder.Append(" Postdata = \"" + item.Postdata.Replace("\"","\\\"").Replace("\r\n", "\"" + "+\r\n \"") + "\",//Post数据 可选项GET时不需要写 \r\n"); builder.Append(" Timeout = " + item.Timeout + ",//连接超时时间 可选项默认为100000 \r\n"); builder.Append(" ReadWriteTimeout = " + item.ReadWriteTimeout + ",//写入Post数据超时时间 可选项默认为30000 \r\n"); builder.Append(" UserAgent = \"" + item.UserAgent + "\",//用户的浏览器类型，版本，操作系统 可选项有默认值 \r\n");