Update AssemblyInfo.cs

up addr
Update SpeedtestHandler.cs
2019-10-30 14:20:12 +08:00 · 2019-10-30 14:07:26 +08:00 · 2019-10-28 13:11:14 +08:00 · 2019-10-27 12:55:20 +08:00 · 2019-10-24 08:42:55 +08:00 · 2019-10-24 08:23:32 +08:00
25 changed files with 1840 additions and 2313 deletions
--- a/v2rayN/v2rayN/Base/HttpWebServer.cs
+++ b/v2rayN/v2rayN/Base/HttpWebServer.cs
@@ -61,6 +61,7 @@ namespace v2rayN.Base
                            try
                            {
                                string address = ctx.Request.LocalEndPoint.Address.ToString();
+                                Utils.SaveLog("Webserver Request " + address);
                                string rstr = _responderMethod(address);
                                byte[] buf = Encoding.UTF8.GetBytes(rstr);
                                ctx.Response.StatusCode = 200;
--- a/v2rayN/v2rayN/Base/HttpWebServerB.cs
+++ b/v2rayN/v2rayN/Base/HttpWebServerB.cs
@@ -39,8 +39,15 @@ namespace v2rayN.Base

            while (true)
            {
+                if (!listener.Pending())
+                {
+                    Thread.Sleep(100);
+                    continue;
+                }
+
                TcpClient socket = listener.AcceptTcpClient();
                Thread thread = new Thread(new ParameterizedThreadStart(ProcessThread));
+                thread.IsBackground = true;
                thread.Start(socket);
                Thread.Sleep(1);
            }
@@ -62,6 +69,7 @@ namespace v2rayN.Base
                        if (_responderMethod != null)
                        {
                            var address = ((IPEndPoint)socket.Client.LocalEndPoint).Address.ToString();
+                            Utils.SaveLog("WebserverB Request " + address);
                            string pac = _responderMethod(address);

                            if (inputStream.CanWrite)
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -33,6 +33,14 @@ namespace v2rayN.Forms
            Application.ApplicationExit += (sender, args) =>
            {
                Utils.ClearTempPath();
+
+                v2rayHandler.V2rayStop();
+                HttpProxyHandle.Update(config, true);
+                HttpProxyHandle.CloseHttpAgent(config);
+                PACServerHandle.Stop();
+
+                ConfigHandler.SaveConfig(ref config);
+                statistics?.SaveToFile();
                statistics?.Close();
            };
        }
@@ -79,18 +87,9 @@ namespace v2rayN.Forms
            if (e.CloseReason == CloseReason.UserClosing)
            {
                e.Cancel = true;
-
-                statistics?.SaveToFile();
-
                HideForm();
                return;
            }
-            if (e.CloseReason == CloseReason.ApplicationExitCall)
-            {
-                ConfigHandler.SaveConfig(ref config);
-                statistics?.SaveToFile();
-                statistics?.Close();
-            }
        }

        private void MainForm_Resize(object sender, EventArgs e)
@@ -110,24 +109,24 @@ namespace v2rayN.Forms
            //config.uiItem.mainQRCodeWidth = splitContainer1.SplitterDistance;
        }

-        private const int WM_QUERYENDSESSION = 0x0011;
-        protected override void WndProc(ref Message m)
-        {
-            switch (m.Msg)
-            {
-                case WM_QUERYENDSESSION:
-                    Utils.SaveLog("Windows shutdown UnsetProxy");
-                    //CloseV2ray();
-                    ConfigHandler.ToJsonFile(config);
-                    statistics?.SaveToFile();
-                    ProxySetting.UnsetProxy();
-                    m.Result = (IntPtr)1;
-                    break;
-                default:
-                    base.WndProc(ref m);
-                    break;
-            }
-        }
+        //private const int WM_QUERYENDSESSION = 0x0011;
+        //protected override void WndProc(ref Message m)
+        //{
+        //    switch (m.Msg)
+        //    {
+        //        case WM_QUERYENDSESSION:
+        //            Utils.SaveLog("Windows shutdown UnsetProxy");
+
+        //            ConfigHandler.ToJsonFile(config);
+        //            statistics?.SaveToFile();
+        //            ProxySetting.UnsetProxy();
+        //            m.Result = (IntPtr)1;
+        //            break;
+        //        default:
+        //            base.WndProc(ref m);
+        //            break;
+        //    }
+        //}
        #endregion

        #region 显示服务器 listview 和 menu
@@ -594,44 +593,43 @@ namespace v2rayN.Forms

        private void menuPingServer_Click(object sender, EventArgs e)
        {
-            GetLvSelectedIndex();
-            ClearTestResult();
-            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "ping", UpdateSpeedtestHandler);
+            Speedtest("ping");
        }
        private void menuTcpingServer_Click(object sender, EventArgs e)
        {
-            GetLvSelectedIndex();
-            ClearTestResult();
-            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "tcping", UpdateSpeedtestHandler);
+            Speedtest("tcping");
        }

        private void menuRealPingServer_Click(object sender, EventArgs e)
        {
-            if (!config.sysAgentEnabled)
-            {
-                UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
-                return;
-            }
+            //if (!config.sysAgentEnabled)
+            //{
+            //    UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
+            //    return;
+            //}

-            UI.Show(UIRes.I18N("SpeedServerTips"));
+            //UI.Show(UIRes.I18N("SpeedServerTips"));

-            GetLvSelectedIndex();
-            ClearTestResult();
-            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "realping", UpdateSpeedtestHandler);
+            Speedtest("realping");
        }

        private void menuSpeedServer_Click(object sender, EventArgs e)
        {
-            if (!config.sysAgentEnabled)
-            {
-                UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
-                return;
-            }
+            //if (!config.sysAgentEnabled)
+            //{
+            //    UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
+            //    return;
+            //}

-            UI.Show(UIRes.I18N("SpeedServerTips"));
+            //UI.Show(UIRes.I18N("SpeedServerTips"));

+            Speedtest("speedtest");
+        }
+        private void Speedtest(string actionType)
+        {
            GetLvSelectedIndex();
-            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "speedtest", UpdateSpeedtestHandler);
+            ClearTestResult();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, actionType, UpdateSpeedtestHandler);
        }

        private void menuExport2ClientConfig_Click(object sender, EventArgs e)
@@ -1007,15 +1005,10 @@ namespace v2rayN.Forms

        private void menuExit_Click(object sender, EventArgs e)
        {
-            CloseV2ray();

            this.Visible = false;
            this.Close();

-            statistics?.Close();
-
-            //this.Dispose();
-            //System.Environment.Exit(System.Environment.ExitCode);
            Application.Exit();
        }

--- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
@@ -28,7 +28,6 @@
        /// </summary>
        private void InitializeComponent()
        {
-            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionSettingForm));
            this.btnClose = new System.Windows.Forms.Button();
            this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -63,8 +62,9 @@
            this.txtUserblock = new System.Windows.Forms.TextBox();
            this.panel3 = new System.Windows.Forms.Panel();
            this.btnSetDefRountingRule = new System.Windows.Forms.Button();
-            this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
            this.labRoutingTips = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
            this.label15 = new System.Windows.Forms.Label();
            this.label12 = new System.Windows.Forms.Label();
            this.cmbroutingMode = new System.Windows.Forms.ComboBox();
@@ -95,7 +95,6 @@
            this.panel2 = new System.Windows.Forms.Panel();
            this.btnOK = new System.Windows.Forms.Button();
            this.panel1 = new System.Windows.Forms.Panel();
-            this.configBindingSource = new System.Windows.Forms.BindingSource(this.components);
            this.tabControl1.SuspendLayout();
            this.tabPage1.SuspendLayout();
            this.groupBox1.SuspendLayout();
@@ -109,36 +108,36 @@
            this.tabPage6.SuspendLayout();
            this.tabPage7.SuspendLayout();
            this.panel2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.configBindingSource)).BeginInit();
            this.SuspendLayout();
            // 
            // btnClose
            // 
-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            this.btnClose.Name = "btnClose";
            this.btnClose.UseVisualStyleBackColor = true;
            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
            // 
            // tabControl1
            // 
+            resources.ApplyResources(this.tabControl1, "tabControl1");
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Controls.Add(this.tabPage6);
            this.tabControl1.Controls.Add(this.tabPage7);
-            resources.ApplyResources(this.tabControl1, "tabControl1");
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            // 
            // tabPage1
            // 
-            this.tabPage1.Controls.Add(this.groupBox1);
            resources.ApplyResources(this.tabPage1, "tabPage1");
+            this.tabPage1.Controls.Add(this.groupBox1);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.UseVisualStyleBackColor = true;
            // 
            // groupBox1
            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Controls.Add(this.chksniffingEnabled2);
            this.groupBox1.Controls.Add(this.chksniffingEnabled);
            this.groupBox1.Controls.Add(this.txtremoteDNS);
@@ -157,7 +156,6 @@
            this.groupBox1.Controls.Add(this.label5);
            this.groupBox1.Controls.Add(this.txtlocalPort);
            this.groupBox1.Controls.Add(this.label2);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
@@ -204,12 +202,12 @@
            // 
            // cmbprotocol2
            // 
+            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
            this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbprotocol2.FormattingEnabled = true;
            this.cmbprotocol2.Items.AddRange(new object[] {
            resources.GetString("cmbprotocol2.Items"),
            resources.GetString("cmbprotocol2.Items1")});
-            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
            this.cmbprotocol2.Name = "cmbprotocol2";
            // 
            // label3
@@ -224,8 +222,8 @@
            // 
            // cmbprotocol
            // 
-            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
+            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbprotocol.FormattingEnabled = true;
            this.cmbprotocol.Items.AddRange(new object[] {
            resources.GetString("cmbprotocol.Items"),
@@ -251,6 +249,7 @@
            // 
            // cmbloglevel
            // 
+            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
            this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbloglevel.FormattingEnabled = true;
            this.cmbloglevel.Items.AddRange(new object[] {
@@ -259,7 +258,6 @@
            resources.GetString("cmbloglevel.Items2"),
            resources.GetString("cmbloglevel.Items3"),
            resources.GetString("cmbloglevel.Items4")});
-            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
            this.cmbloglevel.Name = "cmbloglevel";
            // 
            // label5
@@ -279,32 +277,32 @@
            // 
            // tabPage2
            // 
-            this.tabPage2.Controls.Add(this.groupBox2);
            resources.ApplyResources(this.tabPage2, "tabPage2");
+            this.tabPage2.Controls.Add(this.groupBox2);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.UseVisualStyleBackColor = true;
            // 
            // groupBox2
            // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Controls.Add(this.tabControl2);
            this.groupBox2.Controls.Add(this.panel3);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Name = "groupBox2";
            this.groupBox2.TabStop = false;
            // 
            // tabControl2
            // 
+            resources.ApplyResources(this.tabControl2, "tabControl2");
            this.tabControl2.Controls.Add(this.tabPage3);
            this.tabControl2.Controls.Add(this.tabPage4);
            this.tabControl2.Controls.Add(this.tabPage5);
-            resources.ApplyResources(this.tabControl2, "tabControl2");
            this.tabControl2.Name = "tabControl2";
            this.tabControl2.SelectedIndex = 0;
            // 
            // tabPage3
            // 
-            this.tabPage3.Controls.Add(this.txtUseragent);
            resources.ApplyResources(this.tabPage3, "tabPage3");
+            this.tabPage3.Controls.Add(this.txtUseragent);
            this.tabPage3.Name = "tabPage3";
            this.tabPage3.UseVisualStyleBackColor = true;
            // 
@@ -315,8 +313,8 @@
            // 
            // tabPage4
            // 
-            this.tabPage4.Controls.Add(this.txtUserdirect);
            resources.ApplyResources(this.tabPage4, "tabPage4");
+            this.tabPage4.Controls.Add(this.txtUserdirect);
            this.tabPage4.Name = "tabPage4";
            this.tabPage4.UseVisualStyleBackColor = true;
            // 
@@ -327,8 +325,8 @@
            // 
            // tabPage5
            // 
-            this.tabPage5.Controls.Add(this.txtUserblock);
            resources.ApplyResources(this.tabPage5, "tabPage5");
+            this.tabPage5.Controls.Add(this.txtUserblock);
            this.tabPage5.Name = "tabPage5";
            this.tabPage5.UseVisualStyleBackColor = true;
            // 
@@ -339,13 +337,14 @@
            // 
            // panel3
            // 
+            resources.ApplyResources(this.panel3, "panel3");
            this.panel3.Controls.Add(this.btnSetDefRountingRule);
-            this.panel3.Controls.Add(this.cmbdomainStrategy);
            this.panel3.Controls.Add(this.labRoutingTips);
+            this.panel3.Controls.Add(this.label4);
+            this.panel3.Controls.Add(this.cmbdomainStrategy);
            this.panel3.Controls.Add(this.label15);
            this.panel3.Controls.Add(this.label12);
            this.panel3.Controls.Add(this.cmbroutingMode);
-            resources.ApplyResources(this.panel3, "panel3");
            this.panel3.Name = "panel3";
            // 
            // btnSetDefRountingRule
@@ -355,23 +354,29 @@
            this.btnSetDefRountingRule.UseVisualStyleBackColor = true;
            this.btnSetDefRountingRule.Click += new System.EventHandler(this.btnSetDefRountingRule_Click);
            // 
+            // labRoutingTips
+            // 
+            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+            this.labRoutingTips.Name = "labRoutingTips";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.ForeColor = System.Drawing.Color.Brown;
+            this.label4.Name = "label4";
+            // 
            // cmbdomainStrategy
            // 
+            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
            this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbdomainStrategy.FormattingEnabled = true;
            this.cmbdomainStrategy.Items.AddRange(new object[] {
            resources.GetString("cmbdomainStrategy.Items"),
            resources.GetString("cmbdomainStrategy.Items1"),
            resources.GetString("cmbdomainStrategy.Items2")});
-            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
            this.cmbdomainStrategy.Name = "cmbdomainStrategy";
            // 
-            // labRoutingTips
-            // 
-            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
-            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
-            this.labRoutingTips.Name = "labRoutingTips";
-            // 
            // label15
            // 
            resources.ApplyResources(this.label15, "label15");
@@ -384,6 +389,7 @@
            // 
            // cmbroutingMode
            // 
+            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
            this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbroutingMode.FormattingEnabled = true;
            this.cmbroutingMode.Items.AddRange(new object[] {
@@ -391,11 +397,11 @@
            resources.GetString("cmbroutingMode.Items1"),
            resources.GetString("cmbroutingMode.Items2"),
            resources.GetString("cmbroutingMode.Items3")});
-            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
            this.cmbroutingMode.Name = "cmbroutingMode";
            // 
            // tabPage6
            // 
+            resources.ApplyResources(this.tabPage6, "tabPage6");
            this.tabPage6.Controls.Add(this.chkKcpcongestion);
            this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
            this.tabPage6.Controls.Add(this.label10);
@@ -409,7 +415,6 @@
            this.tabPage6.Controls.Add(this.label7);
            this.tabPage6.Controls.Add(this.txtKcpmtu);
            this.tabPage6.Controls.Add(this.label6);
-            resources.ApplyResources(this.tabPage6, "tabPage6");
            this.tabPage6.Name = "tabPage6";
            this.tabPage6.UseVisualStyleBackColor = true;
            // 
@@ -481,6 +486,7 @@
            // 
            // tabPage7
            // 
+            resources.ApplyResources(this.tabPage7, "tabPage7");
            this.tabPage7.Controls.Add(this.cbFreshrate);
            this.tabPage7.Controls.Add(this.tbCacheDays);
            this.tabPage7.Controls.Add(this.lbFreshrate);
@@ -490,15 +496,14 @@
            this.tabPage7.Controls.Add(this.txturlGFWList);
            this.tabPage7.Controls.Add(this.label13);
            this.tabPage7.Controls.Add(this.chkAutoRun);
-            resources.ApplyResources(this.tabPage7, "tabPage7");
            this.tabPage7.Name = "tabPage7";
            this.tabPage7.UseVisualStyleBackColor = true;
            // 
            // cbFreshrate
            // 
+            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
            this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cbFreshrate.FormattingEnabled = true;
-            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
            this.cbFreshrate.Name = "cbFreshrate";
            // 
            // tbCacheDays
@@ -546,9 +551,9 @@
            // 
            // panel2
            // 
+            resources.ApplyResources(this.panel2, "panel2");
            this.panel2.Controls.Add(this.btnClose);
            this.panel2.Controls.Add(this.btnOK);
-            resources.ApplyResources(this.panel2, "panel2");
            this.panel2.Name = "panel2";
            // 
            // btnOK
@@ -563,10 +568,6 @@
            resources.ApplyResources(this.panel1, "panel1");
            this.panel1.Name = "panel1";
            // 
-            // configBindingSource
-            // 
-            this.configBindingSource.DataSource = typeof(v2rayN.Mode.Config);
-            // 
            // OptionSettingForm
            // 
            resources.ApplyResources(this, "$this");
@@ -598,7 +599,6 @@
            this.tabPage7.ResumeLayout(false);
            this.tabPage7.PerformLayout();
            this.panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.configBindingSource)).EndInit();
            this.ResumeLayout(false);

        }
@@ -670,6 +670,6 @@
        private System.Windows.Forms.Label lbCacheDays;
        private System.Windows.Forms.ComboBox cbFreshrate;
        private System.Windows.Forms.Label lbFreshrate;
-        private System.Windows.Forms.BindingSource configBindingSource;
+        private System.Windows.Forms.Label label4;
    }
 }
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
@@ -196,9 +196,21 @@
  <data name="tabPage3.Text" xml:space="preserve">
    <value>  代理的Domain或IP  </value>
  </data>
+  <data name="txtUserdirect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 404</value>
+  </data>
+  <data name="tabPage4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 410</value>
+  </data>
  <data name="tabPage4.Text" xml:space="preserve">
    <value>  直连的Domain或IP  </value>
  </data>
+  <data name="txtUserblock.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 404</value>
+  </data>
+  <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 410</value>
+  </data>
  <data name="tabPage5.Text" xml:space="preserve">
    <value>  阻止的Domain或IP  </value>
  </data>
@@ -207,7 +219,7 @@
    <value>NoControl</value>
  </data>
  <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing">
-    <value>381, 43</value>
+    <value>7, 60</value>
  </data>
  <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing">
    <value>201, 23</value>
@@ -215,25 +227,37 @@
  <data name="btnSetDefRountingRule.Text" xml:space="preserve">
    <value>一键设置默认自定义路由规则</value>
  </data>
-  <data name="cmbdomainStrategy.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
-  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="labRoutingTips.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
+  <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 96</value>
+  </data>
  <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
    <value>383, 12</value>
  </data>
  <data name="labRoutingTips.Text" xml:space="preserve">
    <value>*设置的规则，用逗号(,)隔开;支持Domain(纯字符串/正则/子域名)和IP</value>
  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>规则加载次序:自定义的代理/直连/阻止,选择的路由模式</value>
+  </data>
+  <data name="cmbdomainStrategy.Location" type="System.Drawing.Point, System.Drawing">
+    <value>81, 30</value>
+  </data>
+  <data name="cmbdomainStrategy.Size" type="System.Drawing.Size, System.Drawing">
+    <value>186, 20</value>
+  </data>
  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
    <value>53, 12</value>
  </data>
  <data name="label15.Text" xml:space="preserve">
    <value>域名策略</value>
  </data>
+  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
+    <value>295, 34</value>
+  </data>
  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
    <value>53, 12</value>
  </data>
@@ -252,8 +276,11 @@
  <data name="cmbroutingMode.Items3" xml:space="preserve">
    <value>绕过局域网及大陆地址</value>
  </data>
+  <data name="cmbroutingMode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>372, 30</value>
+  </data>
  <data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
+    <value>244, 20</value>
  </data>
  <data name="tabPage2.Text" xml:space="preserve">
    <value>  Core:路由设置  </value>
@@ -261,6 +288,24 @@
  <data name="tabPage6.Text" xml:space="preserve">
    <value>  Core:KCP设置  </value>
  </data>
+  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="lbFreshrate.Text" xml:space="preserve">
+    <value>统计刷新频率</value>
+  </data>
+  <data name="lbCacheDays.Size" type="System.Drawing.Size, System.Drawing">
+    <value>305, 12</value>
+  </data>
+  <data name="lbCacheDays.Text" xml:space="preserve">
+    <value>缓存天数（0-30， 0关闭缓存单独每天的数据使用情况）</value>
+  </data>
+  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+    <value>384, 16</value>
+  </data>
+  <data name="chkEnableStatistics.Text" xml:space="preserve">
+    <value>启用统计（实时网速显示和使用流量显示，需要重启v2rayN客户端）</value>
+  </data>
  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 16</value>
  </data>
@@ -288,13 +333,4 @@
  <data name="$this.Text" xml:space="preserve">
    <value>参数设置</value>
  </data>
-  <data name="chkEnableStatistics.Text" xml:space="preserve">
-    <value>启用统计（实时网速显示和使用流量显示，需要重启v2rayN客户端）</value>
-  </data>
-  <data name="lbCacheDays.Text" xml:space="preserve">
-    <value>缓存天数（0-30， 0关闭缓存单独每天的数据使用情况）</value>
-  </data>
-  <data name="lbFreshrate.Text" xml:space="preserve">
-    <value>统计刷新频率</value>
-  </data>
 </root>
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -515,11 +515,11 @@ namespace v2rayN.Handler
        {
            string newFileName = string.Empty;
            newFileName = string.Format("{0}.json", Utils.GetGUID());
-            newFileName = Path.Combine(Utils.GetTempPath(), newFileName);
+            //newFileName = Path.Combine(Utils.GetTempPath(), newFileName);

            try
            {
-                File.Copy(fileName, newFileName);
+                File.Copy(fileName, Path.Combine(Utils.GetTempPath(), newFileName));
            }
            catch
            {
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -37,16 +37,19 @@ namespace v2rayN.Handler
            if (actionType == "ping")
            {
                _workThread = new Thread(new ThreadStart(RunPing));
+                _workThread.IsBackground = true;
                _workThread.Start();
            }
            if (actionType == "tcping")
            {
                _workThread = new Thread(new ThreadStart(RunTcping));
+                _workThread.IsBackground = true;
                _workThread.Start();
            }
            else if (actionType == "realping")
            {
                _workThread = new Thread(new ThreadStart(RunRealPing));
+                _workThread.IsBackground = true;
                _workThread.Start();
            }
            else if (actionType == "speedtest")
@@ -235,7 +238,7 @@ namespace v2rayN.Handler

            var httpPort = _config.GetLocalPort("speedtest");
            index = _selecteds[index];
-            
+
            testCounter++;
            var webProxy = new WebProxy(Global.Loopback, httpPort + index);
            downloadHandle2.DownloadFileAsync(_config, url, webProxy);
@@ -249,7 +252,7 @@ namespace v2rayN.Handler

            try
            {
-                IPHostEntry ipHostInfo = System.Net.Dns.Resolve(url);
+                IPHostEntry ipHostInfo = System.Net.Dns.GetHostEntry(url);
                IPAddress ipAddress = ipHostInfo.AddressList[0];

                var timer = new Stopwatch();
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -6,7 +6,9 @@ using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using v2rayN.Mode;
+using v2rayN.Properties;
 using v2rayN.Protos.Statistics;
+using v2rayN.Tool;

 namespace v2rayN.Handler
 {
@@ -66,6 +68,23 @@ namespace v2rayN.Handler

        public StatisticsHandler(Mode.Config config, Action<ulong, ulong, ulong, ulong, List<Mode.ServerStatistics>> update)
        {
+            try
+            {
+                if (Environment.Is64BitOperatingSystem)
+                {
+                    FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x64.dll"), Resources.grpc_csharp_ext_x64_dll);
+                }
+                else
+                {
+                    FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x86.dll"), Resources.grpc_csharp_ext_x86_dll);
+                }
+            }
+            catch (IOException ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+            }
+
            config_ = config;
            enabled_ = config.enableStatistics;
            UpdateUI = false;
@@ -86,6 +105,7 @@ namespace v2rayN.Handler
            GrpcInit();

            workThread_ = new Thread(new ThreadStart(Run));
+            workThread_.IsBackground = true;
            workThread_.Start();
        }

--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -655,7 +655,7 @@ namespace v2rayN.Handler
                if (!v2rayConfig.routing.rules.Exists(item => { return item.outboundTag == tag; }))
                {
                    var apiRoutingRule = new Mode.RulesItem();
-                    apiRoutingRule.inboundTag = tag;
+                    apiRoutingRule.inboundTag = new List<string> { tag };
                    apiRoutingRule.outboundTag = tag;
                    apiRoutingRule.type = "field";
                    v2rayConfig.routing.rules.Add(apiRoutingRule);
@@ -688,11 +688,21 @@ namespace v2rayN.Handler
                    return -1;
                }

-                string addressFileName = config.address();
                if (File.Exists(fileName))
                {
                    File.Delete(fileName);
                }
+
+                string addressFileName = config.address();
+                if (!File.Exists(addressFileName))
+                {
+                    addressFileName = Path.Combine(Utils.GetTempPath(), addressFileName);
+                }
+                if (!File.Exists(addressFileName))
+                {
+                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    return -1;
+                }
                File.Copy(addressFileName, fileName);

                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
@@ -1430,7 +1440,7 @@ namespace v2rayN.Handler
                    v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]);

                    var rule = new Mode.RulesItem();
-                    rule.inboundTag = inbound.tag;
+                    rule.inboundTag = new List<string> { inbound.tag };
                    rule.outboundTag = v2rayConfigCopy.outbounds[0].tag;
                    rule.type = "field";
                    v2rayConfig.routing.rules.Add(rule);
--- a/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
@@ -30,33 +30,33 @@ namespace v2rayN.HttpProxyHandler
                    }
                    if (type == 1)
                    {
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                        SysProxyHandle.SetIEProxy(true, true, $"{Global.Loopback}:{port}", null);
                    }
                    else if (type == 2)
                    {
                        string pacUrl = GetPacUrl();
                        SysProxyHandle.SetIEProxy(true, false, null, pacUrl);
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                        PACServerHandle.Init(config);
                    }
                    else if (type == 3)
                    {
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                        SysProxyHandle.SetIEProxy(false, false, null, null);
                    }
                    else if (type == 4)
                    {
                        string pacUrl = GetPacUrl();
                        SysProxyHandle.SetIEProxy(false, false, null, null);
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                        PACServerHandle.Init(config);
                    }
                }
                else
                {
                    SysProxyHandle.SetIEProxy(false, false, null, null);
-                    PACServerHandle.Stop();
+                    //PACServerHandle.Stop();
                }
            }
            catch (Exception ex)
@@ -104,8 +104,7 @@ namespace v2rayN.HttpProxyHandler

                Global.sysAgent = false;
                Global.socksPort = 0;
-                Global.httpPort = 0;
-                Global.pacPort = 0;
+                Global.httpPort = 0; 
            }
            catch
            {
--- a/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs
@@ -28,14 +28,16 @@ namespace v2rayN.HttpProxyHandler

        public static void Init(Config config)
        {
-            //if (InitServer("*"))
-            //{
-            //    pacPort = Global.pacPort;
-            //}
-            if (InitServer(Global.Loopback))
+            Global.pacPort = config.GetLocalPort("pac");
+
+            if (InitServer("*"))
            {
                pacPort = Global.pacPort;
            }
+            //else if (InitServer(Global.Loopback))
+            //{
+            //    pacPort = Global.pacPort;
+            //}
            else if (InitServerB(Global.Loopback))
            {
                pacPort = Global.pacPort;
@@ -122,18 +124,23 @@ namespace v2rayN.HttpProxyHandler

        public static void Stop()
        {
-            //try
-            //{
-            //    if (server != null)
-            //    {
-            //        server.Stop();
-            //        server = null;
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-            //    Utils.SaveLog("Webserver Stop " + ex.Message);
-            //}
+            try
+            {
+                if (server != null)
+                {
+                    server.Stop();
+                    server = null;
+                }
+                if (serverB != null)
+                {
+                    serverB.Stop();
+                    serverB = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("Webserver Stop " + ex.Message);
+            }

            //try
            //{
--- a/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs
@@ -34,7 +34,6 @@ namespace v2rayN.HttpProxyHandler
                _privoxyJob = new Job();

                FileManager.UncompressFile(Utils.GetTempPath("v2ray_privoxy.exe"), Resources.privoxy_exe);
-                FileManager.UncompressFile(Utils.GetTempPath("mgwz.dll"), Resources.mgwz_dll);
            }
            catch (IOException ex)
            {
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -310,7 +310,7 @@ namespace v2rayN.Mode
        /// </summary>
        public string port { get; set; }

-        public string inboundTag { get; set; }
+        public List<string> inboundTag { get; set; }
        /// <summary>
        /// 
        /// </summary>
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("2.46")]
+[assembly: AssemblyFileVersion("2.48")]
--- a/v2rayN/v2rayN/Properties/Resources.Designer.cs
+++ b/v2rayN/v2rayN/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace v2rayN.Properties {
    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -91,25 +91,35 @@ namespace v2rayN.Properties {
        }
        
        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        ///   查找 System.Byte[] 类型的本地化资源。
        /// </summary>
-        internal static System.Drawing.Bitmap help {
+        internal static byte[] grpc_csharp_ext_x64_dll {
            get {
-                object obj = ResourceManager.GetObject("help", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
+                object obj = ResourceManager.GetObject("grpc_csharp_ext_x64_dll", resourceCulture);
+                return ((byte[])(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Byte[] 类型的本地化资源。
        /// </summary>
-        internal static byte[] mgwz_dll {
+        internal static byte[] grpc_csharp_ext_x86_dll {
            get {
-                object obj = ResourceManager.GetObject("mgwz_dll", resourceCulture);
+                object obj = ResourceManager.GetObject("grpc_csharp_ext_x86_dll", resourceCulture);
                return ((byte[])(obj));
            }
        }
        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap help {
+            get {
+                object obj = ResourceManager.GetObject("help", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
@@ -157,6 +167,7 @@ namespace v2rayN.Properties {
        ///show-on-task-bar 0
        ///activity-animation 0
        ///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
+        ///max-client-connections 2048
        ///hide-console
        /// 的本地化字符串。
        /// </summary>
--- a/v2rayN/v2rayN/Properties/Resources.resx
+++ b/v2rayN/v2rayN/Properties/Resources.resx
@@ -127,12 +127,15 @@
  <data name="checkupdate" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\resources\checkupdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="grpc_csharp_ext_x64_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\grpc_csharp_ext.x64.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpc_csharp_ext_x86_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\grpc_csharp_ext.x86.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="mgwz_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\mgwz.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="minimize" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
--- a/v2rayN/v2rayN/Resources/grpc_csharp_ext.x64.dll.gz
+++ b/v2rayN/v2rayN/Resources/grpc_csharp_ext.x64.dll.gz
--- a/v2rayN/v2rayN/Resources/grpc_csharp_ext.x86.dll.gz
+++ b/v2rayN/v2rayN/Resources/grpc_csharp_ext.x86.dll.gz
--- a/v2rayN/v2rayN/Resources/mgwz.dll.gz
+++ b/v2rayN/v2rayN/Resources/mgwz.dll.gz
--- a/v2rayN/v2rayN/Sample/SampleClientConfig.txt
+++ b/v2rayN/v2rayN/Sample/SampleClientConfig.txt
@@ -76,7 +76,7 @@
 		"domainStrategy": "IPIfNonMatch",
 		"rules": [
 				{
-                    "inboundTag": "api",
+                    "inboundTag": ["api"],
                    "outboundTag": "api",
                    "type": "field"
                }
--- a/v2rayN/v2rayN/grpc_csharp_ext.x64.dll
+++ b/v2rayN/v2rayN/grpc_csharp_ext.x64.dll
--- a/v2rayN/v2rayN/grpc_csharp_ext.x86.dll
+++ b/v2rayN/v2rayN/grpc_csharp_ext.x86.dll
--- a/v2rayN/v2rayN/packages.config
+++ b/v2rayN/v2rayN/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Grpc.Tools" version="2.23.0" targetFramework="net46" developmentDependency="true" />
+  <package id="Grpc.Tools" version="2.24.0" targetFramework="net46" developmentDependency="true" />
 </packages>
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props')" />
+  <Import Project="..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -198,6 +198,11 @@
    <Compile Include="Mode\ServerStatistics.cs" />
    <Compile Include="Mode\SysproxyConfig.cs" />
    <Compile Include="Mode\EConfigType.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
    <Compile Include="Resx\ResUI.zh-Hans.Designer.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
@@ -319,14 +324,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
    <EmbeddedResource Include="app.config">
      <SubType>Designer</SubType>
    </EmbeddedResource>
@@ -342,6 +342,8 @@
    </Compile>
    <Protobuf Include="Protos\Statistics.proto" />
    <None Include="Resources\abp.js.gz" />
+    <None Include="Resources\grpc_csharp_ext.x64.dll.gz" />
+    <None Include="Resources\grpc_csharp_ext.x86.dll.gz" />
    <None Include="Resources\pac.txt.gz" />
    <None Include="Resources\sysproxy.exe.gz" />
    <None Include="Resources\sysproxy64.exe.gz" />
@@ -392,7 +394,6 @@
    <EmbeddedResource Include="Sample\SampleServerConfig.txt" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="Resources\mgwz.dll.gz" />
    <None Include="Resources\privoxy.exe.gz" />
    <None Include="Resources\restart.png" />
  </ItemGroup>
@@ -420,12 +421,6 @@
    <EmbeddedResource Include="LIB\System.Runtime.CompilerServices.Unsafe.dll" />
    <EmbeddedResource Include="LIB\zxing.dll" />
    <EmbeddedResource Include="LIB\zxing.presentation.dll" />
-    <Content Include="grpc_csharp_ext.x64.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="grpc_csharp_ext.x86.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
    <EmbeddedResource Include="LIB\netstandard.dll" />
    <Content Include="Resources\help.png" />
    <None Include="Resources\notify.png" />
@@ -439,12 +434,12 @@
  <Import Project="..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props'))" />
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets'))" />
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props'))" />
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets'))" />
  </Target>
-  <Import Project="..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets')" />
+  <Import Project="..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
Author	SHA1	Message	Date
2dust	f199e3bf82	Update AssemblyInfo.cs	2019-10-30 14:20:12 +08:00
2dust	7d31c2e472	up addr	2019-10-30 14:07:26 +08:00
2dust	ad406c3682	Update SpeedtestHandler.cs	2019-10-28 13:11:14 +08:00
2dust	2779670fa2	up speedtest	2019-10-27 12:55:20 +08:00
2dust	5b00bf82fb	Update MainForm.cs	2019-10-24 08:42:55 +08:00
2dust	473e0cf839	Update HttpWebServerB.cs	2019-10-24 08:23:32 +08:00
2dust	ef01b4aa5e	fix pac	2019-10-23 15:18:21 +08:00
2dust	c0340843eb	up pac	2019-10-22 17:04:11 +08:00
2dust	e6ca25462e	clean	2019-10-21 14:17:28 +08:00