2025-04-19 17:10:56 +00:00
32 changed files with 123 additions and 464 deletions
--- a/FodyWeavers.xml
+++ b/FodyWeavers.xml
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-	<Costura />
-</Weavers>
--- a/ProxySU.sln
+++ b/ProxySU.sln
@ -9,11 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProxySuper.WPF", "ProxySupe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProxySuper.Core", "ProxySuper.Core\ProxySuper.Core.csproj", "{15779EE6-D8CA-44BF-BFE2-941E155EEF3F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{327FE75A-7D23-4F0E-80E2-7D10C7603969}"
-	ProjectSection(SolutionItems) = preProject
-		FodyWeavers.xml = FodyWeavers.xml
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
--- a/ProxySuper.Core/Converters/ProxyTypeConverter.cs
+++ b/ProxySuper.Core/Converters/ProxyTypeConverter.cs
@ -1,7 +1,5 @@
 using System;
 using System.Globalization;
-using System.Linq;
-using System.Windows;
 using System.Windows.Data;

 namespace ProxySuper.Core.Converters
@ -28,19 +26,4 @@ namespace ProxySuper.Core.Converters
            return parameter;
        }
    }
-
-    public class BooleanOrConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            return values.OfType<bool>().Any(v => v);
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-
 }
--- a/ProxySuper.Core/Converters/VisibleConverter.cs
+++ b/ProxySuper.Core/Converters/VisibleConverter.cs
@ -9,47 +9,22 @@ namespace ProxySuper.Core.Converters
    {
        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
        {
-            bool isMatch = (value != null && value.Equals(parameter));
-            // 如果匹配则显示，否则隐藏（Collapsed）
-            return isMatch ? Visibility.Visible : Visibility.Hidden;//Collapsed;
-            //return value.Equals(true) ? Visibility.Visible : Visibility.Hidden;//Collapsed;
+            return value.Equals(true) ? Visibility.Visible : Visibility.Collapsed;
        }

        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
        {
-            throw new NotImplementedException();
-            //if (value == null)
-            //{
-            //    return false;
-            //}
-
-            //if (value.Equals(Visibility.Visible))
-            //{
-            //    return true;
-            //}
-
-            //return false;
-        }
+            if (value == null)
+            {
+                return false;
            }

-    public class BooleanOrToVisibilityConverter : IMultiValueConverter
+            if (value.Equals(Visibility.Visible))
            {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            // 如果任一条件为 true，则返回 Visible，否则返回 Hidden/Collapsed
-            foreach (var value in values)
-            {
-                if (value is bool boolVal && boolVal)
-                {
-                    return Visibility.Visible;
-                }
-            }
-            return Visibility.Hidden;//Collapsed
+                return true;
            }

-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
+            return false;
        }
    }
 }
--- a/ProxySuper.Core/Models/Hosts/Host.cs
+++ b/ProxySuper.Core/Models/Hosts/Host.cs
@ -20,61 +20,36 @@ namespace ProxySuper.Core.Models.Hosts

        public string Address { get; set; }

-        public int Port { get; set; } = 22;
-
        public string UserName { get; set; }

        public string Password { get; set; }

-        public string PrivateKeyPath { get; set; }
+        public int Port { get; set; } = 22;

-        public string PrivateKeyPassPhrase { get; set; }
+        public string PrivateKeyPath { get; set; }

        public LocalProxy Proxy { get; set; }

        public LoginSecretType SecretType { get; set; }

-        //public IMvxCommand UploadPrivateKeyCommand => new MvxCommand(UploadPrivateKey);
-        
-        private readonly IMvxCommand _uploadPrivateKeyCommand;
-        public IMvxCommand UploadPrivateKeyCommand => _uploadPrivateKeyCommand ?? new MvxCommand(UploadPrivateKey);
+        public IMvxCommand UploadPrivateKeyCommand => new MvxCommand(UploadPrivateKey);

        private void UploadPrivateKey()
        {
-            var fileDialog = new OpenFileDialog() 
-            {
-                Filter = "Private Key (*.pem;*.key)|*.pem;*.key|All File (*.*)|*.*",
-                Title = "Select the private key file"
-            };
+            var fileDialog = new OpenFileDialog();
            fileDialog.FileOk += OnFileOk;
            fileDialog.ShowDialog();
        }

-        private async void OnFileOk(object sender, CancelEventArgs e)
+        private void OnFileOk(object sender, CancelEventArgs e)
        {
            var file = sender as OpenFileDialog;
-            if (file != null)
-            {
            PrivateKeyPath = file.FileName;

-                //Task.Delay(300).ContinueWith((t) =>
-                //{
-                //    MessageBox.Show("OK:" + PrivateKeyPath, "Tips");
-                //});
-
-                await Task.Delay(300);
-                MessageBox.Show("OK:" + PrivateKeyPath, "Tips");
-            }
-            else
+            Task.Delay(300).ContinueWith((t) =>
            {
-                //Task.Delay(300).ContinueWith((t) =>
-                //{
-                //    MessageBox.Show("Error:Unable to get file!", "Tips");
-                //});
-
-                await Task.Delay(300);
-                MessageBox.Show("Error:Unable to get file!", "Tips");
-            }
+                MessageBox.Show("上传成功", "提示");
+            });
        }
    }
 }
--- a/ProxySuper.Core/Models/Projects/XraySettings.cs
+++ b/ProxySuper.Core/Models/Projects/XraySettings.cs
@ -9,14 +9,12 @@ namespace ProxySuper.Core.Models.Projects
 {
    public class XraySettings : V2raySettings
    {
-        public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized" };
-
-        //流控参数在服务端只有两种 "none", "xtls-rprx-vision"，客户端可以选择三种："none", "xtls-rprx-vision", "xtls-rprx-vision-udp443",但是选择了XTLS模式就是默认flow不为空或者"none",所以这里不再填加"none"这一项。
-        public static List<string> FlowList = new List<string> { "xtls-rprx-vision", "xtls-rprx-vision-udp443" };  //{ "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-splice", "xtls-rprx-splice-udp443" };
+        public static List<string> FlowList = new List<string> { "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-splice", "xtls-rprx-splice-udp443" };
+        public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "randomized" };

        public string UTLS { get; set; } = UTLSList[1];

-        public string Flow { get; set; } = FlowList[0];
+        public string Flow { get; set; } = FlowList[2];

        /// <summary>
        /// vless xtls shareLink
--- a/ProxySuper.Core/ProxySuper.Core.csproj
+++ b/ProxySuper.Core/ProxySuper.Core.csproj
@ -47,8 +47,8 @@
    <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
      <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
    </Reference>
-    <Reference Include="Renci.SshNet, Version=2023.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll</HintPath>
+    <Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+      <HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
--- a/ProxySuper.Core/Services/ServiceBase.cs
+++ b/ProxySuper.Core/Services/ServiceBase.cs
@ -802,13 +802,13 @@ namespace ProxySuper.Core.Services
                if (_host.SecretType == LoginSecretType.PrivateKey)
                {
                    PrivateKeyFile keyFile;
-                    if (string.IsNullOrEmpty(_host.PrivateKeyPassPhrase))
+                    if (string.IsNullOrEmpty(_host.Password))
                    {
                        keyFile = new PrivateKeyFile(_host.PrivateKeyPath);
                    }
                    else
                    {
-                        keyFile = new PrivateKeyFile(_host.PrivateKeyPath, _host.PrivateKeyPassPhrase);
+                        keyFile = new PrivateKeyFile(_host.PrivateKeyPath, _host.Password);
                    }
                    authMethods.Add(new PrivateKeyAuthenticationMethod(_host.UserName, keyFile));
                }
@ -829,8 +829,7 @@ namespace ProxySuper.Core.Services
                    proxyType: _host.Proxy.Type,
                    proxyHost: _host.Proxy.Address,
                    proxyPort: _host.Proxy.Port,
-                    proxyUsername: _host.Proxy.UserName,
-                    proxyPassword: _host.Proxy.Password,
+                    proxyUsername: _host.Proxy.UserName, proxyPassword: _host.Proxy.Password,
                    authenticationMethods: authMethods.ToArray());
            }
            catch (Exception ex)
--- a/ProxySuper.Core/Services/ShareLink.cs
+++ b/ProxySuper.Core/Services/ShareLink.cs
@ -184,7 +184,7 @@ namespace ProxySuper.Core.Services
                case RayType.VLESS_TCP_XTLS:
                    _protocol = "vless";
                    _type = "tcp";
-                    _security = "tls";
+                    _security = "xtls";
                    _descriptiveText = "vless-tcp-xtls";
                    break;
                case RayType.VLESS_WS:
--- a/ProxySuper.Core/Services/XrayConfigBuilder.cs
+++ b/ProxySuper.Core/Services/XrayConfigBuilder.cs
@ -79,8 +79,7 @@ namespace ProxySuper.Core.Services
                }
                var domain = parameters.MaskDomain
                    .TrimStart("http://".ToCharArray())
-                    .TrimStart("https://".ToCharArray())
-                    .TrimEnd('/');
+                    .TrimStart("https://".ToCharArray());

                caddyStr = caddyStr.Replace("##reverse_proxy##", $"reverse_proxy {prefix}{domain} {{ \n        header_up Host {domain} \n    }}");
            }
@ -104,7 +103,6 @@ namespace ProxySuper.Core.Services
                }
                else
                {
-                    flow = "xtls-rprx-vision";//兼容普通tls与xtls
                    obj = new { id = id, flow = flow };
                }

--- a/ProxySuper.Core/packages.config
+++ b/ProxySuper.Core/packages.config
@ -3,7 +3,7 @@
  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
  <package id="MvvmCross" version="8.0.2" targetFramework="net472" />
  <package id="QRCoder" version="1.4.3" targetFramework="net472" />
-  <package id="SSH.NET" version="2023.0.0" targetFramework="net472" />
+  <package id="SSH.NET" version="2020.0.2" targetFramework="net472" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
  <package id="System.Console" version="4.3.1" targetFramework="net461" />
  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
--- a/ProxySuper.WPF/Controls/HostControl.xaml
+++ b/ProxySuper.WPF/Controls/HostControl.xaml
@ -13,15 +13,11 @@
    <UserControl.Resources>
        <convert:LoginSecretTypeConverter x:Key="SecretTypeConverter" />
        <convert:ProxyTypeConverter x:Key="ProxyTypeConverter" />
-        <convert:BooleanOrConverter x:Key="BooleanOrConverter" />
-        <convert:BooleanOrToVisibilityConverter x:Key="BooleanOrToVisibilityConverter" />
-        <convert:VisibleConverter x:Key="VisibleConverter" />
-        
    </UserControl.Resources>
    
    <Grid>
        <Grid.RowDefinitions>
-            <RowDefinition Height="330" />
+            <RowDefinition Height="300" />
            <RowDefinition Height="auto" />
        </Grid.RowDefinitions>
        
@ -40,7 +36,6 @@
                    <RowDefinition Height="36" />
                    <RowDefinition Height="36" />
                    <RowDefinition Height="36" />
-                    <RowDefinition Height="36" />
                </Grid.RowDefinitions>

                <Grid.ColumnDefinitions>
@ -99,13 +94,7 @@
                                 }" />
                </StackPanel>

-                <Label Content="{DynamicResource HostUploadSecretKey}" 
-                       Grid.Row="6" Grid.Column="0" 
-                       Visibility="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource VisibleConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"/> 
+                <Label Content="{DynamicResource HostUploadSecretKey}" Grid.Row="6" Grid.Column="0" /> 
                <Button Height="24"
                        Width="100"
                        HorizontalAlignment="Left"
@ -116,54 +105,7 @@
                            Converter={StaticResource SecretTypeConverter},
                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
                        }"
-                        Visibility="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource VisibleConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"
                        Content="{DynamicResource HostUploadSecretKey}" /> 
-
-                <Label Content="{DynamicResource HostSertTypePrivateKeyPassPhrase}" 
-                       Grid.Row="7" Grid.Column="0" 
-                       Visibility="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource VisibleConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"/>
-                <TextBox Grid.Row="7" Grid.Column="1"
-                         Width="170"
-                         Text="{Binding Host.PrivateKeyPassPhrase}"
-                         IsEnabled="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource SecretTypeConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"
-                        Visibility="{
-                            Binding Host.SecretType,
-                            Converter={StaticResource VisibleConverter},
-                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
-                        }"
-                         VerticalContentAlignment="Center" Height="26" >
-                    <TextBox.Resources>
-                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
-                            <VisualBrush.Visual>
-                                <TextBlock FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
-                            </VisualBrush.Visual>
-                        </VisualBrush>
-                    </TextBox.Resources>
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Style.Triggers>
-                                <Trigger Property="Text" Value="{x:Null}">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                                <Trigger Property="Text" Value="">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBox.Style>
-                </TextBox>
            </Grid>
        </GroupBox>

@ -190,13 +132,6 @@
                                    Converter={StaticResource ProxyTypeConverter},
                                    ConverterParameter={x:Static ssh:ProxyTypes.None}
                                 }"/>
-                    <RadioButton Content="{DynamicResource ProxyTypeSocks5}"
-                                 Margin="5,0"
-                                 IsChecked="{
-                                    Binding Host.Proxy.Type,
-                                    Converter={StaticResource ProxyTypeConverter},
-                                    ConverterParameter={x:Static ssh:ProxyTypes.Socks5}
-                                 }"/>
                    <RadioButton Content="{DynamicResource ProxyTypeHttp}"
                                 Margin="5,0"
                                 IsChecked="{
@ -204,168 +139,26 @@
                                    Converter={StaticResource ProxyTypeConverter},
                                    ConverterParameter={x:Static ssh:ProxyTypes.Http}
                                 }"/>
-                </StackPanel>
-
-                <Label Content="{DynamicResource ProxyAddress}" Grid.Row="1" Grid.Column="0" >
-                    <Label.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </Label.Visibility>
-                </Label>
-                <TextBox Text="{Binding Host.Proxy.Address}" 
-                         Grid.Row="1" 
-                         Grid.Column="1" >
-                    <!-- IsEnabled="{
+                    <RadioButton Content="{DynamicResource ProxyTypeSocks5}"
+                                 Margin="5,0"
+                                 IsChecked="{
                                    Binding Host.Proxy.Type,
                                    Converter={StaticResource ProxyTypeConverter},
                                    ConverterParameter={x:Static ssh:ProxyTypes.Socks5}
-                         }" -->
-                         <TextBox.IsEnabled>
-                            <MultiBinding Converter="{StaticResource BooleanOrConverter}">
-                                <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                                <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                            </MultiBinding>
-                        </TextBox.IsEnabled>
-                    <TextBox.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </TextBox.Visibility>
-                </TextBox>
+                                 }"/>
+                </StackPanel>

-                <Label Content="{DynamicResource HostPort}" Grid.Row="2" Grid.Column="0" >
-                    <Label.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                               Converter="{StaticResource ProxyTypeConverter}" 
-                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" 
-                               Converter="{StaticResource ProxyTypeConverter}" 
-                               ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </Label.Visibility>
-                </Label>
-                <TextBox Text="{Binding Host.Proxy.Port}" Grid.Row="2" Grid.Column="1" >
-                    <TextBox.IsEnabled>
-                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
-                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </TextBox.IsEnabled>
-                    <TextBox.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
-                        </MultiBinding>
-                    </TextBox.Visibility>
-                </TextBox>
+                <Label Content="{DynamicResource ProxyAddress}" Grid.Row="1" Grid.Column="0" />
+                <TextBox Text="{Binding Host.Proxy.Address}" Grid.Row="1" Grid.Column="1" />

-                <Label Content="{DynamicResource ProxyUserName}" Grid.Row="3" Grid.Column="0" >
-                    <Label.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                               Converter="{StaticResource ProxyTypeConverter}" 
-                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </Label.Visibility>
-                </Label>
-                <TextBox Text="{Binding Host.Proxy.UserName}" Grid.Row="3" Grid.Column="1" Height="26" >
-                    <TextBox.IsEnabled>
-                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
-                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </TextBox.IsEnabled>
-                    <TextBox.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </TextBox.Visibility>
-                    <TextBox.Resources>
-                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
-                            <VisualBrush.Visual>
-                                <TextBlock FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
-                            </VisualBrush.Visual>
-                        </VisualBrush>
-                    </TextBox.Resources>
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Style.Triggers>
-                                <Trigger Property="Text" Value="{x:Null}">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                                <Trigger Property="Text" Value="">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBox.Style>
-                </TextBox>
+                <Label Content="{DynamicResource ProxyUserName}" Grid.Row="2" Grid.Column="0" />
+                <TextBox Text="{Binding Host.Proxy.UserName}" Grid.Row="2" Grid.Column="1" />

-                <Label Content="{DynamicResource ProxyPassword}" Grid.Row="4" Grid.Column="0" >
-                    <Label.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                               Converter="{StaticResource ProxyTypeConverter}" 
-                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </Label.Visibility>
-                </Label>
-                <TextBox Text="{Binding Host.Proxy.Password}" Grid.Row="4" Grid.Column="1" Height="26" >
-                    <TextBox.IsEnabled>
-                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
-                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
-                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </TextBox.IsEnabled>
-                    <TextBox.Visibility>
-                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
-                            <Binding Path="Host.Proxy.Type" 
-                                Converter="{StaticResource ProxyTypeConverter}" 
-                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
-                        </MultiBinding>
-                    </TextBox.Visibility>
-                    <TextBox.Resources>
-                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
-                            <VisualBrush.Visual>
-                                <TextBlock Height="auto" FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
-                            </VisualBrush.Visual>
-                        </VisualBrush>
-                    </TextBox.Resources>
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Style.Triggers>
-                                <Trigger Property="Text" Value="{x:Null}">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                                <Trigger Property="Text" Value="">
-                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
-                                </Trigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBox.Style>
-                </TextBox>
+                <Label Content="{DynamicResource HostPort}" Grid.Row="3" Grid.Column="0" />
+                <TextBox Text="{Binding Host.Proxy.Port}" Grid.Row="3" Grid.Column="1" />
+
+                <Label Content="{DynamicResource ProxyPassword}" Grid.Row="4" Grid.Column="0" />
+                <TextBox Text="{Binding Host.Proxy.Password}" Grid.Row="4" Grid.Column="1" />

            </Grid>
        </GroupBox>
--- a/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
@ -116,28 +116,29 @@
                    <TextBox Text="{Binding Path=Domain}" Width="200"  />
                </StackPanel>

+                <!--Mask Domain-->
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                    <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
+                    <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
+                </StackPanel>
+
                <!--UUID-->
                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
                    <Label Content="{DynamicResource XrayUUID}" Width="120" />
+
                    <TextBox Text="{Binding Path=UUID}" Width="200" />
+
                    <Button Margin="5,0,0,0"
                            Padding="12,3"
                            Command="{Binding Path=RandomUuid}"
                            Content="{DynamicResource Random}" />
                </StackPanel>
-
-                <!--v2ray prot-->
-                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                    <Label Content="{DynamicResource V2rayPort}"  Width="120"  />
-                    <TextBox Text="{Binding Path=Port}" Width="120"  />
-                    <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
-                </StackPanel>
                <!--#endregion-->

                <!--more params-->
                <Expander ExpandDirection="Down" Margin="0,10,0,0">
                    <Expander.Header>
-                        <TextBlock Text="{DynamicResource MoreParameters}" FontWeight="Bold" />
+                        <TextBlock Text="更多参数" FontWeight="Bold" />
                    </Expander.Header>

                    <Expander.Content>
@ -153,12 +154,6 @@
                            </StackPanel>
                            <!--#endregion-->

-                            <!--Mask Domain-->
-                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
-                                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
-                            </StackPanel>
-
                            <!--#region VLESS WebSocket Settings -->
                            <!--WebSocket Path-->
                            <StackPanel Margin="0,15,0,0"
@ -442,6 +437,13 @@
                                <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
                                <TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
                            </StackPanel>
+
+                            <!--v2ray prot-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource V2rayPort}" Foreground="Gray" Width="120"  />
+                                <TextBox Text="{Binding Path=Port}" Width="120"  />
+                                <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
+                            </StackPanel>
                            <!--#endregion-->

                            <!--#region Multiple Users Settings -->
--- a/ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml
+++ b/ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml
@ -58,7 +58,7 @@

        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
            <Label Content="传输安全(tls)" Width="140" />
-            <TextBox Text="tls" IsReadOnly="True" Width="300" />
+            <TextBox Text="xtls" IsReadOnly="True" Width="300" />
        </StackPanel>

        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
--- a/ProxySuper.WPF/Controls/XraySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
@ -17,13 +17,6 @@
            <StackPanel Orientation="Horizontal">
                <!--#region VLESS -->
                <WrapPanel Orientation="Vertical">
-                    <!--XTLS+Reality-->
-                    <CheckBox Width="150"
-                              VerticalContentAlignment="Center"
-                              IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
-                        <Label Content="{DynamicResource VlessXtlsRealityDesc}"  FontSize="12" Foreground="LimeGreen" />
-                    </CheckBox>
-
                    <!--XTLS-->
                    <CheckBox Width="150"
                              VerticalContentAlignment="Center"
@ -152,7 +145,7 @@
                <!--more params-->
                <Expander ExpandDirection="Down" Margin="0,10,0,0">
                    <Expander.Header>
-                        <TextBlock Text="{DynamicResource MoreParameters}" FontWeight="Bold" />
+                        <TextBlock Text="更多参数" FontWeight="Bold" />
                    </Expander.Header>

                    <Expander.Content>
@ -174,7 +167,7 @@
                                            Binding Path=Checked_VLESS_TCP_XTLS,
                                            Converter={StaticResource VisibleConverter}
                                        }">
-                                <Label Content="{DynamicResource Flow}" Width="120" VerticalAlignment="Bottom"/>
+                                <Label Content="{Binding Path=Flow}" Width="120" VerticalAlignment="Bottom"/>
                                <ComboBox Width="260" 
                                          VerticalAlignment="Bottom"
                                          ItemsSource="{Binding Path=FlowList}"
--- a/ProxySuper.WPF/MainWindow.xaml
+++ b/ProxySuper.WPF/MainWindow.xaml
@ -8,7 +8,7 @@
        mc:Ignorable="d"
        WindowStartupLocation="CenterScreen"
        Icon="/Resources/ProxySU.ico"
-        Title="ProxySU   v4.2.0" Height="600" Width="1000">
+        Title="ProxySU" Height="600" Width="1000">
    <Grid>
        
    </Grid>
--- a/ProxySuper.WPF/Properties/AssemblyInfo.cs
+++ b/ProxySuper.WPF/Properties/AssemblyInfo.cs
@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.1.6.0")]
+[assembly: AssemblyFileVersion("4.1.6.0")]
--- a/ProxySuper.WPF/ProxySuper.WPF.csproj
+++ b/ProxySuper.WPF/ProxySuper.WPF.csproj
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
  　　<AllowedReferenceRelatedFileExtensions>
@ -19,7 +18,7 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
+    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
@ -33,9 +32,6 @@
    <StartupObject>ProxySuper.WPF.App</StartupObject>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Costura, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll</HintPath>
-    </Reference>
    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
    </Reference>
@ -48,8 +44,8 @@
    <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
      <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
    </Reference>
-    <Reference Include="Renci.SshNet, Version=2023.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll</HintPath>
+    <Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+      <HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@ -716,10 +712,5 @@
      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.4.7.0\build\net461\System.Runtime.WindowsRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.4.7.0\build\net461\System.Runtime.WindowsRuntime.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.6.8.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.2\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
  </Target>
-  <Import Project="..\packages\Fody.6.8.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.8.2\build\Fody.targets')" />
-  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
 </Project>
--- a/ProxySuper.WPF/Resources/Languages/en.xaml
+++ b/ProxySuper.WPF/Resources/Languages/en.xaml
@ -29,7 +29,6 @@
    <sys:String x:Key="MainMenuHelperUseRoot">UseRoot</sys:String>
    <sys:String x:Key="MainMenuHelperCertQuestion">CertQuestion</sys:String>
    <sys:String x:Key="MainMenuHelperPrivateKey">PrivateKey</sys:String>
-    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">Related Resources and Tutorials</sys:String>

    <!--Main DataGrid-->
    <sys:String x:Key="MainDataGridColumnTag">Tag</sys:String>
@ -41,7 +40,7 @@
    <sys:String x:Key="MainDataGridColumnActionViewConfig">ViewConfig</sys:String>
    <sys:String x:Key="MainDataGridColumnActionDelete">Delete</sys:String>
    <sys:String x:Key="MainDataGridColumnActionSortUp">Up</sys:String>
-    <sys:String x:Key="MainDataGridColumnActionSortDone">Down</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionSortDone">Done</sys:String>


    <!--Editor Window-->
@ -52,12 +51,10 @@
    <sys:String x:Key="HostPassword">Password</sys:String>
    <sys:String x:Key="HostPort">Port</sys:String>
    <sys:String x:Key="HostSecretType">SecretType</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">LoadingKey</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">UploadKey</sys:String>
    <sys:String  x:Key="HostSertTypePassword">Password</sys:String>
    <sys:String  x:Key="HostSertTypePrivateKey">PrivateKey</sys:String>
-    <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">PKPassword</sys:String>

-    <sys:String x:Key="TextBoxContentTipsNoneBlank">None,Blank</sys:String>

    <sys:String x:Key="ProxyGroupName">Proxy</sys:String>
    <sys:String x:Key="ProxyAddress">Address</sys:String>
@ -74,7 +71,6 @@
    <sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>

    <!--Xray-->
-    <sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
@ -122,7 +118,6 @@
    <sys:String x:Key="V2rayPort">v2ray Port</sys:String>
    <sys:String x:Key="XrayPort">xray Port</sys:String>
    <sys:String x:Key="XrayPortDefault">default port is 443</sys:String>
-    <sys:String x:Key="MoreParameters">More Parameters</sys:String>

    <!--xray installer-->
    <sys:String x:Key="XrayInstallerInstall">Install</sys:String>
--- a/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
+++ b/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
@ -3,20 +3,20 @@
                    xmlns:sys="clr-namespace:System;assembly=mscorlib">

    <!--common-->
-    <sys:String x:Key="Random">تصادفی</sys:String>
+    <sys:String x:Key="Random">Random</sys:String>
    <sys:String x:Key="Save">ذخیره</sys:String>
    <sys:String x:Key="SaveAndInstall">ذخیره و نصب</sys:String>
    <sys:String x:Key="SaveAs">ذخیره به عنوان</sys:String>
    <sys:String x:Key="Install">نصب</sys:String>
    <sys:String x:Key="Settings">تنظیمات</sys:String>
-    <sys:String x:Key="ReadmeWebsiteDemo">موارد زیر یک اتصال صفحه وب ثابت است که توسط کاربران اینترنتی ارائه شده است، لطفاً بررسی کنید که آیا فایل index.html توسط خودتان وجود دارد یا خیر.</sys:String>
+    <sys:String x:Key="ReadmeWebsiteDemo">The following is a static web page connection provided by netizens, please check whether there is an index.html file by yourself</sys:String>

    <!--Main Menu-->
-    <sys:String x:Key="MainMenuAddHost">میزبان اضافه کنید</sys:String>
-    <sys:String x:Key="MainMenuActions">عمل کنند</sys:String>
-    <sys:String x:Key="MainMenuActionsExportSettings">پیکربندی صادرات</sys:String>
-    <sys:String x:Key="MainMenuActionsExportSubscribe">اشتراک صادرات</sys:String>
-    <sys:String x:Key="MainMenuActionsGetRoot">اکانت روت را فعال کنید</sys:String>
+    <sys:String x:Key="MainMenuAddHost">Add Host</sys:String>
+    <sys:String x:Key="MainMenuActions">Actions</sys:String>
+    <sys:String x:Key="MainMenuActionsExportSettings">Export Settings</sys:String>
+    <sys:String x:Key="MainMenuActionsExportSubscribe">Export Subscribe</sys:String>
+    <sys:String x:Key="MainMenuActionsGetRoot">Get Root</sys:String>

    <sys:String x:Key="MainMenuLanguage">زبان(Language)</sys:String>
    <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
@ -24,24 +24,23 @@
    <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
    <sys:String x:Key="MainMenuLanguageFr">فارسی</sys:String>

-    <sys:String x:Key="MainMenuHelper">یاور</sys:String>
+    <sys:String x:Key="MainMenuHelper">Helper</sys:String>
    <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
-    <sys:String x:Key="MainMenuHelperUseRoot">اکانت روت را فعال کنید</sys:String>
-    <sys:String x:Key="MainMenuHelperCertQuestion">در مورد گواهینامه</sys:String>
-    <sys:String x:Key="MainMenuHelperPrivateKey">در مورد سوال</sys:String>
-    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">منابع و آموزش های مرتبط</sys:String>
+    <sys:String x:Key="MainMenuHelperUseRoot">UseRoot</sys:String>
+    <sys:String x:Key="MainMenuHelperCertQuestion">CertQuestion</sys:String>
+    <sys:String x:Key="MainMenuHelperPrivateKey">PrivateKey</sys:String>

    <!--Main DataGrid-->
    <sys:String x:Key="MainDataGridColumnTag">برچسب</sys:String>
    <sys:String x:Key="MainDataGridColumnAddress">آدرس</sys:String>
    <sys:String x:Key="MainDataGridColumnType">نوع</sys:String>
-    <sys:String x:Key="MainDataGridColumnAction">عمل کنند</sys:String>
+    <sys:String x:Key="MainDataGridColumnAction">Action</sys:String>
    <sys:String x:Key="MainDataGridColumnActionInstall">نصب</sys:String>
    <sys:String x:Key="MainDataGridColumnActionEdit">ویرایش</sys:String>
-    <sys:String x:Key="MainDataGridColumnActionViewConfig">مشاهده پیکربندی</sys:String>
-    <sys:String x:Key="MainDataGridColumnActionDelete">حذف</sys:String>
-    <sys:String x:Key="MainDataGridColumnActionSortUp">بالاا</sys:String>
-    <sys:String x:Key="MainDataGridColumnActionSortDone">پایین</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionViewConfig">ViewConfig</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionDelete">Delete</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionSortUp">Up</sys:String>
+    <sys:String x:Key="MainDataGridColumnActionSortDone">Done</sys:String>


    <!--Editor Window-->
@ -51,13 +50,11 @@
    <sys:String x:Key="HostUserName">نام کاربری</sys:String>
    <sys:String x:Key="HostPassword">رمز عبور</sys:String>
    <sys:String x:Key="HostPort">پورت</sys:String>
-    <sys:String x:Key="HostSecretType">نوع تأیید ورود</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">بارگیری کلید خصوصی</sys:String>
+    <sys:String x:Key="HostSecretType">SecretType</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">UploadKey</sys:String>
    <sys:String  x:Key="HostSertTypePassword">رمز عبور</sys:String>
-    <sys:String  x:Key="HostSertTypePrivateKey">کلید خصوصی</sys:String>
-    <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">رمز عبور PK</sys:String>
+    <sys:String  x:Key="HostSertTypePrivateKey">PrivateKey</sys:String>

-    <sys:String x:Key="TextBoxContentTipsNoneBlank">اگر هیچ کدام، آن را خالی بگذارید</sys:String>

    <sys:String x:Key="ProxyGroupName">پروکسی</sys:String>
    <sys:String x:Key="ProxyAddress">آدرس</sys:String>
@ -67,14 +64,13 @@
    <sys:String x:Key="ProxyType">نوع</sys:String>
    <sys:String x:Key="ProxyTypeNone">None</sys:String>
    <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
-    <sys:String x:Key="ProxyTypeSocks5">Socks5</sys:String>
+    <sys:String x:Key="ProxyTypeSocks5">ساکس5</sys:String>
    
    <!--editor-->
    <sys:String x:Key="EditorProxyType" xml:space="preserve">نوع پروکسی</sys:String>
    <sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>

    <!--Xray-->
-    <sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS TCP XTLS REALITY</sys:String>
    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
@ -94,8 +90,8 @@
    <sys:String x:Key="XrayUUID">UUID</sys:String>
    <sys:String x:Key="Flow">Flow</sys:String>
    <sys:String x:Key="UTLS">uTLS</sys:String>
-    <sys:String x:Key="MultiUser">چند کاربره</sys:String>
-    <sys:String x:Key="MultiUserHelp">چند شناسه تقسیم با ","</sys:String>
+    <sys:String x:Key="MultiUser">Multi User</sys:String>
+    <sys:String x:Key="MultiUserHelp">Multi Id split with ","</sys:String>
    <sys:String x:Key="VlessWsPath">VLESS WS Path</sys:String>
    <sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
    <sys:String x:Key="VlessKcpType">VLESS KCP Type</sys:String>
@ -119,10 +115,9 @@
    <sys:String x:Key="SSPort">SS Port</sys:String>
    <sys:String x:Key="TrojanPassword">Trojan Pwd</sys:String>
    <sys:String x:Key="TrojanPort">پورت تروجان</sys:String>
-    <sys:String x:Key="V2rayPort">v2ray بندر</sys:String>
-    <sys:String x:Key="XrayPort">xray بندر</sys:String>
-    <sys:String x:Key="XrayPortDefault">پورت پیش فرض 443 است</sys:String>
-    <sys:String x:Key="MoreParameters">پارامترهای بیشتر</sys:String>
+    <sys:String x:Key="V2rayPort">v2ray Port</sys:String>
+    <sys:String x:Key="XrayPort">xray Port</sys:String>
+    <sys:String x:Key="XrayPortDefault">default port is 443</sys:String>

    <!--xray installer-->
    <sys:String x:Key="XrayInstallerInstall">نصب</sys:String>
--- a/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
@ -29,7 +29,7 @@
    <sys:String x:Key="MainMenuHelperUseRoot">啓用Root賬戶</sys:String>
    <sys:String x:Key="MainMenuHelperCertQuestion">證書問題</sys:String>
    <sys:String x:Key="MainMenuHelperPrivateKey">私鑰問題</sys:String>
-    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">相關資源與教程</sys:String>
+

    <!--Main DataGrid-->
    <sys:String x:Key="MainDataGridColumnTag">名稱</sys:String>
@ -52,12 +52,9 @@
    <sys:String x:Key="HostPassword">密碼</sys:String>
    <sys:String x:Key="HostPort">端口</sys:String>
    <sys:String x:Key="HostSecretType">登録驗證</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">載入私鑰</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">上傳Key</sys:String>
    <sys:String x:Key="HostSertTypePassword">密碼</sys:String>
    <sys:String x:Key="HostSertTypePrivateKey">私鑰</sys:String>
-    <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">私鑰密碼</sys:String>
-
-    <sys:String x:Key="TextBoxContentTipsNoneBlank">若無,則留空</sys:String>

    <sys:String x:Key="ProxyGroupName">代理</sys:String>
    <sys:String x:Key="ProxyAddress">IP/地址</sys:String>
@ -74,8 +71,7 @@
    <sys:String x:Key="EditorProxyParams" xml:space="preserve">節點參數</sys:String>

    <!--Xray-->
-    <sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
@ -123,7 +119,6 @@
    <sys:String x:Key="V2rayPort">V2ray端口</sys:String>
    <sys:String x:Key="XrayPort">XRAY端口</sys:String>
    <sys:String x:Key="XrayPortDefault">默認端口443，不建議修改</sys:String>
-    <sys:String x:Key="MoreParameters">更多參數</sys:String>

    <!--xray installer-->
    <sys:String x:Key="XrayInstallerInstall">一鍵安裝</sys:String>
--- a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
@ -29,7 +29,7 @@
    <sys:String x:Key="MainMenuHelperUseRoot">启用Root账户</sys:String>
    <sys:String x:Key="MainMenuHelperCertQuestion">证书问题</sys:String>
    <sys:String x:Key="MainMenuHelperPrivateKey">私钥问题</sys:String>
-    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">相关资源与教程</sys:String>
+

    <!--Main DataGrid-->
    <sys:String x:Key="MainDataGridColumnTag">名称</sys:String>
@ -53,12 +53,9 @@
    <sys:String x:Key="HostPassword">密码</sys:String>
    <sys:String x:Key="HostPort">端口</sys:String>
    <sys:String x:Key="HostSecretType">登陆验证</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">载入私钥</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">上传Key</sys:String>
    <sys:String x:Key="HostSertTypePassword">密码</sys:String>
    <sys:String x:Key="HostSertTypePrivateKey">私钥</sys:String>
-    <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">私钥密码</sys:String>
-
-    <sys:String x:Key="TextBoxContentTipsNoneBlank">若无,则留空</sys:String>

    <sys:String x:Key="ProxyGroupName">代理</sys:String>
    <sys:String x:Key="ProxyAddress">IP/地址</sys:String>
@ -75,8 +72,7 @@
    <sys:String x:Key="EditorProxyParams" xml:space="preserve">节点参数</sys:String>

    <!--Xray-->
-    <sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
@ -124,7 +120,6 @@
    <sys:String x:Key="V2rayPort">V2ray端口</sys:String>
    <sys:String x:Key="XrayPort">XRAY端口</sys:String>
    <sys:String x:Key="XrayPortDefault">默认端口443，不建议修改</sys:String>
-    <sys:String x:Key="MoreParameters">更多参数</sys:String>

    <!--xray installer-->
    <sys:String x:Key="XrayInstallerInstall">一键安装</sys:String>
--- a/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json
+++ b/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json
@ -5,7 +5,7 @@
    "clients": [
      {
        "id": "",
-        "flow": "xtls-rprx-vision"
+        "flow": "xtls-rprx-direct"
      }
    ],
    "decryption": "none",
@ -13,13 +13,15 @@
  },
  "streamSettings": {
    "network": "tcp",
-    "security": "tls",
-    "tlsSettings": {
-      "rejectUnknownSni": true,
+    "security": "xtls",
+    "xtlsSettings": {
+      "allowInsecure": false,
      "minVersion": "1.2",
+      "alpn": [
+        "http/1.1"
+      ],
      "certificates": [
        {
-          "ocspStapling": 3600,
          "certificateFile": "/usr/local/etc/xray/ssl/xray_ssl.crt",
          "keyFile": "/usr/local/etc/xray/ssl/xray_ssl.key"
        }
--- a/ProxySuper.WPF/Views/Brook/BrookEditorView.xaml
+++ b/ProxySuper.WPF/Views/Brook/BrookEditorView.xaml
@ -11,7 +11,7 @@
        BorderBrush="#eee"
        Icon="/Resources/ProxySU.ico"
        WindowStartupLocation="CenterScreen"
-        Title="BrookEditorView" Height="640" Width="1000">
+        Title="BrookEditorView" Height="600" Width="1000">
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="310" />
--- a/ProxySuper.WPF/Views/HomeView.xaml
+++ b/ProxySuper.WPF/Views/HomeView.xaml
@ -41,7 +41,6 @@
                <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperUseRoot}" Click="LaunchUseRootSite"></MenuItem>
                <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperCertQuestion}" Click="LaunchCertQuestion"></MenuItem>
                <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperPrivateKey}" Click="LaunchPrivateKeyQuestion"></MenuItem>
-                <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperResourcesAndTutorials}" Click="LaunchResourcesAndTutorials"></MenuItem>
            </MenuItem>
        </Menu>

--- a/ProxySuper.WPF/Views/HomeView.xaml.cs
+++ b/ProxySuper.WPF/Views/HomeView.xaml.cs
@ -62,10 +62,6 @@ namespace ProxySuper.WPF.Views
            System.Diagnostics.Process.Start("explorer.exe", "https://github.com/proxysu/ProxySU/wiki/PrivateKey%E8%BD%AC%E6%8D%A2");
        }

-        private void LaunchResourcesAndTutorials(object sender, RoutedEventArgs e)
-        {
-            System.Diagnostics.Process.Start("explorer.exe", "https://github.com/proxysu/ProxySU/wiki/%E7%9B%B8%E5%85%B3%E8%B5%84%E6%BA%90%E4%B8%8E%E6%95%99%E7%A8%8B");
-        }

        ResourceDictionary resource = new ResourceDictionary();
        private void SetSimpleChinese(object sender, RoutedEventArgs e)
--- a/ProxySuper.WPF/Views/Hysteria/HysteriaEditorView.xaml
+++ b/ProxySuper.WPF/Views/Hysteria/HysteriaEditorView.xaml
@ -11,7 +11,7 @@
        BorderBrush="#eee"
        Icon="/Resources/ProxySU.ico"
        WindowStartupLocation="CenterScreen"
-        Title="Hysteria编辑配置" Height="640" Width="1000">
+        Title="Hysteria编辑配置" Height="600" Width="1000">
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="310" />
--- a/ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml
+++ b/ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml
@ -11,7 +11,7 @@
        BorderBrush="#eee"
        Icon="/Resources/ProxySU.ico"
        WindowStartupLocation="CenterScreen"
-        Title="MTProto-Go编辑配置" Height="640" Width="1000">
+        Title="MTProto-Go编辑配置" Height="600" Width="1000">
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="310" />
--- a/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
+++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
@ -11,7 +11,7 @@
        BorderBrush="#eee"
        Icon="/Resources/ProxySU.ico"
        WindowStartupLocation="CenterScreen"
-        Title="NaiveProxy编辑配置" Height="640" Width="1000">
+        Title="NaiveProxy编辑配置" Height="600" Width="1000">
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="310" />
--- a/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
+++ b/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
@ -11,7 +11,7 @@
        BorderBrush="#eee"
        Icon="/Resources/ProxySU.ico"
        WindowStartupLocation="CenterScreen"
-        Title="Trojan-Go编辑配置" Height="640" Width="1000">
+        Title="Trojan-Go编辑配置" Height="600" Width="1000">
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="310" />
--- a/ProxySuper.WPF/packages.config
+++ b/ProxySuper.WPF/packages.config
@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="6.0.0" targetFramework="net472" developmentDependency="true" />
-  <package id="Fody" version="6.8.2" targetFramework="net472" developmentDependency="true" />
  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
  <package id="MvvmCross" version="8.0.2" targetFramework="net472" />
  <package id="MvvmCross.Platforms.Wpf" version="8.0.2" targetFramework="net472" />
  <package id="QRCoder" version="1.4.3" targetFramework="net472" />
-  <package id="SSH.NET" version="2023.0.0" targetFramework="net472" />
+  <package id="SSH.NET" version="2020.0.2" targetFramework="net472" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
  <package id="System.Console" version="4.3.1" targetFramework="net461" />
  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
--- a/README.md
+++ b/README.md
@ -1,13 +1,10 @@
 # ProxySU
 V2ray, Xray, Trojan, NaiveProxy, Trojan-Go, MTProto Go, Brook,BBR install tools for windows。  
 V2ray，Xray, Trojan，NaiveProxy, Trojan-Go, MTProto Go, Brook 及相关插件。支持纯ipv6主机一键安装代理。  
-BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语言:English、简体中文、正体（繁体）中文，波斯语。  
+BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语言:English、简体中文、正体（繁体）中文。

 编译环境Visual Studio 2019  使用WPF界面。可一键安装 V2ray/Xray, Shadowsocks, Trojan, Trojan-Go, NaiveProxy, MTProto Go, Brook 后续还会再添加其他。  

-零基础用户，强烈建议看一下[Xray官网](https://xtls.github.io)的[小小白白话文-自建教程](https://xtls.github.io/document/level-0)。  
-更多相关资源与工具请看本项目Wiki[资源和工具](https://github.com/proxysu/ProxySU/wiki/%E8%B5%84%E6%BA%90%E5%92%8C%E5%B7%A5%E5%85%B7)。  
-
 ![photo_2021-05-31_17-23-29](https://user-images.githubusercontent.com/73510229/120171754-f46ffd00-c234-11eb-8105-4e6a941a65bb.jpg)
 ![photo_2021-05-31_17-24-29](https://user-images.githubusercontent.com/73510229/120171966-297c4f80-c235-11eb-921a-2ddebad5dc58.jpg)

@ -18,9 +15,8 @@ BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语
 #### 再次声明：  
 ##### ProxySU本着技术中立的原则，没有任何立场，也不持任何见解，更不涉及任何政治因素。ProxySU仅仅主张人的知情权，这是一项天赋人权，也是各国宪法所保障的最基本人权。知情权包含对同一事物正负两方面评价的知情，至于相信哪个，由人自己选择。正如李文亮医生临终所言：一个正常的社会是不应该只有一种声音的。如果真的存在对某一事物只有一种声音的评价，无论其评价是正面还是负面，都是要慎重对待，并需要重新审视的。  

-
-##### 代理版本的选择  
-多数情况下，ProxySU安装代理工具的Latest版。  
+##### 上传自有证书 #####
+需要将crt和key文件打包成zip，在安装界面选择“上传自有证书”

 ##### 支持的VPS系统为：  
 * CentOS 7/8   
@ -62,14 +58,7 @@ ProxySU调用[SSH.NET](https://github.com/sshnet/SSH.NET)库登录远程主机
 * RSA in OpenSSL PEM and ssh.com format  
 * DSA in OpenSSL PEM and ssh.com format  
 * ECDSA 256/384/521 in OpenSSL PEM format  
-* ECDSA 256/384/521, ED25519 and RSA in OpenSSH key format  
-可以使用以下密码方法之一对私钥进行加密：  
-* DES-EDE3-CBC  
-* DES-EDE3-CFB  
-* DES-CBC  
-* AES-128-CBC  
-* AES-192-CBC  
-* AES-256-CBC  
+* ED25519 in OpenSSH key format  
 见官方说明：  
 https://github.com/sshnet/SSH.NET#public-key-authentication  
 如果当前拥有的密钥格式不是以上几种，可以下载[puttygen](https://www.puttygen.com/)工具，将其转换成上面的格式。  
@ -90,9 +79,6 @@ Let's Encrypt证书申请频率的限制
 同一IP地址，在短时间内过于频繁的申请证书，也会被限制，此时更换域名也无法申请成功，只能等待一段时间，或者更换Ip.  
 (网友分享)  

-##### 上传自有证书 #####
-需要将crt和key文件打包成zip，在安装界面选择“上传自有证书”
-
 ##### 关于卸载功能  
 有网友要求，可以卸载其他方法安装的，经过考虑，还是不这样做。1，容易引起争议。2，不容易卸载干净，在用ProxySU安装时可能还会出错。所以第一次使用ProxySU建议使用全新系统，如果以前安装过代理程序，请尽可能将系统重装一下，可以减少很多安装的错误和冲突。  

@ -122,7 +108,7 @@ Microsoft [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-fram

 在使用遇到问题时，请先看一下[常见问题集锦](https://github.com/proxysu/windows/wiki/CommonError)，如果还不能解决，可以到以上平台询问，个人精力有限，尽力解答。

-
+下版本添加 【Hysteria】