### 2021-09-03更新

------
#### SuperDesign    V2.0.2109.0301
- *.[改进]全新网页抓取工具,对历史记录支持编辑和收藏。
- *.[改进]修复网页抓取工具报《未能为 SSL/TLS 安全通道建立信任关系》错的BUG。

CHANGELOG.md

@@ -1,4 +1,10 @@
-### 2021-09-02更新
+### 2021-09-03更新
+------
+#### SuperDesign    V2.0.2109.0301
+- *.[改进]全新网页抓取工具,对历史记录支持编辑和收藏。
+- *.[改进]修复网页抓取工具报《未能为 SSL/TLS 安全通道建立信任关系》错的BUG。
+
+### 2021-09-02更新
 ------
 #### SuperDesign    V2.0.2109.0202
 - *.[改进]网页获取工具的地址下拉提示使用新版objectlistview控件。

Source/开发辅助工具/Form1.Designer.cs

@@ -113,6 +113,7 @@
             // 
             this.rySearch1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
             this.rySearch1.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
+            this.rySearch1.ButtonRoundBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
             this.rySearch1.EmptyText = "请输入工具名称、名称拼音首字母、工具描述进行搜索";
             this.rySearch1.ImeMode = System.Windows.Forms.ImeMode.Close;
             this.rySearch1.Location = new System.Drawing.Point(9, 3);

Source/开发辅助工具/Form1.cs

@@ -3,6 +3,7 @@ using HtmlAgilityPack;
 using Microsoft.Win32;
 using ryCommon;
 using ryCommonDb;
+using Sheng.Winform.Controls.PopupControl;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -106,7 +107,7 @@ namespace 开发辅助工具
             {
                 RyQuickSQL mySQL = new RyQuickSQL("Urls");
                 mySQL.AddField("editTime",DateTime.Now.AddDays(-10));
-                db.ExecuteNonQuery("DELETE FROM Urls WHERE id IN (SELECT id FROM Urls ORDER BY ClickCount desc,editTime desc LIMIT 1000,50) and editTime<=@editTime", mySQL);
+                db.ExecuteNonQuery("DELETE FROM Urls WHERE id IN (SELECT id FROM Urls ORDER BY ClickCount desc,editTime desc LIMIT 1000,50) and editTime<=@editTime and IsFav<>1", mySQL);
             }
             db.Free();
         }

Source/开发辅助工具/Manager/Init.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace 开发辅助工具
+{
+   public class Init
+    {
+        public static void Show(string[] args)
+        {
+            if (args.Length >= 2)
+            {
+                if (args[0] == "ver")
+                {
+                    string ProjectDir = args[1];
+                    Manager.RyProject.UpdateVer(ProjectDir.Trim('"') + "\\Properties\\AssemblyInfo.cs");
+                }
+                else if (args[0] == "get")
+                {
+                    string ProjectPath = args[1];
+                    Application.Run(new Form1(ProjectPath, "get"));
+                }
+                else if (args[0] == "open")
+                {
+                    string ProjectPath = args[1];
+                    Application.Run(new Form1(ProjectPath, "open"));
+                }
+            }
+            else
+            {
+                Application.Run(new Form1("", ""));
+            }
+        }
+    }
+}

Source/开发辅助工具/Manager/Itrycn_Info.cs

@@ -80,6 +80,8 @@ namespace 开发辅助工具.Manager
                 mySQL.AddField("Referer", "");
                 mySQL.AddField("ContentType", "");
                 mySQL.AddField("Encoding", "");
+                mySQL.AddField("IsFav", 0);
+                mySQL.AddField("Des", "");
                 mySQL.AddField("ClickCount", 0);//点击次数
                 mySQL.AddField("editTime", DateTime.Now);
                 mySQL.AddField("addTime", DateTime.Now);

Source/开发辅助工具/Program.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Windows.Forms;
 
@@ -15,29 +16,28 @@ namespace 开发辅助工具
         [STAThread]
         static void Main(string[] args)
         {
+            AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            if (args.Length >= 2)
+            Init.Show(args);
+        }
+        static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            try
             {
-                if (args[0] == "ver")
+                AssemblyName assemblyName = new AssemblyName(args.Name);
+                if (System.IO.File.Exists(Application.StartupPath + @"\Bin\dlls\" + assemblyName.Name + ".dll"))
                 {
-                    string ProjectDir = args[1];
+                    return Assembly.LoadFrom(Application.StartupPath + @"\Bin\dlls\" + assemblyName.Name + ".dll");
-                    Manager.RyProject.UpdateVer(ProjectDir.Trim('"') + "\\Properties\\AssemblyInfo.cs");
                 }
-                else if (args[0] == "get")
+                else
                 {
-                    string ProjectPath = args[1];
+                    return args.RequestingAssembly;
-                    Application.Run(new Form1(ProjectPath,"get"));
-                }
-                else if (args[0] == "open")
-                {
-                    string ProjectPath = args[1];
-                    Application.Run(new Form1(ProjectPath,"open"));
                 }
             }
-            else
+            catch (Exception ex)
             {
-                Application.Run(new Form1("",""));
+                return args.RequestingAssembly;
             }
         }
     }

Source/开发辅助工具/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.2109.0202")]
+[assembly: AssemblyVersion("2.0.2109.0301")]
-[assembly: AssemblyFileVersion("2.0.2109.0202")]
+[assembly: AssemblyFileVersion("2.0.2109.0301")]

Source/开发辅助工具/SuperDesign.csproj

@@ -143,6 +143,7 @@
       <DependentUpon>FrmSetting.cs</DependentUpon>
     </Compile>
     <Compile Include="Manager\HtmlFormater.cs" />
+    <Compile Include="Manager\Init.cs" />
     <Compile Include="Manager\JsonSplit.cs" />
     <Compile Include="Manager\ClsPY.cs" />
     <Compile Include="Manager\FrmAddTools.cs">

Source/开发辅助工具/Tools/FrmWebGet.Designer.cs

@@ -34,17 +34,16 @@
             this.tabControl2 = new System.Windows.Forms.TabControl();
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.RichHtml = new System.Windows.Forms.RichTextBox();
+            this.RichHtml = new ryControls.Controls.RichTextBox2();
-            this.contextMenuStripRichText1 = new ryProcessManager.hezuo.ContextMenuStripRichText();
             this.tabPage12 = new System.Windows.Forms.TabPage();
             this.Te_Format = new FastColoredTextBoxNS.FastColoredTextBox();
             this.contextMenuStripHighlightText1 = new ryProcessManager.hezuo.ContextMenuStripHighlightText();
             this.tabPage4 = new System.Windows.Forms.TabPage();
-            this.RichCookie = new System.Windows.Forms.RichTextBox();
+            this.RichCookie = new ryControls.Controls.RichTextBox2();
             this.tabPage5 = new System.Windows.Forms.TabPage();
-            this.RichStatus = new System.Windows.Forms.RichTextBox();
+            this.RichStatus = new ryControls.Controls.RichTextBox2();
             this.tabPage6 = new System.Windows.Forms.TabPage();
-            this.RichHeader = new System.Windows.Forms.RichTextBox();
+            this.RichHeader = new ryControls.Controls.RichTextBox2();
             this.tabPreview = new System.Windows.Forms.TabPage();
             this.extendedWebBrowser1 = new ExtendedWebBrowser2.ExtendedWebBrowser();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
@@ -82,12 +81,15 @@
             this.label2 = new System.Windows.Forms.Label();
             this.menuRight1 = new ryPaiban.Model.MenuRight(this.components);
             this.BtnCtreateCShape = new ryControls.ButtonEx();
-            this.ColUrl = new XPTable.Models.TextColumn();
-            this.ColTitle = new XPTable.Models.TextColumn();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.objectListView2 = new BrightIdeasSoftware.ObjectListView();
             this.OlvUrl = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
             this.OlvName = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.置顶收藏该项ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.删除该项ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+            this.设置备注ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tabControl2.SuspendLayout();
             this.tabPage3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -104,6 +106,7 @@
             this.groupBox2.SuspendLayout();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.objectListView2)).BeginInit();
+            this.contextMenuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // ChkUrlLower
@@ -157,21 +160,19 @@
             // 
             // RichHtml
             // 
-            this.RichHtml.BackColor = System.Drawing.Color.White;
             this.RichHtml.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.RichHtml.ContextMenuStrip = this.contextMenuStripRichText1;
+            this.RichHtml.DetectUrls = false;
             this.RichHtml.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.RichHtml.EmptyText = "";
+            this.RichHtml.Font = new System.Drawing.Font("Courier New", 10F);
+            this.RichHtml.ForeColor = System.Drawing.Color.Black;
             this.RichHtml.Location = new System.Drawing.Point(3, 3);
             this.RichHtml.Name = "RichHtml";
-            this.RichHtml.ReadOnly = true;
+            this.RichHtml.OnlyInputText = true;
             this.RichHtml.Size = new System.Drawing.Size(875, 274);
-            this.RichHtml.TabIndex = 0;
+            this.RichHtml.TabIndex = 3;
             this.RichHtml.Text = "";
-            // 
+            this.RichHtml.WordWrap = false;
-            // contextMenuStripRichText1
-            // 
-            this.contextMenuStripRichText1.Name = "contextMenuStripRichText1";
-            this.contextMenuStripRichText1.Size = new System.Drawing.Size(101, 164);
             // 
             // tabPage12
             // 
@@ -186,7 +187,7 @@
             // 
             // Te_Format
             // 
-            this.Te_Format.AutoScrollMinSize = new System.Drawing.Size(27, 14);
+            this.Te_Format.AutoScrollMinSize = new System.Drawing.Size(0, 17);
             this.Te_Format.ContextMenuStrip = this.contextMenuStripHighlightText1;
             this.Te_Format.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.Te_Format.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -214,16 +215,19 @@
             // 
             // RichCookie
             // 
-            this.RichCookie.BackColor = System.Drawing.Color.White;
             this.RichCookie.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.RichCookie.ContextMenuStrip = this.contextMenuStripRichText1;
+            this.RichCookie.DetectUrls = false;
             this.RichCookie.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.RichCookie.EmptyText = "";
+            this.RichCookie.Font = new System.Drawing.Font("Courier New", 10F);
+            this.RichCookie.ForeColor = System.Drawing.Color.Black;
             this.RichCookie.Location = new System.Drawing.Point(3, 3);
             this.RichCookie.Name = "RichCookie";
-            this.RichCookie.ReadOnly = true;
+            this.RichCookie.OnlyInputText = true;
             this.RichCookie.Size = new System.Drawing.Size(875, 274);
-            this.RichCookie.TabIndex = 1;
+            this.RichCookie.TabIndex = 4;
             this.RichCookie.Text = "";
+            this.RichCookie.WordWrap = false;
             // 
             // tabPage5
             // 
@@ -238,16 +242,19 @@
             // 
             // RichStatus
             // 
-            this.RichStatus.BackColor = System.Drawing.Color.White;
             this.RichStatus.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.RichStatus.ContextMenuStrip = this.contextMenuStripRichText1;
+            this.RichStatus.DetectUrls = false;
             this.RichStatus.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.RichStatus.EmptyText = "";
+            this.RichStatus.Font = new System.Drawing.Font("Courier New", 10F);
+            this.RichStatus.ForeColor = System.Drawing.Color.Black;
             this.RichStatus.Location = new System.Drawing.Point(3, 3);
             this.RichStatus.Name = "RichStatus";
-            this.RichStatus.ReadOnly = true;
+            this.RichStatus.OnlyInputText = true;
             this.RichStatus.Size = new System.Drawing.Size(875, 274);
-            this.RichStatus.TabIndex = 2;
+            this.RichStatus.TabIndex = 5;
             this.RichStatus.Text = "";
+            this.RichStatus.WordWrap = false;
             // 
             // tabPage6
             // 
@@ -262,16 +269,19 @@
             // 
             // RichHeader
             // 
-            this.RichHeader.BackColor = System.Drawing.Color.White;
             this.RichHeader.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.RichHeader.ContextMenuStrip = this.contextMenuStripRichText1;
+            this.RichHeader.DetectUrls = false;
             this.RichHeader.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.RichHeader.EmptyText = "";
+            this.RichHeader.Font = new System.Drawing.Font("Courier New", 10F);
+            this.RichHeader.ForeColor = System.Drawing.Color.Black;
             this.RichHeader.Location = new System.Drawing.Point(3, 3);
             this.RichHeader.Name = "RichHeader";
-            this.RichHeader.ReadOnly = true;
+            this.RichHeader.OnlyInputText = true;
             this.RichHeader.Size = new System.Drawing.Size(875, 274);
-            this.RichHeader.TabIndex = 3;
+            this.RichHeader.TabIndex = 6;
             this.RichHeader.Text = "";
+            this.RichHeader.WordWrap = false;
             // 
             // tabPreview
             // 
@@ -340,6 +350,7 @@
             this.TxtPost.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.TxtPost.DetectUrls = false;
             this.TxtPost.EmptyText = "请填写Post数据";
+            this.TxtPost.Font = new System.Drawing.Font("Courier New", 10F);
             this.TxtPost.ForeColor = System.Drawing.Color.Black;
             this.TxtPost.Location = new System.Drawing.Point(2, 3);
             this.TxtPost.Name = "TxtPost";
@@ -370,6 +381,7 @@
             this.TxtCookie.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.TxtCookie.DetectUrls = false;
             this.TxtCookie.EmptyText = "请填写请求时要发送的Cookie";
+            this.TxtCookie.Font = new System.Drawing.Font("Courier New", 10F);
             this.TxtCookie.ForeColor = System.Drawing.Color.Black;
             this.TxtCookie.Location = new System.Drawing.Point(2, 3);
             this.TxtCookie.Name = "TxtCookie";
@@ -400,6 +412,7 @@
             this.TxtInputHeader.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.TxtInputHeader.DetectUrls = false;
             this.TxtInputHeader.EmptyText = "请填写请求时要发送的Header";
+            this.TxtInputHeader.Font = new System.Drawing.Font("Courier New", 10F);
             this.TxtInputHeader.ForeColor = System.Drawing.Color.Black;
             this.TxtInputHeader.Location = new System.Drawing.Point(2, 3);
             this.TxtInputHeader.Name = "TxtInputHeader";
@@ -756,20 +769,6 @@
             this.BtnCtreateCShape.UseVisualStyleBackColor = true;
             this.BtnCtreateCShape.Click += new System.EventHandler(this.BtnCtreateCShape_Click);
             // 
-            // ColUrl
-            // 
-            this.ColUrl.Editable = false;
-            this.ColUrl.Tag = null;
-            this.ColUrl.Text = "网址";
-            this.ColUrl.Width = 430;
-            // 
-            // ColTitle
-            // 
-            this.ColTitle.Editable = false;
-            this.ColTitle.Tag = null;
-            this.ColTitle.Text = "名称";
-            this.ColTitle.Width = 200;
-            // 
             // timer1
             // 
             this.timer1.Interval = 1000;
@@ -783,20 +782,25 @@
             this.objectListView2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.OlvUrl,
             this.OlvName});
+            this.objectListView2.ContextMenuStrip = this.contextMenuStrip1;
             this.objectListView2.Cursor = System.Windows.Forms.Cursors.Default;
             this.objectListView2.FullRowSelect = true;
             this.objectListView2.HideSelection = false;
-            this.objectListView2.Location = new System.Drawing.Point(43, 30);
+            this.objectListView2.Location = new System.Drawing.Point(45, 30);
+            this.objectListView2.MultiSelect = false;
             this.objectListView2.Name = "objectListView2";
             this.objectListView2.RowHeight = 25;
             this.objectListView2.ShowGroups = false;
+            this.objectListView2.ShowItemToolTips = true;
             this.objectListView2.Size = new System.Drawing.Size(653, 323);
             this.objectListView2.TabIndex = 113;
             this.objectListView2.UseCompatibleStateImageBehavior = false;
+            this.objectListView2.UseHotItem = true;
             this.objectListView2.View = System.Windows.Forms.View.Details;
             this.objectListView2.Visible = false;
             this.objectListView2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Table1_KeyDown);
             this.objectListView2.Leave += new System.EventHandler(this.Table1_Leave);
+            this.objectListView2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.table1_MouseClick);
             // 
             // OlvUrl
             // 
@@ -808,12 +812,48 @@
             this.OlvName.Text = "名称";
             this.OlvName.Width = 200;
             // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.置顶收藏该项ToolStripMenuItem,
+            this.删除该项ToolStripMenuItem,
+            this.toolStripMenuItem1,
+            this.设置备注ToolStripMenuItem});
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(149, 76);
+            this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
+            // 
+            // 置顶收藏该项ToolStripMenuItem
+            // 
+            this.置顶收藏该项ToolStripMenuItem.Name = "置顶收藏该项ToolStripMenuItem";
+            this.置顶收藏该项ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.置顶收藏该项ToolStripMenuItem.Text = "置顶收藏该项";
+            this.置顶收藏该项ToolStripMenuItem.Click += new System.EventHandler(this.置顶收藏该项ToolStripMenuItem_Click);
+            // 
+            // 删除该项ToolStripMenuItem
+            // 
+            this.删除该项ToolStripMenuItem.Name = "删除该项ToolStripMenuItem";
+            this.删除该项ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.删除该项ToolStripMenuItem.Text = "删除该项";
+            this.删除该项ToolStripMenuItem.Click += new System.EventHandler(this.删除该项ToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(145, 6);
+            // 
+            // 设置备注ToolStripMenuItem
+            // 
+            this.设置备注ToolStripMenuItem.Name = "设置备注ToolStripMenuItem";
+            this.设置备注ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.设置备注ToolStripMenuItem.Text = "设置备注";
+            this.设置备注ToolStripMenuItem.Click += new System.EventHandler(this.设置备注ToolStripMenuItem_Click);
+            // 
             // FrmWebGet
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(909, 620);
-            this.Controls.Add(this.objectListView2);
             this.Controls.Add(this.TxtUrl);
             this.Controls.Add(this.BtnCtreateCShape);
             this.Controls.Add(this.ChkUrlLower);
@@ -825,6 +865,7 @@
             this.Controls.Add(this.RbPost);
             this.Controls.Add(this.RbGet);
             this.Controls.Add(this.label2);
+            this.Controls.Add(this.objectListView2);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "FrmWebGet";
             this.TabPageContextMenuStrip = this.menuRight1;
@@ -849,6 +890,7 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.objectListView2)).EndInit();
+            this.contextMenuStrip1.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -860,14 +902,10 @@
         private System.Windows.Forms.TabControl tabControl2;
         private System.Windows.Forms.TabPage tabPage3;
         private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.RichTextBox RichHtml;
         private System.Windows.Forms.TabPage tabPage12;
         private System.Windows.Forms.TabPage tabPage4;
-        private System.Windows.Forms.RichTextBox RichCookie;
         private System.Windows.Forms.TabPage tabPage5;
-        private System.Windows.Forms.RichTextBox RichStatus;
         private System.Windows.Forms.TabPage tabPage6;
-        private System.Windows.Forms.RichTextBox RichHeader;
         private System.Windows.Forms.GroupBox groupBox3;
         private System.Windows.Forms.GroupBox groupBox2;
         private ryControls.RyComboBox CbbReferer;
@@ -892,12 +930,9 @@
         private System.Windows.Forms.RadioButton RbGet;
         private ryControls.TextBoxEx2 TxtUrl;
         private System.Windows.Forms.Label label2;
-        private ryProcessManager.hezuo.ContextMenuStripRichText contextMenuStripRichText1;
         private ryProcessManager.hezuo.ContextMenuStripHighlightText contextMenuStripHighlightText1;
         private ryPaiban.Model.MenuRight menuRight1;
         private ryControls.ButtonEx BtnCtreateCShape;
-        private XPTable.Models.TextColumn ColUrl;
-        private XPTable.Models.TextColumn ColTitle;
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabPage tabPage1;
@@ -914,5 +949,14 @@
         private BrightIdeasSoftware.ObjectListView objectListView2;
         private BrightIdeasSoftware.OLVColumn OlvUrl;
         private BrightIdeasSoftware.OLVColumn OlvName;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private ryControls.Controls.RichTextBox2 RichHtml;
+        private ryControls.Controls.RichTextBox2 RichCookie;
+        private ryControls.Controls.RichTextBox2 RichStatus;
+        private ryControls.Controls.RichTextBox2 RichHeader;
+        private System.Windows.Forms.ToolStripMenuItem 置顶收藏该项ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 删除该项ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem 设置备注ToolStripMenuItem;
     }
 }

Source/开发辅助工具/Tools/FrmWebGet.cs

@@ -1,9 +1,11 @@
-using DotNet4.Utilities;
+using BrightIdeasSoftware;
+using DotNet4.Utilities;
 using FastColoredTextBoxNS;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using ryCommon;
 using ryCommonDb;
+using Sheng.Winform.Controls.PopupControl;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -12,6 +14,8 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -34,9 +38,54 @@ namespace 开发辅助工具.Tools
             Te_Format.AutoIndentNeeded -= fctb_AutoIndentNeeded;
             Te_Format.Language = Language.JSON;
             Te_Format.OnSyntaxHighlight(new TextChangedEventArgs(Te_Format.Range));
-            OlvName.AspectGetter = delegate (object x) { return ((UrlInfo)x).Name; };
             OlvUrl.AspectGetter = delegate (object x) { return ((UrlInfo)x).Url; };
+            OlvName.AspectGetter = delegate (object x) {
+                var item = (UrlInfo)x;
+                if (item.Des.Length == 0)
+                { return item.Name; }
+                else
+                {
+                    return "【"+item.Des+"】"+ item.Name;
+                }
+            };
+            //OlvUrl.Renderer = CreateDescribedTaskRenderer();
+            objectListView2.FormatRow += ObjectListView2_FormatRow;
         }
+        private DescribedTaskRenderer CreateDescribedTaskRenderer()
+        {
+
+            // Let's create an appropriately configured renderer.
+            DescribedTaskRenderer renderer = new DescribedTaskRenderer();
+
+            // Give the renderer its own collection of images.
+            // If this isn't set, the renderer will use the SmallImageList from the ObjectListView.
+            // (this is standard Renderer behaviour, not specific to DescribedTaskRenderer).
+            // Tell the renderer which property holds the text to be used as a description
+            renderer.DescriptionAspectName = "Name";
+            renderer.UseCustomCheckboxImages = false;
+            // Change the formatting slightly
+            renderer.TitleFont = new Font("宋体", 9, FontStyle.Regular);
+            renderer.DescriptionFont = new Font("宋体", 9);
+            renderer.DescriptionColor = Color.Gray;
+            renderer.TopSpace = 2;
+            //renderer.ImageTextSpace = 8;
+            renderer.TitleDescriptionSpace = 2;
+
+            // Use older Gdi renderering, since most people think the text looks clearer
+            renderer.UseGdiTextRendering = true;
+
+            // If you like colours other than black and grey, you could uncomment these
+            //            renderer.TitleColor = Color.DarkBlue;
+            //            renderer.DescriptionColor = Color.CornflowerBlue;
+
+            return renderer;
+        }
+        private void ObjectListView2_FormatRow(object sender, BrightIdeasSoftware.FormatRowEventArgs e)
+        {
+            var item = (UrlInfo)e.Model;
+            if (item.Fav) { e.Item.ForeColor = Color.Blue; } else { e.Item.ForeColor = Color.Black; }
+        }
+
         private void fctb_AutoIndentNeeded(object sender, AutoIndentEventArgs args)
         {
             //block {}
@@ -456,7 +505,6 @@ namespace 开发辅助工具.Tools
                 }
             }
         }
-
         private void FrmWebGet_Load(object sender, EventArgs e)
         {
             //TxtPost.AutoWordSelection = false;
@@ -472,8 +520,12 @@ namespace 开发辅助工具.Tools
                         break;
                 }
             }
+            ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate;
+        }
+        private bool ValidateServerCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        {
+            return true;
         }
-
         private void Gb_Click(object sender, EventArgs e)
         {
             objectListView2.Visible = false;
@@ -611,7 +663,7 @@ namespace 开发辅助工具.Tools
             if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1)
             {
                 var _title = title;
-                if(_title == "")
+                if(_title.Length==0)
                 {
                     var mode = url.Replace("?","&").GetStr("&a=","");
                     if (mode.IndexOf("&") > 0) { mode = mode.GetStr("", "&"); }
@@ -687,7 +739,7 @@ namespace 开发辅助工具.Tools
                         }
                         void SetValueByRich(ryControls.Controls.RichTextBox2 txt, string Field)
                         {
-                            if (row[Field].ToString().Length > 0) { txt.Text = row[Field].ToString(); }
+                            if (row[Field].ToString().Length > 0) { txt.Text = row[Field].ToString(); txt.Refresh(); }
                         }
                         void SetValue2(ryControls.RyComboBox cbb, string Field)
                         {
@@ -725,7 +777,7 @@ namespace 开发辅助工具.Tools
         {
             if (proc_use) { return; }
             string sql_where = "";
-            if (TxtUrl.Text != "") { sql_where = " where (Name like @SearchText or Url like @SearchText)"; }
+            if (TxtUrl.Text != "") { sql_where = " where (Name like @SearchText or Url like @SearchText or Des like @SearchText)"; }
             #region 重新载入数据
             objectListView2.ClearObjects();
             List<UrlInfo> list = new List<UrlInfo>();
@@ -734,12 +786,16 @@ namespace 开发辅助工具.Tools
             if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1)
             {
                 db.AddParameter("SearchText", "%" + TxtUrl.Text + "%");
-                DataSet ds = db.ReadData("select * from Urls" + sql_where+ " order by ClickCount desc,editTime desc", db.GetParameter());
+                DataSet ds = db.ReadData("select * from Urls" + sql_where+ " order by IsFav desc,ClickCount desc,editTime desc", db.GetParameter());
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                 {
                     DataRow row = ds.Tables[0].Rows[i];
                     DateTime editTime = row["editTime"].ToDateTime();
-                    var item = new UrlInfo() { Id = row["id"].ToInt(), Name = row["Name"].ToString(), Url = row["Url"].ToString() };
+                    var item = new UrlInfo() { Id = row["id"].ToInt(), Name = row["Name"].ToString(),
+                        Des = row["Des"].ToString(),
+                        Url = row["Url"].ToString(),
+                        ClickCount = row["ClickCount"].ToInt(),
+                        Fav = row["IsFav"].ToInt()==1 };
                     if (editTime >= DateTime.Now.AddMinutes(-10))
                     {
                         list.Insert(0,item);
@@ -832,12 +888,84 @@ namespace 开发辅助工具.Tools
         {
             ChkHtmlPreview.Enabled = !ChkNoPreview.Checked;
         }
+
+        private void 置顶收藏该项ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var item = (UrlInfo)objectListView2.SelectedObject;
+            if (item == null) { return; }
+            IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
+            if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1)
+            {
+                RyQuickSQL mySQL = new RyQuickSQL("Urls");
+                mySQL.AddField("IsFav", item.Fav ? 0 : 1);
+                db.ExecuteNonQuery(mySQL.GetUpdateSQL()+" where id="+item.Id,mySQL);
+                item.Fav = !item.Fav;
+                objectListView2.RefreshObject(item);
+            }
+            db.Free();
+
+        }
+
+        private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)
+        {
+            var item = (UrlInfo)objectListView2.SelectedObject;
+            if (item == null) { return; }
+            置顶收藏该项ToolStripMenuItem.Text = item.Fav ? "取消收藏该项" : "置顶收藏该项";
+        }
+
+        private void 删除该项ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var item = (UrlInfo)objectListView2.SelectedObject;
+            if (item == null) { return; }
+            if(item.ClickCount>5)
+            {
+                switch (MessageBox.Show("确认要删除该项记录吗？", "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2))
+                {
+                    case DialogResult.No:
+                        return;
+                }
+            }
+            IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
+            if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1)
+            {
+                db.ExecuteNonQuery("delete from Urls where id=" + item.Id);
+                objectListView2.RemoveObject(item);
+            }
+            db.Free();
+        }
+
+        private void 设置备注ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var item = (UrlInfo)objectListView2.SelectedObject;
+            if (item == null) { return; }
+            IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
+            if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1)
+            {
+                SuperDesign.Controls.FrmTitle frm = new SuperDesign.Controls.FrmTitle();
+                frm.TxtTitle.Text = item.Des;
+                if (frm.ShowDialog() == DialogResult.OK)
+                {
+                    RyQuickSQL mySQL = new RyQuickSQL("Urls");
+                    mySQL.AddField("Des", frm.TxtTitle.Text);
+                    db.ExecuteNonQuery(mySQL.GetUpdateSQL() + " where id=" + item.Id, mySQL);
+                    item.Des = frm.TxtTitle.Text;
+                    objectListView2.RefreshObject(item);
+                }
+            }
+            db.Free();
+        }
     }
     public class UrlInfo
     {
         public int Id {  get; set; }=0;
         public string Url { get; set; } = "";
         public string Name { get; set; } = "";
+        public string Des { get; set; } = "";
+        public int ClickCount { get; set; } = 0;
+        /// <summary>
+        /// 是否收藏
+        /// </summary>
+        public bool Fav { get; set; } = false;
     }
     public class UserAgentInfo
     {

Source/开发辅助工具/Tools/FrmWebGet.resx

@@ -117,14 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="contextMenuStripRichText1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>627, 25</value>
-  </metadata>
   <metadata name="contextMenuStripHighlightText1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>33, 18</value>
   </metadata>
   <metadata name="menuRight1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>842, 25</value>
+    <value>603, 26</value>
+  </metadata>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>388, 26</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -204,6 +204,6 @@
 </value>
   </data>
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>537, 25</value>
+    <value>280, 15</value>
   </metadata>
 </root>

Source/开发辅助工具/Tools/FrmXpath.Designer.cs

@@ -74,7 +74,8 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.TxtXML.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.TxtXML.DetectUrls = false;
-            this.TxtXML.EmptyText = "待匹配的XML或HTML内容";
+            this.TxtXML.EmptyText = "待匹配的XML、HTML或Json内容";
+            this.TxtXML.Font = new System.Drawing.Font("Courier New", 10F);
             this.TxtXML.ForeColor = System.Drawing.Color.Black;
             this.TxtXML.Location = new System.Drawing.Point(3, 3);
             this.TxtXML.Name = "TxtXML";
@@ -82,6 +83,7 @@
             this.TxtXML.Size = new System.Drawing.Size(868, 137);
             this.TxtXML.TabIndex = 32;
             this.TxtXML.Text = "";
+            this.TxtXML.WordWrap = false;
             this.TxtXML.DoubleClick += new System.EventHandler(this.TxtXML_DoubleClick);
             // 
             // panelEx1
@@ -95,7 +97,7 @@
             this.panelEx1.Name = "panelEx1";
             this.panelEx1.Padding = new System.Windows.Forms.Padding(2);
             this.panelEx1.RoundeStyle = ryControls.RoundStyle.None;
-            this.panelEx1.Size = new System.Drawing.Size(869, 324);
+            this.panelEx1.Size = new System.Drawing.Size(869, 326);
             this.panelEx1.TabIndex = 8;
             this.panelEx1.TileBackColor = System.Drawing.Color.White;
             // 
@@ -109,7 +111,7 @@
             this.fastColoredTextBox1.ImeMode = System.Windows.Forms.ImeMode.On;
             this.fastColoredTextBox1.Location = new System.Drawing.Point(2, 2);
             this.fastColoredTextBox1.Name = "fastColoredTextBox1";
-            this.fastColoredTextBox1.Size = new System.Drawing.Size(865, 320);
+            this.fastColoredTextBox1.Size = new System.Drawing.Size(865, 322);
             this.fastColoredTextBox1.TabIndex = 0;
             // 
             // contextMenuStripHighlightText1