Update AssemblyInfo.cs

fix bugs
Merge pull request #2164 from Lemonawa/master
2022-04-07 20:36:10 +08:00 · 2022-04-07 17:05:56 +08:00 · 2022-04-06 19:49:52 +08:00 · 2022-04-05 23:19:37 +08:00 · 2022-04-05 23:10:16 +08:00 · 2022-04-05 23:10:08 +08:00
52 changed files with 2031 additions and 1117 deletions
--- a/.github/ISSUE_TEMPLATE/bug---.md
+++ b/.github/ISSUE_TEMPLATE/bug---.md
@@ -1,3 +1,12 @@
+---
+name: Bug 报告
+about: 在提出问题前请先自行排除服务器端问题和升级到最新客户端，同时也请通过搜索确认是否有人提出过相同问题。
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
 在提出问题前请先自行排除服务器端问题和升级到最新客户端，同时也请通过搜索确认是否有人提出过相同问题。  

 ### 预期行为
@@ -22,4 +31,3 @@
 ### 环境信息(客户端请升级至最新正式版)

 ### 额外信息（可选）
-
--- a/.github/ISSUE_TEMPLATE/feature---.md
+++ b/.github/ISSUE_TEMPLATE/feature---.md
@@ -0,0 +1,20 @@
+---
+name: Feature 请求
+about: 为这个项目提出一个建议
+title: "[Feature request]"
+labels: enhancement
+assignees: ''
+
+---
+
+**你的功能请求是否与一个问题有关？请描述。**
+清楚而简洁地描述问题是什么。例如。我总是感到沮丧，当 [...]
+
+**描述你希望的解决方案**
+对你希望发生的事情进行清晰、简明的描述。
+
+**描述你所考虑的替代方案**
+对你考虑过的任何替代解决方案或功能进行清晰、简洁的描述。
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/README.md
+++ b/README.md
@@ -1,12 +1,18 @@
 # v2rayN
 A V2Ray client for Windows, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core)

+
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)
+[![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayn/badge)](https://www.codefactor.io/repository/github/2dust/v2rayn)
+[![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayN/latest/total?logo=github)](https://github.com/2dust/v2rayN/releases)
+[![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)
+
 ### How to use
 - If you are newbie please download v2rayN-Core.zip from releases
 - Otherwise please download v2rayN.zip (Also need to download v2ray core in the same folder)
 - Run v2rayN.exe

 ### Requirements  
- Microsoft [.NET Framework 4.8](https://docs.microsoft.com/zh-cn/dotnet/framework/install/guide-for-developers)
+- Microsoft [.NET Framework 4.8](https://dotnet.microsoft.com/zh-cn/download/dotnet-framework/thank-you/net48-web-installer)
 - v2fly core [https://github.com/v2fly/v2ray-core/releases](https://github.com/v2fly/v2ray-core/releases)
 - Xray core [https://github.com/XTLS/Xray-core/releases](https://github.com/XTLS/Xray-core/releases)
--- a/v2rayN/v2rayN/Base/ListViewFlickerFree.cs
+++ b/v2rayN/v2rayN/Base/ListViewFlickerFree.cs
@@ -1,10 +1,13 @@
-using System.Drawing;
+using System;
+using System.Drawing;
 using System.Windows.Forms;

 namespace v2rayN.Base
 {
    class ListViewFlickerFree : ListView
    {
+        Action<int, int> _updateFunc;
+
        public ListViewFlickerFree()
        {
            SetStyle(ControlStyles.OptimizedDoubleBuffer
@@ -13,40 +16,82 @@ namespace v2rayN.Base
            UpdateStyles();
        }

-
-        public void AutoResizeColumns()
+        public void RegisterDragEvent(Action<int, int> _update)
        {
-            try
-            {
-                this.SuspendLayout();
-                Graphics graphics = this.CreateGraphics();
+            _updateFunc = _update;
+            this.AllowDrop = true;

-                // 原生 ColumnHeaderAutoResizeStyle.ColumnContent 将忽略列头宽度
-                this.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize);
-
-                for (int i = 0; i < this.Columns.Count; i++)
-                {
-                    ColumnHeader c = this.Columns[i];
-                    int cWidth = c.Width;
-                    string MaxStr = "";
-                    Font font = this.Items[0].SubItems[0].Font;
-
-                    foreach (ListViewItem item in this.Items)
-                    {
-                        // 整行视作相同字形，不单独计算每个单元格
-                        font = item.SubItems[i].Font;
-                        string str = item.SubItems[i].Text;
-                        if (str.Length > MaxStr.Length) // 未考虑非等宽问题
-                            MaxStr = str;
-                    }
-                    int strWidth = (int)graphics.MeasureString(MaxStr, font).Width;
-                    c.Width = System.Math.Max(cWidth, strWidth);
-                }
-                this.ResumeLayout();
-            }
-            catch { }
+            this.ItemDrag += new ItemDragEventHandler(this.lv_ItemDrag);
+            this.DragDrop += new DragEventHandler(this.lv_DragDrop);
+            this.DragEnter += new DragEventHandler(this.lv_DragEnter);
+            this.DragOver += new DragEventHandler(this.lv_DragOver);
+            this.DragLeave += new EventHandler(this.lv_DragLeave);
        }

-      
+        private void lv_DragDrop(object sender, DragEventArgs e)
+        {
+            int targetIndex = this.InsertionMark.Index;
+            if (targetIndex == -1)
+            {
+                return;
+            }
+            if (this.InsertionMark.AppearsAfterItem)
+            {
+                targetIndex++;
+            }
+
+
+            if (this.SelectedIndices.Count <= 0)
+            {
+                return;
+            }
+
+            _updateFunc(this.SelectedIndices[0], targetIndex);
+
+            //ListViewItem draggedItem = (ListViewItem)e.Data.GetData(typeof(ListViewItem));
+            //this.BeginUpdate();
+            //this.Items.Insert(targetIndex, (ListViewItem)draggedItem.Clone());
+            //this.Items.Remove(draggedItem);
+            //this.EndUpdate();
+        }
+
+
+        private void lv_DragEnter(object sender, DragEventArgs e)
+        {
+            e.Effect = e.AllowedEffect;
+        }
+
+        private void lv_DragLeave(object sender, EventArgs e)
+        {
+            this.InsertionMark.Index = -1;
+        }
+
+        private void lv_DragOver(object sender, DragEventArgs e)
+        {
+            Point targetPoint = this.PointToClient(new Point(e.X, e.Y));
+            int targetIndex = this.InsertionMark.NearestIndex(targetPoint);
+
+            if (targetIndex > -1)
+            {
+                Rectangle itemBounds = this.GetItemRect(targetIndex);
+                this.EnsureVisible(targetIndex);
+
+                if (targetPoint.Y > itemBounds.Top + (itemBounds.Height / 2))
+                {
+                    this.InsertionMark.AppearsAfterItem = true;
+                }
+                else
+                {
+                    this.InsertionMark.AppearsAfterItem = false;
+                }
+            }
+            this.InsertionMark.Index = targetIndex;
+        }
+
+        private void lv_ItemDrag(object sender, ItemDragEventArgs e)
+        {
+            this.DoDragDrop(e.Item, DragDropEffects.Move);
+            this.InsertionMark.Index = -1;
+        }
    }
 }
--- a/v2rayN/v2rayN/Forms/AddServer2Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer2Form.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -19,6 +20,7 @@ namespace v2rayN.Forms
        {
            cmbCoreType.Items.AddRange(Global.coreTypes.ToArray());
            cmbCoreType.Items.Add("clash");
+            cmbCoreType.Items.Add("hysteria");
            cmbCoreType.Items.Add(string.Empty);

            txtAddress.ReadOnly = true;
@@ -66,12 +68,12 @@ namespace v2rayN.Forms
            string remarks = txtRemarks.Text;
            if (Utils.IsNullOrEmpty(remarks))
            {
-                UI.Show(UIRes.I18N("PleaseFillRemarks"));
+                UI.Show(ResUI.PleaseFillRemarks);
                return;
            }
            if (Utils.IsNullOrEmpty(txtAddress.Text))
            {
-                UI.Show(UIRes.I18N("FillServerAddressCustom"));
+                UI.Show(ResUI.FillServerAddressCustom);
                return;
            }
            vmessItem.remarks = remarks;
@@ -90,7 +92,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(ResUI.OperationFailed);
            }
        }

@@ -108,7 +110,7 @@ namespace v2rayN.Forms

        private void btnBrowse_Click(object sender, EventArgs e)
        {
-            UI.Show(UIRes.I18N("CustomServerTips"));
+            UI.Show(ResUI.CustomServerTips);

            OpenFileDialog fileDialog = new OpenFileDialog
            {
@@ -131,11 +133,11 @@ namespace v2rayN.Forms
            if (ConfigHandler.AddCustomServer(ref config, vmessItem, false) == 0)
            {
                BindingServer();
-                UI.Show(UIRes.I18N("SuccessfullyImportedCustomServer"));
+                UI.Show(ResUI.SuccessfullyImportedCustomServer);
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("FailedImportedCustomServer"));
+                UI.ShowWarning(ResUI.FailedImportedCustomServer);
            }
        }

@@ -144,7 +146,7 @@ namespace v2rayN.Forms
            var address = txtAddress.Text;
            if (Utils.IsNullOrEmpty(address))
            {
-                UI.Show(UIRes.I18N("FillServerAddressCustom"));
+                UI.Show(ResUI.FillServerAddressCustom);
                return;
            }

--- a/v2rayN/v2rayN/Forms/AddServerForm.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -194,24 +195,24 @@ namespace v2rayN.Forms

            if (Utils.IsNullOrEmpty(address))
            {
-                UI.Show(UIRes.I18N("FillServerAddress"));
+                UI.Show(ResUI.FillServerAddress);
                return;
            }
            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumberic(port))
            {
-                UI.Show(UIRes.I18N("FillCorrectServerPort"));
+                UI.Show(ResUI.FillCorrectServerPort);
                return;
            }
            if (eConfigType == EConfigType.Shadowsocks)
            {
                if (Utils.IsNullOrEmpty(id))
                {
-                    UI.Show(UIRes.I18N("FillPassword"));
+                    UI.Show(ResUI.FillPassword);
                    return;
                }
                if (Utils.IsNullOrEmpty(security))
                {
-                    UI.Show(UIRes.I18N("PleaseSelectEncryption"));
+                    UI.Show(ResUI.PleaseSelectEncryption);
                    return;
                }
            }
@@ -219,7 +220,7 @@ namespace v2rayN.Forms
            {
                if (Utils.IsNullOrEmpty(id))
                {
-                    UI.Show(UIRes.I18N("FillUUID"));
+                    UI.Show(ResUI.FillUUID);
                    return;
                }
            }
@@ -270,7 +271,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(ResUI.OperationFailed);
            }

        }
--- a/v2rayN/v2rayN/Forms/GlobalHotkeySettingForm.cs
+++ b/v2rayN/v2rayN/Forms/GlobalHotkeySettingForm.cs
@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -104,7 +105,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(ResUI.OperationFailed);
            }
        }

--- a/v2rayN/v2rayN/Forms/GroupSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/GroupSettingForm.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -73,7 +74,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(ResUI.OperationFailed);
            }
        }

--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -47,6 +47,7 @@
            this.menuCopyServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuSetDefaultServer = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.menuMoveToGroup = new System.Windows.Forms.ToolStripMenuItem();
            this.menuMoveTop = new System.Windows.Forms.ToolStripMenuItem();
            this.menuMoveUp = new System.Windows.Forms.ToolStripMenuItem();
            this.menuMoveDown = new System.Windows.Forms.ToolStripMenuItem();
@@ -64,9 +65,9 @@
            this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
            this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem();
            this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
            this.tabGroup = new System.Windows.Forms.TabControl();
            this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
-            this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.gbMsgTitle = new System.Windows.Forms.GroupBox();
@@ -208,6 +209,7 @@
            this.menuCopyServer,
            this.menuSetDefaultServer,
            this.toolStripSeparator3,
+            this.menuMoveToGroup,
            this.menuMoveTop,
            this.menuMoveUp,
            this.menuMoveDown,
@@ -226,6 +228,7 @@
            this.menuExport2ShareUrl,
            this.menuExport2SubContent});
            this.cmsLv.Name = "cmsLv";
+            this.cmsLv.OwnerItem = this.tsbServer;
            resources.ApplyResources(this.cmsLv, "cmsLv");
            // 
            // menuAddVmessServer
@@ -310,6 +313,12 @@
            this.toolStripSeparator3.Name = "toolStripSeparator3";
            resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
            // 
+            // menuMoveToGroup
+            // 
+            this.menuMoveToGroup.Name = "menuMoveToGroup";
+            resources.ApplyResources(this.menuMoveToGroup, "menuMoveToGroup");
+            this.menuMoveToGroup.Click += new System.EventHandler(this.menuMoveToGroup_Click);
+            // 
            // menuMoveTop
            // 
            this.menuMoveTop.Name = "menuMoveTop";
@@ -410,6 +419,13 @@
            resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
            this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
            // 
+            // tsbServer
+            // 
+            this.tsbServer.DropDown = this.cmsLv;
+            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
+            resources.ApplyResources(this.tsbServer, "tsbServer");
+            this.tsbServer.Name = "tsbServer";
+            // 
            // tabGroup
            // 
            resources.ApplyResources(this.tabGroup, "tabGroup");
@@ -422,13 +438,6 @@
            resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
            this.qrCodeControl.Name = "qrCodeControl";
            // 
-            // tsbServer
-            // 
-            this.tsbServer.DropDown = this.cmsLv;
-            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
-            resources.ApplyResources(this.tsbServer, "tsbServer");
-            this.tsbServer.Name = "tsbServer";
-            // 
            // splitContainer1
            // 
            resources.ApplyResources(this.splitContainer1, "splitContainer1");
@@ -1076,6 +1085,7 @@
        private System.Windows.Forms.ToolStripMenuItem tsbGlobalHotkeySetting;
        private System.Windows.Forms.TabControl tabGroup;
        private System.Windows.Forms.ToolStripMenuItem tsbGroupSetting;
+        private System.Windows.Forms.ToolStripMenuItem menuMoveToGroup;
    }
 }

--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -12,6 +12,7 @@ using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Tool;
 using System.Linq;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -149,12 +150,17 @@ namespace v2rayN.Forms
        {
            scMain.Panel2Collapsed = true;

+            if (!config.uiItem.mainLocation.IsEmpty)
+            {
+                this.Location = config.uiItem.mainLocation;
+            }
            if (!config.uiItem.mainSize.IsEmpty)
            {
                this.Width = config.uiItem.mainSize.Width;
                this.Height = config.uiItem.mainSize.Height;
            }

+
            for (int k = 0; k < lvServers.Columns.Count; k++)
            {
                var width = ConfigHandler.GetformMainLvColWidth(ref config, ((EServerColName)k).ToString(), lvServers.Columns[k].Width);
@@ -164,6 +170,8 @@ namespace v2rayN.Forms

        private void StorageUI()
        {
+            config.uiItem.mainLocation = this.Location;
+
            config.uiItem.mainSize = new Size(this.Width, this.Height);

            for (int k = 0; k < lvServers.Columns.Count; k++)
@@ -225,34 +233,47 @@ namespace v2rayN.Forms
            lvServers.Scrollable = true;
            lvServers.MultiSelect = true;
            lvServers.HeaderStyle = ColumnHeaderStyle.Clickable;
+            lvServers.RegisterDragEvent(UpdateDragEventHandler);

            lvServers.Columns.Add("", 30);
-            lvServers.Columns.Add(UIRes.I18N("LvServiceType"), 80);
-            lvServers.Columns.Add(UIRes.I18N("LvAlias"), 100);
-            lvServers.Columns.Add(UIRes.I18N("LvAddress"), 120);
-            lvServers.Columns.Add(UIRes.I18N("LvPort"), 100);
-            lvServers.Columns.Add(UIRes.I18N("LvEncryptionMethod"), 120);
-            lvServers.Columns.Add(UIRes.I18N("LvTransportProtocol"), 120);
-            lvServers.Columns.Add(UIRes.I18N("LvTLS"), 100);
-            lvServers.Columns.Add(UIRes.I18N("LvSubscription"), 100);
-            lvServers.Columns.Add(UIRes.I18N("LvTestResults"), 120, HorizontalAlignment.Right);
+            lvServers.Columns.Add(ResUI.LvServiceType, 80);
+            lvServers.Columns.Add(ResUI.LvAlias, 100);
+            lvServers.Columns.Add(ResUI.LvAddress, 120);
+            lvServers.Columns.Add(ResUI.LvPort, 100);
+            lvServers.Columns.Add(ResUI.LvEncryptionMethod, 120);
+            lvServers.Columns.Add(ResUI.LvTransportProtocol, 120);
+            lvServers.Columns.Add(ResUI.LvTLS, 100);
+            lvServers.Columns.Add(ResUI.LvSubscription, 100);
+            lvServers.Columns.Add(ResUI.LvTestResults, 120, HorizontalAlignment.Right);

            if (statistics != null && statistics.Enable)
            {
-                lvServers.Columns.Add(UIRes.I18N("LvTodayDownloadDataAmount"), 70);
-                lvServers.Columns.Add(UIRes.I18N("LvTodayUploadDataAmount"), 70);
-                lvServers.Columns.Add(UIRes.I18N("LvTotalDownloadDataAmount"), 70);
-                lvServers.Columns.Add(UIRes.I18N("LvTotalUploadDataAmount"), 70);
+                lvServers.Columns.Add(ResUI.LvTodayDownloadDataAmount, 70);
+                lvServers.Columns.Add(ResUI.LvTodayUploadDataAmount, 70);
+                lvServers.Columns.Add(ResUI.LvTotalDownloadDataAmount, 70);
+                lvServers.Columns.Add(ResUI.LvTotalUploadDataAmount, 70);
            }
            lvServers.EndUpdate();
        }

+        private void UpdateDragEventHandler(int index, int targetIndex)
+        {
+            if (index < 0 || targetIndex < 0)
+            {
+                return;
+            }
+            if (ConfigHandler.MoveServer(ref config, ref lstVmess, index, EMove.Position, targetIndex) == 0)
+            {
+                RefreshServers();
+            }
+        }
+
        /// <summary>
        /// 刷新服务器列表
        /// </summary>
        private void RefreshServersView()
        {
-            int index = lvServers.SelectedIndices.Count > 0 ? lvServers.SelectedIndices[0] : -1;
+            int index = GetLvSelectedIndex(false);

            lvServers.BeginUpdate();
            lvServers.Items.Clear();
@@ -260,29 +281,12 @@ namespace v2rayN.Forms
            for (int k = 0; k < lstVmess.Count; k++)
            {
                string def = string.Empty;
-                string totalUp = string.Empty,
-                        totalDown = string.Empty,
-                        todayUp = string.Empty,
-                        todayDown = string.Empty;
-
                VmessItem item = lstVmess[k];
                if (config.IsActiveNode(item))
                {
                    def = "√";
                }

-                bool stats = statistics != null && statistics.Enable;
-                if (stats)
-                {
-                    ServerStatItem sItem = statistics.Statistic.Find(item_ => item_.itemId == item.indexId);
-                    if (sItem != null)
-                    {
-                        totalUp = Utils.HumanFy(sItem.totalUp);
-                        totalDown = Utils.HumanFy(sItem.totalDown);
-                        todayUp = Utils.HumanFy(sItem.todayUp);
-                        todayDown = Utils.HumanFy(sItem.todayDown);
-                    }
-                }
                ListViewItem lvItem = new ListViewItem(def);
                Utils.AddSubItem(lvItem, EServerColName.configType.ToString(), (item.configType).ToString());
                Utils.AddSubItem(lvItem, EServerColName.remarks.ToString(), item.remarks);
@@ -293,8 +297,22 @@ namespace v2rayN.Forms
                Utils.AddSubItem(lvItem, EServerColName.streamSecurity.ToString(), item.streamSecurity);
                Utils.AddSubItem(lvItem, EServerColName.subRemarks.ToString(), item.GetSubRemarks(config));
                Utils.AddSubItem(lvItem, EServerColName.testResult.ToString(), item.testResult);
-                if (stats)
+
+                if (statistics != null && statistics.Enable)
                {
+                    string totalUp = string.Empty,
+                        totalDown = string.Empty,
+                        todayUp = string.Empty,
+                        todayDown = string.Empty;
+                    ServerStatItem sItem = statistics.Statistic.Find(item_ => item_.itemId == item.indexId);
+                    if (sItem != null)
+                    {
+                        totalUp = Utils.HumanFy(sItem.totalUp);
+                        totalDown = Utils.HumanFy(sItem.totalDown);
+                        todayUp = Utils.HumanFy(sItem.todayUp);
+                        todayDown = Utils.HumanFy(sItem.todayDown);
+                    }
+
                    Utils.AddSubItem(lvItem, EServerColName.todayDown.ToString(), todayDown);
                    Utils.AddSubItem(lvItem, EServerColName.todayUp.ToString(), todayUp);
                    Utils.AddSubItem(lvItem, EServerColName.totalDown.ToString(), totalDown);
@@ -395,32 +413,9 @@ namespace v2rayN.Forms
        }

        private void lvServers_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            int index = -1;
-            try
-            {
-                if (lvServers.SelectedIndices.Count > 0)
-                {
-                    index = lvServers.SelectedIndices[0];
-                }
-            }
-            catch
-            {
-            }
-            if (index < 0)
-            {
-                return;
-            }
-            //qrCodeControl.showQRCode(index, config);
+        {            
        }

-        private void DisplayToolStatus()
-        {
-            toolSslInboundInfo.Text = $"{Global.InboundSocks} {Global.Loopback}:{config.inbound[0].localPort} | "
-             + $"{ Global.InboundHttp} { Global.Loopback}:{Global.httpPort}";
-
-            notifyMain.Icon = MainFormHandler.Instance.GetNotifyIcon(config, this.Icon);
-        }
        private void ssMain_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
        {
            if (!Utils.IsNullOrEmpty(e.ClickedItem.Text))
@@ -472,7 +467,7 @@ namespace v2rayN.Forms
        {
            tabGroup.TabPages.Clear();

-            string title = $"  {UIRes.I18N("AllGroupServers")}   ";
+            string title = $"  {ResUI.AllGroupServers}   ";
            var tabPage = new TabPage(title);
            tabPage.Name = "";
            tabGroup.TabPages.Add(tabPage);
@@ -485,6 +480,23 @@ namespace v2rayN.Forms
            }

            tabGroup.SelectedIndex = 0;
+
+            //menuMoveToGroup
+            menuMoveToGroup.DropDownItems.Clear();
+
+            List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
+            foreach (var item in config.groupItem)
+            {
+                string name = item.remarks;
+
+                ToolStripMenuItem ts = new ToolStripMenuItem(name)
+                {
+                    Tag = item.id,
+                };
+                ts.Click += new EventHandler(ts_Group_Click);
+                lst.Add(ts);
+            }
+            menuMoveToGroup.DropDownItems.AddRange(lst.ToArray());
        }

        private void tabGroup_SelectedIndexChanged(object sender, EventArgs e)
@@ -501,6 +513,29 @@ namespace v2rayN.Forms

            lvServers.Focus();
        }
+
+        private void ts_Group_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ToolStripItem ts = (ToolStripItem)sender;
+                var groupIdSelected = Utils.ToString(ts.Tag);
+
+                int index = GetLvSelectedIndex();
+                if (index < 0)
+                {
+                    return;
+                }
+
+                if (ConfigHandler.MoveServerToGroup(config, lstSelecteds, groupIdSelected) == 0)
+                {
+                    RefreshServers();
+                }
+            }
+            catch
+            {
+            }
+        }
        #endregion

        #region v2ray 操作
@@ -549,17 +584,7 @@ namespace v2rayN.Forms

        private void lvServers_Click(object sender, EventArgs e)
        {
-            int index = -1;
-            try
-            {
-                if (lvServers.SelectedIndices.Count > 0)
-                {
-                    index = lvServers.SelectedIndices[0];
-                }
-            }
-            catch
-            {
-            }
+            int index = GetLvSelectedIndex(false);
            if (index < 0)
            {
                return;
@@ -674,7 +699,7 @@ namespace v2rayN.Forms
            {
                return;
            }
-            if (UI.ShowYesNo(UIRes.I18N("RemoveServer")) == DialogResult.No)
+            if (UI.ShowYesNo(ResUI.RemoveServer) == DialogResult.No)
            {
                return;
            }
@@ -688,10 +713,10 @@ namespace v2rayN.Forms
        private void menuRemoveDuplicateServer_Click(object sender, EventArgs e)
        {
            int oldCount = lstVmess.Count;
-            int newCount = ConfigHandler.DedupServerList(ref config, ref lstVmess);          
+            int newCount = ConfigHandler.DedupServerList(ref config, ref lstVmess);
            RefreshServers();
            _ = LoadV2ray();
-            UI.Show(string.Format(UIRes.I18N("RemoveDuplicateServerResult"), oldCount, newCount));
+            UI.Show(string.Format(ResUI.RemoveDuplicateServerResult, oldCount, newCount));
        }

        private void menuCopyServer_Click(object sender, EventArgs e)
@@ -720,50 +745,50 @@ namespace v2rayN.Forms

        private void menuPingServer_Click(object sender, EventArgs e)
        {
-            Speedtest("ping");
+            Speedtest(ESpeedActionType.Ping);
        }
        private void menuTcpingServer_Click(object sender, EventArgs e)
        {
-            Speedtest("tcping");
+            Speedtest(ESpeedActionType.Tcping);
        }

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

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

-            Speedtest("realping");
+            Speedtest(ESpeedActionType.Realping);
        }

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

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

-            Speedtest("speedtest");
+            Speedtest(ESpeedActionType.Speedtest);
        }
-        private void Speedtest(string actionType)
+        private void Speedtest(ESpeedActionType actionType)
        {
            if (GetLvSelectedIndex() < 0) return;
            ClearTestResult();
-            SpeedtestHandler statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lstSelecteds, actionType, UpdateSpeedtestHandler);
+            SpeedtestHandler statistics = new SpeedtestHandler(ref config, v2rayHandler, lstSelecteds, actionType, UpdateSpeedtestHandler);
        }

        private void tsbTestMe_Click(object sender, EventArgs e)
        {
            SpeedtestHandler statistics = new SpeedtestHandler(ref config);
            string result = statistics.RunAvailabilityCheck() + "ms";
-            AppendText(false, string.Format(UIRes.I18N("TestMeOutput"), result));
+            AppendText(false, string.Format(ResUI.TestMeOutput, result));
        }

        private void menuClearStatistic_Click(object sender, EventArgs e)
@@ -804,8 +829,8 @@ namespace v2rayN.Forms
            if (sb.Length > 0)
            {
                Utils.SetClipboardData(sb.ToString());
-                AppendText(false, UIRes.I18N("BatchExportURLSuccessfully"));
-                //UI.Show(UIRes.I18N("BatchExportURLSuccessfully"));
+                AppendText(false, ResUI.BatchExportURLSuccessfully);
+                //UI.Show(ResUI.BatchExportURLSuccessfully"));
            }
        }

@@ -827,7 +852,7 @@ namespace v2rayN.Forms
            if (sb.Length > 0)
            {
                Utils.SetClipboardData(Utils.Base64Encode(sb.ToString()));
-                UI.Show(UIRes.I18N("BatchExportSubscriptionSuccessfully"));
+                UI.Show(ResUI.BatchExportSubscriptionSuccessfully);
            }
        }

@@ -897,7 +922,7 @@ namespace v2rayN.Forms
        {
            if (index < 0)
            {
-                UI.Show(UIRes.I18N("PleaseSelectServer"));
+                UI.Show(ResUI.PleaseSelectServer);
                return -1;
            }
            if (ConfigHandler.SetDefaultServer(ref config, lstVmess[index]) == 0)
@@ -912,7 +937,7 @@ namespace v2rayN.Forms
        /// 取得ListView选中的行
        /// </summary>
        /// <returns></returns>
-        private int GetLvSelectedIndex()
+        private int GetLvSelectedIndex(bool show = true)
        {
            int index = -1;
            lstSelecteds.Clear();
@@ -920,7 +945,10 @@ namespace v2rayN.Forms
            {
                if (lvServers.SelectedIndices.Count <= 0)
                {
-                    UI.Show(UIRes.I18N("PleaseSelectServer"));
+                    if (show)
+                    {
+                        UI.Show(ResUI.PleaseSelectServer);
+                    }
                    return index;
                }

@@ -967,7 +995,7 @@ namespace v2rayN.Forms
            if (ret > 0)
            {
                RefreshServers();
-                UI.Show(string.Format(UIRes.I18N("SuccessfullyImportedServerViaClipboard"), ret));
+                UI.Show(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
            }
        }

@@ -989,7 +1017,7 @@ namespace v2rayN.Forms

            if (Utils.IsNullOrEmpty(result))
            {
-                UI.ShowWarning(UIRes.I18N("NoValidQRcodeFound"));
+                UI.ShowWarning(ResUI.NoValidQRcodeFound);
            }
            else
            {
@@ -997,7 +1025,7 @@ namespace v2rayN.Forms
                if (ret > 0)
                {
                    RefreshServers();
-                    UI.Show(UIRes.I18N("SuccessfullyImportedServerViaScan"));
+                    UI.Show(ResUI.SuccessfullyImportedServerViaScan);
                }
            }
        }
@@ -1136,11 +1164,13 @@ namespace v2rayN.Forms
            this.ShowInTaskbar = true;
            //this.notifyIcon1.Visible = false;
            this.txtMsgBox.ScrollToCaret();
-            //if (config.index >= 0 && config.index < lvServers.Items.Count)
-            //{
-            //    lvServers.Items[config.index].Selected = true;
-            //    lvServers.EnsureVisible(config.index); // workaround
-            //}
+
+            int index = GetLvSelectedIndex(false);
+            if (index >= 0 && index < lvServers.Items.Count && lvServers.Items.Count > 0)
+            {
+                lvServers.Items[index].Selected = true;
+                lvServers.EnsureVisible(index); // workaround
+            }

            SetVisibleCore(true);
        }
@@ -1199,25 +1229,26 @@ namespace v2rayN.Forms
                down /= (ulong)(config.statisticsFreshRate / 1000f);
                toolSslServerSpeed.Text = string.Format("{0}/s↑ | {1}/s↓", Utils.HumanFy(up), Utils.HumanFy(down));

-                List<string[]> datas = new List<string[]>();
-                for (int i = 0; i < lstVmess.Count; i++)
+                foreach (var it in statistics)
                {
-                    int index = statistics.FindIndex(item_ => item_.itemId == lstVmess[i].indexId);
-                    if (index != -1)
+                    int index = lstVmess.FindIndex(item => item.indexId == it.itemId);
+                    if (index < 0)
                    {
-                        lvServers.Invoke((MethodInvoker)delegate
-                        {
-                            lvServers.BeginUpdate();
-
-                            lvServers.Items[i].SubItems["todayDown"].Text = Utils.HumanFy(statistics[index].todayDown);
-                            lvServers.Items[i].SubItems["todayUp"].Text = Utils.HumanFy(statistics[index].todayUp);
-                            lvServers.Items[i].SubItems["totalDown"].Text = Utils.HumanFy(statistics[index].totalDown);
-                            lvServers.Items[i].SubItems["totalUp"].Text = Utils.HumanFy(statistics[index].totalUp);
-
-                            lvServers.EndUpdate();
-                        });
+                        continue;
                    }
+                    lvServers.Invoke((MethodInvoker)delegate
+                    {
+                        lvServers.BeginUpdate();
+
+                        lvServers.Items[index].SubItems["todayDown"].Text = Utils.HumanFy(it.todayDown);
+                        lvServers.Items[index].SubItems["todayUp"].Text = Utils.HumanFy(it.todayUp);
+                        lvServers.Items[index].SubItems["totalDown"].Text = Utils.HumanFy(it.totalDown);
+                        lvServers.Items[index].SubItems["totalUp"].Text = Utils.HumanFy(it.totalUp);
+
+                        lvServers.EndUpdate();
+                    });
                }
+                
            }
            catch (Exception ex)
            {
@@ -1263,7 +1294,7 @@ namespace v2rayN.Forms
            int index = GetLvSelectedIndex();
            if (index < 0)
            {
-                UI.Show(UIRes.I18N("PleaseSelectServer"));
+                UI.Show(ResUI.PleaseSelectServer);
                return;
            }
            if (ConfigHandler.MoveServer(ref config, ref lstVmess, index, eMove) == 0)
@@ -1280,7 +1311,9 @@ namespace v2rayN.Forms
                item.Selected = true;
            }
        }
-
+        private void menuMoveToGroup_Click(object sender, EventArgs e)
+        {
+        }
        #endregion

        #region 系统代理相关
@@ -1317,6 +1350,23 @@ namespace v2rayN.Forms
            DisplayToolStatus();
        }

+        private void DisplayToolStatus()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($"{Global.InboundSocks} {Global.Loopback}:{config.GetLocalPort(Global.InboundSocks)}");
+            sb.Append(" | ");
+            sb.Append($"{Global.InboundHttp} {Global.Loopback}:{config.GetLocalPort(Global.InboundHttp)}");
+
+            if (config.sysProxyType == ESysProxyType.ForcedChange)
+            {
+                sb.Append(" | ");
+                sb.Append($"{ResUI.SystemProxy} {Global.Loopback}:{config.GetLocalPort(Global.InboundHttp2)}");
+            }
+
+            toolSslInboundInfo.Text = sb.ToString();
+
+            notifyMain.Icon = MainFormHandler.Instance.GetNotifyIcon(config, this.Icon);
+        }
        #endregion


@@ -1337,15 +1387,15 @@ namespace v2rayN.Forms

        private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
        {
-            CheckUpdateCore("v2fly");
+            CheckUpdateCore(ECoreType.v2fly);
        }

        private void tsbCheckUpdateXrayCore_Click(object sender, EventArgs e)
        {
-            CheckUpdateCore("xray");
+            CheckUpdateCore(ECoreType.Xray);
        }

-        private void CheckUpdateCore(string type)
+        private void CheckUpdateCore(ECoreType type)
        {
            void _updateUI(bool success, string msg)
            {
@@ -1357,12 +1407,12 @@ namespace v2rayN.Forms
                    string fileName = Utils.GetPath(Utils.GetDownloadFileName(msg));
                    FileManager.ZipExtractToFile(fileName, config.ignoreGeoUpdateCore ? "geo" : "");

-                    AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfullyMore"));
+                    AppendText(false, ResUI.MsgUpdateV2rayCoreSuccessfullyMore);

                    Global.reloadV2ray = true;
                    _ = LoadV2ray();

-                    AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfully"));
+                    AppendText(false, ResUI.MsgUpdateV2rayCoreSuccessfully);
                }
            };
            (new UpdateHandle()).CheckUpdateCore(type, config, _updateUI);
@@ -1604,7 +1654,7 @@ namespace v2rayN.Forms
            if (fm.ShowDialog() == DialogResult.OK)
            {
                MsgFilter = fm.MsgFilter;
-                gbMsgTitle.Text = string.Format(UIRes.I18N("MsgInformationTitle"), MsgFilter);
+                gbMsgTitle.Text = string.Format(ResUI.MsgInformationTitle, MsgFilter);
            }
        }
        #endregion
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -206,6 +206,12 @@
  <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
    <value>352, 6</value>
  </data>
+  <data name="menuMoveToGroup.Size" type="System.Drawing.Size, System.Drawing">
+    <value>355, 22</value>
+  </data>
+  <data name="menuMoveToGroup.Text" xml:space="preserve">
+    <value>Move to Group</value>
+  </data>
  <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
    <value>355, 22</value>
  </data>
@@ -302,8 +308,20 @@
  <data name="menuExport2SubContent.Text" xml:space="preserve">
    <value>Export subscription (base64) share to clipboard</value>
  </data>
+  <data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>64, 53</value>
+  </data>
+  <data name="tsbServer.Text" xml:space="preserve">
+    <value>Servers</value>
+  </data>
+  <data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
  <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>356, 622</value>
+    <value>356, 666</value>
  </data>
  <data name="&gt;&gt;cmsLv.Name" xml:space="preserve">
    <value>cmsLv</value>
@@ -452,18 +470,6 @@
  <data name="&gt;&gt;scMain.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 53</value>
-  </data>
-  <data name="tsbServer.Text" xml:space="preserve">
-    <value>Servers</value>
-  </data>
-  <data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
  <data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
@@ -549,7 +555,7 @@
    <value>Set message filters</value>
  </data>
  <data name="cmsMsgBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>228, 158</value>
+    <value>228, 136</value>
  </data>
  <data name="&gt;&gt;cmsMsgBox.Name" xml:space="preserve">
    <value>cmsMsgBox</value>
@@ -792,7 +798,7 @@
    <value>264, 22</value>
  </data>
  <data name="menuUpdateSubscriptions.Text" xml:space="preserve">
-    <value>Update subscriptions</value>
+    <value>Update subscription without proxy</value>
  </data>
  <data name="menuUpdateSubViaProxy.Size" type="System.Drawing.Size, System.Drawing">
    <value>264, 22</value>
@@ -864,13 +870,13 @@
    <value>182, 22</value>
  </data>
  <data name="tsbSubUpdate.Text" xml:space="preserve">
-    <value>Updates</value>
+    <value>Update subscription without proxy</value>
  </data>
  <data name="tsbSubUpdateViaProxy.Size" type="System.Drawing.Size, System.Drawing">
    <value>182, 22</value>
  </data>
  <data name="tsbSubUpdateViaProxy.Text" xml:space="preserve">
-    <value>Updates via proxy</value>
+    <value>Update subscription with proxy</value>
  </data>
  <data name="tsbSub.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
    <value>Magenta</value>
@@ -1205,6 +1211,12 @@
  <data name="&gt;&gt;toolStripSeparator3.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;menuMoveToGroup.Name" xml:space="preserve">
+    <value>menuMoveToGroup</value>
+  </data>
+  <data name="&gt;&gt;menuMoveToGroup.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;menuMoveTop.Name" xml:space="preserve">
    <value>menuMoveTop</value>
  </data>
--- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -421,7 +421,7 @@
    <value>260, 22</value>
  </data>
  <data name="menuUpdateSubscriptions.Text" xml:space="preserve">
-    <value>更新订阅</value>
+    <value>更新订阅(不通过代理)</value>
  </data>
  <data name="menuUpdateSubViaProxy.Size" type="System.Drawing.Size, System.Drawing">
    <value>260, 22</value>
@@ -451,7 +451,7 @@
    <value>180, 22</value>
  </data>
  <data name="tsbSubUpdate.Text" xml:space="preserve">
-    <value>更新订阅</value>
+    <value>更新订阅(不通过代理)</value>
  </data>
  <data name="tsbSubUpdateViaProxy.Size" type="System.Drawing.Size, System.Drawing">
    <value>180, 22</value>
@@ -573,4 +573,7 @@
  <data name="tsbClose.Text" xml:space="preserve">
    <value>  关闭窗口  </value>
  </data>
+  <data name="menuMoveToGroup.Text" xml:space="preserve">
+    <value>移至分组</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/MsgFilterSetForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MsgFilterSetForm.Designer.cs
@@ -34,14 +34,18 @@
            this.panel2 = new System.Windows.Forms.Panel();
            this.btnClose = new System.Windows.Forms.Button();
            this.btnOK = new System.Windows.Forms.Button();
+            this.btnFilterDirect = new System.Windows.Forms.Button();
+            this.btnFilderProxy = new System.Windows.Forms.Button();
            this.groupBox1.SuspendLayout();
            this.panel2.SuspendLayout();
            this.SuspendLayout();
            // 
            // groupBox1
            // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.btnFilderProxy);
+            this.groupBox1.Controls.Add(this.btnFilterDirect);
            this.groupBox1.Controls.Add(this.txtMsgFilter);
+            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
@@ -52,15 +56,15 @@
            // 
            // 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";
            // 
            // btnClose
            // 
-            resources.ApplyResources(this.btnClose, "btnClose");
            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            resources.ApplyResources(this.btnClose, "btnClose");
            this.btnClose.Name = "btnClose";
            this.btnClose.UseVisualStyleBackColor = true;
            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
@@ -72,6 +76,20 @@
            this.btnOK.UseVisualStyleBackColor = true;
            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
            // 
+            // btnFilterDirect
+            // 
+            resources.ApplyResources(this.btnFilterDirect, "btnFilterDirect");
+            this.btnFilterDirect.Name = "btnFilterDirect";
+            this.btnFilterDirect.UseVisualStyleBackColor = true;
+            this.btnFilterDirect.Click += new System.EventHandler(this.btnFilterDirect_Click);
+            // 
+            // btnFilderProxy
+            // 
+            resources.ApplyResources(this.btnFilderProxy, "btnFilderProxy");
+            this.btnFilderProxy.Name = "btnFilderProxy";
+            this.btnFilderProxy.UseVisualStyleBackColor = true;
+            this.btnFilderProxy.Click += new System.EventHandler(this.btnFilderProxy_Click);
+            // 
            // MsgFilterSetForm
            // 
            resources.ApplyResources(this, "$this");
@@ -94,5 +112,7 @@
        private System.Windows.Forms.Panel panel2;
        private System.Windows.Forms.Button btnClose;
        private System.Windows.Forms.Button btnOK;
+        private System.Windows.Forms.Button btnFilderProxy;
+        private System.Windows.Forms.Button btnFilterDirect;
    }
 }
--- a/v2rayN/v2rayN/Forms/MsgFilterSetForm.cs
+++ b/v2rayN/v2rayN/Forms/MsgFilterSetForm.cs
@@ -34,5 +34,15 @@ namespace v2rayN.Forms
        {
            this.DialogResult = DialogResult.Cancel;
        }
+
+        private void btnFilderProxy_Click(object sender, EventArgs e)
+        {
+            txtMsgFilter.Text = "^(?!.*proxy).*$";
+        }
+
+        private void btnFilterDirect_Click(object sender, EventArgs e)
+        {
+            txtMsgFilter.Text = "^(?!.*direct).*$";
+        }
    }
 }
--- a/v2rayN/v2rayN/Forms/MsgFilterSetForm.resx
+++ b/v2rayN/v2rayN/Forms/MsgFilterSetForm.resx
@@ -117,151 +117,226 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="&gt;&gt;txtMsgFilter.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;txtMsgFilter.Name" xml:space="preserve">
-    <value>txtMsgFilter</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>&amp;OK</value>
-  </data>
-  <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="btnClose.Text" xml:space="preserve">
-    <value>&amp;Cancel</value>
-  </data>
-  <data name="&gt;&gt;txtMsgFilter.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="txtMsgFilter.Location" type="System.Drawing.Point, System.Drawing">
-    <value>41, 29</value>
+  <data name="btnFilderProxy.Location" type="System.Drawing.Point, System.Drawing">
+    <value>157, 47</value>
  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>490, 60</value>
+  <data name="btnFilderProxy.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 23</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="txtMsgFilter.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+  <data name="btnFilderProxy.TabIndex" type="System.Int32, mscorlib">
+    <value>13</value>
  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  <data name="btnFilderProxy.Text" xml:space="preserve">
+    <value>Filter Proxy</value>
  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
+  <data name="&gt;&gt;btnFilderProxy.Name" xml:space="preserve">
+    <value>btnFilderProxy</value>
  </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
-    <value>396, 17</value>
-  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
-  </data>
-  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+  <data name="&gt;&gt;btnFilderProxy.Type" xml:space="preserve">
    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;btnFilderProxy.Parent" xml:space="preserve">
+    <value>groupBox1</value>
  </data>
-  <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+  <data name="&gt;&gt;btnFilderProxy.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnFilterDirect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
-  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
-    <value>panel2</value>
+  <data name="btnFilterDirect.Location" type="System.Drawing.Point, System.Drawing">
+    <value>41, 47</value>
  </data>
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <data name="btnFilterDirect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 23</value>
  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>MsgFilterSetForm</value>
+  <data name="btnFilterDirect.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
+  <data name="btnFilterDirect.Text" xml:space="preserve">
+    <value>Filter Direct</value>
+  </data>
+  <data name="&gt;&gt;btnFilterDirect.Name" xml:space="preserve">
+    <value>btnFilterDirect</value>
+  </data>
+  <data name="&gt;&gt;btnFilterDirect.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnFilterDirect.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnFilterDirect.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtMsgFilter.Location" type="System.Drawing.Point, System.Drawing">
+    <value>41, 20</value>
  </data>
  <data name="txtMsgFilter.Size" type="System.Drawing.Size, System.Drawing">
    <value>409, 21</value>
  </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="txtMsgFilter.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
  </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 76</value>
+  <data name="&gt;&gt;txtMsgFilter.Name" xml:space="preserve">
+    <value>txtMsgFilter</value>
  </data>
  <data name="&gt;&gt;txtMsgFilter.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
+  <data name="&gt;&gt;txtMsgFilter.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtMsgFilter.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
  </data>
  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
    <value>490, 76</value>
  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel2</value>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
  </data>
  <data name="groupBox1.Text" xml:space="preserve">
    <value>Filter</value>
  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
    <value>btnOK</value>
  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>490, 136</value>
+  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</value>
  </data>
-  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>303, 17</value>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 76</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>490, 60</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>MsgFilterSetForm</value>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>396, 17</value>
+  </data>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>490, 136</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>MsgFilterSetForm</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>MsgFilterSetForm</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/MsgFilterSetForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MsgFilterSetForm.zh-Hans.resx
@@ -129,4 +129,10 @@
  <data name="$this.Text" xml:space="preserve">
    <value>设置过滤器</value>
  </data>
+  <data name="btnFilderProxy.Text" xml:space="preserve">
+    <value>过滤Proxy</value>
+  </data>
+  <data name="btnFilterDirect.Text" xml:space="preserve">
+    <value>过滤Direct</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
@@ -33,15 +33,14 @@
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label16 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.txtpass = new System.Windows.Forms.TextBox();
+            this.txtuser = new System.Windows.Forms.TextBox();
            this.chkdefAllowInsecure = new System.Windows.Forms.CheckBox();
-            this.chksniffingEnabled2 = new System.Windows.Forms.CheckBox();
+            this.chkAllowLANConn = new System.Windows.Forms.CheckBox();
            this.chksniffingEnabled = new System.Windows.Forms.CheckBox();
            this.chkmuxEnabled = new System.Windows.Forms.CheckBox();
-            this.chkAllowIn2 = new System.Windows.Forms.CheckBox();
-            this.chkudpEnabled2 = new System.Windows.Forms.CheckBox();
-            this.cmbprotocol2 = new System.Windows.Forms.ComboBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.txtlocalPort2 = new System.Windows.Forms.TextBox();
            this.cmbprotocol = new System.Windows.Forms.ComboBox();
            this.label1 = new System.Windows.Forms.Label();
            this.chkudpEnabled = new System.Windows.Forms.CheckBox();
@@ -79,7 +78,6 @@
            this.cbFreshrate = new System.Windows.Forms.ComboBox();
            this.lbFreshrate = new System.Windows.Forms.Label();
            this.chkEnableStatistics = new System.Windows.Forms.CheckBox();
-            this.chkAllowLANConn = new System.Windows.Forms.CheckBox();
            this.chkAutoRun = new System.Windows.Forms.CheckBox();
            this.tabPageCoreType = new System.Windows.Forms.TabPage();
            this.cmbCoreType6 = new System.Windows.Forms.ComboBox();
@@ -143,15 +141,14 @@
            // 
            // groupBox1
            // 
+            this.groupBox1.Controls.Add(this.label16);
+            this.groupBox1.Controls.Add(this.label4);
+            this.groupBox1.Controls.Add(this.txtpass);
+            this.groupBox1.Controls.Add(this.txtuser);
            this.groupBox1.Controls.Add(this.chkdefAllowInsecure);
-            this.groupBox1.Controls.Add(this.chksniffingEnabled2);
+            this.groupBox1.Controls.Add(this.chkAllowLANConn);
            this.groupBox1.Controls.Add(this.chksniffingEnabled);
            this.groupBox1.Controls.Add(this.chkmuxEnabled);
-            this.groupBox1.Controls.Add(this.chkAllowIn2);
-            this.groupBox1.Controls.Add(this.chkudpEnabled2);
-            this.groupBox1.Controls.Add(this.cmbprotocol2);
-            this.groupBox1.Controls.Add(this.label3);
-            this.groupBox1.Controls.Add(this.txtlocalPort2);
            this.groupBox1.Controls.Add(this.cmbprotocol);
            this.groupBox1.Controls.Add(this.label1);
            this.groupBox1.Controls.Add(this.chkudpEnabled);
@@ -164,17 +161,37 @@
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
+            // label16
+            // 
+            resources.ApplyResources(this.label16, "label16");
+            this.label16.Name = "label16";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
+            // txtpass
+            // 
+            resources.ApplyResources(this.txtpass, "txtpass");
+            this.txtpass.Name = "txtpass";
+            // 
+            // txtuser
+            // 
+            resources.ApplyResources(this.txtuser, "txtuser");
+            this.txtuser.Name = "txtuser";
+            // 
            // chkdefAllowInsecure
            // 
            resources.ApplyResources(this.chkdefAllowInsecure, "chkdefAllowInsecure");
            this.chkdefAllowInsecure.Name = "chkdefAllowInsecure";
            this.chkdefAllowInsecure.UseVisualStyleBackColor = true;
            // 
-            // chksniffingEnabled2
+            // chkAllowLANConn
            // 
-            resources.ApplyResources(this.chksniffingEnabled2, "chksniffingEnabled2");
-            this.chksniffingEnabled2.Name = "chksniffingEnabled2";
-            this.chksniffingEnabled2.UseVisualStyleBackColor = true;
+            resources.ApplyResources(this.chkAllowLANConn, "chkAllowLANConn");
+            this.chkAllowLANConn.Name = "chkAllowLANConn";
+            this.chkAllowLANConn.UseVisualStyleBackColor = true;
            // 
            // chksniffingEnabled
            // 
@@ -188,39 +205,6 @@
            this.chkmuxEnabled.Name = "chkmuxEnabled";
            this.chkmuxEnabled.UseVisualStyleBackColor = true;
            // 
-            // chkAllowIn2
-            // 
-            resources.ApplyResources(this.chkAllowIn2, "chkAllowIn2");
-            this.chkAllowIn2.Name = "chkAllowIn2";
-            this.chkAllowIn2.UseVisualStyleBackColor = true;
-            this.chkAllowIn2.CheckedChanged += new System.EventHandler(this.chkAllowIn2_CheckedChanged);
-            // 
-            // chkudpEnabled2
-            // 
-            resources.ApplyResources(this.chkudpEnabled2, "chkudpEnabled2");
-            this.chkudpEnabled2.Name = "chkudpEnabled2";
-            this.chkudpEnabled2.UseVisualStyleBackColor = true;
-            // 
-            // 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
-            // 
-            resources.ApplyResources(this.label3, "label3");
-            this.label3.Name = "label3";
-            // 
-            // txtlocalPort2
-            // 
-            resources.ApplyResources(this.txtlocalPort2, "txtlocalPort2");
-            this.txtlocalPort2.Name = "txtlocalPort2";
-            // 
            // cmbprotocol
            // 
            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -399,7 +383,6 @@
            this.tabPage7.Controls.Add(this.cbFreshrate);
            this.tabPage7.Controls.Add(this.lbFreshrate);
            this.tabPage7.Controls.Add(this.chkEnableStatistics);
-            this.tabPage7.Controls.Add(this.chkAllowLANConn);
            this.tabPage7.Controls.Add(this.chkAutoRun);
            resources.ApplyResources(this.tabPage7, "tabPage7");
            this.tabPage7.Name = "tabPage7";
@@ -464,12 +447,6 @@
            this.chkEnableStatistics.Name = "chkEnableStatistics";
            this.chkEnableStatistics.UseVisualStyleBackColor = true;
            // 
-            // chkAllowLANConn
-            // 
-            resources.ApplyResources(this.chkAllowLANConn, "chkAllowLANConn");
-            this.chkAllowLANConn.Name = "chkAllowLANConn";
-            this.chkAllowLANConn.UseVisualStyleBackColor = true;
-            // 
            // chkAutoRun
            // 
            resources.ApplyResources(this.chkAutoRun, "chkAutoRun");
@@ -664,11 +641,6 @@
        private System.Windows.Forms.Panel panel2;
        private System.Windows.Forms.ComboBox cmbprotocol;
        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.ComboBox cmbprotocol2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox txtlocalPort2;
-        private System.Windows.Forms.CheckBox chkudpEnabled2;
-        private System.Windows.Forms.CheckBox chkAllowIn2;
        private System.Windows.Forms.CheckBox chkmuxEnabled;
        private System.Windows.Forms.TabPage tabPage6;
        private System.Windows.Forms.TextBox txtKcpmtu;
@@ -688,7 +660,6 @@
        private System.Windows.Forms.CheckBox chkAutoRun;
        private System.Windows.Forms.CheckBox chkAllowLANConn;
        private System.Windows.Forms.CheckBox chksniffingEnabled;
-        private System.Windows.Forms.CheckBox chksniffingEnabled2;
        private System.Windows.Forms.CheckBox chkEnableStatistics;
        private System.Windows.Forms.ComboBox cbFreshrate;
        private System.Windows.Forms.Label lbFreshrate;
@@ -722,5 +693,9 @@
        private System.Windows.Forms.Label labCoreType3;
        private System.Windows.Forms.ComboBox cmbCoreType2;
        private System.Windows.Forms.Label labCoreType2;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox txtpass;
+        private System.Windows.Forms.TextBox txtuser;
    }
 }
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -5,6 +5,7 @@ using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -45,23 +46,10 @@ namespace v2rayN.Forms
                cmbprotocol.Text = config.inbound[0].protocol.ToString();
                chkudpEnabled.Checked = config.inbound[0].udpEnabled;
                chksniffingEnabled.Checked = config.inbound[0].sniffingEnabled;
+                chkAllowLANConn.Checked = config.inbound[0].allowLANConn;
+                txtuser.Text = config.inbound[0].user;
+                txtpass.Text = config.inbound[0].pass;

-                txtlocalPort2.Text = $"{config.inbound[0].localPort + 1}";
-                cmbprotocol2.Text = Global.InboundHttp;
-
-                if (config.inbound.Count > 1)
-                {
-                    txtlocalPort2.Text = config.inbound[1].localPort.ToString();
-                    cmbprotocol2.Text = config.inbound[1].protocol.ToString();
-                    chkudpEnabled2.Checked = config.inbound[1].udpEnabled;
-                    chksniffingEnabled2.Checked = config.inbound[1].sniffingEnabled;
-                    chkAllowIn2.Checked = true;
-                }
-                else
-                {
-                    chkAllowIn2.Checked = false;
-                }
-                chkAllowIn2State();
            }

            //remoteDNS
@@ -95,15 +83,14 @@ namespace v2rayN.Forms
            //开机自动启动
            chkAutoRun.Checked = Utils.IsAutoRun();

-            chkAllowLANConn.Checked = config.allowLANConn;
            chkEnableStatistics.Checked = config.enableStatistics;
            chkKeepOlderDedupl.Checked = config.keepOlderDedupl;

            ComboItem[] cbSource = new ComboItem[]
            {
-                new ComboItem{ID = (int)Global.StatisticsFreshRate.quick, Text = UIRes.I18N("QuickFresh")},
-                new ComboItem{ID = (int)Global.StatisticsFreshRate.medium, Text = UIRes.I18N("MediumFresh")},
-                new ComboItem{ID = (int)Global.StatisticsFreshRate.slow, Text = UIRes.I18N("SlowFresh")},
+                new ComboItem{ID = (int)Global.StatisticsFreshRate.quick, Text = ResUI.QuickFresh},
+                new ComboItem{ID = (int)Global.StatisticsFreshRate.medium, Text = ResUI.MediumFresh},
+                new ComboItem{ID = (int)Global.StatisticsFreshRate.slow, Text = ResUI.SlowFresh},
            };
            cbFreshrate.DataSource = cbSource;

@@ -187,7 +174,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(ResUI.OperationFailed);
            }
        }

@@ -209,14 +196,15 @@ namespace v2rayN.Forms
            string protocol = cmbprotocol.Text.TrimEx();
            bool udpEnabled = chkudpEnabled.Checked;
            bool sniffingEnabled = chksniffingEnabled.Checked;
+            bool allowLANConn = chkAllowLANConn.Checked;
            if (Utils.IsNullOrEmpty(localPort) || !Utils.IsNumberic(localPort))
            {
-                UI.Show(UIRes.I18N("FillLocalListeningPort"));
+                UI.Show(ResUI.FillLocalListeningPort);
                return -1;
            }
            if (Utils.IsNullOrEmpty(protocol))
            {
-                UI.Show(UIRes.I18N("PleaseSelectProtocol"));
+                UI.Show(ResUI.PleaseSelectProtocol);
                return -1;
            }

@@ -229,7 +217,7 @@ namespace v2rayN.Forms
            {
                if (remoteDNS.Contains("{") || remoteDNS.Contains("}"))
                {
-                    UI.Show(UIRes.I18N("FillCorrectDNSText"));
+                    UI.Show(ResUI.FillCorrectDNSText);
                    return -1;
                }
            }
@@ -238,41 +226,16 @@ namespace v2rayN.Forms
            config.inbound[0].protocol = protocol;
            config.inbound[0].udpEnabled = udpEnabled;
            config.inbound[0].sniffingEnabled = sniffingEnabled;
+            config.inbound[0].allowLANConn = allowLANConn;
+            config.inbound[0].user = txtuser.Text;
+            config.inbound[0].pass = txtpass.Text;

-            //本地监听2
-            string localPort2 = txtlocalPort2.Text.TrimEx();
-            string protocol2 = cmbprotocol2.Text.TrimEx();
-            bool udpEnabled2 = chkudpEnabled2.Checked;
-            bool sniffingEnabled2 = chksniffingEnabled2.Checked;
-            if (chkAllowIn2.Checked)
+            if (config.inbound.Count > 1)
            {
-                if (Utils.IsNullOrEmpty(localPort2) || !Utils.IsNumberic(localPort2))
-                {
-                    UI.Show(UIRes.I18N("FillLocalListeningPort"));
-                    return -1;
-                }
-                if (Utils.IsNullOrEmpty(protocol2))
-                {
-                    UI.Show(UIRes.I18N("PleaseSelectProtocol"));
-                    return -1;
-                }
-                if (config.inbound.Count < 2)
-                {
-                    config.inbound.Add(new Mode.InItem());
-                }
-                config.inbound[1].localPort = Utils.ToInt(localPort2);
-                config.inbound[1].protocol = protocol2;
-                config.inbound[1].udpEnabled = udpEnabled2;
-                config.inbound[1].sniffingEnabled = sniffingEnabled2;
-            }
-            else
-            {
-                if (config.inbound.Count > 1)
-                {
-                    config.inbound.RemoveAt(1);
-                }
+                config.inbound.RemoveAt(1);
            }

+
            //日志     
            config.logEnabled = logEnabled;
            config.loglevel = loglevel;
@@ -312,7 +275,7 @@ namespace v2rayN.Forms
                || Utils.IsNullOrEmpty(readBufferSize) || !Utils.IsNumberic(readBufferSize)
                || Utils.IsNullOrEmpty(writeBufferSize) || !Utils.IsNumberic(writeBufferSize))
            {
-                UI.Show(UIRes.I18N("FillKcpParameters"));
+                UI.Show(ResUI.FillKcpParameters);
                return -1;
            }
            config.kcpItem.mtu = Utils.ToInt(mtu);
@@ -335,8 +298,6 @@ namespace v2rayN.Forms
            //开机自动启动
            Utils.SetAutoRun(chkAutoRun.Checked);

-            config.allowLANConn = chkAllowLANConn.Checked;
-
            bool lastEnableStatistics = config.enableStatistics;
            config.enableStatistics = chkEnableStatistics.Checked;
            config.statisticsFreshRate = (int)cbFreshrate.SelectedValue;
@@ -366,17 +327,6 @@ namespace v2rayN.Forms
            this.DialogResult = DialogResult.Cancel;
        }

-        private void chkAllowIn2_CheckedChanged(object sender, EventArgs e)
-        {
-            chkAllowIn2State();
-        }
-        private void chkAllowIn2State()
-        {
-            bool blAllow2 = chkAllowIn2.Checked;
-            txtlocalPort2.Enabled =
-            cmbprotocol2.Enabled =
-            chkudpEnabled2.Enabled = blAllow2;
-        }

        private void linkDnsObjectDoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
        {
@@ -387,5 +337,6 @@ namespace v2rayN.Forms
        {
            Process.Start(Utils.GetPath("EnableLoopback.exe"));
        }
+         
    }
 }
--- 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
@@ -121,48 +121,96 @@
    <value>取消(&amp;C)</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
+  <data name="label16.Text" xml:space="preserve">
+    <value>认证密码</value>
+  </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>219, 65</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>认证用户名</value>
+  </data>
+  <data name="chkdefAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 208</value>
+  </data>
  <data name="chkdefAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
    <value>324, 16</value>
  </data>
  <data name="chkdefAllowInsecure.Text" xml:space="preserve">
    <value>传输层安全选tls时，默认跳过证书验证(allowInsecure)</value>
  </data>
+  <data name="chksniffingEnabled2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>468, 117</value>
+  </data>
  <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
    <value>96, 16</value>
  </data>
  <data name="chksniffingEnabled2.Text" xml:space="preserve">
    <value>开启流量探测</value>
  </data>
+  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
+    <value>144, 16</value>
+  </data>
+  <data name="chkAllowLANConn.Text" xml:space="preserve">
+    <value>允许来自局域网的连接</value>
+  </data>
  <data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing">
    <value>96, 16</value>
  </data>
  <data name="chksniffingEnabled.Text" xml:space="preserve">
    <value>开启流量探测</value>
  </data>
+  <data name="chkmuxEnabled.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 145</value>
+  </data>
  <data name="chkmuxEnabled.Size" type="System.Drawing.Size, System.Drawing">
    <value>114, 16</value>
  </data>
  <data name="chkmuxEnabled.Text" xml:space="preserve">
    <value>开启Mux多路复用</value>
  </data>
+  <data name="chkAllowIn2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 120</value>
+  </data>
  <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
    <value>102, 16</value>
  </data>
  <data name="chkAllowIn2.Text" xml:space="preserve">
    <value>本地监听端口2</value>
  </data>
+  <data name="chkudpEnabled2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>369, 119</value>
+  </data>
  <data name="chkudpEnabled2.Size" type="System.Drawing.Size, System.Drawing">
    <value>66, 16</value>
  </data>
  <data name="chkudpEnabled2.Text" xml:space="preserve">
    <value>开启UDP</value>
  </data>
+  <data name="cmbprotocol2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>257, 117</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>206, 121</value>
+  </data>
  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
    <value>29, 12</value>
  </data>
  <data name="label3.Text" xml:space="preserve">
    <value>协议</value>
  </data>
+  <data name="txtlocalPort2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>124, 117</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>219, 29</value>
+  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>29, 12</value>
  </data>
@@ -175,12 +223,21 @@
  <data name="chkudpEnabled.Text" xml:space="preserve">
    <value>开启UDP</value>
  </data>
+  <data name="chklogEnabled.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 176</value>
+  </data>
  <data name="chklogEnabled.Size" type="System.Drawing.Size, System.Drawing">
    <value>156, 16</value>
  </data>
  <data name="chklogEnabled.Text" xml:space="preserve">
    <value>记录本地日志(默认关闭)</value>
  </data>
+  <data name="cmbloglevel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>257, 174</value>
+  </data>
+  <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>193, 178</value>
+  </data>
  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
    <value>53, 12</value>
  </data>
@@ -253,12 +310,6 @@
  <data name="chkIgnoreGeoUpdateCore.Text" xml:space="preserve">
    <value>更新Core时忽略Geo文件</value>
  </data>
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>Core类型</value>
-  </data>
  <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
    <value>156, 16</value>
  </data>
@@ -277,12 +328,6 @@
  <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>
-  <data name="chkAllowLANConn.Text" xml:space="preserve">
-    <value>允许来自局域网的连接</value>
-  </data>
  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
    <value>180, 16</value>
  </data>
@@ -295,6 +340,12 @@
  <data name="tabPage7.Text" xml:space="preserve">
    <value>  v2rayN设置  </value>
  </data>
+  <data name="tabPageCoreType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPageCoreType.Text" xml:space="preserve">
+    <value>  Core类型设置  </value>
+  </data>
  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
    <value>95, 12</value>
  </data>
@@ -328,13 +379,16 @@
  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 479</value>
  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>662, 60</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>662, 10</value>
+  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>662, 539</value>
  </data>
  <data name="$this.Text" xml:space="preserve">
    <value>参数设置</value>
  </data>
-  <data name="tabPageCoreType.Text" xml:space="preserve">
-    <value>  Core类型设置  </value>
-  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs
+++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs
@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -47,8 +48,8 @@ namespace v2rayN.Forms
                }
                rulesItem.inboundTag = inboundTag;
                rulesItem.outboundTag = cmbOutboundTag.Text;
-                rulesItem.domain = Utils.String2List(txtDomain.Text);
-                rulesItem.ip = Utils.String2List(txtIP.Text);
+                rulesItem.domain = Utils.String2ListSorted(txtDomain.Text);
+                rulesItem.ip = Utils.String2ListSorted(txtIP.Text);

                var protocol = new List<string>();
                for (int i = 0; i < clbProtocol.Items.Count; i++)
@@ -125,7 +126,7 @@ namespace v2rayN.Forms
            }
            if (!hasRule)
            {
-                UI.ShowWarning(string.Format(UIRes.I18N("RoutingRuleDetailRequiredTips"), "Port/Protocol/Domain/IP"));
+                UI.ShowWarning(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP"));
                return;
            }
            this.DialogResult = DialogResult.OK;
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -54,6 +55,7 @@ namespace v2rayN.Forms
            lvRoutings.View = View.Details;
            lvRoutings.MultiSelect = true;
            lvRoutings.HeaderStyle = ColumnHeaderStyle.Clickable;
+            lvRoutings.RegisterDragEvent(UpdateDragEventHandler);

            lvRoutings.Columns.Add("", 30);
            lvRoutings.Columns.Add("outboundTag", 80);
@@ -61,11 +63,22 @@ namespace v2rayN.Forms
            lvRoutings.Columns.Add("protocol", 80);
            lvRoutings.Columns.Add("inboundTag", 80);
            lvRoutings.Columns.Add("domain", 160);
-            lvRoutings.Columns.Add("ip", 160); 
+            lvRoutings.Columns.Add("ip", 160);
            lvRoutings.Columns.Add("enable", 60);

            lvRoutings.EndUpdate();
        }
+        private void UpdateDragEventHandler(int index, int targetIndex)
+        {
+            if (index < 0 || targetIndex < 0)
+            {
+                return;
+            }
+            if (ConfigHandler.MoveRoutingRule(ref routingItem, index, EMove.Position, targetIndex) == 0)
+            {
+                RefreshRoutingsView();
+            }
+        }

        private void RefreshRoutingsView()
        {
@@ -102,7 +115,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(ResUI.OperationFailed);
            }
        }

@@ -142,7 +155,7 @@ namespace v2rayN.Forms
            {
                if (lvRoutings.SelectedIndices.Count <= 0)
                {
-                    UI.Show(UIRes.I18N("PleaseSelectRules"));
+                    UI.Show(ResUI.PleaseSelectRules);
                    return index;
                }

@@ -186,7 +199,7 @@ namespace v2rayN.Forms
            int index = GetLvSelectedIndex();
            if (index < 0)
            {
-                UI.Show(UIRes.I18N("PleaseSelectRules"));
+                UI.Show(ResUI.PleaseSelectRules);
                return;
            }
            if (ConfigHandler.MoveRoutingRule(ref routingItem, index, eMove) == 0)
@@ -220,7 +233,7 @@ namespace v2rayN.Forms
            {
                return;
            }
-            if (UI.ShowYesNo(UIRes.I18N("RemoveRules")) == DialogResult.No)
+            if (UI.ShowYesNo(ResUI.RemoveRules) == DialogResult.No)
            {
                return;
            }
@@ -241,7 +254,7 @@ namespace v2rayN.Forms
            if (lst.Count > 0)
            {
                Utils.SetClipboardData(Utils.ToJson(lst));
-                //UI.Show(UIRes.I18N("OperationSuccess"));
+                //UI.Show(ResUI.OperationSuccess"));
            }

        }
@@ -311,7 +324,7 @@ namespace v2rayN.Forms
            if (AddBatchRoutingRules(ref routingItem, result) == 0)
            {
                RefreshRoutingsView();
-                UI.Show(UIRes.I18N("OperationSuccess"));
+                UI.Show(ResUI.OperationSuccess);
            }
        }

@@ -321,7 +334,7 @@ namespace v2rayN.Forms
            if (AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
            {
                RefreshRoutingsView();
-                UI.Show(UIRes.I18N("OperationSuccess"));
+                UI.Show(ResUI.OperationSuccess);
            }
        }
        private void menuImportRulesFromUrl_Click(object sender, EventArgs e)
@@ -329,7 +342,7 @@ namespace v2rayN.Forms
            var url = txtUrl.Text.Trim();
            if (Utils.IsNullOrEmpty(url))
            {
-                UI.Show(UIRes.I18N("MsgNeedUrl"));
+                UI.Show(ResUI.MsgNeedUrl);
                return;
            }
            DownloadHandle downloadHandle = new DownloadHandle();
@@ -337,13 +350,13 @@ namespace v2rayN.Forms
            if (AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
            {
                RefreshRoutingsView();
-                UI.Show(UIRes.I18N("OperationSuccess"));
+                UI.Show(ResUI.OperationSuccess);
            }
        }
        private int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
        {
            bool blReplace = false;
-            if (UI.ShowYesNo(UIRes.I18N("AddBatchRoutingRulesYesNo")) == DialogResult.No)
+            if (UI.ShowYesNo(ResUI.AddBatchRoutingRulesYesNo) == DialogResult.No)
            {
                blReplace = true;
            }
@@ -353,6 +366,6 @@ namespace v2rayN.Forms


        #endregion
-               
+
    }
 }
--- a/v2rayN/v2rayN/Forms/RoutingSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/RoutingSettingForm.cs
@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -61,7 +62,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(ResUI.OperationFailed);
            }
        }

@@ -144,10 +145,10 @@ namespace v2rayN.Forms
            lvRoutings.HeaderStyle = ColumnHeaderStyle.Clickable;

            lvRoutings.Columns.Add("", 30);
-            lvRoutings.Columns.Add(UIRes.I18N("LvAlias"), 200);
-            lvRoutings.Columns.Add(UIRes.I18N("LvCount"), 60);
-            lvRoutings.Columns.Add(UIRes.I18N("LvUrl"), 240);
-            lvRoutings.Columns.Add(UIRes.I18N("LvCustomIcon"), 240);
+            lvRoutings.Columns.Add(ResUI.LvAlias, 200);
+            lvRoutings.Columns.Add(ResUI.LvCount, 60);
+            lvRoutings.Columns.Add(ResUI.LvUrl, 240);
+            lvRoutings.Columns.Add(ResUI.LvCustomIcon, 240);

            lvRoutings.EndUpdate();
        }
@@ -211,7 +212,7 @@ namespace v2rayN.Forms
            {
                if (lvRoutings.SelectedIndices.Count <= 0)
                {
-                    UI.Show(UIRes.I18N("PleaseSelectRules"));
+                    UI.Show(ResUI.PleaseSelectRules);
                    return index;
                }

@@ -259,7 +260,7 @@ namespace v2rayN.Forms
            {
                return;
            }
-            if (UI.ShowYesNo(UIRes.I18N("RemoveRules")) == DialogResult.No)
+            if (UI.ShowYesNo(ResUI.RemoveRules) == DialogResult.No)
            {
                return;
            }
@@ -282,7 +283,7 @@ namespace v2rayN.Forms
        {
            if (index < 0)
            {
-                UI.Show(UIRes.I18N("PleaseSelectServer"));
+                UI.Show(ResUI.PleaseSelectServer);
                return -1;
            }
            if (ConfigHandler.SetDefaultRouting(ref config, index) == 0)
@@ -301,7 +302,7 @@ namespace v2rayN.Forms

            txtBlockDomain.Text = "geosite:category-ads-all";

-            UI.Show(UIRes.I18N("OperationSuccess"));
+            UI.Show(ResUI.OperationSuccess);
        }

        private void menuImportAdvancedRules_Click(object sender, EventArgs e)
--- a/v2rayN/v2rayN/Forms/ServerTransportControl.cs
+++ b/v2rayN/v2rayN/Forms/ServerTransportControl.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -156,34 +157,34 @@ namespace v2rayN.Forms

            if (network.Equals(Global.DefaultNetwork))
            {
-                tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip1");
-                tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip1");
+                tipRequestHost.Text = ResUI.TransportRequestHostTip1;
+                tipHeaderType.Text = ResUI.TransportHeaderTypeTip1;
            }
            else if (network.Equals("kcp"))
            {
-                tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip2");
-                tipPath.Text = UIRes.I18N("TransportPathTip5");                
+                tipHeaderType.Text = ResUI.TransportHeaderTypeTip2;
+                tipPath.Text = ResUI.TransportPathTip5;                
            }
            else if (network.Equals("ws"))
            {
-                tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip2");
-                tipPath.Text = UIRes.I18N("TransportPathTip1");
+                tipRequestHost.Text = ResUI.TransportRequestHostTip2;
+                tipPath.Text = ResUI.TransportPathTip1;
            }
            else if (network.Equals("h2"))
            {
-                tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip3");
-                tipPath.Text = UIRes.I18N("TransportPathTip2");
+                tipRequestHost.Text = ResUI.TransportRequestHostTip3;
+                tipPath.Text = ResUI.TransportPathTip2;
            }
            else if (network.Equals("quic"))
            {
-                tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip4");
-                tipPath.Text = UIRes.I18N("TransportPathTip3");
-                tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip3");
+                tipRequestHost.Text = ResUI.TransportRequestHostTip4;
+                tipPath.Text = ResUI.TransportPathTip3;
+                tipHeaderType.Text = ResUI.TransportHeaderTypeTip3;
            }
            else if (network.Equals("grpc"))
            {
-                tipPath.Text = UIRes.I18N("TransportPathTip4");
-                tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip4");
+                tipPath.Text = ResUI.TransportPathTip4;
+                tipHeaderType.Text = ResUI.TransportHeaderTypeTip4;
                labHeaderType.Visible = false;
            }
        }
--- a/v2rayN/v2rayN/Forms/SubSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/SubSettingForm.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Forms
 {
@@ -74,7 +75,7 @@ namespace v2rayN.Forms
            }
            else
            {
-                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                UI.ShowWarning(ResUI.OperationFailed);
            }
        }

--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -15,8 +15,9 @@ namespace v2rayN
        public const string xrayCoreUrl = "https://github.com/XTLS/Xray-core/releases";
        public const string NUrl = @"https://github.com/2dust/v2rayN/releases";
        public const string clashCoreUrl = "https://github.com/Dreamacro/clash/releases";
+        public const string hysteriaCoreUrl = "https://github.com/HyNetwork/hysteria/releases";
+

-        


        /// <summary>
@@ -110,6 +111,7 @@ namespace v2rayN

        public const string InboundSocks = "socks";
        public const string InboundHttp = "http";
+        public const string InboundHttp2 = "http2";
        public const string Loopback = "127.0.0.1";
        public const string InboundAPITagName = "api";
        public const string InboundAPIProtocal = "dokodemo-door";
@@ -218,31 +220,6 @@ namespace v2rayN
            get; set;
        }

-        /// <summary>
-        /// 是否开启全局代理(http)
-        /// </summary>
-        public static bool sysAgent
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// socks端口
-        /// </summary>
-        public static int socksPort
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// http端口
-        /// </summary>
-        public static int httpPort
-        {
-            get; set;
-        }
-
-
        /// <summary>
        ///  
        /// </summary>
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -15,6 +15,7 @@ namespace v2rayN.Handler
    class ConfigHandler
    {
        private static string configRes = Global.ConfigFileName;
+        private static readonly object objLock = new object();

        #region ConfigHandler

@@ -204,7 +205,10 @@ namespace v2rayN.Handler
        /// <param name="config"></param>
        private static void ToJsonFile(Config config)
        {
-            Utils.ToJsonFile(config, Utils.GetPath(configRes));
+            lock (objLock)
+            {
+                Utils.ToJsonFile(config, Utils.GetPath(configRes));
+            }
        }

        #endregion
@@ -353,7 +357,7 @@ namespace v2rayN.Handler
        /// <param name="index"></param>
        /// <param name="eMove"></param>
        /// <returns></returns>
-        public static int MoveServer(ref Config config, ref List<VmessItem> lstVmess, int index, EMove eMove)
+        public static int MoveServer(ref Config config, ref List<VmessItem> lstVmess, int index, EMove eMove, int pos = -1)
        {
            int count = lstVmess.Count;
            if (index < 0 || index > lstVmess.Count - 1)
@@ -409,6 +413,9 @@ namespace v2rayN.Handler

                        break;
                    }
+                case EMove.Position:
+                    lstVmess[index].sort = pos * 10 + 1;
+                    break;
            }

            ToJsonFile(config);
@@ -740,6 +747,10 @@ namespace v2rayN.Handler
            {
                vmessItem.indexId = Utils.GetGUID(false);
            }
+            else if (vmessItem.indexId == config.indexId)
+            {
+                Global.reloadV2ray = true;
+            }
            if (!config.vmess.Exists(it => it.indexId == vmessItem.indexId))
            {
                var maxSort = config.vmess.Any() ? config.vmess.Max(t => t.sort) : 0;
@@ -748,11 +759,6 @@ namespace v2rayN.Handler
                config.vmess.Add(vmessItem);
            }

-            //if (config.vmess.Count == 1)
-            //{
-            //    config.indexId = config.vmess[0].indexId;
-            //    Global.reloadV2ray = true;
-            //}
            return 0;
        }

@@ -934,6 +940,15 @@ namespace v2rayN.Handler
                vmessItem.address = fileName;
                vmessItem.remarks = "clash_custom";
            }
+            //Is Other configuration
+            else
+            {
+                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.txt");
+                File.WriteAllText(fileName, clipboardData);
+
+                vmessItem.address = fileName;
+                vmessItem.remarks = "other_custom";
+            }

            if (!Utils.IsNullOrEmpty(subid))
            {
@@ -1115,7 +1130,17 @@ namespace v2rayN.Handler
            return 0;
        }

+        public static int MoveServerToGroup(Config config, List<VmessItem> indexs, string groupId)
+        {
+            foreach (var item in indexs)
+            {
+                item.groupId = groupId;
+            }

+            ToJsonFile(config);
+
+            return 0;
+        }
        #endregion

        #region UI
@@ -1134,6 +1159,8 @@ namespace v2rayN.Handler
            {
                config.uiItem.mainLvColWidth.Add(name, width);
            }
+
+            ToJsonFile(config);
            return 0;
        }
        public static int GetformMainLvColWidth(ref Config config, string name, int width)
@@ -1248,7 +1275,7 @@ namespace v2rayN.Handler
        /// <param name="index"></param>
        /// <param name="eMove"></param>
        /// <returns></returns>
-        public static int MoveRoutingRule(ref RoutingItem routingItem, int index, EMove eMove)
+        public static int MoveRoutingRule(ref RoutingItem routingItem, int index, EMove eMove, int pos = -1)
        {
            int count = routingItem.rules.Count;
            if (index < 0 || index > routingItem.rules.Count - 1)
@@ -1306,6 +1333,14 @@ namespace v2rayN.Handler

                        break;
                    }
+                case EMove.Position:
+                    {
+                        var removeItem = routingItem.rules[index];
+                        var item = Utils.DeepCopy(routingItem.rules[index]);
+                        routingItem.rules.Insert(pos, item);
+                        routingItem.rules.Remove(removeItem);
+                        break;
+                    }

            }
            return 0;
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using v2rayN.Base;
+using v2rayN.Resx;

 namespace v2rayN.Handler
 {
@@ -39,7 +40,7 @@ namespace v2rayN.Handler
            try
            {
                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().enableSecurityProtocolTls13);
-                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, UIRes.I18N("Downloading")));
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, ResUI.Downloading));

                progressPercentage = -1;
                totalBytesToReceive = 0;
@@ -215,7 +216,7 @@ namespace v2rayN.Handler
            try
            {
                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().enableSecurityProtocolTls13);
-                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, UIRes.I18N("Downloading")));
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, ResUI.Downloading));

                progressPercentage = -1;
                totalBytesToReceive = 0;
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -9,6 +9,7 @@ namespace v2rayN.Handler
    {
        private static readonly Lazy<LazyConfig> _instance = new Lazy<LazyConfig>(() => new LazyConfig());
        private Config _config;
+        private List<CoreInfo> coreInfos;

        public static LazyConfig Instance
        {
@@ -51,5 +52,53 @@ namespace v2rayN.Handler
            }
            return item.coreType;
        }
+
+        public CoreInfo GetCoreInfo(ECoreType coreType)
+        {
+            if (coreInfos == null)
+            {
+                InitCoreInfo();
+            }
+            return coreInfos.Where(t => t.coreType == coreType).FirstOrDefault();
+        }
+
+        private void InitCoreInfo()
+        {
+            coreInfos = new List<CoreInfo>();
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.v2fly,
+                coreExes = new List<string> { "wv2ray", "v2ray" },
+                arguments = "",
+                coreUrl = Global.v2flyCoreUrl
+
+            });
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.Xray,
+                coreExes = new List<string> { "xray" },
+                arguments = "",
+                coreUrl = Global.xrayCoreUrl
+            });
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.clash,
+                coreExes = new List<string> { "clash-windows-amd64", "clash-windows-386", "clash" },
+                arguments = "-f config.json",
+                coreUrl = Global.clashCoreUrl
+            });
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.hysteria,
+                coreExes = new List<string> { "hysteria-tun-windows-6.0-amd64", "hysteria-tun-windows-6.0-386", "hysteria" },
+                arguments = "",
+                coreUrl = Global.hysteriaCoreUrl
+            });
+        }
+
    }
 }
--- a/v2rayN/v2rayN/Handler/MainFormHandler.cs
+++ b/v2rayN/v2rayN/Handler/MainFormHandler.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using v2rayN.Mode;
 using System.Linq;
+using v2rayN.Resx;

 namespace v2rayN.Handler
 {
@@ -88,7 +89,7 @@ namespace v2rayN.Handler
            if (item.configType != EConfigType.Vmess
                && item.configType != EConfigType.VLESS)
            {
-                UI.Show(UIRes.I18N("NonVmessService"));
+                UI.Show(ResUI.NonVmessService);
                return;
            }

@@ -115,7 +116,7 @@ namespace v2rayN.Handler
            }
            else
            {
-                UI.ShowWarning(string.Format(UIRes.I18N("SaveClientConfigurationIn"), fileName));
+                UI.ShowWarning(string.Format(ResUI.SaveClientConfigurationIn, fileName));
            }
        }

@@ -128,7 +129,7 @@ namespace v2rayN.Handler
            if (item.configType != EConfigType.Vmess
                && item.configType != EConfigType.VLESS)
            {
-                UI.Show(UIRes.I18N("NonVmessService"));
+                UI.Show(ResUI.NonVmessService);
                return;
            }

@@ -155,7 +156,7 @@ namespace v2rayN.Handler
            }
            else
            {
-                UI.ShowWarning(string.Format(UIRes.I18N("SaveServerConfigurationIn"), fileName));
+                UI.ShowWarning(string.Format(ResUI.SaveServerConfigurationIn, fileName));
            }
        }

@@ -191,11 +192,11 @@ namespace v2rayN.Handler
                if (ret == 0)
                {

-                    UI.Show(UIRes.I18N("OperationSuccess"));
+                    UI.Show(ResUI.OperationSuccess);
                }
                else
                {
-                    UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                    UI.ShowWarning(ResUI.OperationFailed);
                }
            }
        }
@@ -268,12 +269,12 @@ namespace v2rayN.Handler
                try
                {
                    HotkeyManager.Current.AddOrReplace(((int)item.eGlobalHotkey).ToString(), keys, handler);
-                    var msg = string.Format(UIRes.I18N("RegisterGlobalHotkeySuccessfully"), $"{item.eGlobalHotkey.ToString()} = {keys}");
+                    var msg = string.Format(ResUI.RegisterGlobalHotkeySuccessfully, $"{item.eGlobalHotkey.ToString()} = {keys}");
                    update(false, msg);
                }
                catch (Exception ex)
                {
-                    var msg = string.Format(UIRes.I18N("RegisterGlobalHotkeyFailed"), $"{item.eGlobalHotkey.ToString()} = {keys}", ex.Message);
+                    var msg = string.Format(ResUI.RegisterGlobalHotkeyFailed, $"{item.eGlobalHotkey.ToString()} = {keys}", ex.Message);
                    update(false, msg);
                    Utils.SaveLog(msg);
                }
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using System.Web;
 using v2rayN.Base;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Handler
 {
@@ -318,7 +319,7 @@ namespace v2rayN.Handler
                string result = clipboardData.TrimEx();// Utils.GetClipboardData();
                if (Utils.IsNullOrEmpty(result))
                {
-                    msg = UIRes.I18N("FailedReadConfiguration");
+                    msg = ResUI.FailedReadConfiguration;
                    return null;
                }

@@ -338,7 +339,7 @@ namespace v2rayN.Handler
                }
                else if (result.StartsWith(Global.ssProtocol))
                {
-                    msg = UIRes.I18N("ConfigurationFormatIncorrect");
+                    msg = ResUI.ConfigurationFormatIncorrect;

                    vmessItem = ResolveSSLegacy(result);
                    if (vmessItem == null)
@@ -358,7 +359,7 @@ namespace v2rayN.Handler
                }
                else if (result.StartsWith(Global.socksProtocol))
                {
-                    msg = UIRes.I18N("ConfigurationFormatIncorrect");
+                    msg = ResUI.ConfigurationFormatIncorrect;

                    vmessItem = ResolveSocksNew(result);
                    if (vmessItem == null)
@@ -378,7 +379,7 @@ namespace v2rayN.Handler
                }
                else if (result.StartsWith(Global.trojanProtocol))
                {
-                    msg = UIRes.I18N("ConfigurationFormatIncorrect");
+                    msg = ResUI.ConfigurationFormatIncorrect;

                    vmessItem = ResolveTrojan(result);
                }
@@ -390,13 +391,13 @@ namespace v2rayN.Handler
                }
                else
                {
-                    msg = UIRes.I18N("NonvmessOrssProtocol");
+                    msg = ResUI.NonvmessOrssProtocol;
                    return null;
                }
            }
            catch
            {
-                msg = UIRes.I18N("Incorrectconfiguration");
+                msg = ResUI.Incorrectconfiguration;
                return null;
            }

@@ -416,7 +417,7 @@ namespace v2rayN.Handler
            VmessQRCode vmessQRCode = Utils.FromJson<VmessQRCode>(result);
            if (vmessQRCode == null)
            {
-                msg = UIRes.I18N("FailedConversionConfiguration");
+                msg = ResUI.FailedConversionConfiguration;
                return null;
            }

@@ -507,7 +508,7 @@ namespace v2rayN.Handler

            i.address = u.IdnHost;
            i.port = u.Port;
-            i.remarks = Utils.UrlDecode(u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped));
+            i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
            var q = HttpUtility.ParseQueryString(u.Query);

            var m = StdVmessUserInfo.Match(u.UserInfo);
@@ -589,13 +590,13 @@ namespace v2rayN.Handler
            }
            VmessItem server = new VmessItem
            {
-                remarks = Utils.UrlDecode(parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped)),
+                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
                address = parsedUrl.IdnHost,
                port = parsedUrl.Port,
            };

            // parse base64 UserInfo
-            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
+            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
            string userInfo = Utils.Base64Decode(rawUserInfo);
            string[] userInfoParts = userInfo.Split(new char[] { ':' }, 2);
            if (userInfoParts.Length != 2)
@@ -711,7 +712,7 @@ namespace v2rayN.Handler
            }
            VmessItem server = new VmessItem
            {
-                remarks = Utils.UrlDecode(parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped)),
+                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
                address = parsedUrl.IdnHost,
                port = parsedUrl.Port,
            };
@@ -740,7 +741,7 @@ namespace v2rayN.Handler

            item.address = url.IdnHost;
            item.port = url.Port;
-            item.remarks = Utils.UrlDecode(url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped));
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
            item.id = url.UserInfo;

            var query = HttpUtility.ParseQueryString(url.Query);
@@ -760,7 +761,7 @@ namespace v2rayN.Handler

            item.address = url.IdnHost;
            item.port = url.Port;
-            item.remarks = Utils.UrlDecode(url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped));
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
            item.id = url.UserInfo;

            var query = HttpUtility.ParseQueryString(url.Query);
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -6,6 +6,7 @@ using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Handler
 {
@@ -21,7 +22,7 @@ namespace v2rayN.Handler
            _config = config;
        }

-        public SpeedtestHandler(ref Config config, ref V2rayHandler v2rayHandler, List<VmessItem> selecteds, string actionType, Action<string, string> update)
+        public SpeedtestHandler(ref Config config, V2rayHandler v2rayHandler, List<VmessItem> selecteds, ESpeedActionType actionType, Action<string, string> update)
        {
            _config = config;
            _v2rayHandler = v2rayHandler;
@@ -40,19 +41,19 @@ namespace v2rayN.Handler
                });
            }

-            if (actionType == "ping")
+            if (actionType == ESpeedActionType.Ping)
            {
                Task.Run(() => RunPing());
            }
-            if (actionType == "tcping")
+            else if (actionType == ESpeedActionType.Tcping)
            {
                Task.Run(() => RunTcping());
            }
-            else if (actionType == "realping")
+            else if (actionType == ESpeedActionType.Realping)
            {
                Task.Run(() => RunRealPing());
            }
-            else if (actionType == "speedtest")
+            else if (actionType == ESpeedActionType.Speedtest)
            {
                Task.Run(() => RunSpeedTest());
            }
@@ -117,7 +118,7 @@ namespace v2rayN.Handler
                pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);
                if (pid < 0)
                {
-                    _updateFunc(_selecteds[0].indexId, UIRes.I18N("OperationFailed"));
+                    _updateFunc(_selecteds[0].indexId, ResUI.OperationFailed);
                    return;
                }

@@ -168,7 +169,7 @@ namespace v2rayN.Handler
        {
            try
            {
-                int httpPort = _config.GetLocalPort(Global.InboundHttp);
+                int httpPort = _config.GetLocalPort(Global.InboundHttp2);

                Task<int> t = Task.Run(() =>
                {
@@ -203,7 +204,7 @@ namespace v2rayN.Handler
            pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);
            if (pid < 0)
            {
-                _updateFunc(_selecteds[0].indexId, UIRes.I18N("OperationFailed"));
+                _updateFunc(_selecteds[0].indexId, ResUI.OperationFailed);
                return;
            }

--- a/v2rayN/v2rayN/Handler/SysProxyHandle.cs
+++ b/v2rayN/v2rayN/Handler/SysProxyHandle.cs
@@ -59,8 +59,7 @@ namespace v2rayN.Handler

            try
            {
-                Global.httpPort = config.GetLocalPort(Global.InboundHttp);
-                int port = Global.httpPort;
+                int port = config.GetLocalPort(Global.InboundHttp2);
                if (port <= 0)
                {
                    return false;
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -8,6 +8,7 @@ using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Handler
 {
@@ -53,7 +54,7 @@ namespace v2rayN.Handler
                {
                    if (args.Success)
                    {
-                        _updateFunc(false, UIRes.I18N("MsgDownloadV2rayCoreSuccessfully"));
+                        _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);

                        try
                        {
@@ -93,7 +94,7 @@ namespace v2rayN.Handler
            {
                if (args.Success)
                {
-                    _updateFunc(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "v2rayN"));
+                    _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN"));

                    url = args.Msg;
                    askToDownload(downloadHandle, url, true);
@@ -103,12 +104,12 @@ namespace v2rayN.Handler
                    _updateFunc(false, args.Msg);
                }
            };
-            _updateFunc(false, string.Format(UIRes.I18N("MsgStartUpdating"), "v2rayN"));
-            CheckUpdateAsync("v2rayN");
+            _updateFunc(false, string.Format(ResUI.MsgStartUpdating, "v2rayN"));
+            CheckUpdateAsync(ECoreType.v2rayN);
        }


-        public void CheckUpdateCore(string type, Config config, Action<bool, string> update)
+        public void CheckUpdateCore(ECoreType type, Config config, Action<bool, string> update)
        {
            _config = config;
            _updateFunc = update;
@@ -122,8 +123,8 @@ namespace v2rayN.Handler
                {
                    if (args.Success)
                    {
-                        _updateFunc(false, UIRes.I18N("MsgDownloadV2rayCoreSuccessfully"));
-                        _updateFunc(false, UIRes.I18N("MsgUnpacking"));
+                        _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                        _updateFunc(false, ResUI.MsgUnpacking);

                        try
                        {
@@ -149,7 +150,7 @@ namespace v2rayN.Handler
            {
                if (args.Success)
                {
-                    _updateFunc(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "Core"));
+                    _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core"));
                    url = args.Msg;
                    askToDownload(downloadHandle, url, true);
                }
@@ -158,7 +159,7 @@ namespace v2rayN.Handler
                    _updateFunc(false, args.Msg);
                }
            };
-            _updateFunc(false, string.Format(UIRes.I18N("MsgStartUpdating"), "Core"));
+            _updateFunc(false, string.Format(ResUI.MsgStartUpdating, "Core"));
            CheckUpdateAsync(type);
        }

@@ -168,11 +169,11 @@ namespace v2rayN.Handler
            _config = config;
            _updateFunc = update;

-            _updateFunc(false, UIRes.I18N("MsgUpdateSubscriptionStart"));
+            _updateFunc(false, ResUI.MsgUpdateSubscriptionStart);

            if (config.subItem == null || config.subItem.Count <= 0)
            {
-                _updateFunc(false, UIRes.I18N("MsgNoValidSubscription"));
+                _updateFunc(false, ResUI.MsgNoValidSubscription);
                return;
            }

@@ -182,14 +183,14 @@ namespace v2rayN.Handler
                string url = config.subItem[k - 1].url.TrimEx();
                string userAgent = config.subItem[k - 1].userAgent.TrimEx();
                string groupId = config.subItem[k - 1].groupId.TrimEx();
-                string hashCode = $"{k}->";
+                string hashCode = $"{k}){config.subItem[k - 1].remarks}->";
                if (config.subItem[k - 1].enabled == false)
                {
                    continue;
                }
                if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url))
                {
-                    _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgNoValidSubscription")}");
+                    _updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
                    continue;
                }

@@ -198,17 +199,17 @@ namespace v2rayN.Handler
                {
                    if (args.Success)
                    {
-                        _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgGetSubscriptionSuccessfully")}");
+                        _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
                        //string result = Utils.Base64Decode(args.Msg);
                        string result = args.Msg;
                        if (Utils.IsNullOrEmpty(result))
                        {
-                            _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgSubscriptionDecodingFailed")}");
+                            _updateFunc(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
                            return;
                        }

                        //ConfigHandler.RemoveServerViaSubid(ref config, id);
-                        //_updateFunc(false, $"{hashCode}{UIRes.I18N("MsgClearSubscription")}");
+                        //_updateFunc(false, $"{hashCode}{ResUI.MsgClearSubscription")}");
                        //  RefreshServers();
                        int ret = ConfigHandler.AddBatchServers(ref config, result, id, groupId);
                        if (ret > 0)
@@ -217,9 +218,9 @@ namespace v2rayN.Handler
                        }
                        else
                        {
-                            _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgFailedImportSubscription")}");
+                            _updateFunc(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}");
                        }
-                        _updateFunc(true, $"{hashCode}{UIRes.I18N("MsgUpdateSubscriptionEnd")}");
+                        _updateFunc(true, $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}");
                    }
                    else
                    {
@@ -231,10 +232,10 @@ namespace v2rayN.Handler
                    _updateFunc(false, args.GetException().Message);
                };

-                WebProxy webProxy = blProxy ? new WebProxy(Global.Loopback, _config.GetLocalPort(Global.InboundHttp)) : null;
+                WebProxy webProxy = blProxy ? new WebProxy(Global.Loopback, _config.GetLocalPort(Global.InboundHttp2)) : null;
                downloadHandle3.WebDownloadString(url, webProxy, userAgent);

-                _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}");
+                _updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
            }

        }
@@ -255,7 +256,7 @@ namespace v2rayN.Handler
                {
                    if (args.Success)
                    {
-                        _updateFunc(false, string.Format(UIRes.I18N("MsgDownloadGeoFileSuccessfully"), geoName));
+                        _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));

                        try
                        {
@@ -292,7 +293,7 @@ namespace v2rayN.Handler

        #region private

-        private async void CheckUpdateAsync(string type)
+        private async void CheckUpdateAsync(ECoreType type)
        {
            try
            {
@@ -303,22 +304,22 @@ namespace v2rayN.Handler
                };
                if (httpProxyTest() > 0)
                {
-                    int httpPort = _config.GetLocalPort(Global.InboundHttp);
+                    int httpPort = _config.GetLocalPort(Global.InboundHttp2);
                    WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
                    webRequestHandler.Proxy = webProxy;
                }
                HttpClient httpClient = new HttpClient(webRequestHandler);

                string url;
-                if (type == "v2fly")
+                if (type == ECoreType.v2fly)
                {
                    url = v2flyCoreLatestUrl;
                }
-                else if (type == "xray")
+                else if (type == ECoreType.Xray)
                {
                    url = xrayCoreLatestUrl;
                }
-                else if (type == "v2rayN")
+                else if (type == ECoreType.v2rayN)
                {
                    url = nLatestUrl;
                }
@@ -347,18 +348,18 @@ namespace v2rayN.Handler
        /// <summary>
        /// 获取V2RayCore版本
        /// </summary>
-        private string getCoreVersion(string type)
+        private string getCoreVersion(ECoreType type)
        {
            try
            {
                var core = string.Empty;
                var match = string.Empty;
-                if (type == "v2fly")
+                if (type == ECoreType.v2fly)
                {
                    core = "v2ray.exe";
                    match = "V2Ray";
                }
-                else if (type == "xray")
+                else if (type == ECoreType.Xray)
                {
                    core = "xray.exe";
                    match = "Xray";
@@ -366,7 +367,7 @@ namespace v2rayN.Handler
                string filePath = Utils.GetPath(core);
                if (!File.Exists(filePath))
                {
-                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"");
+                    string msg = string.Format(ResUI.NotFoundCore, @"");
                    //ShowMsg(true, msg);
                    return "";
                }
@@ -392,7 +393,7 @@ namespace v2rayN.Handler
                return "";
            }
        }
-        private void responseHandler(string type, string redirectUrl)
+        private void responseHandler(ECoreType type, string redirectUrl)
        {
            try
            {
@@ -401,24 +402,24 @@ namespace v2rayN.Handler
                string curVersion;
                string message;
                string url;
-                if (type == "v2fly")
+                if (type == ECoreType.v2fly)
                {
                    curVersion = "v" + getCoreVersion(type);
-                    message = string.Format(UIRes.I18N("IsLatestCore"), curVersion);
+                    message = string.Format(ResUI.IsLatestCore, curVersion);
                    string osBit = Environment.Is64BitProcess ? "64" : "32";
                    url = string.Format(v2flyCoreUrl, version, osBit);
                }
-                else if (type == "xray")
+                else if (type == ECoreType.Xray)
                {
                    curVersion = "v" + getCoreVersion(type);
-                    message = string.Format(UIRes.I18N("IsLatestCore"), curVersion);
+                    message = string.Format(ResUI.IsLatestCore, curVersion);
                    string osBit = Environment.Is64BitProcess ? "64" : "32";
                    url = string.Format(xrayCoreUrl, version, osBit);
                }
-                else if (type == "v2rayN")
+                else if (type == ECoreType.v2rayN)
                {
                    curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
-                    message = string.Format(UIRes.I18N("IsLatestN"), curVersion);
+                    message = string.Format(ResUI.IsLatestN, curVersion);
                    url = string.Format(nUrl, version);
                }
                else
@@ -446,7 +447,7 @@ namespace v2rayN.Handler
            bool blDownload = false;
            if (blAsk)
            {
-                if (UI.ShowYesNo(string.Format(UIRes.I18N("DownloadYesNo"), url)) == DialogResult.Yes)
+                if (UI.ShowYesNo(string.Format(ResUI.DownloadYesNo, url)) == DialogResult.Yes)
                {
                    blDownload = true;
                }
@@ -459,7 +460,7 @@ namespace v2rayN.Handler
            {
                if (httpProxyTest() > 0)
                {
-                    int httpPort = _config.GetLocalPort(Global.InboundHttp);
+                    int httpPort = _config.GetLocalPort(Global.InboundHttp2);
                    WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
                    downloadHandle.DownloadFileAsync(url, webProxy, 600);
                }
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -6,6 +6,7 @@ using System.Net;
 using System.Net.NetworkInformation;
 using v2rayN.Base;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Handler
 {
@@ -32,11 +33,11 @@ namespace v2rayN.Handler
            {
                if (node == null)
                {
-                    msg = UIRes.I18N("CheckServerSettings");
+                    msg = ResUI.CheckServerSettings;
                    return -1;
                }

-                msg = UIRes.I18N("InitialConfiguration");
+                msg = ResUI.InitialConfiguration;
                if (node.configType == EConfigType.Custom)
                {
                    return GenerateClientCustomConfig(node, fileName, out msg);
@@ -46,7 +47,7 @@ namespace v2rayN.Handler
                string result = Utils.GetEmbedText(SampleClient);
                if (Utils.IsNullOrEmpty(result))
                {
-                    msg = UIRes.I18N("FailedGetDefaultConfiguration");
+                    msg = ResUI.FailedGetDefaultConfiguration;
                    return -1;
                }

@@ -54,7 +55,7 @@ namespace v2rayN.Handler
                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                if (v2rayConfig == null)
                {
-                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    msg = ResUI.FailedGenDefaultConfiguration;
                    return -1;
                }

@@ -80,11 +81,11 @@ namespace v2rayN.Handler

                Utils.ToJsonFile(v2rayConfig, fileName, false);

-                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), $"[{config.GetGroupRemarks(node.groupId)}] {node.GetSummary()}");
+                msg = string.Format(ResUI.SuccessfulConfiguration, $"[{config.GetGroupRemarks(node.groupId)}] {node.GetSummary()}");
            }
            catch
            {
-                msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                msg = ResUI.FailedGenDefaultConfiguration;
                return -1;
            }
            return 0;
@@ -149,7 +150,7 @@ namespace v2rayN.Handler
                inbound.tag = Global.InboundSocks;
                inbound.port = config.inbound[0].localPort;
                inbound.protocol = config.inbound[0].protocol;
-                if (config.allowLANConn)
+                if (config.inbound[0].allowLANConn)
                {
                    inbound.listen = "0.0.0.0";
                }
@@ -168,6 +169,25 @@ namespace v2rayN.Handler
                inbound2.protocol = Global.InboundHttp;
                inbound2.listen = inbound.listen;
                inbound2.settings.allowTransparent = false;
+                inbound2.sniffing.enabled = inbound.sniffing.enabled;
+
+                //auth
+                if (!Utils.IsNullOrEmpty(config.inbound[0].user) && !Utils.IsNullOrEmpty(config.inbound[0].pass))
+                {
+                    inbound.settings.auth = "password";
+                    inbound.settings.accounts = new List<AccountsItem> { new AccountsItem() { user = config.inbound[0].user, pass = config.inbound[0].pass } };
+                    inbound2.settings.auth = "password";
+                    inbound2.settings.accounts = new List<AccountsItem> { new AccountsItem() { user = config.inbound[0].user, pass = config.inbound[0].pass } };
+                }
+
+                //http Loopback
+                Inbounds inbound3 = v2rayConfig.inbounds[2];
+                inbound3.tag = Global.InboundHttp2;
+                inbound3.port = config.GetLocalPort(Global.InboundHttp2);
+                inbound3.protocol = Global.InboundHttp;
+                inbound3.listen = Global.Loopback;
+                inbound3.settings.allowTransparent = false;
+                inbound3.sniffing.enabled = inbound.sniffing.enabled;
            }
            catch
            {
@@ -900,7 +920,7 @@ namespace v2rayN.Handler
                //检查GUI设置
                if (node == null)
                {
-                    msg = UIRes.I18N("CheckServerSettings");
+                    msg = ResUI.CheckServerSettings;
                    return -1;
                }

@@ -916,16 +936,39 @@ namespace v2rayN.Handler
                }
                if (!File.Exists(addressFileName))
                {
-                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    msg = ResUI.FailedGenDefaultConfiguration;
                    return -1;
                }
                File.Copy(addressFileName, fileName);

-                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), $"[{LazyConfig.Instance.GetConfig().GetGroupRemarks(node.groupId)}] {node.GetSummary()}");
+                //check again
+                if (!File.Exists(fileName))
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return -1;
+                }
+
+                //overwrite port
+                var fileContent = File.ReadAllLines(fileName).ToList();
+                var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
+                switch (coreType)
+                {
+                    case ECoreType.v2fly:
+                    case ECoreType.Xray:
+                        break;
+                    case ECoreType.clash:
+                        fileContent.Add($"port: {LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundHttp)}");
+                        fileContent.Add($"socks-port: {LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundSocks)}");
+                        break;
+                }
+                File.WriteAllLines(fileName, fileContent);
+
+                msg = string.Format(ResUI.SuccessfulConfiguration, $"[{LazyConfig.Instance.GetConfig().GetGroupRemarks(node.groupId)}] {node.GetSummary()}");
            }
-            catch
+            catch (Exception ex)
            {
-                msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                Utils.SaveLog("GenerateClientCustomConfig", ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
                return -1;
            }
            return 0;
@@ -949,17 +992,17 @@ namespace v2rayN.Handler
                //检查GUI设置
                if (node == null)
                {
-                    msg = UIRes.I18N("CheckServerSettings");
+                    msg = ResUI.CheckServerSettings;
                    return -1;
                }

-                msg = UIRes.I18N("InitialConfiguration");
+                msg = ResUI.InitialConfiguration;

                //取得默认配置
                string result = Utils.GetEmbedText(SampleServer);
                if (Utils.IsNullOrEmpty(result))
                {
-                    msg = UIRes.I18N("FailedGetDefaultConfiguration");
+                    msg = ResUI.FailedGetDefaultConfiguration;
                    return -1;
                }

@@ -967,7 +1010,7 @@ namespace v2rayN.Handler
                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                if (v2rayConfig == null)
                {
-                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    msg = ResUI.FailedGenDefaultConfiguration;
                    return -1;
                }

@@ -984,11 +1027,11 @@ namespace v2rayN.Handler

                Utils.ToJsonFile(v2rayConfig, fileName, false);

-                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), node.GetSummary());
+                msg = string.Format(ResUI.SuccessfulConfiguration, node.GetSummary());
            }
            catch
            {
-                msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                msg = ResUI.FailedGenDefaultConfiguration;
                return -1;
            }
            return 0;
@@ -1086,7 +1129,7 @@ namespace v2rayN.Handler
                string result = Utils.LoadResource(fileName);
                if (Utils.IsNullOrEmpty(result))
                {
-                    msg = UIRes.I18N("FailedReadConfiguration");
+                    msg = ResUI.FailedReadConfiguration;
                    return null;
                }

@@ -1094,14 +1137,14 @@ namespace v2rayN.Handler
                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                if (v2rayConfig == null)
                {
-                    msg = UIRes.I18N("FailedConversionConfiguration");
+                    msg = ResUI.FailedConversionConfiguration;
                    return null;
                }

                if (v2rayConfig.outbounds == null
                 || v2rayConfig.outbounds.Count <= 0)
                {
-                    msg = UIRes.I18N("IncorrectClientConfiguration");
+                    msg = ResUI.IncorrectClientConfiguration;
                    return null;
                }

@@ -1115,7 +1158,7 @@ namespace v2rayN.Handler
                    || outbound.settings.vnext[0].users == null
                    || outbound.settings.vnext[0].users.Count <= 0)
                {
-                    msg = UIRes.I18N("IncorrectClientConfiguration");
+                    msg = ResUI.IncorrectClientConfiguration;
                    return null;
                }

@@ -1208,7 +1251,7 @@ namespace v2rayN.Handler
            }
            catch
            {
-                msg = UIRes.I18N("IncorrectClientConfiguration");
+                msg = ResUI.IncorrectClientConfiguration;
                return null;
            }

@@ -1232,7 +1275,7 @@ namespace v2rayN.Handler
                string result = Utils.LoadResource(fileName);
                if (Utils.IsNullOrEmpty(result))
                {
-                    msg = UIRes.I18N("FailedReadConfiguration");
+                    msg = ResUI.FailedReadConfiguration;
                    return null;
                }

@@ -1240,14 +1283,14 @@ namespace v2rayN.Handler
                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                if (v2rayConfig == null)
                {
-                    msg = UIRes.I18N("FailedConversionConfiguration");
+                    msg = ResUI.FailedConversionConfiguration;
                    return null;
                }

                if (v2rayConfig.inbounds == null
                 || v2rayConfig.inbounds.Count <= 0)
                {
-                    msg = UIRes.I18N("IncorrectServerConfiguration");
+                    msg = ResUI.IncorrectServerConfiguration;
                    return null;
                }

@@ -1259,7 +1302,7 @@ namespace v2rayN.Handler
                    || inbound.settings.clients == null
                    || inbound.settings.clients.Count <= 0)
                {
-                    msg = UIRes.I18N("IncorrectServerConfiguration");
+                    msg = ResUI.IncorrectServerConfiguration;
                    return null;
                }

@@ -1353,7 +1396,7 @@ namespace v2rayN.Handler
            }
            catch
            {
-                msg = UIRes.I18N("IncorrectClientConfiguration");
+                msg = ResUI.IncorrectClientConfiguration;
                return null;
            }
            return vmessItem;
@@ -1394,25 +1437,25 @@ namespace v2rayN.Handler
            {
                if (config == null)
                {
-                    msg = UIRes.I18N("CheckServerSettings");
+                    msg = ResUI.CheckServerSettings;
                    return "";
                }

-                msg = UIRes.I18N("InitialConfiguration");
+                msg = ResUI.InitialConfiguration;

                Config configCopy = Utils.DeepCopy(config);

                string result = Utils.GetEmbedText(SampleClient);
                if (Utils.IsNullOrEmpty(result))
                {
-                    msg = UIRes.I18N("FailedGetDefaultConfiguration");
+                    msg = ResUI.FailedGetDefaultConfiguration;
                    return "";
                }

                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                if (v2rayConfig == null)
                {
-                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    msg = ResUI.FailedGenDefaultConfiguration;
                    return "";
                }
                List<IPEndPoint> lstIpEndPoints = null;
@@ -1493,12 +1536,12 @@ namespace v2rayN.Handler
                    v2rayConfig.routing.rules.Add(rule);
                }

-                //msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), node.getSummary());
+                //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
                return Utils.ToJson(v2rayConfig);
            }
            catch
            {
-                msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                msg = ResUI.FailedGenDefaultConfiguration;
                return "";
            }
        }
--- a/v2rayN/v2rayN/Handler/V2rayHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayHandler.cs
@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using v2rayN.Mode;
+using v2rayN.Resx;

 namespace v2rayN.Handler
 {
@@ -21,9 +22,7 @@ namespace v2rayN.Handler
    class V2rayHandler
    {
        private static string v2rayConfigRes = Global.v2rayConfigFileName;
-        private List<string> lstV2ray;
-        private string coreUrl;
-        private string coreArguments;
+        private CoreInfo coreInfo;
        public event ProcessDelegate ProcessEvent;
        //private int processId = 0;
        private Process _process;
@@ -42,11 +41,15 @@ namespace v2rayN.Handler
                var item = ConfigHandler.GetDefaultServer(ref config);
                if (item == null)
                {
-                    ShowMsg(false, UIRes.I18N("CheckServerSettings"));
+                    ShowMsg(false, ResUI.CheckServerSettings);
                    return;
                }

-                SetCore(config, item);
+                if (SetCore(config, item) != 0)
+                {
+                    ShowMsg(false, ResUI.CheckServerSettings);
+                    return;
+                }
                string fileName = Utils.GetPath(v2rayConfigRes);
                if (V2rayConfigHandler.GenerateClientConfig(item, fileName, false, out string msg) != 0)
                {
@@ -106,7 +109,11 @@ namespace v2rayN.Handler
                }
                else
                {
-                    foreach (string vName in lstV2ray)
+                    if (coreInfo == null || coreInfo.coreExes == null)
+                    {
+                        return;
+                    }
+                    foreach (string vName in coreInfo.coreExes)
                    {
                        Process[] existing = Process.GetProcessesByName(vName);
                        foreach (Process p in existing)
@@ -163,12 +170,10 @@ namespace v2rayN.Handler
            }
        }

-        private string V2rayFindexe()
+        private string V2rayFindexe(List<string> lstCoreTemp)
        {
-            //查找v2ray文件是否存在
            string fileName = string.Empty;
-            //lstV2ray.Reverse();
-            foreach (string name in lstV2ray)
+            foreach (string name in lstCoreTemp)
            {
                string vName = string.Format("{0}.exe", name);
                vName = Utils.GetPath(vName);
@@ -180,7 +185,7 @@ namespace v2rayN.Handler
            }
            if (Utils.IsNullOrEmpty(fileName))
            {
-                string msg = string.Format(UIRes.I18N("NotFoundCore"), coreUrl);
+                string msg = string.Format(ResUI.NotFoundCore, coreInfo.coreUrl);
                ShowMsg(false, msg);
            }
            return fileName;
@@ -191,11 +196,11 @@ namespace v2rayN.Handler
        /// </summary>
        private void V2rayStart()
        {
-            ShowMsg(false, string.Format(UIRes.I18N("StartService"), DateTime.Now.ToString()));
+            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString()));

            try
            {
-                string fileName = V2rayFindexe();
+                string fileName = V2rayFindexe(coreInfo.coreExes);
                if (fileName == "") return;

                Process p = new Process
@@ -203,7 +208,7 @@ namespace v2rayN.Handler
                    StartInfo = new ProcessStartInfo
                    {
                        FileName = fileName,
-                        Arguments = coreArguments,
+                        Arguments = coreInfo.arguments,
                        WorkingDirectory = Utils.StartupPath(),
                        UseShellExecute = false,
                        RedirectStandardOutput = true,
@@ -245,11 +250,11 @@ namespace v2rayN.Handler
        /// </summary>
        private int V2rayStartNew(string configStr)
        {
-            ShowMsg(false, string.Format(UIRes.I18N("StartService"), DateTime.Now.ToString()));
+            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString()));

            try
            {
-                string fileName = V2rayFindexe();
+                string fileName = V2rayFindexe(new List<string> { "xray" });
                if (fileName == "") return -1;

                Process p = new Process
@@ -326,44 +331,21 @@ namespace v2rayN.Handler
            }
        }

-        private void SetCore(Config config, VmessItem item)
+        private int SetCore(Config config, VmessItem item)
        {
            if (item == null)
            {
-                return;
+                return -1;
            }
            var coreType = LazyConfig.Instance.GetCoreType(item, item.configType);

-            if (coreType == ECoreType.v2fly)
+            coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+
+            if (coreInfo == null)
            {
-                lstV2ray = new List<string>
-                {
-                    "wv2ray",
-                    "v2ray"
-                };
-                coreUrl = Global.v2flyCoreUrl;
-                coreArguments = string.Empty;
-            }
-            else if (coreType == ECoreType.Xray)
-            {
-                lstV2ray = new List<string>
-                {
-                    "xray"
-                };
-                coreUrl = Global.xrayCoreUrl;
-                coreArguments = string.Empty;
-            }
-            else if (coreType == ECoreType.clash)
-            {
-                lstV2ray = new List<string>
-                {
-                    "clash-windows-amd64",
-                    "clash-windows-386",
-                    "clash"
-                };
-                coreUrl = Global.clashCoreUrl;
-                coreArguments = "-f config.json";
+                return -1;
            }
+            return 0;
        }
    }
 }
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Base;
 using System.Linq;
-
+using System.Drawing;

 namespace v2rayN.Mode
 {
@@ -52,14 +52,6 @@ namespace v2rayN.Mode
            get; set;
        }

-        /// <summary>
-        /// 允许来自局域网的连接
-        /// </summary>
-        public bool allowLANConn
-        {
-            get; set;
-        }
-
        /// <summary>
        /// 启用实时网速和流量统计
        /// </summary>
@@ -220,7 +212,10 @@ namespace v2rayN.Mode
            {
                return GetLocalPort(Global.InboundSocks) + 1;
            }
-
+            else if (protocol == Global.InboundHttp2)
+            {
+                return GetLocalPort(Global.InboundSocks) + 2;
+            }
            else if (protocol == "speedtest")
            {
                return GetLocalPort(Global.InboundSocks) + 103;
@@ -581,6 +576,13 @@ namespace v2rayN.Mode
        /// 开启流量探测
        /// </summary>
        public bool sniffingEnabled { get; set; } = true;
+
+        public bool allowLANConn { get; set; }
+       
+        public string user { get; set; }
+       
+        public string pass { get; set; }
+
    }

    [Serializable]
@@ -692,7 +694,9 @@ namespace v2rayN.Mode
            get; set;
        }

-        public System.Drawing.Size mainSize
+        public Point mainLocation { get; set; }
+
+        public Size mainSize
        {
            get; set;
        }
--- a/v2rayN/v2rayN/Mode/CoreInfo.cs
+++ b/v2rayN/v2rayN/Mode/CoreInfo.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace v2rayN.Mode
+{
+    [Serializable]
+    public class CoreInfo
+    {
+        public ECoreType coreType { get; set; }
+
+        public List<string> coreExes { get; set; }
+
+        public string arguments { get; set; }
+
+        public string coreUrl { get; set; }
+    }
+}
--- a/v2rayN/v2rayN/Mode/ECoreType.cs
+++ b/v2rayN/v2rayN/Mode/ECoreType.cs
@@ -5,6 +5,8 @@ namespace v2rayN.Mode
    {
        v2fly = 1,
        Xray = 2,
-        clash = 3
+        clash = 11,
+        hysteria = 21,
+        v2rayN = 99
    }
 }
--- a/v2rayN/v2rayN/Mode/EMove.cs
+++ b/v2rayN/v2rayN/Mode/EMove.cs
@@ -6,6 +6,7 @@ namespace v2rayN.Mode
        Top = 1,
        Up = 2,
        Down = 3,
-        Bottom = 4
+        Bottom = 4,
+        Position = 5
    }
 }
--- a/v2rayN/v2rayN/Mode/ESpeedActionType.cs
+++ b/v2rayN/v2rayN/Mode/ESpeedActionType.cs
@@ -0,0 +1,11 @@
+
+namespace v2rayN.Mode
+{
+    public enum ESpeedActionType
+    {
+        Ping,
+        Tcping,
+        Realping,
+        Speedtest
+    }
+}
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -141,6 +141,7 @@ namespace v2rayN.Mode

        public bool allowTransparent { get; set; }

+        public List<AccountsItem> accounts { get; set; }
    }

    public class UsersItem
@@ -540,4 +541,15 @@ namespace v2rayN.Mode
        public bool multiMode { get; set; }
    }

+    public class AccountsItem
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string user { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string pass { get; set; }
+    }
 }
--- a/v2rayN/v2rayN/Program.cs
+++ b/v2rayN/v2rayN/Program.cs
@@ -35,6 +35,7 @@ namespace v2rayN
            {
                Logging.Setup();
                Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
+                Logging.ClearLogs();

                //设置语言环境
                string lang = Utils.RegReadValue(Global.MyRegPath, Global.MyRegKeyLanguage, "zh-Hans");
@@ -42,7 +43,7 @@ namespace v2rayN

                Application.EnableVisualStyles();
                Application.SetCompatibleTextRenderingDefault(false);
-                Application.Run(new MainForm());
+                Application.Run(new MainForm()); 
            }
            else
            {
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("v2rayN")]
-[assembly: AssemblyCopyright("Copyright © 2019-2020 (GPLv3)")]
+[assembly: AssemblyCopyright("Copyright © 2019-2022 (GPLv3)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("5.5")]
+[assembly: AssemblyFileVersion("5.12")]
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -934,6 +934,15 @@ namespace v2rayN.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 System proxy 的本地化字符串。
+        /// </summary>
+        internal static string SystemProxy {
+            get {
+                return ResourceManager.GetString("SystemProxy", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 The ping of current service: {0} 的本地化字符串。
        /// </summary>
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -454,4 +454,7 @@
  <data name="FillServerAddressCustom" xml:space="preserve">
    <value>Please browse to import server configuration</value>
  </data>
+  <data name="SystemProxy" xml:space="preserve">
+    <value>System proxy</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -454,4 +454,7 @@
  <data name="FillServerAddressCustom" xml:space="preserve">
    <value>请浏览导入服务器配置</value>
  </data>
+  <data name="SystemProxy" xml:space="preserve">
+    <value>系统代理</value>
+  </data>
 </root>
--- a/v2rayN/v2rayN/Sample/SampleClientConfig.txt
+++ b/v2rayN/v2rayN/Sample/SampleClientConfig.txt
@@ -24,7 +24,23 @@
 		{
 			"tag": "tag2",
 			"port": 10809,
-			"protocol": "socks",
+			"protocol": "http",
+			"listen": "127.0.0.1",
+			"settings": {
+				"allowTransparent": false
+			},
+			"sniffing": {
+				"enabled": true,
+				"destOverride": [
+					"http",
+					"tls"
+				]
+			}
+		},
+		{
+			"tag": "tag3",
+			"port": 10809,
+			"protocol": "http",
 			"listen": "127.0.0.1",
 			"settings": {
 				"allowTransparent": false
--- a/v2rayN/v2rayN/Tool/Logging.cs
+++ b/v2rayN/v2rayN/Tool/Logging.cs
@@ -3,6 +3,9 @@ using log4net.Appender;
 using log4net.Core;
 using log4net.Layout;
 using log4net.Repository.Hierarchy;
+using System;
+using System.IO;
+using System.Threading.Tasks;

 namespace v2rayN.Tool
 {
@@ -15,7 +18,7 @@ namespace v2rayN.Tool
            PatternLayout patternLayout = new PatternLayout();
            patternLayout.ConversionPattern = "%date [%thread] %-5level %logger - %message%newline";
            patternLayout.ActivateOptions();
-          
+
            RollingFileAppender roller = new RollingFileAppender();
            roller.AppendToFile = true;
            roller.RollingStyle = RollingFileAppender.RollingMode.Date;
@@ -30,8 +33,34 @@ namespace v2rayN.Tool
            memory.ActivateOptions();
            hierarchy.Root.AddAppender(memory);

-            hierarchy.Root.Level = Level.Info;
+            hierarchy.Root.Level = Level.Debug;
            hierarchy.Configured = true;
        }
+
+        public static void ClearLogs()
+        {
+            Task.Run(() =>
+            {
+                try
+                {
+                    var now = DateTime.Now.AddMonths(-1);
+                    var dir = Utils.GetPath(@"guiLogs\");
+                    var files = Directory.GetFiles(dir, "*.txt");
+                    foreach (var filePath in files)
+                    {
+                        var file = new FileInfo(filePath);
+                        if (file.CreationTime < now)
+                        {
+                            try
+                            {
+                                file.Delete();
+                            }
+                            catch { }
+                        }
+                    }
+                }
+                catch { }
+            });
+        }
    }
 }
--- a/v2rayN/v2rayN/Tool/UIRes.cs
+++ b/v2rayN/v2rayN/Tool/UIRes.cs
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Reflection;
-using System.Resources;
-
-namespace v2rayN
-{
-    public class UIRes
-    {
-        static ResourceManager res = new ResourceManager("v2rayN.Resx.ResUI", Assembly.GetExecutingAssembly());
-
-        static string LoadString(ResourceManager resMgr, string key)
-        {
-            string value = resMgr.GetString(key);
-            if (value == null)
-            {
-                throw new KeyNotFoundException($"key: {key}");
-            }
-            return value;
-        }
-
-        public static string I18N(string key)
-        {
-            return LoadString(res, key);
-        }
-    }
-}
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -219,6 +219,26 @@ namespace v2rayN
            }
        }

+        /// <summary>
+        /// 逗号分隔的字符串,先排序后转List<string>
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static List<string> String2ListSorted(string str)
+        {
+            try
+            {
+                str = str.Replace(Environment.NewLine, "");
+                List<string> list = new List<string>(str.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
+                return list.OrderBy(x => x).ToList();
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex.Message, ex);
+                return new List<string>();
+            }
+        }
+
        /// <summary>
        /// Base64编码
        /// </summary>
@@ -370,7 +390,8 @@ namespace v2rayN

        public static string UrlEncode(string url)
        {
-            return HttpUtility.UrlEncode(url);
+            return Uri.EscapeDataString(url);
+            //return  HttpUtility.UrlEncode(url);
        }
        public static string UrlDecode(string url)
        {
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -199,6 +199,7 @@
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="Handler\SysProxyHandle.cs" />
+    <Compile Include="Mode\ESpeedActionType.cs" />
    <Compile Include="Mode\EGlobalHotkey.cs" />
    <Compile Include="Mode\ECoreType.cs" />
    <Compile Include="Mode\ESysProxyType.cs" />
@@ -207,6 +208,7 @@
    <Compile Include="Mode\RoutingItem.cs" />
    <Compile Include="Mode\RulesItem.cs" />
    <Compile Include="Mode\ServerStatistics.cs" />
+    <Compile Include="Mode\CoreInfo.cs" />
    <Compile Include="Mode\SysproxyConfig.cs" />
    <Compile Include="Mode\EConfigType.cs" />
    <Compile Include="Mode\ServerTestItem.cs" />
@@ -260,7 +262,6 @@
    <Compile Include="Tool\Job.cs" />
    <Compile Include="Tool\Logging.cs" />
    <Compile Include="Tool\QueryableExtension.cs" />
-    <Compile Include="Tool\UIRes.cs" />
    <Compile Include="Tool\UI.cs" />
    <Compile Include="Tool\Utils.cs" />
    <Compile Include="Handler\V2rayConfigHandler.cs" />
Author	SHA1	Message	Date
2dust	3aa48a9a3e	Update AssemblyInfo.cs	2022-04-07 20:36:10 +08:00
2dust	09702b9bde	fix bugs	2022-04-07 17:05:56 +08:00
2dust	35f6cd3d9c	Merge pull request #2164 from Lemonawa/master Update issue templates	2022-04-06 19:49:52 +08:00
Lemonawa	b62f1786a9	Update issue templates	2022-04-05 23:19:37 +08:00
Lemonawa	b21ad28d5b	Delete config.yaml	2022-04-05 23:10:16 +08:00
Lemonawa	8d66c0d180	Delete issue_template.md	2022-04-05 23:10:08 +08:00
Lemonawa	ec8aa0df18	Update issue templates	2022-04-05 23:09:30 +08:00
Lemonawa	e824d8e91d	Create config.yaml	2022-04-05 23:06:42 +08:00
2dust	b919422ec4	Update AssemblyInfo.cs	2022-04-04 19:34:32 +08:00
2dust	a8bc9ce605	Refactor local listening port	2022-04-04 19:32:16 +08:00
2dust	e2f399eeb1	Update AssemblyInfo.cs	2022-04-03 17:03:21 +08:00
2dust	82924278b5	Delete log files older than one month	2022-04-03 17:01:45 +08:00
2dust	bb828a4e06	modify some text	2022-04-03 17:00:47 +08:00
2dust	74933ac146	Merge pull request #2151 from zhaogarvie/master 过滤器添加快捷按钮	2022-04-01 20:37:41 +08:00
uniceguy	0d315f0dc3	过滤器添加快捷按钮	2022-04-01 19:55:16 +08:00
2dust	372ee346dc	Update README.md	2022-04-01 19:33:31 +08:00
2dust	cb462ab944	Update README.md	2022-04-01 19:27:44 +08:00
2dust	606da79372	Update AssemblyInfo.cs	2022-04-01 18:10:48 +08:00
2dust	0801c3db64	Refactor stat update	2022-04-01 18:09:58 +08:00
2dust	35deb0c915	Merge pull request #2148 from zhaogarvie/master 保存自定义路由信息时先排序后输出	2022-04-01 18:07:25 +08:00
uniceguy	fd4d712688	保存自定义路由信息时先排序后输出	2022-04-01 13:21:22 +08:00
2dust	354fc618b0	fix encode issue	2022-03-31 20:19:15 +08:00
2dust	82b6ee5ad2	Refactor ResUI	2022-03-31 19:53:58 +08:00
2dust	645e6c4ec0	Update ConfigHandler.cs	2022-03-28 19:21:31 +08:00
2dust	cdc83bc9d7	Update AssemblyInfo.cs	2022-03-28 19:09:27 +08:00
2dust	70feacd276	Add hysteria support	2022-03-28 19:08:54 +08:00
2dust	ece4572058	Refactor and improve	2022-03-28 18:54:05 +08:00
2dust	4d16a5e801	Update AssemblyInfo.cs	2022-03-24 19:09:15 +08:00
2dust	1493a8b03f	add drag to sort	2022-03-24 19:07:45 +08:00
2dust	d20791bf73	Update AssemblyInfo.cs	2022-03-23 18:56:01 +08:00
2dust	7bb91f57ac	Custom configuration overwrite port	2022-03-23 18:49:28 +08:00
2dust	b7a6004830	some improvements	2022-03-23 18:48:57 +08:00
2dust	dee5613f2f	add move servers to group	2022-03-23 18:47:59 +08:00