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 bf3959b..cf96a4b 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.Designer.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.Designer.cs @@ -35,9 +35,15 @@ 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_lanPort3 = new System.Windows.Forms.TextBox(); + this.textBox_remotePort3 = new System.Windows.Forms.TextBox(); + this.label_tunnel3 = new System.Windows.Forms.Label(); + this.label_tunnel2 = new System.Windows.Forms.Label(); + this.label_tunnel1 = new System.Windows.Forms.Label(); this.textBox_lanPort2 = new System.Windows.Forms.TextBox(); this.textBox_remotePort2 = new System.Windows.Forms.TextBox(); this.textBox_lanPort1 = new System.Windows.Forms.TextBox(); + this.textBox_remotePort1 = new System.Windows.Forms.TextBox(); this.label_lanport = new System.Windows.Forms.Label(); this.label_remoteport = new System.Windows.Forms.Label(); this.label_tunnels = new System.Windows.Forms.Label(); @@ -47,12 +53,8 @@ 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_remotePort1 = new System.Windows.Forms.TextBox(); - this.label_tunnel1 = new System.Windows.Forms.Label(); - this.label_tunnel2 = new System.Windows.Forms.Label(); - this.label_tunnel3 = new System.Windows.Forms.Label(); - this.textBox_remotePort3 = new System.Windows.Forms.TextBox(); - this.textBox_lanPort3 = new System.Windows.Forms.TextBox(); + this.label_lanHttps = new System.Windows.Forms.Label(); + this.textBox_lanHttps = new System.Windows.Forms.TextBox(); this.groupBox_AuthToken.SuspendLayout(); this.groupBox_Ngrokserver.SuspendLayout(); this.groupBox_Url.SuspendLayout(); @@ -116,8 +118,10 @@ this.groupBox_Url.Controls.Add(this.label_lanport); this.groupBox_Url.Controls.Add(this.label_remoteport); this.groupBox_Url.Controls.Add(this.label_tunnels); + this.groupBox_Url.Controls.Add(this.textBox_lanHttps); this.groupBox_Url.Controls.Add(this.textBox_lanHttp); this.groupBox_Url.Controls.Add(this.textBox_subDomain); + this.groupBox_Url.Controls.Add(this.label_lanHttps); this.groupBox_Url.Controls.Add(this.label_lanHttp); this.groupBox_Url.Controls.Add(this.label_subDomain); this.groupBox_Url.Location = new System.Drawing.Point(6, 123); @@ -127,6 +131,47 @@ this.groupBox_Url.TabStop = false; this.groupBox_Url.Text = "内网端Ngrok"; // + // textBox_lanPort3 + // + this.textBox_lanPort3.Location = new System.Drawing.Point(191, 140); + this.textBox_lanPort3.Name = "textBox_lanPort3"; + this.textBox_lanPort3.Size = new System.Drawing.Size(50, 21); + this.textBox_lanPort3.TabIndex = 19; + // + // textBox_remotePort3 + // + this.textBox_remotePort3.Location = new System.Drawing.Point(96, 140); + this.textBox_remotePort3.Name = "textBox_remotePort3"; + this.textBox_remotePort3.Size = new System.Drawing.Size(50, 21); + this.textBox_remotePort3.TabIndex = 18; + // + // label_tunnel3 + // + this.label_tunnel3.AutoSize = true; + this.label_tunnel3.Location = new System.Drawing.Point(17, 142); + this.label_tunnel3.Name = "label_tunnel3"; + this.label_tunnel3.Size = new System.Drawing.Size(53, 12); + this.label_tunnel3.TabIndex = 17; + this.label_tunnel3.Text = "Tunnel3:"; + // + // label_tunnel2 + // + this.label_tunnel2.AutoSize = true; + this.label_tunnel2.Location = new System.Drawing.Point(17, 115); + this.label_tunnel2.Name = "label_tunnel2"; + this.label_tunnel2.Size = new System.Drawing.Size(53, 12); + this.label_tunnel2.TabIndex = 16; + this.label_tunnel2.Text = "Tunnel2:"; + // + // label_tunnel1 + // + this.label_tunnel1.AutoSize = true; + this.label_tunnel1.Location = new System.Drawing.Point(17, 88); + this.label_tunnel1.Name = "label_tunnel1"; + this.label_tunnel1.Size = new System.Drawing.Size(53, 12); + this.label_tunnel1.TabIndex = 15; + this.label_tunnel1.Text = "Tunnel1:"; + // // textBox_lanPort2 // this.textBox_lanPort2.Location = new System.Drawing.Point(191, 112); @@ -148,6 +193,13 @@ this.textBox_lanPort1.Size = new System.Drawing.Size(50, 21); this.textBox_lanPort1.TabIndex = 11; // + // textBox_remotePort1 + // + this.textBox_remotePort1.Location = new System.Drawing.Point(96, 85); + this.textBox_remotePort1.Name = "textBox_remotePort1"; + this.textBox_remotePort1.Size = new System.Drawing.Size(50, 21); + this.textBox_remotePort1.TabIndex = 10; + // // label_lanport // this.label_lanport.AutoSize = true; @@ -194,9 +246,9 @@ this.label_lanHttp.AutoSize = true; this.label_lanHttp.Location = new System.Drawing.Point(80, 18); this.label_lanHttp.Name = "label_lanHttp"; - this.label_lanHttp.Size = new System.Drawing.Size(89, 12); + this.label_lanHttp.Size = new System.Drawing.Size(77, 12); this.label_lanHttp.TabIndex = 1; - this.label_lanHttp.Text = "http/s服务端口"; + this.label_lanHttp.Text = "http服务端口"; // // label_subDomain // @@ -227,53 +279,21 @@ this.button_save.UseVisualStyleBackColor = true; this.button_save.Click += new System.EventHandler(this.button_save_Click); // - // textBox_remotePort1 + // label_lanHttps // - this.textBox_remotePort1.Location = new System.Drawing.Point(96, 85); - this.textBox_remotePort1.Name = "textBox_remotePort1"; - this.textBox_remotePort1.Size = new System.Drawing.Size(50, 21); - this.textBox_remotePort1.TabIndex = 10; + this.label_lanHttps.AutoSize = true; + this.label_lanHttps.Location = new System.Drawing.Point(172, 18); + this.label_lanHttps.Name = "label_lanHttps"; + this.label_lanHttps.Size = new System.Drawing.Size(83, 12); + this.label_lanHttps.TabIndex = 1; + this.label_lanHttps.Text = "https服务端口"; // - // label_tunnel1 + // textBox_lanHttps // - this.label_tunnel1.AutoSize = true; - this.label_tunnel1.Location = new System.Drawing.Point(17, 88); - this.label_tunnel1.Name = "label_tunnel1"; - this.label_tunnel1.Size = new System.Drawing.Size(53, 12); - this.label_tunnel1.TabIndex = 15; - this.label_tunnel1.Text = "Tunnel1:"; - // - // label_tunnel2 - // - this.label_tunnel2.AutoSize = true; - this.label_tunnel2.Location = new System.Drawing.Point(17, 115); - this.label_tunnel2.Name = "label_tunnel2"; - this.label_tunnel2.Size = new System.Drawing.Size(53, 12); - this.label_tunnel2.TabIndex = 16; - this.label_tunnel2.Text = "Tunnel2:"; - // - // label_tunnel3 - // - this.label_tunnel3.AutoSize = true; - this.label_tunnel3.Location = new System.Drawing.Point(17, 142); - this.label_tunnel3.Name = "label_tunnel3"; - this.label_tunnel3.Size = new System.Drawing.Size(53, 12); - this.label_tunnel3.TabIndex = 17; - this.label_tunnel3.Text = "Tunnel3:"; - // - // textBox_remotePort3 - // - this.textBox_remotePort3.Location = new System.Drawing.Point(96, 140); - this.textBox_remotePort3.Name = "textBox_remotePort3"; - this.textBox_remotePort3.Size = new System.Drawing.Size(50, 21); - this.textBox_remotePort3.TabIndex = 18; - // - // textBox_lanPort3 - // - this.textBox_lanPort3.Location = new System.Drawing.Point(191, 140); - this.textBox_lanPort3.Name = "textBox_lanPort3"; - this.textBox_lanPort3.Size = new System.Drawing.Size(50, 21); - this.textBox_lanPort3.TabIndex = 19; + this.textBox_lanHttps.Location = new System.Drawing.Point(191, 37); + this.textBox_lanHttps.Name = "textBox_lanHttps"; + this.textBox_lanHttps.Size = new System.Drawing.Size(50, 21); + this.textBox_lanHttps.TabIndex = 4; // // Form_ngrok // @@ -325,5 +345,7 @@ private System.Windows.Forms.Label label_tunnel3; private System.Windows.Forms.Label label_tunnel2; private System.Windows.Forms.Label label_tunnel1; + private System.Windows.Forms.TextBox textBox_lanHttps; + private System.Windows.Forms.Label label_lanHttps; } } \ No newline at end of file diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.cs index 92d10b0..51602ba 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.cs @@ -29,6 +29,10 @@ namespace net.nutcore.aliddns int.TryParse(textBox_lanHttp.Text, out lanhttp); textBox_lanHttp.Text = lanhttp.ToString(); + var lanhttps = 443; + int.TryParse(textBox_lanHttps.Text, out lanhttps); + textBox_lanHttps.Text = lanhttp.ToString(); + var subdomain = textBox_subDomain.Text.ToString(); var remoteport1 = 2221; @@ -52,7 +56,7 @@ namespace net.nutcore.aliddns int.TryParse(textBox_lanPort3.Text, out lanport3); textBox_lanPort3.Text = lanport3.ToString(); - ngrok.Save(token, server_addr, lanhttp, subdomain, remoteport1, lanport1, remoteport2, lanport2, remoteport3, lanport3, true, true); + ngrok.Save(token, server_addr, subdomain, lanhttp, lanhttps, remoteport1, lanport1, remoteport2, lanport2, remoteport3, lanport3, true, true); this.Close(); this.Dispose(); } @@ -70,8 +74,9 @@ namespace net.nutcore.aliddns var config = ngrok.Load(); textBox_AuthToken.Text = config.authtoken; textBox_serverAddr.Text = config.server_addr; - textBox_subDomain.Text = config.tunnels.website.subdomain.ToString(); - textBox_lanHttp.Text = config.tunnels.website.proto.http.ToString(); + textBox_subDomain.Text = config.tunnels.website_http.subdomain.ToString(); + textBox_lanHttp.Text = config.tunnels.website_http.proto.http.ToString(); + textBox_lanHttps.Text = config.tunnels.website_https.proto.https.ToString(); textBox_remotePort1.Text = config.tunnels.tcp1.remote_port.ToString(); textBox_lanPort1.Text = config.tunnels.tcp1.proto.tcp.ToString(); textBox_remotePort2.Text = config.tunnels.tcp2.remote_port.ToString(); diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/NgrokHelper.cs b/net.nutcore.aliddns/net.nutcore.aliddns/NgrokHelper.cs index d0c7ddd..34c857e 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/NgrokHelper.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/NgrokHelper.cs @@ -36,7 +36,8 @@ namespace net.nutcore.aliddns public class Tunnel { - public Protocol website { get; set; } + public Protocol website_http { get; set; } + public Protocol website_https { get; set; } public Protocol tcp1 { get; set; } public Protocol tcp2 { get; set; } public Protocol tcp3 { get; set; } @@ -53,6 +54,7 @@ namespace net.nutcore.aliddns public class Proto { public int http { get; set; } + public int https { get; set; } public int tcp { get; set; } } @@ -75,7 +77,7 @@ namespace net.nutcore.aliddns var config = new Config { authtoken = string.Empty, - server_addr = "tunnels.ngrok.io:443", + server_addr = "tunnels.ngrok.io:4443", console_ui = true, region = "us", log_level = "info", @@ -86,7 +88,7 @@ namespace net.nutcore.aliddns run_tcp = true, tunnels = new Tunnel { - website = new Protocol + website_http = new Protocol { subdomain = "www", proto = new Proto @@ -95,6 +97,14 @@ namespace net.nutcore.aliddns } }, + website_https = new Protocol + { + subdomain = "www", + proto = new Proto + { + https = 443 + } + }, tcp1 = new Protocol { remote_port = 2221, @@ -159,13 +169,15 @@ namespace net.nutcore.aliddns return config; } - public void Save(string token, string server_addr, int http, string subdomain, int remoteport1, int lanport1, int remoteport2, int lanport2, int remoteport3, int lanport3, bool run_website, bool run_tcp) + public void Save(string token, string server_addr, string subdomain, int http, int https, int remoteport1, int lanport1, int remoteport2, int lanport2, int remoteport3, int lanport3, bool run_website, bool run_tcp) { var config = Load(); config.authtoken = token; config.server_addr = server_addr; - config.tunnels.website.proto.http = http; - config.tunnels.website.subdomain = subdomain; + config.tunnels.website_http.subdomain = subdomain; + config.tunnels.website_http.proto.http = http; + config.tunnels.website_https.subdomain = subdomain; + config.tunnels.website_https.proto.https = https; config.tunnels.tcp1.remote_port = remoteport1; config.tunnels.tcp1.proto.tcp = lanport1; config.tunnels.tcp2.remote_port = remoteport2; @@ -192,19 +204,23 @@ namespace net.nutcore.aliddns switch (code) { case 1: - exec.Arguments += "website"; + exec.Arguments += "website_http"; break; case 2: - exec.Arguments += "website tcp1"; + exec.Arguments += "website_http website_https"; break; case 3: - exec.Arguments += "website tcp1 tcp2"; + exec.Arguments += "website_http website_https tcp1"; + break; + + case 4: + exec.Arguments += "website_http website_https tcp1 tcp2"; break; default: - exec.Arguments += "website tcp1 tcp2 tcp3"; + exec.Arguments += "website_http website_https tcp1 tcp2 tcp3"; break; } diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs index 9cc52b2..891b112 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.8.6.3")] -[assembly: AssemblyFileVersion("3.8.6.3")] +[assembly: AssemblyVersion("3.8.6.4")] +[assembly: AssemblyFileVersion("3.8.6.4")] diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt b/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt index c11727c..162e1fb 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt +++ b/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt @@ -1,3 +1,6 @@ +v3.8.6.4 +1ngrok https͸ + v3.8.6.3 1޸IJԴ洢߼Recordid༭򣬱ɹֹ޸ļ洢RecordidһʱɵԶ³