diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.Designer.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.Designer.cs index 9a2e8b8..3ee4dd9 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.Designer.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.Designer.cs @@ -28,6 +28,12 @@ /// private void InitializeComponent() { + System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] { + "http", + "www", + "http", + "8081", + "80"}, -1); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form_ngrok)); this.groupBox_AuthToken = new System.Windows.Forms.GroupBox(); this.textBox_AuthToken = new System.Windows.Forms.TextBox(); @@ -35,6 +41,9 @@ this.textBox_serverAddr = new System.Windows.Forms.TextBox(); this.label_NgrokDomain = new System.Windows.Forms.Label(); this.groupBox_Url = new System.Windows.Forms.GroupBox(); + this.textBox_lanPort4 = new System.Windows.Forms.TextBox(); + this.textBox_remotePort4 = new System.Windows.Forms.TextBox(); + this.label_tunnel4 = new System.Windows.Forms.Label(); this.textBox_lanPort3 = new System.Windows.Forms.TextBox(); this.textBox_remotePort3 = new System.Windows.Forms.TextBox(); this.label_tunnel3 = new System.Windows.Forms.Label(); @@ -55,9 +64,12 @@ this.label_subDomain = new System.Windows.Forms.Label(); this.button_cancel = new System.Windows.Forms.Button(); this.button_save = new System.Windows.Forms.Button(); - this.textBox_lanPort4 = new System.Windows.Forms.TextBox(); - this.textBox_remotePort4 = new System.Windows.Forms.TextBox(); - this.label_tunnel4 = new System.Windows.Forms.Label(); + this.listView_setup = new System.Windows.Forms.ListView(); + this.columnHeader_proto = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader_remoteport = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader_lanport = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader_subdomain = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader_symbol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.groupBox_AuthToken.SuspendLayout(); this.groupBox_Ngrokserver.SuspendLayout(); this.groupBox_Url.SuspendLayout(); @@ -137,6 +149,29 @@ this.groupBox_Url.TabStop = false; this.groupBox_Url.Text = "内网端Ngrok"; // + // textBox_lanPort4 + // + this.textBox_lanPort4.Location = new System.Drawing.Point(171, 166); + this.textBox_lanPort4.Name = "textBox_lanPort4"; + this.textBox_lanPort4.Size = new System.Drawing.Size(50, 21); + this.textBox_lanPort4.TabIndex = 20; + // + // textBox_remotePort4 + // + this.textBox_remotePort4.Location = new System.Drawing.Point(87, 166); + this.textBox_remotePort4.Name = "textBox_remotePort4"; + this.textBox_remotePort4.Size = new System.Drawing.Size(50, 21); + this.textBox_remotePort4.TabIndex = 19; + // + // label_tunnel4 + // + this.label_tunnel4.AutoSize = true; + this.label_tunnel4.Location = new System.Drawing.Point(17, 169); + this.label_tunnel4.Name = "label_tunnel4"; + this.label_tunnel4.Size = new System.Drawing.Size(53, 12); + this.label_tunnel4.TabIndex = 18; + this.label_tunnel4.Text = "Tunnel4:"; + // // textBox_lanPort3 // this.textBox_lanPort3.Location = new System.Drawing.Point(171, 140); @@ -301,34 +336,53 @@ this.button_save.UseVisualStyleBackColor = true; this.button_save.Click += new System.EventHandler(this.button_save_Click); // - // textBox_lanPort4 + // listView_setup // - this.textBox_lanPort4.Location = new System.Drawing.Point(171, 166); - this.textBox_lanPort4.Name = "textBox_lanPort4"; - this.textBox_lanPort4.Size = new System.Drawing.Size(50, 21); - this.textBox_lanPort4.TabIndex = 20; + this.listView_setup.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader_symbol, + this.columnHeader_subdomain, + this.columnHeader_proto, + this.columnHeader_remoteport, + this.columnHeader_lanport}); + this.listView_setup.GridLines = true; + this.listView_setup.Items.AddRange(new System.Windows.Forms.ListViewItem[] { + listViewItem1}); + this.listView_setup.Location = new System.Drawing.Point(254, 188); + this.listView_setup.Name = "listView_setup"; + this.listView_setup.Size = new System.Drawing.Size(247, 151); + this.listView_setup.TabIndex = 5; + this.listView_setup.UseCompatibleStateImageBehavior = false; + this.listView_setup.View = System.Windows.Forms.View.Details; // - // textBox_remotePort4 + // columnHeader_proto // - this.textBox_remotePort4.Location = new System.Drawing.Point(87, 166); - this.textBox_remotePort4.Name = "textBox_remotePort4"; - this.textBox_remotePort4.Size = new System.Drawing.Size(50, 21); - this.textBox_remotePort4.TabIndex = 19; + this.columnHeader_proto.Text = "proto"; + this.columnHeader_proto.Width = 43; // - // label_tunnel4 + // columnHeader_remoteport // - this.label_tunnel4.AutoSize = true; - this.label_tunnel4.Location = new System.Drawing.Point(17, 169); - this.label_tunnel4.Name = "label_tunnel4"; - this.label_tunnel4.Size = new System.Drawing.Size(53, 12); - this.label_tunnel4.TabIndex = 18; - this.label_tunnel4.Text = "Tunnel4:"; + this.columnHeader_remoteport.Text = "remoteport"; + // + // columnHeader_lanport + // + this.columnHeader_lanport.Text = "Lanport"; + // + // columnHeader_subdomain + // + this.columnHeader_subdomain.Text = "subdomain"; + this.columnHeader_subdomain.Width = 69; + // + // columnHeader_symbol + // + this.columnHeader_symbol.Text = "symbol"; + this.columnHeader_symbol.Width = 50; // // Form_ngrok // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(254, 351); + this.ClientSize = new System.Drawing.Size(513, 351); + this.Controls.Add(this.listView_setup); this.Controls.Add(this.button_save); this.Controls.Add(this.button_cancel); this.Controls.Add(this.groupBox_Url); @@ -383,5 +437,11 @@ private System.Windows.Forms.TextBox textBox_lanPort4; private System.Windows.Forms.TextBox textBox_remotePort4; private System.Windows.Forms.Label label_tunnel4; + private System.Windows.Forms.ListView listView_setup; + private System.Windows.Forms.ColumnHeader columnHeader_symbol; + private System.Windows.Forms.ColumnHeader columnHeader_subdomain; + private System.Windows.Forms.ColumnHeader columnHeader_proto; + private System.Windows.Forms.ColumnHeader columnHeader_remoteport; + private System.Windows.Forms.ColumnHeader columnHeader_lanport; } } \ No newline at end of file diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/YamlHelper.cs b/net.nutcore.aliddns/net.nutcore.aliddns/YamlHelper.cs new file mode 100644 index 0000000..0e8262c --- /dev/null +++ b/net.nutcore.aliddns/net.nutcore.aliddns/YamlHelper.cs @@ -0,0 +1,245 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; + +namespace net.nutcore.aliddns +{ + class Yaml + { + // 所有行 + private String[] lines; + // 格式化为节点 + private List nodeList = new List(); + // 文件所在地址 + private String path; + + public Yaml(String path) + { + this.path = path; + this.lines = File.ReadAllLines(path); + + for (int i = 0; i < lines.Length; i++) + { + String line = lines[i]; + if (line.Trim() == "") + { + Console.WriteLine("空白行，行号：" + (i + 1)); + continue; + } + else if (line.Trim().Substring(0, 1) == "#") + { + Console.WriteLine("注释行，行号：" + (i + 1)); + continue; + } + + String[] kv = Regex.Split(line, ":", RegexOptions.IgnoreCase); + findPreSpace(line); + Node node = new Node(); + node.space = findPreSpace(line); + node.name = kv[0].Trim(); + + // 去除前后空白符 + String fline = line.Trim(); + int first = fline.IndexOf(':'); + node.value = first == fline.Length - 1 ? null : fline.Substring(first + 2, fline.Length - first - 2); + node.parent = findParent(node.space); + nodeList.Add(node); + } + + this.formatting(); + } + + // 修改值 允许key为多级 例如：spring.datasource.url + public void modify(String key, String value) + { + Node node = findNodeByKey(key); + if (node != null) + { + node.value = value; + } + } + + // 读取值 + public String read(String key, String value) + { + Node node = findNodeByKey(key); + if (node != null) + { + return node.value; + } + return null; + } + + // 根据key找节点 + private Node findNodeByKey(String key) + { + String[] ks = key.Split('.'); + for (int i = 0; i < nodeList.Count; i++) + { + Node node = nodeList[i]; + if (node.name == ks[ks.Length - 1]) + { + // 判断父级 + Node tem = node; + // 统计匹配到的次数 + int count = 1; + for (int j = ks.Length - 2; j >= 0; j--) + { + if (tem.parent.name == ks[j]) + { + count++; + // 继续检查父级 + tem = tem.parent; + } + } + + if (count == ks.Length) + { + return node; + } + } + } + return null; + } + + // 保存到文件中 + public void save() + { + StreamWriter stream = File.CreateText(this.path); + for (int i = 0; i < nodeList.Count; i++) + { + Node node = nodeList[i]; + StringBuilder sb = new StringBuilder(); + // 放入前置空格 + for (int j = 0; j < node.tier; j++) + { + sb.Append(" "); + } + sb.Append(node.name); + sb.Append(": "); + if (node.value != null) + { + sb.Append(node.value); + } + stream.WriteLine(sb.ToString()); + } + stream.Flush(); + stream.Close(); + } + + // 格式化 + public void formatting() + { + // 先找出根节点 + List parentNode = new List(); + for (int i = 0; i < nodeList.Count; i++) + { + Node node = nodeList[i]; + if (node.parent == null) + { + parentNode.Add(node); + } + } + + List fNodeList = new List(); + // 遍历根节点 + for (int i = 0; i < parentNode.Count; i++) + { + Node node = parentNode[i]; + fNodeList.Add(node); + findChildren(node, fNodeList); + } + + Console.WriteLine("完成"); + + // 指针指向格式化后的 + nodeList = fNodeList; + } + + + // 层级 + int tier = 0; + // 查找孩子并进行分层 + private void findChildren(Node node, List fNodeList) + { + // 当前层 默认第一级，根在外层进行操作 + tier++; + + for (int i = 0; i < nodeList.Count; i++) + { + Node item = nodeList[i]; + if (item.parent == node) + { + item.tier = tier; + fNodeList.Add(item); + findChildren(item, fNodeList); + } + } + + // 走出一层 + tier--; + } + + //查找前缀空格数量 + private int findPreSpace(String str) + { + List chars = str.ToList(); + int count = 0; + foreach (char c in chars) + { + if (c == ' ') + { + count++; + } + else + { + break; + } + } + return count; + } + + // 根据缩进找上级 + private Node findParent(int space) + { + + if (nodeList.Count == 0) + { + return null; + } + else + { + // 倒着找上级 + for (int i = nodeList.Count - 1; i >= 0; i--) + { + Node node = nodeList[i]; + if (node.space < space) + { + return node; + } + } + // 如果没有找到 返回null + return null; + } + } + + // 私有节点类 + private class Node + { + // 名称 + public String name { get; set; } + // 值 + public String value { get; set; } + // 父级 + public Node parent { get; set; } + // 前缀空格 + public int space { get; set; } + // 所属层级 + public int tier { get; set; } + } + + } +} diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/net.nutcore.aliddns.csproj b/net.nutcore.aliddns/net.nutcore.aliddns/net.nutcore.aliddns.csproj index 412f237..ce25848 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/net.nutcore.aliddns.csproj +++ b/net.nutcore.aliddns/net.nutcore.aliddns/net.nutcore.aliddns.csproj @@ -89,6 +89,7 @@ + Form