From 92dccfbe27f31dc9cb7bf726e77dbed01706ab2d Mon Sep 17 00:00:00 2001
From: wisdomwei201804 <wisdom_wei@139.com>
Date: Sat, 15 Feb 2020 15:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BB=E5=86=99ngrok.cfg?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net.nutcore.aliddns/Form_ngrok.cs         |  2 +-
 .../net.nutcore.aliddns/NgrokHelper.cs        | 27 ++++---------------
 .../Properties/AssemblyInfo.cs                |  4 +--
 .../net.nutcore.aliddns/updateinfo.txt        |  3 +++
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.cs
index 51602ba..4065e28 100644
--- a/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.cs
+++ b/net.nutcore.aliddns/net.nutcore.aliddns/Form_ngrok.cs
@@ -76,7 +76,7 @@ namespace net.nutcore.aliddns
                 textBox_serverAddr.Text = config.server_addr;
                 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_lanHttps.Text = config.tunnels.website_http.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 34c857e..2b69ffb 100644
--- a/net.nutcore.aliddns/net.nutcore.aliddns/NgrokHelper.cs
+++ b/net.nutcore.aliddns/net.nutcore.aliddns/NgrokHelper.cs
@@ -37,7 +37,6 @@ namespace net.nutcore.aliddns
         public class Tunnel
         {
             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; }
@@ -93,15 +92,7 @@ namespace net.nutcore.aliddns
                             subdomain = "www",
                             proto = new Proto
                             {
-                                http = 80
-                            }
-
-                        },
-                        website_https = new Protocol
-                        {
-                            subdomain = "www",
-                            proto = new Proto
-                            {
+                                http = 80,
                                 https = 443
                             }
                         },
@@ -176,8 +167,7 @@ namespace net.nutcore.aliddns
             config.server_addr = server_addr;
             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.website_http.proto.https = https;
             config.tunnels.tcp1.remote_port = remoteport1;
             config.tunnels.tcp1.proto.tcp = lanport1;
             config.tunnels.tcp2.remote_port = remoteport2;
@@ -206,21 +196,14 @@ namespace net.nutcore.aliddns
                 case 1:
                     exec.Arguments += "website_http";
                     break;
-
                 case 2:
-                    exec.Arguments += "website_http website_https";
+                    exec.Arguments += "website_http tcp1";
                     break;
-
                 case 3:
-                    exec.Arguments += "website_http website_https tcp1";
+                    exec.Arguments += "website_http tcp1 tcp2";
                     break;
-
-                case 4:
-                    exec.Arguments += "website_http website_https tcp1 tcp2";
-                    break;
-
                 default:
-                    exec.Arguments += "website_http website_https tcp1 tcp2 tcp3";
+                    exec.Arguments += "website_http 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 3d29735..bad0617 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.5")]
-[assembly: AssemblyFileVersion("3.8.6.5")]
+[assembly: AssemblyVersion("3.8.6.6")]
+[assembly: AssemblyFileVersion("3.8.6.6")]
diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt b/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt
index 0da2461..36df052 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.6
+1���Ż���дngrok.cfg�����ļ����롣
+
 v3.8.6.5
 1������ngrok https��͸��