diff --git a/ProxySU/App.xaml b/ProxySU/App.xaml
index 332218e..727c569 100644
--- a/ProxySU/App.xaml
+++ b/ProxySU/App.xaml
@@ -4,6 +4,11 @@
              xmlns:local="clr-namespace:ProxySU"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Translations\ProxySU.zh-CN.xaml" />
+                <ResourceDictionary Source="Translations\ProxySU.en-US.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml
index 36ff75f..ba714a7 100644
--- a/ProxySU/MainWindow.xaml
+++ b/ProxySU/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ProxySU"
         mc:Ignorable="d"
-        Title="ProxySU - v1.8.5" Height="600" Width="530">
+        Title="ProxySU - v1.8.6" Height="600" Width="530">
     <!--以下样式参考自：https://yq.aliyun.com/articles/331878
 	https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
     <Window.Resources>
@@ -38,7 +38,7 @@
                     
                 </Grid>
             </TabItem>-->
-            <TabItem Header="应用布署" Width="110" Height="30">
+            <TabItem Header="{DynamicResource TabItemHeaderAppDeployment}" Width="110" Height="30">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"></ColumnDefinition>
@@ -60,12 +60,12 @@
                         <RowDefinition ></RowDefinition>
                         <RowDefinition Height="60"></RowDefinition>
                     </Grid.RowDefinitions>
-                    <TextBlock Text="主机名：" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" Grid.Column="0" Grid.Row="0"></TextBlock>
-                    <TextBlock Text="端口：" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" Grid.Column="2" Grid.Row="0"></TextBlock>
-                    <TextBox x:Name="TextBoxHost" Text="" Style="{StaticResource TitleText}" Tag="IP或域名(不可为空)" Margin="5" Grid.Column="1" Grid.Row="0"></TextBox>
+                    <TextBlock Text="{DynamicResource TextBlockHostName}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5" Grid.Column="0" Grid.Row="0"></TextBlock>
+                    <TextBlock Text="{DynamicResource TextBlockHostPart}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5" Grid.Column="2" Grid.Row="0"></TextBlock>
+                    <TextBox x:Name="TextBoxHost" Text="" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxHostNamePrompt}" Margin="5" Grid.Column="1" Grid.Row="0"></TextBox>
                     <TextBox x:Name="TextBoxPort" CommandManager.PreviewExecuted="TextBoxPort_PreviewExecuted" Text="22" Margin="5" Grid.Column="3" Grid.Row="0" PreviewTextInput="TextBoxPort_PreviewTextInput"/>
-                    <TextBlock Text="用户名：" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" Grid.Column="0" Grid.Row="1"></TextBlock>
-                    <TextBlock x:Name="TextBlockPassword" Text="密码：" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" Grid.Column="2" Grid.Row="1"></TextBlock>
+                    <TextBlock Text="{DynamicResource TextBlockHostUser}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5" Grid.Column="0" Grid.Row="1"></TextBlock>
+                    <TextBlock x:Name="TextBlockPassword" Text="{DynamicResource TextBlockHostPassword}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5" Grid.Column="2" Grid.Row="1"></TextBlock>
                     <TextBox x:Name="TextBoxUserName" Text="root" Margin="5" Grid.Column="1" Grid.Row="1"></TextBox>
                     <PasswordBox x:Name="PasswordBoxHostPassword" Password=""   Margin="5" Grid.Column="3" Grid.Row="1"></PasswordBox>
                     <RadioButton x:Name="RadioButtonPasswordLogin" GroupName="CertIsYesNo" Content="密码登录" Visibility="Hidden" Grid.Column="0" Grid.Row="2" Checked="RadioButtonPasswordLogin_Checked"></RadioButton>
@@ -103,11 +103,11 @@
                     <PasswordBox x:Name="PasswordBoxProxyPassword" IsEnabled="False" Password=""  Margin="5" Grid.Column="3" Grid.Row="6" Visibility="Collapsed"></PasswordBox>
 
                     <!--<StatusBar x:Name="StatusBarStatusMonitoring" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="4"></StatusBar>-->
-                    <TextBlock x:Name="TextBlockSetUpProcessing" Text="等待安装布署" Foreground="Blue" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4"></TextBlock>
+                    <TextBlock x:Name="TextBlockSetUpProcessing" Text="{DynamicResource TextBlockSetUpProcessing}" Foreground="Blue" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4"></TextBlock>
                     <ProgressBar x:Name="ProgressBarSetUpProcessing" Minimum="0" Maximum="100" Value="0" IsIndeterminate="False" Margin="7" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4"></ProgressBar>
                     <TextBox x:Name="TextBoxMonitorCommandResults" TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"  Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="4" Grid.RowSpan="5" Margin="30,0,30,10"></TextBox>
                     <TabControl Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="3">
-                        <TabItem Header="V2ray" Width="100" Height="30">
+                        <TabItem Header="V2Ray" Width="100" Height="30">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition></ColumnDefinition>
@@ -122,7 +122,7 @@
                                 
                                 <!--<Button x:Name="ButtonGuideConfiguration" Visibility="Visible"  Content="启用向导" Grid.Column="0" Grid.Row="0" Click="ButtonGuideConfiguration_Click"></Button>
                                 <TextBlock Text="通过向导生成配置文件" Visibility="Visible" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>-->
-                                <Button x:Name="ButtonTemplateConfiguration" Content="V2ray模板库" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTemplateConfiguration_Click"></Button>
+                                <Button x:Name="ButtonTemplateConfiguration" Content="{DynamicResource ButtonV2RayTemplateConfiguration}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTemplateConfiguration_Click"></Button>
                                 <!--<TextBlock Text="模板库" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>-->
                                 <!--<Button x:Name="ButtonAdvancedConfiguration" Visibility="Visible" Content="配置编辑器" Grid.Column="2" Grid.Row="0" Click="ButtonAdvancedConfiguration_Click"></Button>
                                 <TextBlock Text="配置文件高级生成器&#x0a;（有经验用户可以使用）" Visibility="Visible" Grid.Column="2" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>-->
@@ -131,9 +131,9 @@
                                 <RadioButton x:Name="RadioButtonAdvancedConfiguration" Content="高级配置" Grid.Column="0" Grid.Row="2"></RadioButton>
                                 <TextBox x:Name="TextBoxJsonPath" Margin="10" Grid.Column="1" Grid.Row="1"></TextBox>
                                 <Button x:Name="ButtonSetConfiguration" Margin="6" Content="配置" Grid.Column="2" Grid.Row="2" Click="ButtonSetConfiguration_Click"></Button>-->
-                                <Button x:Name="Button_Login" Content="V2ray一键安装"  Margin="10" Grid.Column="0" Grid.Row="2" Click="Button_Login_Click"></Button>
-                                <Button x:Name="ButtonUpdateV2ray" Content="检测/升级V2Ray" Margin="10" Grid.Column="1" Grid.Row="2"  Click="ButtonUpdateV2ray_Click"></Button>
-                                <Button x:Name="Button_canel" Content="取消"  Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
+                                <Button x:Name="Button_Login" Content="{DynamicResource ButtonV2RayOneKeyInstall}"  Margin="10" Grid.Column="0" Grid.Row="2" Click="Button_Login_Click"></Button>
+                                <Button x:Name="ButtonUpdateV2ray" Content="{DynamicResource ButtonUpdateV2ray}" Margin="10" Grid.Column="1" Grid.Row="2"  Click="ButtonUpdateV2ray_Click"></Button>
+                                <Button x:Name="Button_canel" Content="{DynamicResource Button_canel}"  Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
                             </Grid>
                         </TabItem>
                         <TabItem Header="Trojan-Go" Width="100" Height="30">
@@ -153,11 +153,11 @@
                                
                                 <!--<Button x:Name="ButtonTrojanTemplate" Content="Trojan参数设置" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanTemplate_Click"/>-->
                                 <!--<TextBlock Text="Trojan参数设置" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>-->
-                                <Button x:Name="ButtonTrojanGoTemplate" Content="Trojan-Go参数设置" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanGoTemplate_Click"/>
+                                <Button x:Name="ButtonTrojanGoTemplate" Content="{DynamicResource ButtonTrojanGoTemplate}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanGoTemplate_Click"/>
 
-                                <Button x:Name="ButtonTrojanGoSetUp" Content="Trojan-Go一键安装"  Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonTrojanGoSetUp_Click"/>
-                                <Button x:Name="ButtonUpdateTrojanGo" Content="检测/升级Trojan-Go" Margin="10" Grid.Column="1" Grid.Row="2"  Click="ButtonUpdateTrojanGo_Click"></Button>
-                                <Button x:Name="ButtonTrojanGoCancel" Content="取消"  Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
+                                <Button x:Name="ButtonTrojanGoSetUp" Content="{DynamicResource ButtonTrojanGoSetUp}"  Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonTrojanGoSetUp_Click"/>
+                                <Button x:Name="ButtonUpdateTrojanGo" Content="{DynamicResource ButtonUpdateTrojanGo}" Margin="10" Grid.Column="1" Grid.Row="2"  Click="ButtonUpdateTrojanGo_Click"></Button>
+                                <Button x:Name="ButtonTrojanGoCancel" Content="{DynamicResource ButtonTrojanGoCancel}"  Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
                             </Grid>
                         </TabItem>
                         <TabItem Header="Trojan" Width="100" Height="30">
@@ -174,7 +174,7 @@
                                     <RowDefinition Height="60"></RowDefinition>
 
                                 </Grid.RowDefinitions>
-                                <GroupBox Header="参数设置" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
+                                <GroupBox Header="{DynamicResource GroupBoxHeaderParameterTrojan}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.4*"></ColumnDefinition>
@@ -189,16 +189,16 @@
                                             <RowDefinition></RowDefinition>
                                             <RowDefinition></RowDefinition>
                                         </Grid.RowDefinitions>
-                                        <TextBlock Text="模式：Trojan+TLS+Caddy" Grid.Column="1" Grid.Row="0"></TextBlock>
-                                        <TextBlock Text="服务器地址(域名)：" Grid.Column="0" Grid.Row="1"></TextBlock>
-                                        <TextBox x:Name="TextBoxTrojanHostDomain" Style="{StaticResource TitleText}" Tag="域名不可为空" Grid.Column="1" Grid.Row="1" Margin="3"></TextBox>
-                                        <TextBlock Text="端口：443" Grid.Column="2" Grid.Row="1"></TextBlock>
+                                        <TextBlock Text="{DynamicResource TextBlockTrojanTemplateExplanation}" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock Text="{DynamicResource TextBlockTrojanServerDomain}" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5"></TextBlock>
+                                        <TextBox x:Name="TextBoxTrojanHostDomain" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxDomainPrompt}" Grid.Column="1" Grid.Row="1" Margin="3"></TextBox>
+                                        <TextBlock Text="{DynamicResource TextBlockTrojanPort}" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
                                         <!--<TextBlock Text="用户名：" Grid.Column="0" Grid.Row="2"></TextBlock>
                                         <TextBox x:Name="TextBoxUser" Grid.Column="1" Grid.Row="2" Margin="3"></TextBox>
                                         <Button x:Name="ButtonNaiveUser" Content="随机" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonNaiveUser_Click"></Button>-->
-                                        <TextBlock Text="密码：" Grid.Column="0" Grid.Row="2"></TextBlock>
+                                        <TextBlock Text="{DynamicResource TextBlockTrojanHostPassword}" Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
                                         <TextBox x:Name="TextBoxTrojanPassword"  Grid.Column="1" Grid.Row="2" Margin="3"></TextBox>
-                                        <Button x:Name="ButtonTrojanPassword" Content="更新" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonTrojanPassword_Click" ></Button>
+                                        <Button x:Name="ButtonTrojanPassword" Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonTrojanPassword_Click" ></Button>
                                         
                                         <TextBlock Text="伪装网站：" Grid.Column="0" Grid.Row="3" Visibility="Collapsed"></TextBlock>
                                         <TextBox x:Name="TextBoxTrojanSites" Style="{StaticResource TitleText}" Tag="可以增加代理的隐蔽(可为空)"  Grid.Column="1" Grid.Row="3" Margin="3"  Visibility="Collapsed"></TextBox>
@@ -211,9 +211,9 @@
                                 <!--<Button x:Name="ButtonTrojanGoTemplate" Content="Trojan-Go参数设置" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTrojanGoTemplate_Click"/>-->
 
 
-                                <Button x:Name="ButtonTrojanSetUp" Content="Trojan一键安装"  Grid.Column="0" Grid.Row="2"  Margin="10" Click="ButtonTrojanSetUp_Click"/>
-                                <Button x:Name="ButtonUpdateTrojan" Content="检测/升级Trojan" Grid.Column="1" Grid.Row="2" Margin="10" Click="ButtonUpdateTrojan_Click"></Button>
-                                <Button x:Name="ButtonTrojanCancel" Content="取消" Grid.Column="2" Grid.Row="2"  Margin="10" Click="Button_canel_Click"></Button>
+                                <Button x:Name="ButtonTrojanSetUp" Content="{DynamicResource ButtonTrojanSetUp}"  Grid.Column="0" Grid.Row="2"  Margin="10" Click="ButtonTrojanSetUp_Click"/>
+                                <Button x:Name="ButtonUpdateTrojan" Content="{DynamicResource ButtonUpdateTrojan}" Grid.Column="1" Grid.Row="2" Margin="10" Click="ButtonUpdateTrojan_Click"></Button>
+                                <Button x:Name="ButtonTrojanCancel" Content="{DynamicResource ButtonTrojanCancel}" Grid.Column="2" Grid.Row="2"  Margin="10" Click="Button_canel_Click"></Button>
                             </Grid>
                         </TabItem>
                         <TabItem x:Name="TabItemNaiveProxy" Header="NaiveProxy" Width="100" Height="30">
@@ -228,7 +228,7 @@
                                     <RowDefinition></RowDefinition>
                                     <RowDefinition Height="60"></RowDefinition>
                                 </Grid.RowDefinitions>
-                                <GroupBox Header="参数设置" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
+                                <GroupBox Header="{DynamicResource GroupBoxHeaderParameterTrojan}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.4*"></ColumnDefinition>
@@ -243,16 +243,16 @@
                                             <RowDefinition></RowDefinition>
                                             <RowDefinition></RowDefinition>
                                         </Grid.RowDefinitions>
-                                        <TextBlock Text="模式：NaiveProxy+TLS+Caddy" Grid.Column="1" Grid.Row="0"></TextBlock>
-                                        <TextBlock Text="服务器地址(域名)：" Grid.Column="0" Grid.Row="1"></TextBlock>
-                                        <TextBox x:Name="TextBoxNaiveHostDomain" Style="{StaticResource TitleText}" Tag="域名不可为空" Grid.Column="1" Grid.Row="1" Margin="3"></TextBox>
-                                        <TextBlock Text="端口：443" Grid.Column="2" Grid.Row="1"></TextBlock>
-                                        <TextBlock Text="用户名：" Grid.Column="0" Grid.Row="2"></TextBlock>
+                                        <TextBlock Text="{DynamicResource TextBlockNaiveProxyTemplateExplanation}" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock Text="{DynamicResource TextBlockTrojanServerDomain}" Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
+                                        <TextBox x:Name="TextBoxNaiveHostDomain" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxDomainPrompt}" Grid.Column="1" Grid.Row="1" Margin="3"></TextBox>
+                                        <TextBlock Text="{DynamicResource TextBlockTrojanPort}" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock Text="{DynamicResource TextBlockHostUser}" Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
                                         <TextBox x:Name="TextBoxNaiveUser" Grid.Column="1" Grid.Row="2" Margin="3"></TextBox>
-                                        <Button x:Name="ButtonNaiveUser" Content="随机" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonNaiveUser_Click"></Button>
-                                        <TextBlock Text="密码：" Grid.Column="0" Grid.Row="3"></TextBlock>
+                                        <Button x:Name="ButtonNaiveUser" Content="{DynamicResource ButtonNaiveProxyChangeUser}" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonNaiveUser_Click"></Button>
+                                        <TextBlock Text="{DynamicResource TextBlockTrojanHostPassword}" Grid.Column="0" Grid.Row="3" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
                                         <TextBox x:Name="TextBoxNaivePassword"  Grid.Column="1" Grid.Row="3" Margin="3"></TextBox>
-                                        <Button x:Name="ButtonNaivePassword" Content="更新" Grid.Column="2" Grid.Row="3" Margin="2" Click="ButtonNaivePassword_Click"></Button>
+                                        <Button x:Name="ButtonNaivePassword" Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="2" Grid.Row="3" Margin="2" Click="ButtonNaivePassword_Click"></Button>
                                         <TextBlock Text="伪装网站：" Grid.Column="0" Grid.Row="4" Visibility="Collapsed"></TextBlock>
                                         <TextBox x:Name="TextBoxNaiveSites" Style="{StaticResource TitleText}" Tag="可以增加代理的隐蔽(可为空)"  Grid.Column="1" Grid.Row="4" Margin="3"  Visibility="Collapsed"></TextBox>
                                        
@@ -261,8 +261,8 @@
                                 <!--<Button x:Name="ButtonNaiveTemplate" Content="Naive设置" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonTrojanTemplate_Click"/>
                                 <TextBlock Text="Naive参数设置" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>-->
 
-                                <Button x:Name="ButtonNavieSetUp" Content="NaiveProxy一键安装" Grid.ColumnSpan="1" Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonNavieSetUp_Click"/>
-                                <Button x:Name="ButtonNaiveCancel" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
+                                <Button x:Name="ButtonNavieSetUp" Content="{DynamicResource ButtonNavieSetUp}" Grid.ColumnSpan="1" Margin="10" Grid.Column="0" Grid.Row="2" Click="ButtonNavieSetUp_Click"/>
+                                <Button x:Name="ButtonNaiveCancel" Content="{DynamicResource ButtonNaiveCancel}" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
                             </Grid>
                         </TabItem>
                         <TabItem Header="三合一" Width="100" Height="30" Visibility="Collapsed">
@@ -334,8 +334,8 @@
                                 <Button x:Name="Button_canel3in1" Content="取消" Grid.ColumnSpan="1" Margin="10" Grid.Column="2" Grid.Row="2" Click="Button_canel_Click"></Button>
                             </Grid>
                         </TabItem>
-                        
-                        <TabItem Header="系统工具" Width="100" Height="30">
+
+                        <TabItem Header="{DynamicResource TabItemHeaderSysTools}" Width="100" Height="30">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition></ColumnDefinition>
@@ -348,9 +348,10 @@
                                     <RowDefinition></RowDefinition>
                                     <RowDefinition></RowDefinition>
                                 </Grid.RowDefinitions>
-                                <Button x:Name="ButtonProofreadTime" Content="校对时间" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonProofreadTime_Click"/>
-                                <Button x:Name="ButtonClearOccupiedPorts" Content="释放80/443端口" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonClearOccupiedPorts_Click"></Button>
-                                <Button x:Name="ButtonTestAndEnableBBR" Content="检测/启用BBR" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTestAndEnableBBR_Click"></Button>
+                                <Button x:Name="ButtonProofreadTime" Content="{DynamicResource ButtonProofreadTime}" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonProofreadTime_Click"/>
+                                <Button x:Name="ButtonClearOccupiedPorts" Content="{DynamicResource ButtonClearOccupiedPorts}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonClearOccupiedPorts_Click"></Button>
+                                <Button x:Name="ButtonTestAndEnableBBR" Content="{DynamicResource ButtonTestAndEnableBBR}" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTestAndEnableBBR_Click"></Button>
+
                             </Grid>
                         </TabItem>
                         
@@ -377,7 +378,7 @@
                   
                 </Grid>
             </TabItem>
-            <TabItem Header="资源工具" Width="110" Height="30">
+            <TabItem Header="{DynamicResource TabItemHeaderResourceTools}" Width="110" Height="30">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition></ColumnDefinition>
@@ -406,10 +407,10 @@
                         <RowDefinition></RowDefinition>
                         <RowDefinition></RowDefinition>
                     </Grid.RowDefinitions>
-                    <Button x:Name="ButtonWebBrowserHomePage" Content="主页" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonWebBrowserHomePage_Click"></Button>
-                    <Button x:Name="ButtonWebBrowserForward" Content="前进" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonWebBrowserForward_Click"></Button>
-                    <Button x:Name="ButtonWebBrowserBack" Content="后退" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonWebBrowserBack_Click"/>
-                    <TextBlock Text="由于众所周知的原因，在某些时候，加载缓慢，请耐心等待一下" Grid.Column="4" Grid.Row="0" Grid.ColumnSpan="4" Margin="5"></TextBlock>
+                    <Button x:Name="ButtonWebBrowserHomePage" Content="{DynamicResource ButtonWebBrowserHomePage}" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonWebBrowserHomePage_Click"></Button>
+                    <Button x:Name="ButtonWebBrowserForward" Content="{DynamicResource ButtonWebBrowserForward}" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonWebBrowserForward_Click"></Button>
+                    <Button x:Name="ButtonWebBrowserBack" Content="{DynamicResource ButtonWebBrowserBack}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonWebBrowserBack_Click"/>
+                    <TextBlock Text="{DynamicResource TextBlockWebExplain}" TextWrapping="Wrap" Grid.Column="4" Grid.Row="0" Grid.ColumnSpan="4"></TextBlock>
                     <!--<TextBox x:Name="TextBoxWebBrowserProxyUrl" Style="{StaticResource TitleText}" Tag="粘贴被墙的网址到这里点击 GO(下面被墙网址右击==复制快捷方式)" Grid.Column="3" Grid.Row="0" Grid.ColumnSpan="5" Margin="5"></TextBox>
                     <Button x:Name="ButtonWebBrowserProxyGo" Content="Go" Grid.Column="8" Grid.Row="0" Margin="5" Click="ButtonWebBrowserProxyGo_Click"></Button>-->
                     <WebBrowser x:Name="WebBrowserResourcesAndTools" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="9" Grid.RowSpan="13" Source="https://github.com/proxysu/windows/wiki/ResourcesAndTools" />
diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs
index c3c5288..4114859 100644
--- a/ProxySU/MainWindow.xaml.cs
+++ b/ProxySU/MainWindow.xaml.cs
@@ -51,9 +51,13 @@ namespace ProxySU
         static string sshCmdUpdate;                 //保存软件安装所用更新软件库命令
         static string sshCmdInstall;                //保存软件安装所用命令格式
 
+        //******  ******
+        //  Application.Current.FindResource("").ToString()
         public MainWindow()
         {
+
             InitializeComponent();
+            ResourcesLoad();
             //初始化选定密码登录
             RadioButtonPasswordLogin.IsChecked = true;
             //初始化选定无代理
@@ -118,6 +122,29 @@ namespace ProxySU
         #endregion
 
         #region 主界面控件的有效无效控制代码块
+        //加载语言资源文件
+        private void ResourcesLoad()
+        {
+            string Culture = System.Globalization.CultureInfo.InstalledUICulture.Name;
+            List<ResourceDictionary> dictionaryList = new List<ResourceDictionary>();
+            foreach (ResourceDictionary dictionary in Application.Current.Resources.MergedDictionaries)
+            {
+                dictionaryList.Add(dictionary);
+            }
+            string requestedCulture = string.Format(@"Translations\ProxySU.{0}.xaml", Culture);
+            //string requestedCulture = string.Format(@"Translations\ProxySU.{0}.xaml", "default");
+            ResourceDictionary resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture));
+            if (resourceDictionary == null)
+            {
+                requestedCulture = @"Translations\ProxySU.en-US.xaml";
+                resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture));
+            }
+            if (resourceDictionary != null)
+            {
+                Application.Current.Resources.MergedDictionaries.Remove(resourceDictionary);
+                Application.Current.Resources.MergedDictionaries.Add(resourceDictionary);
+            }
+        }
         private void RadioButtonNoProxy_Checked(object sender, RoutedEventArgs e)
         {
             TextBlockProxyHost.IsEnabled = false;
@@ -186,7 +213,7 @@ namespace ProxySU
             ButtonOpenFileDialog.Visibility = Visibility.Collapsed;
             TextBoxCertFilePath.IsEnabled = false;
             TextBoxCertFilePath.Visibility = Visibility.Collapsed;
-            TextBlockPassword.Text = "密码：";
+            //TextBlockPassword.Text = "密码：";
             //TextBlockPassword.Visibility = Visibility.Visible;
             PasswordBoxHostPassword.IsEnabled = true;
             PasswordBoxHostPassword.Visibility = Visibility.Visible;
@@ -194,7 +221,7 @@ namespace ProxySU
 
         private void RadioButtonCertLogin_Checked(object sender, RoutedEventArgs e)
         {
-            TextBlockPassword.Text = "密钥：";
+            //TextBlockPassword.Text = "密钥：";
             //TextBlockPassword.Visibility = Visibility.Collapsed;
             PasswordBoxHostPassword.IsEnabled = false;
             PasswordBoxHostPassword.Visibility = Visibility.Collapsed;
@@ -237,7 +264,8 @@ namespace ProxySU
             #region 检测输入的内空是否有错，并读取内容
             if (string.IsNullOrEmpty(TextBoxHost.Text) == true || string.IsNullOrEmpty(TextBoxPort.Text) == true || string.IsNullOrEmpty(TextBoxUserName.Text) == true)
             {
-                MessageBox.Show("主机地址、主机端口、用户名为必填项，不能为空");
+                //******"主机地址、主机端口、用户名为必填项，不能为空"******
+                MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorHostPortUserNotEmpty").ToString());
 
                 return connectionInfo = null;
             }
@@ -247,13 +275,15 @@ namespace ProxySU
 
             if (RadioButtonPasswordLogin.IsChecked == true && string.IsNullOrEmpty(PasswordBoxHostPassword.Password) == true)
             {
-                MessageBox.Show("登录密码为必填项，不能为空");
+                //****** "登录密码为必填项，不能为空!!" ******
+                MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorHostPasswordNotEmpty").ToString());
                 return connectionInfo = null;
             }
             string sshPassword = PasswordBoxHostPassword.Password.ToString();
             if (RadioButtonCertLogin.IsChecked == true && string.IsNullOrEmpty(TextBoxCertFilePath.Text) == true)
             {
-                MessageBox.Show("密钥文件为必填项，不能为空");
+                //****** "密钥文件为必填项，不能为空!" ******
+                MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorHostKeyNotEmpty").ToString());
                 return connectionInfo = null;
             }
             string sshPrivateKey = TextBoxCertFilePath.Text.ToString();
@@ -280,14 +310,16 @@ namespace ProxySU
             //MessageBox.Show(proxyTypes.ToString());
             if (RadioButtonNoProxy.IsChecked == false && (string.IsNullOrEmpty(TextBoxProxyHost.Text) == true || string.IsNullOrEmpty(TextBoxProxyPort.Text) == true))
             {
-                MessageBox.Show("如果选择了代理，则代理地址与端口不能为空");
+                //****** "如果选择了代理，则代理地址与端口不能为空!" ******
+                MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorProxyAddressPortNotEmpty").ToString());
                 return connectionInfo = null;
             }
             string sshProxyHost = TextBoxProxyHost.Text.ToString();
             int sshProxyPort = int.Parse(TextBoxProxyPort.Text.ToString());
             if (RadioButtonNoProxy.IsChecked==false && RadiobuttonProxyYesLogin.IsChecked == true && (string.IsNullOrEmpty(TextBoxProxyUserName.Text) == true || string.IsNullOrEmpty(PasswordBoxProxyPassword.Password) == true))
             {
-                MessageBox.Show("如果代理需要登录，则代理登录的用户名与密码不能为空");
+                //****** "如果代理需要登录，则代理登录的用户名与密码不能为空!" ******
+                MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorProxyUserPasswordNotEmpty").ToString());
                 return connectionInfo = null;
             }
             string sshProxyUser = TextBoxProxyUserName.Text.ToString();
@@ -352,7 +384,7 @@ namespace ProxySU
             ConnectionInfo connectionInfo = GenerateConnectionInfo();
             if(connectionInfo==null)
             {
-                MessageBox.Show("远程主机连接信息有误，请检查");
+                MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorHostConnection").ToString());    //远程主机连接信息有误，请检查
                 return;
             }
 
@@ -370,7 +402,8 @@ namespace ProxySU
             //选择模板
             if (String.IsNullOrEmpty(ReceiveConfigurationParameters[0]) == true)
             {
-                MessageBox.Show("请先选择配置模板！");
+                //"请先选择配置模板！"
+                MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ChooseTemplate").ToString()); 
                 return;
             }
             else if (String.Equals(ReceiveConfigurationParameters[0], "TCP"))
@@ -473,7 +506,9 @@ namespace ProxySU
         //登录远程主机布署V2ray程序
         private void StartSetUpV2ray(ConnectionInfo connectionInfo,TextBlock textBlockName, ProgressBar progressBar, string serverConfig,string clientConfig,string upLoadPath)
         {
-            string currentStatus = "正在登录远程主机......";
+
+            //"正在登录远程主机......"
+            string currentStatus = Application.Current.FindResource("DisplayInstallInfo_Login").ToString();
             textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
             currentShellCommandResult = currentStatus;
             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -513,14 +548,18 @@ namespace ProxySU
                     client.Connect();
                     if (client.IsConnected == true)
                     {
-                        currentStatus = "主机登录成功";
+                        //"主机登录成功"
+                        currentStatus = Application.Current.FindResource("DisplayInstallInfo_LoginSuccessful").ToString();  
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果在监视窗口
                         Thread.Sleep(1000);
                     }
-                    //检测是否运行在root权限下
-                    currentShellCommandResult = "检测是否运行在root权限下...";
+
+                    //"检测是否运行在root权限下..."
+                    currentStatus = Application.Current.FindResource("DisplayInstallInfo_DetectionRootPermission").ToString(); 
+                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                    currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"id -u";
@@ -531,32 +570,29 @@ namespace ProxySU
                     string testRootAuthority = currentShellCommandResult;
                     if (testRootAuthority.Equals("0\n") == false)
                     {
-                        MessageBox.Show("请使用具有root权限的账户登录主机！！");
+                        //"请使用具有root权限的账户登录主机！！"
+                        MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorRootPermission").ToString());
                         client.Disconnect();
                         return;
                     }
                     else
                     {
-                        currentShellCommandResult = "检测结果：OK！";
+                        //"检测结果：OK！"
+                        currentStatus = Application.Current.FindResource("DisplayInstallInfo_DetectionRoot_OK").ToString();
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
-                    //string testRootAuthority = client.RunCommand(@"id -u").Result;
-                    //if (testRootAuthority.Equals("0\n")==false)
-                    //{
-                    //    MessageBox.Show("请使用具有root权限的账户登录主机！！");
-                    //    client.Disconnect();
-                    //    return;
-                    //}
-                    //检测是否安装有V2ray
-                    currentStatus = "检测系统是否已经安装V2ray......";
+
+                    //"检测系统是否已经安装V2ray......"
+                    currentStatus = Application.Current.FindResource("DisplayInstallInfo_TestExistV2Ray").ToString();
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     Thread.Sleep(1000);
 
-                    //string cmdTestV2rayInstalled = @"find / -name v2ray";
                     sshShellCommand = @"find / -name v2ray";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -565,10 +601,12 @@ namespace ProxySU
                     string resultCmdTestV2rayInstalled = currentShellCommandResult;
                     if (resultCmdTestV2rayInstalled.Contains("/usr/bin/v2ray") == true || resultCmdTestV2rayInstalled.Contains("/usr/local/bin/v2ray") == true)
                     {
-                        MessageBoxResult messageBoxResult = MessageBox.Show("远程主机已安装V2ray,是否强制重新安装？", "", MessageBoxButton.YesNo, MessageBoxImage.Question);
+                        //"远程主机已安装V2ray,是否强制重新安装？"
+                        MessageBoxResult messageBoxResult = MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ExistedV2Ray").ToString(), "", MessageBoxButton.YesNo, MessageBoxImage.Question);
                         if (messageBoxResult==MessageBoxResult.No)
                         {
-                            currentStatus = "安装取消，退出";
+                            //"安装取消，退出"
+                            currentStatus = Application.Current.FindResource("DisplayInstallInfo_InstallationCanceledExit").ToString();
                             textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                             currentShellCommandResult = currentStatus;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -579,7 +617,8 @@ namespace ProxySU
                         }
                         else
                         {
-                            currentStatus = "已选择强制安装V2Ray！";
+                            //"已选择强制安装V2Ray！"
+                            currentStatus = Application.Current.FindResource("DisplayInstallInfo_ForceInstallV2Ray").ToString();
                             textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                             currentShellCommandResult = currentStatus;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -588,34 +627,40 @@ namespace ProxySU
                     }
                     else
                     {
-                        currentStatus = "检测结果：未安装V2Ray！";
+                        //"检测结果：未安装V2Ray！"
+                        currentStatus = Application.Current.FindResource("DisplayInstallInfo_NoInstalledV2Ray").ToString();
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
 
-                    //检测远程主机系统环境是否符合要求
-                    currentStatus = "检测系统是否符合安装要求......";
+                    //"检测系统是否符合安装要求......"
+                    currentStatus = Application.Current.FindResource("DisplayInstallInfo_CheckSystemRequirements").ToString();
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     Thread.Sleep(1000);
 
-                    //string result = client.RunCommand("uname -r").Result;
                     sshShellCommand = @"uname -r";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
                     string result = currentShellCommandResult;
                     string[] linuxKernelVerStr= result.Split('-');
-
                     bool detectResult = DetectKernelVersion(linuxKernelVerStr[0]);
                     if (detectResult == false)
                     {
-                        MessageBox.Show($"当前系统内核版本为{linuxKernelVerStr[0]}，V2ray要求内核为2.6.23及以上。请升级内核再安装！");
-                        currentStatus = "系统内核版本不符合要求，安装失败！！";
+                        //$"当前系统内核版本为{linuxKernelVerStr[0]}，V2ray要求内核为2.6.23及以上。请升级内核再安装！"
+                        MessageBox.Show(
+                            Application.Current.FindResource("MessageBoxShow_CurrentKernelVersion").ToString() 
+                            + $"{linuxKernelVerStr[0]}" 
+                            + Application.Current.FindResource("MessageBoxShow_RequiredKernelVersionExplain").ToString()
+                            );
+                        //"系统内核版本不符合要求，安装失败！！"
+                        currentStatus = Application.Current.FindResource("DisplayInstallInfo_KernelVersionNotMatch").ToString();
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -625,12 +670,6 @@ namespace ProxySU
 
                     //检测系统是否支持yum 或 apt-get或zypper，且支持Systemd
                     //如果不存在组件，则命令结果为空，string.IsNullOrEmpty值为真，
-                    //bool getApt = String.IsNullOrEmpty(client.RunCommand("command -v apt").Result);
-                    //bool getDnf = String.IsNullOrEmpty(client.RunCommand("command -v dnf").Result);
-                    //bool getYum = String.IsNullOrEmpty(client.RunCommand("command -v yum").Result);
-                    //bool getZypper = String.IsNullOrEmpty(client.RunCommand("command -v zypper").Result);
-                    //bool getSystemd = String.IsNullOrEmpty(client.RunCommand("command -v systemctl").Result);
-                    //bool getGetenforce = String.IsNullOrEmpty(client.RunCommand("command -v getenforce").Result);
 
                     sshShellCommand = @"command -v apt";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
@@ -673,19 +712,23 @@ namespace ProxySU
                     //也就是apt ，dnf\yum, zypper必须安装其中之一，且必须安装Systemd的系统才能安装。
                     if ((getApt && getDnf && getYum && getZypper) || getSystemd)
                     {
-                        MessageBox.Show($"系统缺乏必要的安装组件如:apt||dnf||yum||zypper||Syetemd，主机系统推荐使用：CentOS 7/8,Debian 8/9/10,Ubuntu 16.04及以上版本");
-                        currentStatus = "系统环境不满足要求，安装失败！！";
-                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        //"系统缺乏必要的安装组件如:apt||dnf||yum||zypper||Syetemd，主机系统推荐使用：CentOS 7/8,Debian 8/9/10,Ubuntu 16.04及以上版本"
+                        MessageBox.Show(Application.Current.FindResource("MessageBoxShow_MissingSystemComponents").ToString());
 
+                        //"系统环境不满足要求，安装失败！！"
+                        currentStatus = Application.Current.FindResource("DisplayInstallInfo_MissingSystemComponents").ToString();
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
                         Thread.Sleep(1000);
                         client.Disconnect();
                         return;
                     }
                     else
                     {
-                        currentStatus = "检测结果：OK!";
+                        //"检测结果：OK!"
+                        currentStatus = Application.Current.FindResource("DisplayInstallInfo_SystemRequirementsOK").ToString();
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -695,29 +738,21 @@ namespace ProxySU
                     //设置安装软件所用的命令格式
                     if (getApt == false)
                     {
-                        //client.RunCommand("apt -qq update");
-                        //client.RunCommand("apt -y -qq install curl");
                         sshCmdUpdate = @"apt -qq update";
                         sshCmdInstall = @"apt -y -qq install ";
                     }
                     else if (getDnf == false)
                     {
-                        //client.RunCommand("dnf -q makecache");
-                        //client.RunCommand("dnf -y -q install curl");
                         sshCmdUpdate = @"dnf -q makecache";
                         sshCmdInstall = @"dnf -y -q install ";
                     }
                     else if (getYum == false)
                     {
-                        //client.RunCommand("yum -q makecache");
-                        //client.RunCommand("yum -y -q install curl");
                         sshCmdUpdate = @"yum -q makecache";
                         sshCmdInstall = @"yum -y -q install ";
                     }
                     else if (getZypper == false)
                     {
-                        //client.RunCommand("zypper ref");
-                        //client.RunCommand("zypper -y install curl");
                         sshCmdUpdate = @"zypper ref";
                         sshCmdInstall = @"zypper -y install ";
                     }
@@ -725,7 +760,6 @@ namespace ProxySU
                     //判断是否启用了SELinux,如果启用了，并且工作在Enforcing模式下，则改为Permissive模式
                     if (getGetenforce == false)
                     {
-                        //string testSELinux = client.RunCommand("getenforce").Result;
                         sshShellCommand = @"getenforce";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -735,24 +769,23 @@ namespace ProxySU
 
                         if (testSELinux.Contains("Enforcing") == true)
                         {
-                            currentStatus = "检测到系统启用SELinux，且工作在严格模式下，需改为宽松模式！修改中...";
+                            //"检测到系统启用SELinux，且工作在严格模式下，需改为宽松模式！修改中......"
+                            currentStatus = Application.Current.FindResource("DisplayInstallInfo_EnableSELinux").ToString();
                             textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                             currentShellCommandResult = currentStatus;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                            //MessageBox.Show("Enforcing");
-                            //client.RunCommand("setenforce  0");//不重启改为Permissive模式
-                            //client.RunCommand("sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config");//重启也工作在Permissive模式下
                             sshShellCommand = @"setenforce  0";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
                             sshShellCommand = @"sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                            currentStatus = "修改完毕！";
+                            //"修改完毕！"
+                            currentStatus = Application.Current.FindResource("DisplayInstallInfo_SELinuxModifyOK").ToString();
                             textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                             currentShellCommandResult = currentStatus;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -773,67 +806,10 @@ namespace ProxySU
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        //为假则表示系统有相应的组件。
-                        //if (getApt == false)
-                        //{
-                        //    client.RunCommand("apt -qq update");
-                        //    client.RunCommand("apt -y -qq install curl");
-                        //}
-                        //else if (getDnf == false)
-                        //{
-                        //    client.RunCommand("dnf -q makecache");
-                        //    client.RunCommand("dnf -y -q install curl");
-                        //}
-                        //else if (getYum == false)
-                        //{
-                        //    client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("yum -y -q install curl");
-                        //}
-                        //else if (getZypper == false)
-                        //{
-                        //    client.RunCommand("zypper ref");
-                        //    client.RunCommand("zypper -y install curl");
-                        //}
                     }
-                    ////在相应系统内安装curl(如果没有安装curl)
-                    //if (string.IsNullOrEmpty(client.RunCommand("command -v curl").Result) == true)
-                    //{
-                    //    //为假则表示系统有相应的组件。
-                    //    if (getApt == false)
-                    //    {
-                    //        client.RunCommand("apt -qq update");
-                    //        client.RunCommand("apt -y -qq install curl");
-                    //    }
-                    //    else if (getDnf == false)
-                    //    {
-                    //        client.RunCommand("dnf -q makecache");
-                    //        client.RunCommand("dnf -y -q install curl");
-                    //    }
-                    //    else if (getYum == false)
-                    //    {
-                    //        client.RunCommand("yum -q makecache");
-                    //        client.RunCommand("yum -y -q install curl");
-                    //    }
-                    //    //else if (getZypper == false)
-                    //    //{
-                    //    //    client.RunCommand("zypper ref");
-                    //    //    client.RunCommand("zypper -y install curl");
-                    //    //}
-                    //}
 
-                    ////判断是否启用了SELinux,如果启用了，并且工作在Enforcing模式下，则改为Permissive模式
-                    //if (getGetenforce == false)
-                    //{
-                    //    string testSELinux = client.RunCommand("getenforce").Result;
-                    //    if (testSELinux.Contains("Enforcing")==true)
-                    //    {
-                    //        client.RunCommand("setenforce  0");//不重启改为Permissive模式
-                    //        client.RunCommand("sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config");//重启也工作在Permissive模式下
-                    //    }
-                    //}
-
-                    //校对时间
-                    currentStatus = "校对时间......";
+                    //"校对时间......"
+                    currentStatus = Application.Current.FindResource("DisplayInstallInfo_ProofreadingTime").ToString();
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -847,9 +823,10 @@ namespace ProxySU
                     long timeStampLocal = Convert.ToInt64(ts.TotalSeconds);
                     if (Math.Abs(timeStampLocal - timeStampVPS) >= 90)
                     {
-
-                        MessageBox.Show("本地时间与远程主机时间相差超过限制(90秒)，请先用\"系统工具-->时间校对\"校对时间后再设置");
-                        currentStatus = "时间较对失败......";
+                        //"本地时间与远程主机时间相差超过限制(90秒)，请先用 '系统工具-->时间校对' 校对时间后再设置"
+                        MessageBox.Show(Application.Current.FindResource("MessageBoxShow_TimeError").ToString());
+                        //"时间较对失败......"
+                        currentStatus = Application.Current.FindResource("DisplayInstallInfo_TimeError").ToString();
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -858,7 +835,8 @@ namespace ProxySU
                         client.Disconnect();
                         return;
                     }
-                    currentStatus = "时间差符合要求，OK!";
+                    //"时间差符合要求，OK!"
+                    currentStatus = Application.Current.FindResource("DisplayInstallInfo_TimeOK").ToString();
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -874,22 +852,16 @@ namespace ProxySU
 
                         Thread.Sleep(1000);
 
-                        //string nativeIp = client.RunCommand("curl -4 ip.sb").Result.ToString();
-                        //string testDomainCmd = "ping " + ReceiveConfigurationParameters[4] + " -c 1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
-                        //string resultCmd = client.RunCommand(testDomainCmd).Result.ToString();
-
                         sshShellCommand = @"curl -4 ip.sb";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
                         string nativeIp = currentShellCommandResult;
 
                         sshShellCommand = "ping " + ReceiveConfigurationParameters[4] + " -c 1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
                         string resultTestDomainCmd = currentShellCommandResult;
 
                         if (String.Equals(nativeIp, resultTestDomainCmd) == true)
@@ -927,27 +899,6 @@ namespace ProxySU
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                            //为假则表示系统有相应的组件。
-                            //if (getApt == false)
-                            //    {
-                            //        client.RunCommand("apt -qq update");
-                            //        client.RunCommand("apt -y -qq install lsof");
-                            //    }
-                            //    else if (getDnf == false)
-                            //    {
-                            //        client.RunCommand("dnf -q makecache");
-                            //        client.RunCommand("dnf -y -q install lsof");
-                            //    }
-                            //    else if (getYum == false)
-                            //    {
-                            //        client.RunCommand("yum -q makecache");
-                            //        client.RunCommand("yum -y -q install lsof");
-                            //    }
-                                //else if (getZypper == false)
-                                //{
-                                //    client.RunCommand("zypper ref");
-                                //    client.RunCommand("zypper -y install lsof");
-                                //}
                         }
                         currentStatus = "正在检测端口占用情况......";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -991,15 +942,9 @@ namespace ProxySU
 
                             Thread.Sleep(1000);
 
-                            //string cmdTestPort = @"lsof -n -P -i :443 | grep LISTEN";
-                            //string cmdResult = client.RunCommand(cmdTestPort).Result;
-
                             if (String.IsNullOrEmpty(testPort443) == false)
                             {
                                 string[] cmdResultArry443 = testPort443.Split(' ');
-                                //client.RunCommand($"systemctl stop {cmdResultArry443[0]}");
-                                //client.RunCommand($"systemctl disable {cmdResultArry443[0]}");
-                                //client.RunCommand($"kill -9 {cmdResultArry443[3]}");
                                 sshShellCommand = $"systemctl stop {cmdResultArry443[0]}";
                                 TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                                 currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1017,14 +962,9 @@ namespace ProxySU
 
                             }
 
-                            //cmdTestPort = @"lsof -n -P -i :80 | grep LISTEN";
-                            //cmdResult = client.RunCommand(cmdTestPort).Result;
                             if (String.IsNullOrEmpty(testPort80) == false)
                             {
                                 string[] cmdResultArry80 = testPort80.Split(' ');
-                                //client.RunCommand($"systemctl stop {cmdResultArry80[0]}");
-                                //client.RunCommand($"systemctl disable {cmdResultArry80[0]}");
-                                //client.RunCommand($"kill -9 {cmdResultArry80[3]}");
                                 sshShellCommand = $"systemctl stop {cmdResultArry80[0]}";
                                 TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                                 currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1057,48 +997,6 @@ namespace ProxySU
 
                         }
 
-                        //if (String.IsNullOrEmpty(client.RunCommand(@"lsof -n -P -i :80 | grep LISTEN").Result) == false || String.IsNullOrEmpty(client.RunCommand(@"lsof -n -P -i :443 | grep LISTEN").Result) == false)
-                        //{
-                        //    //MessageBox.Show("80/443端口之一，或全部被占用，请先用系统工具中的“释放80/443端口”工具，释放出，再重新安装");
-                        //    MessageBoxResult dialogResult = MessageBox.Show("80/443端口之一，或全部被占用，将强制停止占用80/443端口的程序?", "Stop application", MessageBoxButton.YesNo);
-                        //    if (dialogResult == MessageBoxResult.No)
-                        //    {
-                        //        currentStatus = "端口被占用，安装失败......";
-                        //        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        //        Thread.Sleep(1000);
-                        //        client.Disconnect();
-                        //        return;
-                        //    }
-
-                        //    currentStatus = "正在释放80/443端口......";
-                        //    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        //    Thread.Sleep(1000);
-
-                        //    string cmdTestPort = @"lsof -n -P -i :443 | grep LISTEN";
-                        //    string cmdResult = client.RunCommand(cmdTestPort).Result;
-                        //    if (String.IsNullOrEmpty(cmdResult) == false)
-                        //    {
-                        //        string[] cmdResultArry443 = cmdResult.Split(' ');
-                        //        client.RunCommand($"systemctl stop {cmdResultArry443[0]}");
-                        //        client.RunCommand($"systemctl disable {cmdResultArry443[0]}");
-                        //        client.RunCommand($"kill -9 {cmdResultArry443[3]}");
-                        //    }
-
-                        //    cmdTestPort = @"lsof -n -P -i :80 | grep LISTEN";
-                        //    cmdResult = client.RunCommand(cmdTestPort).Result;
-                        //    if (String.IsNullOrEmpty(cmdResult) == false)
-                        //    {
-                        //        string[] cmdResultArry80 = cmdResult.Split(' ');
-                        //        client.RunCommand($"systemctl stop {cmdResultArry80[0]}");
-                        //        client.RunCommand($"systemctl disable {cmdResultArry80[0]}");
-                        //        client.RunCommand($"kill -9 {cmdResultArry80[3]}");
-                        //    }
-                        //    currentStatus = "80/443端口释放完毕！";
-                        //    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        //    Thread.Sleep(1000);
-
-                        //}
-
                     }
                     currentStatus = "系统环境检测完毕，符合安装要求,开始布署......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -1118,10 +1016,6 @@ namespace ProxySU
                     {
                         if (String.Equals(openFireWallPort, "443"))
                         {
-                            //client.RunCommand("firewall-cmd --zone=public --add-port=80/tcp --permanent");
-                            //client.RunCommand("firewall-cmd --zone=public --add-port=443/tcp --permanent");
-                            //client.RunCommand("firewall-cmd --reload");
-
                             sshShellCommand = @"firewall-cmd --zone=public --add-port=80/tcp --permanent";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1139,10 +1033,6 @@ namespace ProxySU
                         }
                         else
                         {
-                            //client.RunCommand($"firewall-cmd --zone=public --add-port={openFireWallPort}/tcp --permanent");
-                            //client.RunCommand($"firewall-cmd --zone=public --add-port={openFireWallPort}/udp --permanent");
-                            //client.RunCommand("firewall-cmd --reload");
-
                             sshShellCommand = $"firewall-cmd --zone=public --add-port={openFireWallPort}/tcp --permanent";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1164,10 +1054,6 @@ namespace ProxySU
                     {
                         if (String.Equals(openFireWallPort, "443"))
                         {
-                            //client.RunCommand("ufw allow 80");
-                            //client.RunCommand("ufw allow 443");
-                            //client.RunCommand("yes | ufw reload");
-
                             sshShellCommand = @"ufw allow 80";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1186,9 +1072,6 @@ namespace ProxySU
                         }
                         else
                         {
-                            //client.RunCommand($"ufw allow {openFireWallPort}/tcp");
-                            //client.RunCommand($"ufw allow {openFireWallPort}/udp");
-                            //client.RunCommand("yes | ufw reload");
                             sshShellCommand = $"ufw allow {openFireWallPort}/tcp";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1215,9 +1098,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //client.RunCommand("curl -o /tmp/go.sh https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh");
-                    //client.RunCommand("yes | bash /tmp/go.sh -f");
-                    //string installResult = client.RunCommand("find / -name v2ray").Result.ToString();
                     sshShellCommand = @"curl -o /tmp/go.sh https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1255,7 +1135,7 @@ namespace ProxySU
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                         Thread.Sleep(1000);
-                        //client.RunCommand("systemctl enable v2ray; systemctl start v2ray");
+   
                         sshShellCommand = @"systemctl enable v2ray";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1263,7 +1143,6 @@ namespace ProxySU
 
                     }
 
-                    //client.RunCommand("mv /usr/local/etc/v2ray/config.json /usr/local/etc/v2ray/config.json.1");
                     sshShellCommand = @"mv /usr/local/etc/v2ray/config.json /usr/local/etc/v2ray/config.json.1";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1359,34 +1238,31 @@ namespace ProxySU
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        //if (getApt == false)
-                        //{
-                        //    //client.RunCommand("apt-get -qq update");
-                        //    client.RunCommand("apt -y -qq install socat");
-                        //}
-                        //else if (getDnf == false)
-                        //{
-                        //    //client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("dnf -y -q install socat");
-                        //}
-                        //else if (getYum == false)
-                        //{
-                        //    //client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("yum -y -q install socat");
-                        //}
-                        //if (getZypper == false)
-                        //{
-                        //   // client.RunCommand("zypper ref");
-                        //    client.RunCommand("zypper -y install socat");
-                        //}
-                        //client.RunCommand("curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh  | INSTALLONLINE=1  sh");
-                        //client.RunCommand("cd ~/.acme.sh/");
-                        //client.RunCommand("alias acme.sh=~/.acme.sh/acme.sh");
+                       
                         sshShellCommand = @"curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh  | INSTALLONLINE=1  sh";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                        if (currentShellCommandResult.Contains("Install success") == true)
+                        {
+                            currentStatus = "acme.sh安装成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            currentStatus = "acme.sh安装失败！原因未知，请向开发者提问！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            return;
+                        }
+
                         sshShellCommand = @"cd ~/.acme.sh/";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1405,20 +1281,29 @@ namespace ProxySU
 
                         Thread.Sleep(1000);
 
-                        //client.RunCommand("mkdir -p /etc/v2ray/ssl");
-                        //client.RunCommand($"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}");
                         sshShellCommand = $"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                        if (currentShellCommandResult.Contains("Cert success") == true)
+                        {
+                            currentStatus = "证书申请成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        //currentStatus = "申请域名证书......";
-                        //textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        //Thread.Sleep(1000);
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            currentStatus = "证书申请失败！原因未知，请向开发者提问！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        //client.RunCommand("mkdir -p /usr/local/etc/v2ray/ssl");
-                        //client.RunCommand($"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}");
+                            return;
+                        }
 
                         currentStatus = "安装证书到V2ray......";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -1432,12 +1317,33 @@ namespace ProxySU
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        // client.RunCommand($"/root/.acme.sh/acme.sh  --installcert  -d {ReceiveConfigurationParameters[4]}  --certpath /usr/local/etc/v2ray/ssl/v2ray_ssl.crt --keypath /usr/local/etc/v2ray/ssl/v2ray_ssl.key  --capath  /usr/local/etc/v2ray/ssl/v2ray_ssl.crt  --reloadcmd  \"systemctl restart v2ray\"");
                         sshShellCommand = $"/root/.acme.sh/acme.sh  --installcert  -d {ReceiveConfigurationParameters[4]}  --certpath /usr/local/etc/v2ray/ssl/v2ray_ssl.crt --keypath /usr/local/etc/v2ray/ssl/v2ray_ssl.key  --capath  /usr/local/etc/v2ray/ssl/v2ray_ssl.crt  --reloadcmd  \"systemctl restart v2ray\"";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                        sshShellCommand = @"if [ ! -f ""/usr/local/etc/v2ray/ssl/v2ray_ssl.key"" ]; then echo ""0""; else echo ""1""; fi | head -n 1";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        if (currentShellCommandResult.Contains("1") == true)
+                        {
+                            currentStatus = "证书安装到V2ray，成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        }
+                        else
+                        {
+                            currentStatus = "证书安装到V2ray失败，原因未知，可以向开发者提问！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            return;
+                        }
+
                         //设置私钥权限
                         sshShellCommand = @"chmod 644 /usr/local/etc/v2ray/ssl/v2ray_ssl.key";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
@@ -1460,10 +1366,7 @@ namespace ProxySU
                         //为假则表示系统有相应的组件。
                         if (getApt == false)
                         {
-                            //client.RunCommand(@"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list");
-                            //client.RunCommand("apt install -y apt-transport-https");
-                            //client.RunCommand("apt -qq update");
-                            //client.RunCommand("apt -y -qq install caddy");
+
                             sshShellCommand = @"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1487,10 +1390,7 @@ namespace ProxySU
                         }
                         else if (getDnf == false)
                         {
-                            //client.RunCommand(@"dnf install 'dnf-command(copr)' -y");
-                            //client.RunCommand(@"dnf copr enable @caddy/caddy -y");
-                            ////client.RunCommand("dnf -q makecache");
-                            //client.RunCommand("dnf -y -q install caddy");
+
                             sshShellCommand = @"dnf install 'dnf-command(copr)' -y";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1506,6 +1406,7 @@ namespace ProxySU
                             //currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                             //TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+
                             sshShellCommand = @"dnf -y -q install caddy";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1514,10 +1415,7 @@ namespace ProxySU
                         }
                         else if (getYum == false)
                         {
-                            //client.RunCommand(@"yum install yum-plugin-copr -y");
-                            //client.RunCommand(@"yum copr enable @caddy/caddy -y");
-                            ////client.RunCommand("yum -q makecache");
-                            //client.RunCommand("yum -y -q install caddy");
+
                             sshShellCommand = @"yum install yum-plugin-copr -y";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1539,32 +1437,6 @@ namespace ProxySU
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                         }
-                        //if (getApt == false)
-                        //{
-                        //    client.RunCommand(@"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list");
-                        //    client.RunCommand("apt install -y apt-transport-https");
-                        //    client.RunCommand("apt -qq update");
-                        //    client.RunCommand("apt -y -qq install caddy");
-                        //}
-                        //else if (getDnf == false)
-                        //{
-                        //    client.RunCommand(@"dnf install 'dnf-command(copr)' -y");
-                        //    client.RunCommand(@"dnf copr enable @caddy/caddy -y");
-                        //    //client.RunCommand("dnf -q makecache");
-                        //    client.RunCommand("dnf -y -q install caddy");
-                        //}
-                        //else if (getYum == false)
-                        //{
-                        //    client.RunCommand(@"yum install yum-plugin-copr -y");
-                        //    client.RunCommand(@"yum copr enable @caddy/caddy -y");
-                        //    //client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("yum -y -q install caddy");
-                        //}
-                        //else if (getZypper == false)
-                        //{
-                        //    client.RunCommand("zypper ref");
-                        //    client.RunCommand("zypper -y install curl");
-                        //}
 
                         sshShellCommand = @"find / -name caddy";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
@@ -1592,55 +1464,12 @@ namespace ProxySU
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                         Thread.Sleep(1000);
-                        //client.RunCommand("systemctl enable caddy");
+
                         sshShellCommand = @"systemctl enable caddy";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        //if (getApt == false)
-                        //{
-                        //    client.RunCommand(@"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list");
-                        //    client.RunCommand("apt install -y apt-transport-https");
-                        //    client.RunCommand("apt -qq update");
-                        //    client.RunCommand("apt -y -qq install caddy");
-                        //}
-                        //else if (getDnf == false)
-                        //{
-                        //    client.RunCommand(@"dnf install 'dnf-command(copr)' -y");
-                        //    client.RunCommand(@"dnf copr enable @caddy/caddy -y");
-                        //    //client.RunCommand("dnf -q makecache");
-                        //    client.RunCommand("dnf -y -q install caddy");
-                        //}
-                        //else if (getYum == false)
-                        //{
-                        //    client.RunCommand(@"yum install yum-plugin-copr -y");
-                        //    client.RunCommand(@"yum copr enable @caddy/caddy -y");
-                        //    //client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("yum -y -q install caddy");
-                        //}
-                        ////else if (getZypper == false)
-                        ////{
-                        ////    client.RunCommand("zypper ref");
-                        ////    client.RunCommand("zypper -y install curl");
-                        ////}
-                        //installResult = client.RunCommand("find / -name caddy").Result.ToString();
-
-                        //if (!installResult.Contains("/usr/bin/caddy"))
-                        //{
-                        //    MessageBox.Show("安装Caddy失败！");
-
-                        //    currentStatus = "安装Caddy失败！";
-                        //    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        //    client.Disconnect();
-                        //    return;
-                        //}
-                        //else {
-                        //    currentStatus = "Caddy安装成功！";
-                        //    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        //    Thread.Sleep(1000);
-                        //    client.RunCommand("systemctl enable caddy");
-                        //}
                         //在Caddy 2还未推出2.2.0的正式版之前，先用测试版替代
                         if (String.Equals(ReceiveConfigurationParameters[0], "http2Web"))
                         {
@@ -1651,12 +1480,6 @@ namespace ProxySU
 
                             Thread.Sleep(1000);
 
-                            //client.RunCommand(@"curl -o /tmp/caddy.zip https://raw.githubusercontent.com/proxysu/Resources/master/Caddy2/caddy.zip");
-                            //client.RunCommand(@"unzip /tmp/caddy.zip");
-                            //client.RunCommand(@"chmod +x caddy");
-                            //client.RunCommand(@"systemctl stop caddy;rm -f /usr/bin/caddy");
-                            //client.RunCommand(@"cp /root/caddy /usr/bin/");
-
                             sshShellCommand = @"curl -o /tmp/caddy.zip https://raw.githubusercontent.com/proxysu/Resources/master/Caddy2/caddy.zip";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1713,23 +1536,15 @@ namespace ProxySU
                         UploadConfig(connectionInfo, serverConfig, upLoadPath);
 
                         //设置Caddyfile文件中的tls 邮箱,在caddy2中已经不需要设置。
-                        //string sshCmdEmail = $"email={ReceiveConfigurationParameters[4]};email=${{email/./@}};echo $email";//结尾有回车符
-                        //string email = client.RunCommand(sshCmdEmail).Result.Replace("\n", "");//删除结尾的回车符
-                        //string email = $"user@{ReceiveConfigurationParameters[4]}";
-                        //string sshCmd = $"sed -i 's/off/{email}/' {upLoadPath}";//设置Caddyfile中的邮箱
-                        //client.RunCommand(sshCmd);
 
                         //设置域名
-                        //string sshCmd = $"sed -i 's/##domain##/{ReceiveConfigurationParameters[4]}/' {upLoadPath}";
-                        //client.RunCommand(sshCmd);
+
                         sshShellCommand = $"sed -i 's/##domain##/{ReceiveConfigurationParameters[4]}/' {upLoadPath}";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                         //设置Path
-                        //sshCmd = $"sed -i 's/##path##/\\{ReceiveConfigurationParameters[3]}/' {upLoadPath}";
-                        //client.RunCommand(sshCmd);
                         sshShellCommand = $"sed -i 's/##path##/\\{ReceiveConfigurationParameters[3]}/' {upLoadPath}";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1738,9 +1553,7 @@ namespace ProxySU
                         //设置伪装网站
                         if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7])==false)
                         {
-                            //sshCmd = $"sed -i 's/##sites##/reverse_proxy {ReceiveConfigurationParameters[7]}/' {upLoadPath}";
-                            //client.RunCommand(sshCmd);
-                            sshShellCommand = $"sed -i 's/##sites##/proxy \\/ {ReceiveConfigurationParameters[7]}/' {upLoadPath}";
+                           sshShellCommand = $"sed -i 's/##sites##/proxy \\/ {ReceiveConfigurationParameters[7]}/' {upLoadPath}";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -1754,28 +1567,81 @@ namespace ProxySU
                         Thread.Sleep(1000);
 
                         //启动Caddy服务
-                        //client.RunCommand("systemctl restart caddy");
+
                         currentStatus = "正在启动Caddy......";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                       // Thread.Sleep(1000);
                         //启动Caddy服务
                         sshShellCommand = @"systemctl restart caddy";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        currentStatus = "Caddy启动成功！";
-                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        currentShellCommandResult = currentStatus;
+                        Thread.Sleep(3000);
+
+                        sshShellCommand = @"ps aux | grep caddy";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        Thread.Sleep(1000);
-                    }
+                        if (currentShellCommandResult.Contains("/usr/bin/caddy") == true)
+                        {
+                            //运行成功
+                            currentStatus = "Caddy启动成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            //运行失败
+                            currentStatus = "Caddy启动失败！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            Thread.Sleep(1000);
+                            currentStatus = "正在启动Caddy（第二次尝试）！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            Thread.Sleep(3000);
+                            sshShellCommand = @"systemctl restart caddy";
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                            currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            Thread.Sleep(3000);
+
+                            sshShellCommand = @"ps aux | grep caddy";
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                            currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            if (currentShellCommandResult.Contains("/usr/bin/caddy") == true)
+                            {
+                                currentStatus = "Caddy启动成功！";
+                                textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                                currentShellCommandResult = currentStatus;
+                                TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                                Thread.Sleep(1000);
+                            }
+                            else
+                            {
+                                currentStatus = "Caddy启动失败(第二次)！退出安装！";
+                                textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                                currentShellCommandResult = currentStatus;
+                                TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                                Thread.Sleep(1000);
+                                MessageBox.Show("Caddy启动失败，原因未知！请向开发者问询！");
+                                return;
+                            }
+                        }
+                 
+                    }
 
                     currentStatus = "正在启动V2ray......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -1784,20 +1650,74 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
                     //启动V2ray服务
-                    //client.RunCommand("systemctl restart v2ray");
                     sshShellCommand = @"systemctl restart v2ray";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    Thread.Sleep(3000);
 
-                    currentStatus = "V2ray启动成功！";
-                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    currentShellCommandResult = currentStatus;
+                    sshShellCommand = @"ps aux | grep v2ray";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    Thread.Sleep(1000);
+                    if (currentShellCommandResult.Contains("/usr/local/bin/v2ray") == true)
+                    {
+                        //运行成功
+                        currentStatus = "V2ray启动成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        //运行失败
+                        currentStatus = "V2ray启动失败！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(3000);
+                        currentStatus = "正在启动V2ray（第二次尝试）！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(3000);
+                        sshShellCommand = @"systemctl restart v2ray";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(3000);
+
+                        sshShellCommand = @"ps aux | grep v2ray";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        if (currentShellCommandResult.Contains("/usr/local/bin/v2ray") == true)
+                        {
+                            currentStatus = "V2ray启动成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            currentStatus = "V2ray启动失败(第二次)！退出安装！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            Thread.Sleep(1000);
+                            MessageBox.Show("V2Ray启动失败，原因未知！请向开发者问询！");
+                            return;
+                        }
+                    }
+
+                   
                     //测试BBR条件，若满足提示是否启用
                     currentStatus = "BBR测试......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -1806,7 +1726,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //var result = client.RunCommand("uname -r");
                     sshShellCommand = @"uname -r";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1815,7 +1734,7 @@ namespace ProxySU
                     string[] linuxKernelVerStrBBR = currentShellCommandResult.Split('-');
 
                     bool detectResultBBR = DetectKernelVersionBBR(linuxKernelVerStrBBR[0]);
-                    //client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
+
                     sshShellCommand = @"sysctl net.ipv4.tcp_congestion_control | grep bbr";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1831,9 +1750,6 @@ namespace ProxySU
 
                         Thread.Sleep(1000);
 
-                        //client.RunCommand(@"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'");
-                        //client.RunCommand(@"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'");
-                        //client.RunCommand(@"sysctl -p");
                         sshShellCommand = @"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -1867,20 +1783,7 @@ namespace ProxySU
 
                     }
                     client.Disconnect();//断开服务器ssh连接
-                    //result = client.RunCommand("uname -r").Result;
-                    ////var result = client.RunCommand("cat /root/test.ver");
-                    //linuxKernelVerStr = result.Split('-');
-
-                    //detectResult = DetectKernelVersionBBR(linuxKernelVerStr[0]);
-                    //string resultCmdTestBBR = client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
-                    ////如果内核满足大于等于4.9，且还未启用BBR，则启用BBR
-                    //if (detectResult == true && resultCmdTestBBR.Contains("bbr") == false)
-                    //{
-                    //    client.RunCommand(@"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'");
-                    //    client.RunCommand(@"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'");
-                    //    client.RunCommand(@"sysctl -p");
-                    //}
-
+  
                     //生成客户端配置
                     currentStatus = "生成客户端配置......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -1892,7 +1795,7 @@ namespace ProxySU
                     {
                         Directory.CreateDirectory("v2ray_config");//创建该文件夹　　   
                     }
-                    //string clientConfig = "TemplateConfg\\tcp_client_config.json";
+
                     using (StreamReader reader = File.OpenText(clientConfig))
                     {
                         JObject clientJson = (JObject)JToken.ReadFrom(new JsonTextReader(reader));
@@ -1936,8 +1839,6 @@ namespace ProxySU
                         }
                     }
 
-                    //client.Disconnect();
-
                     currentStatus = "V2Ray安装成功,祝你玩的愉快！！";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -1989,7 +1890,6 @@ namespace ProxySU
 
             }
             #endregion
-
         }
 
         //检测升级远程主机端的V2Ray版本
@@ -2466,7 +2366,9 @@ namespace ProxySU
                     }
 
                     //检测是否运行在root权限下
-                    currentShellCommandResult = "检测是否运行在root权限下...";
+                    currentStatus = "检测是否运行在root权限下...";
+                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                    currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"id -u";
@@ -2483,7 +2385,9 @@ namespace ProxySU
                     }
                     else
                     {
-                        currentShellCommandResult = "检测结果：OK！";
+                        currentStatus = "检测结果：OK！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
@@ -2617,29 +2521,21 @@ namespace ProxySU
 
                     if (getApt == false)
                     {
-                        //client.RunCommand("apt -qq update");
-                        //client.RunCommand("apt -y -qq install curl");
                         sshCmdUpdate = @"apt -qq update";
                         sshCmdInstall = @"apt -y -qq install ";
                     }
                     else if (getDnf == false)
                     {
-                        //client.RunCommand("dnf -q makecache");
-                        //client.RunCommand("dnf -y -q install curl");
                         sshCmdUpdate = @"dnf -q makecache";
                         sshCmdInstall = @"dnf -y -q install ";
                     }
                     else if (getYum == false)
                     {
-                        //client.RunCommand("yum -q makecache");
-                        //client.RunCommand("yum -y -q install curl");
                         sshCmdUpdate = @"yum -q makecache";
                         sshCmdInstall = @"yum -y -q install ";
                     }
                     else if (getZypper == false)
                     {
-                        //client.RunCommand("zypper ref");
-                        //client.RunCommand("zypper -y install curl");
                         sshCmdUpdate = @"zypper ref";
                         sshCmdInstall = @"zypper -y install ";
                     }
@@ -2647,14 +2543,13 @@ namespace ProxySU
                     //判断是否启用了SELinux,如果启用了，并且工作在Enforcing模式下，则改为Permissive模式
                     if (getGetenforce == false)
                     {
-                        // string testSELinux = client.RunCommand("getenforce").Result;
                         sshShellCommand = @"getenforce";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                         string testSELinux = currentShellCommandResult;
-                        //MessageBox.Show(testSELinux);
+
                         if (testSELinux.Contains("Enforcing") == true)
                         {
                             currentStatus = "检测到系统启用SELinux，且工作在严格模式下，需改为宽松模式！修改中...";
@@ -2662,10 +2557,7 @@ namespace ProxySU
                             currentShellCommandResult = currentStatus;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                            //MessageBox.Show("Enforcing");
-                            //    client.RunCommand("setenforce  0");//不重启改为Permissive模式
-                            //    client.RunCommand("sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config");//重启也工作在Permissive模式下
-                            sshShellCommand = @"setenforce  0";
+                             sshShellCommand = @"setenforce  0";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -2705,27 +2597,6 @@ namespace ProxySU
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        ////为假则表示系统有相应的组件。
-                        //if (getApt == false)
-                        //{
-                        //    client.RunCommand("apt-get -qq update");
-                        //    client.RunCommand("apt-get -y -qq install curl");
-                        //}
-                        //else if (getDnf == false)
-                        //{
-                        //    client.RunCommand("dnf -q makecache");
-                        //    client.RunCommand("dnf -y -q install curl");
-                        //}
-                        //else if (getYum == false)
-                        //{
-                        //    client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("yum -y -q install curl");
-                        //}
-                        //else if (getZypper == false)
-                        //{
-                        //    client.RunCommand("zypper ref");
-                        //    client.RunCommand("zypper -y install curl");
-                        //}
                     }
 
                     sshShellCommand = @"curl -4 ip.sb";
@@ -2740,7 +2611,6 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //string testDomainCmd = "ping " + ReceiveConfigurationParameters[4] + " -c 1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
                     string resultTestDomainCmd = currentShellCommandResult;
 
                     if (String.Equals(nativeIp, resultTestDomainCmd) == true)
@@ -2778,27 +2648,7 @@ namespace ProxySU
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        //为假则表示系统有相应的组件。
-                        //if (getApt == false)
-                        //{
-                        //    client.RunCommand("apt -qq update");
-                        //    client.RunCommand("apt -y -qq install lsof");
-                        //}
-                        //else if (getDnf == false)
-                        //{
-                        //    client.RunCommand("dnf -q makecache");
-                        //    client.RunCommand("dnf -y -q install lsof");
-                        //}
-                        //else if (getYum == false)
-                        //{
-                        //    client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("yum -y -q install lsof");
-                        //}
-                        //else if (getZypper == false)
-                        //{
-                        //    client.RunCommand("zypper ref");
-                        //    client.RunCommand("zypper -y install lsof");
-                        //}
+                        
                     }
                     currentStatus = "正在检测端口占用情况......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -2806,8 +2656,7 @@ namespace ProxySU
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     Thread.Sleep(1000);
-                    //MessageBox.Show(@"lsof -n -P -i :80 | grep LISTEN");
-                    //MessageBox.Show(client.RunCommand(@"lsof -n -P -i :80 | grep LISTEN").Result);
+
                     sshShellCommand = @"lsof -n -P -i :80 | grep LISTEN";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -2842,15 +2691,10 @@ namespace ProxySU
 
                         Thread.Sleep(1000);
 
-                        //string cmdTestPort = @"lsof -n -P -i :443 | grep LISTEN";
-                        //string cmdResult = client.RunCommand(cmdTestPort).Result;
-
                         if (String.IsNullOrEmpty(testPort443) == false)
                         {
                             string[] cmdResultArry443 = testPort443.Split(' ');
-                            //client.RunCommand($"systemctl stop {cmdResultArry443[0]}");
-                            //client.RunCommand($"systemctl disable {cmdResultArry443[0]}");
-                            //client.RunCommand($"kill -9 {cmdResultArry443[3]}");
+
                             sshShellCommand = $"systemctl stop {cmdResultArry443[0]}";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -2868,14 +2712,11 @@ namespace ProxySU
 
                         }
 
-                        //cmdTestPort = @"lsof -n -P -i :80 | grep LISTEN";
-                        //cmdResult = client.RunCommand(cmdTestPort).Result;
+
                         if (String.IsNullOrEmpty(testPort80) == false)
                         {
                             string[] cmdResultArry80 = testPort80.Split(' ');
-                            //client.RunCommand($"systemctl stop {cmdResultArry80[0]}");
-                            //client.RunCommand($"systemctl disable {cmdResultArry80[0]}");
-                            //client.RunCommand($"kill -9 {cmdResultArry80[3]}");
+
                             sshShellCommand = $"systemctl stop {cmdResultArry80[0]}";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -2924,9 +2765,6 @@ namespace ProxySU
                     if (String.IsNullOrEmpty(client.RunCommand("command -v firewall-cmd").Result) == false)
                     {
 
-                        //client.RunCommand("firewall-cmd --zone=public --add-port=80/tcp --permanent");
-                        //client.RunCommand("firewall-cmd --zone=public --add-port=443/tcp --permanent");
-                        //client.RunCommand("firewall-cmd --reload");
                         sshShellCommand = @"firewall-cmd --zone=public --add-port=80/tcp --permanent";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -2945,9 +2783,6 @@ namespace ProxySU
                     }
                     if (String.IsNullOrEmpty(client.RunCommand("command -v ufw").Result) == false)
                     {
-                        //client.RunCommand("ufw allow 80");
-                        //client.RunCommand("ufw allow 443");
-                        //client.RunCommand("yes | ufw reload");
 
                         sshShellCommand = @"ufw allow 80";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
@@ -2974,9 +2809,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //client.RunCommand("curl -o /tmp/trojan-go.sh https://raw.githubusercontent.com/proxysu/shellscript/master/trojan-go.sh");
-                    //client.RunCommand("yes | bash /tmp/trojan-go.sh -f");
-
                     sshShellCommand = @"curl -o /tmp/trojan-go.sh https://raw.githubusercontent.com/proxysu/shellscript/master/trojan-go.sh";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3014,14 +2846,14 @@ namespace ProxySU
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                         Thread.Sleep(1000);
-                        //client.RunCommand("systemctl enable trojan-go");
+
                         sshShellCommand = @"systemctl enable trojan-go";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
-                    //client.RunCommand("mv /etc/trojan-go/config.json /etc/trojan-go/config.json.1");
+
                     sshShellCommand = @"mv /etc/trojan-go/config.json /etc/trojan-go/config.json.1";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3068,6 +2900,7 @@ namespace ProxySU
 
                     File.Delete(@"config.json");
 
+                    //安装acme.sh
                     currentStatus = "正在安装acme.sh......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -3086,35 +2919,30 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //if (getApt == false)
-                    //{
-                    //    //client.RunCommand("apt-get -qq update");
-                    //    client.RunCommand("apt-get -y -qq install socat");
-                    //}
-                    //else if (getDnf == false)
-                    //{
-                    //    //client.RunCommand("yum -q makecache");
-                    //    client.RunCommand("dnf -y -q install socat");
-                    //}
-                    //else if (getYum == false)
-                    //{
-                    //    //client.RunCommand("yum -q makecache");
-                    //    client.RunCommand("yum -y -q install socat");
-                    //}
-                    //else if (getZypper == false)
-                    //{
-                    //    // client.RunCommand("zypper ref");
-                    //    client.RunCommand("zypper -y install socat");
-                    //}
-                    //client.RunCommand("curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh  | INSTALLONLINE=1  sh");
-                    //client.RunCommand("cd ~/.acme.sh/");
-                    //client.RunCommand("alias acme.sh=~/.acme.sh/acme.sh");
-
                     sshShellCommand = @"curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh  | INSTALLONLINE=1  sh";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    if (currentShellCommandResult.Contains("Install success") == true)
+                    {
+                        currentStatus = "acme.sh安装成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        currentStatus = "acme.sh安装失败！原因未知，请向开发者提问！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        return;
+                    }
+
                     sshShellCommand = @"cd ~/.acme.sh/";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3133,25 +2961,64 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //client.RunCommand("mkdir -p /etc/v2ray/ssl");
-                    //client.RunCommand($"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}");
-                    sshShellCommand = $"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}";
+                     sshShellCommand = $"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    if (currentShellCommandResult.Contains("Cert success") == true)
+                    {
+                        currentStatus = "证书申请成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        currentStatus = "证书申请失败！原因未知，请向开发者提问！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        return;
+                    }
+
+
                     currentStatus = "安装证书到Trojan-Go......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     Thread.Sleep(1000);
-                    //client.RunCommand($"/root/.acme.sh/acme.sh  --installcert  -d {ReceiveConfigurationParameters[4]}  --certpath /usr/local/etc/trojan-go/trojan-go.crt --keypath /usr/local/etc/trojan-go/trojan-go.key  --capath  /usr/local/etc/trojan-go/trojan-go.crt  --reloadcmd  \"systemctl restart trojan-go\"");
-                    sshShellCommand = $"/root/.acme.sh/acme.sh  --installcert  -d {ReceiveConfigurationParameters[4]}  --certpath /usr/local/etc/trojan-go/trojan-go.crt --keypath /usr/local/etc/trojan-go/trojan-go.key  --capath  /usr/local/etc/trojan-go/trojan-go.crt  --reloadcmd  \"systemctl restart trojan-go\"";
+                     sshShellCommand = $"/root/.acme.sh/acme.sh  --installcert  -d {ReceiveConfigurationParameters[4]}  --certpath /usr/local/etc/trojan-go/trojan-go.crt --keypath /usr/local/etc/trojan-go/trojan-go.key  --capath  /usr/local/etc/trojan-go/trojan-go.crt  --reloadcmd  \"systemctl restart trojan-go\"";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    sshShellCommand = @"if [ ! -f ""/usr/local/etc/trojan-go/trojan-go.key"" ]; then echo ""0""; else echo ""1""; fi | head -n 1";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                    if (currentShellCommandResult.Contains("1") == true)
+                    {
+                        currentStatus = "证书安装到Trojan-go，成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                    }
+                    else
+                    {
+                        currentStatus = "证书安装到Trojan-go失败，原因未知，可以向开发者提问！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        return;
+                    }
+
                     //设置证书权限
                     sshShellCommand = @"chmod 644 /usr/local/etc/trojan-go/trojan-go.key";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
@@ -3170,10 +3037,6 @@ namespace ProxySU
                     //为假则表示系统有相应的组件。
                     if (getApt == false)
                     {
-                        //client.RunCommand(@"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list");
-                        //client.RunCommand("apt install -y apt-transport-https");
-                        //client.RunCommand("apt -qq update");
-                        //client.RunCommand("apt -y -qq install caddy");
                         sshShellCommand = @"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3197,10 +3060,6 @@ namespace ProxySU
                     }
                     else if (getDnf == false)
                     {
-                        //client.RunCommand(@"dnf install 'dnf-command(copr)' -y");
-                        //client.RunCommand(@"dnf copr enable @caddy/caddy -y");
-                        ////client.RunCommand("dnf -q makecache");
-                        //client.RunCommand("dnf -y -q install caddy");
                         sshShellCommand = @"dnf install 'dnf-command(copr)' -y";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3224,10 +3083,6 @@ namespace ProxySU
                     }
                     else if (getYum == false)
                     {
-                        //client.RunCommand(@"yum install yum-plugin-copr -y");
-                        //client.RunCommand(@"yum copr enable @caddy/caddy -y");
-                        ////client.RunCommand("yum -q makecache");
-                        //client.RunCommand("yum -y -q install caddy");
                         sshShellCommand = @"yum install yum-plugin-copr -y";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3276,7 +3131,7 @@ namespace ProxySU
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     Thread.Sleep(1000);
-                    // client.RunCommand("systemctl enable caddy");
+
                     sshShellCommand = @"systemctl enable caddy";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3291,7 +3146,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //client.RunCommand("mv /etc/caddy/Caddyfile /etc/caddy/Caddyfile.bak");//备份原文件
                     sshShellCommand = @"mv /etc/caddy/Caddyfile /etc/caddy/Caddyfile.bak";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3307,7 +3161,6 @@ namespace ProxySU
 
                     //string email = $"user@{ReceiveConfigurationParameters[4]}";
                     //设置域名
-                    //string sshCmd = $"sed -i 's/##domain##/{ReceiveConfigurationParameters[4]}/' {upLoadPath}";
                     sshShellCommand = $"sed -i 's/##domain##/{ReceiveConfigurationParameters[4]}/' {upLoadPath}";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3317,8 +3170,6 @@ namespace ProxySU
                     //设置伪装网站
                     if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false)
                     {
-                        // sshCmd = $"sed -i 's/##sites##/proxy \\/ {ReceiveConfigurationParameters[7]}/' {upLoadPath}";
-                        //client.RunCommand(sshCmd);
                         sshShellCommand = $"sed -i 's/##sites##/proxy \\/ {ReceiveConfigurationParameters[7]}/' {upLoadPath}";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3331,9 +3182,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //安装Caddy服务
-                    //sshCmd = $"caddy -service install -agree -conf /etc/caddy/Caddyfile -email {email}";
-                    //client.RunCommand(sshCmd);
                     //启动Caddy服务
                     currentStatus = "正在启动Caddy......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -3342,19 +3190,71 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
                     //启动Caddy服务
-                    //client.RunCommand("systemctl restart caddy");
-                    sshShellCommand = @"systemctl restart caddy";
+                     sshShellCommand = @"systemctl restart caddy";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                    Thread.Sleep(3000);
+
+                    sshShellCommand = @"ps aux | grep caddy";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    if (currentShellCommandResult.Contains("/usr/bin/caddy") == true)
+                    {
+                        //运行成功
+                        currentStatus = "Caddy启动成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    currentStatus = "Caddy启动成功！";
-                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    currentShellCommandResult = currentStatus;
-                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        //运行失败
+                        currentStatus = "Caddy启动失败！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(3000);
+                        currentStatus = "正在启动Caddy（第二次尝试）！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(3000);
+                        sshShellCommand = @"systemctl restart caddy";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    Thread.Sleep(1000);
+                        Thread.Sleep(3000);
+
+                        sshShellCommand = @"ps aux | grep caddy";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        if (currentShellCommandResult.Contains("/usr/bin/caddy") == true)
+                        {
+                            currentStatus = "Caddy启动成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            currentStatus = "Caddy启动失败(第二次)！退出安装！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            Thread.Sleep(1000);
+                            MessageBox.Show("Caddy启动失败，原因未知！请向开发者问询！");
+                            return;
+                        }
+                    }
 
                     currentStatus = "正在启动Trojan-Go......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -3363,19 +3263,74 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
                     //启动Trojan-go服务
-                    //client.RunCommand("systemctl restart trojan-go");
+ 
                     sshShellCommand = @"systemctl restart trojan-go";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    Thread.Sleep(3000);
 
-                    currentStatus = "Trojan-go启动成功！";
-                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    currentShellCommandResult = currentStatus;
+                    sshShellCommand = @"ps aux | grep trojan-go";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    Thread.Sleep(1000);
+                    if (currentShellCommandResult.Contains("/usr/local/bin/trojan-go") == true)
+                    {
+                        //运行成功
+                        currentStatus = "Trojan-go启动成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        //运行失败
+                        currentStatus = "Trojan-go启动失败！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(3000);
+                        currentStatus = "正在启动Trojan-go（第二次尝试）！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(3000);
+                        sshShellCommand = @"systemctl restart trojan-go";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(3000);
+
+                        sshShellCommand = @"ps aux | grep trojan-go";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        if (currentShellCommandResult.Contains("usr/local/bin/trojan-go") == true)
+                        {
+                            currentStatus = "Trojan-go启动成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            currentStatus = "Trojan-go启动失败(第二次)！退出安装！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            Thread.Sleep(1000);
+                            MessageBox.Show("Trojan-go启动失败，原因未知！请向开发者问询！");
+                            return;
+                        }
+                    }
+
 
                     //测试BBR条件，若满足提示是否启用
                     currentStatus = "BBR测试......";
@@ -3385,7 +3340,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //var result = client.RunCommand("uname -r");
                     sshShellCommand = @"uname -r";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3394,7 +3348,7 @@ namespace ProxySU
                     string[] linuxKernelVerStr = currentShellCommandResult.Split('-');
 
                     bool detectResult = DetectKernelVersionBBR(linuxKernelVerStr[0]);
-                    //client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
+
                     sshShellCommand = @"sysctl net.ipv4.tcp_congestion_control | grep bbr";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3410,9 +3364,6 @@ namespace ProxySU
 
                         Thread.Sleep(1000);
 
-                        //client.RunCommand(@"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'");
-                        //client.RunCommand(@"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'");
-                        //client.RunCommand(@"sysctl -p");
                         sshShellCommand = @"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -3448,21 +3399,7 @@ namespace ProxySU
 
                     client.Disconnect();//断开服务器ssh连接
 
-                    ////测试BBR条件，若满足提示是否启用
-                    //var result = client.RunCommand("uname -r");
-                    ////var result = client.RunCommand("cat /root/test.ver");
-                    //string[] linuxKernelVerStr = result.Result.Split('-');
-
-                    //bool detectResult = DetectKernelVersionBBR(linuxKernelVerStr[0]);
-                    //string resultCmdTestBBR = client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
-                    ////如果内核满足大于等于4.9，且还未启用BBR，则启用BBR
-                    //if (detectResult == true && resultCmdTestBBR.Contains("bbr") == false)
-                    //{
-                    //    client.RunCommand(@"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'");
-                    //    client.RunCommand(@"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'");
-                    //    client.RunCommand(@"sysctl -p");
-                    //}
-
+                    
                     //生成客户端配置
                     currentStatus = "生成客户端配置......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -3498,8 +3435,6 @@ namespace ProxySU
                         }
                     }
 
-
-
                     currentStatus = "Trojan-go安装成功,祝你玩的愉快！！";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -3508,10 +3443,9 @@ namespace ProxySU
                     Thread.Sleep(1000);
 
                     //显示服务端连接参数
-                    //MessageBox.Show("用于Trojan官方客户端的配置文件已保存在config文件夹中");
+
                     proxyType = "TrojanGo";
-                    //TrojanGoResultClientInfoWindow resultClientInformation = new TrojanGoResultClientInfoWindow();
-                    //resultClientInformation.ShowDialog();
+
                     ResultClientInformation resultClientInformation = new ResultClientInformation();
                     resultClientInformation.ShowDialog();
                     return;
@@ -3520,7 +3454,7 @@ namespace ProxySU
             catch (Exception ex1)//例外处理   
             #region 例外处理
             {
-                //MessageBox.Show(ex1.Message);
+
                 if (ex1.Message.Contains("连接尝试失败") == true)
                 {
                     MessageBox.Show($"{ex1.Message}\n请检查主机地址及端口是否正确，如果通过代理，请检查代理是否正常工作");
@@ -3835,18 +3769,6 @@ namespace ProxySU
 
         #region Trojan相关
 
-        //打开Trojan参数设置界面
-        //private void ButtonTrojanTemplate_Click(object sender, RoutedEventArgs e)
-        //{
-        //    for (int i = 0; i != ReceiveConfigurationParameters.Length; i++)
-
-        //    {
-        //        ReceiveConfigurationParameters[i] = "";
-        //    }
-        //    TrojanTemplateWindow windowTrojanTemplateConfiguration = new TrojanTemplateWindow();
-        //    windowTrojanTemplateConfiguration.ShowDialog();
-        //}
-
         //Trojan参数传递
         private void ButtonTrojanSetUp_Click(object sender, RoutedEventArgs e)
         {
@@ -3968,7 +3890,9 @@ namespace ProxySU
                         Thread.Sleep(1000);
                     }
                     //检测是否运行在root权限下
-                    currentShellCommandResult = "检测是否运行在root权限下...";
+                    currentStatus = "检测是否运行在root权限下...";
+                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                    currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"id -u";
@@ -3985,19 +3909,13 @@ namespace ProxySU
                     }
                     else
                     {
-                        currentShellCommandResult = "检测结果：OK！";
+                        currentStatus = "检测结果：OK！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
-                    ////检测是否运行在root权限下
-                    //string testRootAuthority = client.RunCommand(@"id -u").Result;
-                    //if (testRootAuthority.Equals("0\n") == false)
-                    //{
-                    //    MessageBox.Show("请使用具有root权限的账户登录主机！！");
-                    //    client.Disconnect();
-                    //    return;
-                    //}
-
+ 
                     //检测是否安装有Trojan
                     currentStatus = "检测系统是否已经安装Trojan......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -4006,7 +3924,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //string resultCmdTestTrojanInstalled = client.RunCommand(@"find / -name trojan").Result;
                     sshShellCommand = @"find / -name trojan";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4053,7 +3970,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //string resultCmd = client.RunCommand("uname -m").Result;
                     sshShellCommand = @"uname -m";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4146,29 +4062,21 @@ namespace ProxySU
 
                     if (getApt == false)
                     {
-                        //client.RunCommand("apt -qq update");
-                        //client.RunCommand("apt -y -qq install curl");
                         sshCmdUpdate = @"apt -qq update";
                         sshCmdInstall = @"apt -y -qq install ";
                     }
                     else if (getDnf == false)
                     {
-                        //client.RunCommand("dnf -q makecache");
-                        //client.RunCommand("dnf -y -q install curl");
                         sshCmdUpdate = @"dnf -q makecache";
                         sshCmdInstall = @"dnf -y -q install ";
                     }
                     else if (getYum == false)
                     {
-                        //client.RunCommand("yum -q makecache");
-                        //client.RunCommand("yum -y -q install curl");
                         sshCmdUpdate = @"yum -q makecache";
                         sshCmdInstall = @"yum -y -q install ";
                     }
                     else if (getZypper == false)
                     {
-                        //client.RunCommand("zypper ref");
-                        //client.RunCommand("zypper -y install curl");
                         sshCmdUpdate = @"zypper ref";
                         sshCmdInstall = @"zypper -y install ";
                     }
@@ -4176,7 +4084,6 @@ namespace ProxySU
                     //判断是否启用了SELinux,如果启用了，并且工作在Enforcing模式下，则改为Permissive模式
                     if (getGetenforce == false)
                     {
-                        //string testSELinux = client.RunCommand("getenforce").Result;
                         sshShellCommand = @"getenforce";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4191,9 +4098,6 @@ namespace ProxySU
                             currentShellCommandResult = currentStatus;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                            //MessageBox.Show("Enforcing");
-                            //client.RunCommand("setenforce  0");//不重启改为Permissive模式
-                            //client.RunCommand("sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config");//重启也工作在Permissive模式下
                             sshShellCommand = @"setenforce  0";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4233,35 +4137,8 @@ namespace ProxySU
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        //为假则表示系统有相应的组件。
-                        //if (getApt == false)
-                        //{
-                        //    client.RunCommand("apt -qq update");
-                        //    client.RunCommand("apt -y -qq install curl");
-                        //}
-                        //else if (getDnf == false)
-                        //{
-                        //    client.RunCommand("dnf -q makecache");
-                        //    client.RunCommand("dnf -y -q install curl");
-                        //}
-                        //else if (getYum == false)
-                        //{
-                        //    client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("yum -y -q install curl");
-                        //}
-                        //else if (getZypper == false)
-                        //{
-                        //    client.RunCommand("zypper ref");
-                        //    client.RunCommand("zypper -y install curl");
-                        //}
                     }
                     //检测域名是否解析正确
-                    //currentStatus = "正在检测域名是否解析到当前VPS的IP上......";
-                    //textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    //Thread.Sleep(1000);
-                    //string nativeIp = client.RunCommand("curl -4 ip.sb").Result.ToString();
-                    //string testDomainCmd = "ping " + ReceiveConfigurationParameters[4] + " -c 1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
-                    //string resultTestDomainCmd = client.RunCommand(testDomainCmd).Result.ToString();
                     sshShellCommand = @"curl -4 ip.sb";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4274,7 +4151,6 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //string testDomainCmd = "ping " + ReceiveConfigurationParameters[4] + " -c 1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
                     string resultTestDomainCmd = currentShellCommandResult;
                     if (String.Equals(nativeIp, resultTestDomainCmd) == true)
                     {
@@ -4311,27 +4187,6 @@ namespace ProxySU
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                        //为假则表示系统有相应的组件。
-                        //if (getApt == false)
-                        //{
-                        //    client.RunCommand("apt -qq update");
-                        //    client.RunCommand("apt -y -qq install lsof");
-                        //}
-                        //else if (getDnf == false)
-                        //{
-                        //    client.RunCommand("dnf -q makecache");
-                        //    client.RunCommand("dnf -y -q install lsof");
-                        //}
-                        //else if (getYum == false)
-                        //{
-                        //    client.RunCommand("yum -q makecache");
-                        //    client.RunCommand("yum -y -q install lsof");
-                        //}
-                        //else if (getZypper == false)
-                        //{
-                        //    client.RunCommand("zypper ref");
-                        //    client.RunCommand("zypper -y install lsof");
-                        //}
                     }
                     currentStatus = "正在检测端口占用情况......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -4375,15 +4230,10 @@ namespace ProxySU
 
                         Thread.Sleep(1000);
 
-                        //string cmdTestPort = @"lsof -n -P -i :443 | grep LISTEN";
-                        //string cmdResult = client.RunCommand(cmdTestPort).Result;
-
                         if (String.IsNullOrEmpty(testPort443) == false)
                         {
                             string[] cmdResultArry443 = testPort443.Split(' ');
-                            //client.RunCommand($"systemctl stop {cmdResultArry443[0]}");
-                            //client.RunCommand($"systemctl disable {cmdResultArry443[0]}");
-                            //client.RunCommand($"kill -9 {cmdResultArry443[3]}");
+
                             sshShellCommand = $"systemctl stop {cmdResultArry443[0]}";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4401,14 +4251,10 @@ namespace ProxySU
 
                         }
 
-                        //cmdTestPort = @"lsof -n -P -i :80 | grep LISTEN";
-                        //cmdResult = client.RunCommand(cmdTestPort).Result;
                         if (String.IsNullOrEmpty(testPort80) == false)
                         {
                             string[] cmdResultArry80 = testPort80.Split(' ');
-                            //client.RunCommand($"systemctl stop {cmdResultArry80[0]}");
-                            //client.RunCommand($"systemctl disable {cmdResultArry80[0]}");
-                            //client.RunCommand($"kill -9 {cmdResultArry80[3]}");
+
                             sshShellCommand = $"systemctl stop {cmdResultArry80[0]}";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4440,27 +4286,7 @@ namespace ProxySU
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
-                    //if (String.IsNullOrEmpty() == false)
-                    //    {
-                    //        string[] cmdResultArry443 = cmdResult.Split(' ');
-                    //        client.RunCommand($"systemctl stop {cmdResultArry443[0]}");
-                    //        client.RunCommand($"systemctl disable {cmdResultArry443[0]}");
-                    //        client.RunCommand($"kill -9 {cmdResultArry443[3]}");
-                    //    }
-
-                    //    cmdTestPort = @"lsof -n -P -i :80 | grep LISTEN";
-                    //    cmdResult = client.RunCommand(cmdTestPort).Result;
-                    //    if (String.IsNullOrEmpty(cmdResult) == false)
-                    //    {
-                    //        string[] cmdResultArry80 = cmdResult.Split(' ');
-                    //        client.RunCommand($"systemctl stop {cmdResultArry80[0]}");
-                    //        client.RunCommand($"systemctl disable {cmdResultArry80[0]}");
-                    //        client.RunCommand($"kill -9 {cmdResultArry80[3]}");
-                    //    }
-                    //    currentStatus = "80/443端口释放完毕！";
-                    //    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    //    Thread.Sleep(1000);
-                    //}
+                    
 
                     currentStatus = "系统环境检测完毕，符合安装要求,开始布署......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -4478,9 +4304,6 @@ namespace ProxySU
                     if (String.IsNullOrEmpty(client.RunCommand("command -v firewall-cmd").Result) == false)
                     {
 
-                        //client.RunCommand("firewall-cmd --zone=public --add-port=80/tcp --permanent");
-                        //client.RunCommand("firewall-cmd --zone=public --add-port=443/tcp --permanent");
-                        //client.RunCommand("firewall-cmd --reload");
                         sshShellCommand = @"firewall-cmd --zone=public --add-port=80/tcp --permanent";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4499,10 +4322,6 @@ namespace ProxySU
                     }
                     if (String.IsNullOrEmpty(client.RunCommand("command -v ufw").Result) == false)
                     {
-                        //client.RunCommand("ufw allow 80");
-                        //client.RunCommand("ufw allow 443");
-                        //client.RunCommand("yes | ufw reload");
-
                         sshShellCommand = @"ufw allow 80";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4531,28 +4350,6 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //if (getApt == false)
-                    //{
-                    //    client.RunCommand("apt -qq update");
-                    //    client.RunCommand("apt -y -qq install xz-utils");
-                    //}
-                    //else if (getDnf == false)
-                    //{
-                    //    //client.RunCommand("yum -q makecache");
-                    //    client.RunCommand("dnf -y -q install xz-utils");
-                    //}
-                    //else if (getYum == false)
-                    //{
-                    //    client.RunCommand("yum -q makecache");
-                    //    client.RunCommand("yum -y -q install xz-utils");
-                    //}
-                    //else if (getZypper == false)
-                    //{
-                    //    client.RunCommand("zypper ref");
-                    //    client.RunCommand("zypper -y install xz-utils");
-                    //}
-
-
                     //下载安装脚本安装
                     currentStatus = "正在安装Trojan......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -4561,8 +4358,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //client.RunCommand("curl -o /tmp/trojan-quickstart.sh https://raw.githubusercontent.com/trojan-gfw/trojan-quickstart/master/trojan-quickstart.sh");
-                    //client.RunCommand("yes | bash /tmp/trojan-quickstart.sh");
                     sshShellCommand = @"curl -o /tmp/trojan-quickstart.sh https://raw.githubusercontent.com/trojan-gfw/trojan-quickstart/master/trojan-quickstart.sh";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4580,8 +4375,6 @@ namespace ProxySU
 
                     string installResult = currentShellCommandResult;
 
-                    //string installResult = client.RunCommand("find / -name trojan").Result.ToString();
-
                     if (!installResult.Contains("/usr/local/bin/trojan"))
                     {
                         MessageBox.Show("安装Trojan失败(官方脚本运行出错！");
@@ -4602,14 +4395,13 @@ namespace ProxySU
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                         Thread.Sleep(1000);
-                        //client.RunCommand("systemctl enable trojan");
+
                         sshShellCommand = @"systemctl enable trojan";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
-                    //client.RunCommand("mv /usr/local/etc/trojan/config.json /usr/local/etc/trojan/config.json.1");
                     sshShellCommand = @"mv /usr/local/etc/trojan/config.json /usr/local/etc/trojan/config.json.1";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4641,39 +4433,6 @@ namespace ProxySU
 
                     File.Delete(@"config.json");
 
-                    ////打开防火墙端口
-                    //string openFireWallPort = ReceiveConfigurationParameters[1];
-                    //if (String.IsNullOrEmpty(client.RunCommand("command -v firewall-cmd").Result) == false)
-                    //{
-                    //    if (String.Equals(openFireWallPort, "443"))
-                    //    {
-                    //        client.RunCommand("firewall-cmd --zone=public --add-port=80/tcp --permanent");
-                    //        client.RunCommand("firewall-cmd --zone=public --add-port=443/tcp --permanent");
-                    //        client.RunCommand("firewall-cmd --reload");
-                    //    }
-                    //    else
-                    //    {
-                    //        client.RunCommand($"firewall-cmd --zone=public --add-port={openFireWallPort}/tcp --permanent");
-                    //        client.RunCommand($"firewall-cmd --zone=public --add-port={openFireWallPort}/udp --permanent");
-                    //        client.RunCommand("firewall-cmd --reload");
-                    //    }
-                    //}
-                    //if (String.IsNullOrEmpty(client.RunCommand("command -v ufw").Result) == false)
-                    //{
-                    //    if (String.Equals(openFireWallPort, "443"))
-                    //    {
-                    //        client.RunCommand("ufw allow 80");
-                    //        client.RunCommand("ufw allow 443");
-                    //        client.RunCommand("yes | ufw reload");
-                    //    }
-                    //    else
-                    //    {
-                    //        client.RunCommand($"ufw allow {openFireWallPort}/tcp");
-                    //        client.RunCommand($"ufw allow {openFireWallPort}/udp");
-                    //        client.RunCommand("yes | ufw reload");
-                    //    }
-                    //}
-
                     currentStatus = "正在安装acme.sh......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -4692,34 +4451,30 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //if (getApt == false)
-                    //{
-                    //    //client.RunCommand("apt-get -qq update");
-                    //    client.RunCommand("apt-get -y -qq install socat");
-                    //}
-                    //else if (getDnf == false)
-                    //{
-                    //    //client.RunCommand("yum -q makecache");
-                    //    client.RunCommand("dnf -y -q install socat");
-                    //}
-                    //else if (getYum == false)
-                    //{
-                    //    //client.RunCommand("yum -q makecache");
-                    //    client.RunCommand("yum -y -q install socat");
-                    //}
-                    //else if (getZypper == false)
-                    //{
-                    //    // client.RunCommand("zypper ref");
-                    //    client.RunCommand("zypper -y install socat");
-                    //}
-                    //client.RunCommand("curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh  | INSTALLONLINE=1  sh");
-                    //client.RunCommand("cd ~/.acme.sh/");
-                    //client.RunCommand("alias acme.sh=~/.acme.sh/acme.sh");
                     sshShellCommand = @"curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh  | INSTALLONLINE=1  sh";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    if (currentShellCommandResult.Contains("Install success") == true)
+                    {
+                        currentStatus = "acme.sh安装成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        currentStatus = "acme.sh安装失败！原因未知，请向开发者提问！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        return;
+                    }
+
                     sshShellCommand = @"cd ~/.acme.sh/";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4738,13 +4493,30 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                        //client.RunCommand("mkdir -p /etc/v2ray/ssl");
-                    //client.RunCommand($"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}");
-                    sshShellCommand = $"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}";
+                     sshShellCommand = $"/root/.acme.sh/acme.sh  --issue  --standalone  -d {ReceiveConfigurationParameters[4]}";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    if (currentShellCommandResult.Contains("Cert success") == true)
+                    {
+                        currentStatus = "证书申请成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        currentStatus = "证书申请失败！原因未知，请向开发者提问！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        return;
+                    }
+
                     currentStatus = "安装证书到Trojan......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -4752,21 +4524,39 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //client.RunCommand($"/root/.acme.sh/acme.sh  --installcert  -d {ReceiveConfigurationParameters[4]}  --certpath /usr/local/etc/trojan/trojan_ssl.crt --keypath /usr/local/etc/trojan/trojan_ssl.key  --capath  /usr/local/etc/trojan/trojan_ssl.crt  --reloadcmd  \"systemctl restart trojan\"");
                     sshShellCommand = $"/root/.acme.sh/acme.sh  --installcert  -d {ReceiveConfigurationParameters[4]}  --certpath /usr/local/etc/trojan/trojan_ssl.crt --keypath /usr/local/etc/trojan/trojan_ssl.key  --capath  /usr/local/etc/trojan/trojan_ssl.crt  --reloadcmd  \"systemctl restart trojan\"";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //currentStatus = "正在启动Trojan......";
-                    //textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    //Thread.Sleep(1000);
+                    sshShellCommand = @"if [ ! -f ""/usr/local/etc/trojan/trojan_ssl.key"" ]; then echo ""0""; else echo ""1""; fi | head -n 1";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //client.RunCommand("systemctl restart trojan");
+                    if (currentShellCommandResult.Contains("1") == true)
+                    {
+                        currentStatus = "证书安装到Trojan，成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                    }
+                    else
+                    {
+                        currentStatus = "证书安装到Trojan-go失败，原因未知，可以向开发者提问！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        return;
+                    }
+
+                    //设置证书权限
+                    sshShellCommand = @"chmod 644 /usr/local/etc/trojan/trojan_ssl.key";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //currentStatus = "Trojan启动成功！";
-                    //textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    //Thread.Sleep(1000);
 
                     currentStatus = "正在安装Caddy";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -4775,19 +4565,10 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //client.RunCommand("curl https://getcaddy.com -o getcaddy");
-                    //client.RunCommand("bash getcaddy personal hook.service");
-                    //client.RunCommand("mkdir -p /etc/caddy");
-                    //client.RunCommand("mkdir -p /var/www");
-
                     //安装Caddy
                     //为假则表示系统有相应的组件。
                     if (getApt == false)
                     {
-                        //client.RunCommand(@"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list");
-                        //client.RunCommand("apt install -y apt-transport-https");
-                        //client.RunCommand("apt -qq update");
-                        //client.RunCommand("apt -y -qq install caddy");
                         sshShellCommand = @"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4811,10 +4592,7 @@ namespace ProxySU
                     }
                     else if (getDnf == false)
                     {
-                        //client.RunCommand(@"dnf install 'dnf-command(copr)' -y");
-                        //client.RunCommand(@"dnf copr enable @caddy/caddy -y");
-                        ////client.RunCommand("dnf -q makecache");
-                        //client.RunCommand("dnf -y -q install caddy");
+
                         sshShellCommand = @"dnf install 'dnf-command(copr)' -y";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4838,10 +4616,6 @@ namespace ProxySU
                     }
                     else if (getYum == false)
                     {
-                        //client.RunCommand(@"yum install yum-plugin-copr -y");
-                        //client.RunCommand(@"yum copr enable @caddy/caddy -y");
-                        ////client.RunCommand("yum -q makecache");
-                        //client.RunCommand("yum -y -q install caddy");
                         sshShellCommand = @"yum install yum-plugin-copr -y";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4863,33 +4637,7 @@ namespace ProxySU
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
-                    //if (getApt == false)
-                    //{
-                    //    client.RunCommand(@"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list");
-                    //    client.RunCommand("apt install -y apt-transport-https");
-                    //    client.RunCommand("apt -qq update");
-                    //    client.RunCommand("apt -y -qq install caddy");
-                    //}
-                    //else if (getDnf == false)
-                    //{
-                    //    client.RunCommand(@"dnf install 'dnf-command(copr)' -y");
-                    //    client.RunCommand(@"dnf copr enable @caddy/caddy -y");
-                    //    //client.RunCommand("dnf -q makecache");
-                    //    client.RunCommand("dnf -y -q install caddy");
-                    //}
-                    //else if (getYum == false)
-                    //{
-                    //    client.RunCommand(@"yum install yum-plugin-copr -y");
-                    //    client.RunCommand(@"yum copr enable @caddy/caddy -y");
-                    //    //client.RunCommand("yum -q makecache");
-                    //    client.RunCommand("yum -y -q install caddy");
-                    //}
-                    //else if (getZypper == false)
-                    //{
-                    //    client.RunCommand("zypper ref");
-                    //    client.RunCommand("zypper -y install curl");
-                    //}
-
+                   
                     sshShellCommand = @"find / -name caddy";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4916,29 +4664,12 @@ namespace ProxySU
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     Thread.Sleep(1000);
-                    //client.RunCommand("systemctl enable caddy");
+
                     sshShellCommand = @"systemctl enable caddy";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-
-                    //if (!installResult.Contains("/usr/bin/caddy"))
-                    //{
-                    //    MessageBox.Show("安装Caddy失败！");
-                    //    currentStatus = "安装Caddy失败！";
-                    //    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    //    client.Disconnect();
-                    //    return;
-                    //}
-                    //else
-                    //{
-                    //    currentStatus = "Caddy安装成功！";
-                    //    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    //    Thread.Sleep(1000);
-                    //    client.RunCommand("systemctl enable caddy");
-                    //}
-
+                    
                     currentStatus = "上传Caddy配置文件......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -4953,16 +4684,12 @@ namespace ProxySU
 
                     string caddyConfig = "TemplateConfg\\trojan_caddy_config.caddyfile";
                     upLoadPath = "/etc/caddy/Caddyfile";
-                    //client.RunCommand("mv /etc/caddy/Caddyfile /etc/caddy/Caddyfile.bak");
+
                     UploadConfig(connectionInfo, caddyConfig, upLoadPath);
 
-                        ////设置Caddyfile文件中的tls 邮箱
-
-                        //string email = $"user@{ReceiveConfigurationParameters[4]}";
-                     //string sshCmd;
+  
                     //设置域名
-                    //string sshCmd = $"sed -i 's/##domain##/{ReceiveConfigurationParameters[4]}/' {upLoadPath}";
-                    //client.RunCommand(sshCmd);
+
                     sshShellCommand = $"sed -i 's/##domain##/{ReceiveConfigurationParameters[4]}/' {upLoadPath}";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4971,8 +4698,6 @@ namespace ProxySU
                     //设置伪装网站
                     if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false)
                     {
-                        //sshCmd = $"sed -i 's/##sites##/proxy \\/ {ReceiveConfigurationParameters[7]}/' {upLoadPath}";
-                        //client.RunCommand(sshCmd);
                         sshShellCommand = $"sed -i 's/##sites##/proxy \\/ {ReceiveConfigurationParameters[7]}/' {upLoadPath}";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -4985,13 +4710,7 @@ namespace ProxySU
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     Thread.Sleep(1000);
-                    // Thread.Sleep(2000);
-
-                    //安装Caddy服务
-                    //sshCmd = $"caddy -service install -agree -conf /etc/caddy/Caddyfile -email {email}";
-                    //MessageBox.Show(sshCmd);
-                    //client.RunCommand(sshCmd);
-
+ 
                     currentStatus = "正在启动Caddy......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -5004,12 +4723,67 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    currentStatus = "Caddy启动成功！";
-                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    currentShellCommandResult = currentStatus;
+                    Thread.Sleep(3000);
+
+                    sshShellCommand = @"ps aux | grep caddy";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    Thread.Sleep(1000);
+                    if (currentShellCommandResult.Contains("/usr/bin/caddy") == true)
+                    {
+                        //运行成功
+                        currentStatus = "Caddy启动成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        //运行失败
+                        currentStatus = "Caddy启动失败！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(1000);
+                        currentStatus = "正在启动Caddy（第二次尝试）！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(1000);
+                        sshShellCommand = @"systemctl restart caddy";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(3000);
+
+                        sshShellCommand = @"ps aux | grep caddy";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        if (currentShellCommandResult.Contains("/usr/bin/caddy") == true)
+                        {
+                            currentStatus = "Caddy启动成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            currentStatus = "Caddy启动失败(第二次)！退出安装！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            Thread.Sleep(1000);
+                            MessageBox.Show("Caddy启动失败，原因未知！请向开发者问询！");
+                            return;
+                        }
+                    }
 
                     currentStatus = "正在启动Trojan......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -5018,19 +4792,72 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
                     //启动Trojan-go服务
-                    //client.RunCommand("systemctl restart trojan-go");
                     sshShellCommand = @"systemctl restart trojan";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    Thread.Sleep(3000);
 
-                    currentStatus = "Trojan启动成功！";
-                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    currentShellCommandResult = currentStatus;
+                    sshShellCommand = @"ps aux | grep trojan";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                    if (currentShellCommandResult.Contains("/usr/local/bin/trojan") == true)
+                    {
+                        currentStatus = "Trojan启动成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+
+                        //运行失败
+                        currentStatus = "Trojan启动失败！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(3000);
+                        currentStatus = "正在启动Trojan（第二次尝试）！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(3000);
+                        sshShellCommand = @"systemctl restart trojan";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(3000);
+
+                        sshShellCommand = @"ps aux | grep trojan";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        if (currentShellCommandResult.Contains("usr/local/bin/trojan-go") == true)
+                        {
+                            currentStatus = "Trojan启动成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            currentStatus = "Trojan启动失败(第二次)！退出安装！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            Thread.Sleep(1000);
+                            MessageBox.Show("Trojan启动失败，原因未知！请向开发者问询！");
+                            return;
+                        }
+                    }
 
-                    Thread.Sleep(1000);
 
                     //测试BBR条件，若满足提示是否启用
                     currentStatus = "BBR测试......";
@@ -5040,7 +4867,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //var result = client.RunCommand("uname -r");
                     sshShellCommand = @"uname -r";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -5049,7 +4875,7 @@ namespace ProxySU
                     string[] linuxKernelVerStr = currentShellCommandResult.Split('-');
 
                     bool detectResult = DetectKernelVersionBBR(linuxKernelVerStr[0]);
-                    //client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
+
                     sshShellCommand = @"sysctl net.ipv4.tcp_congestion_control | grep bbr";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -5065,9 +4891,6 @@ namespace ProxySU
 
                         Thread.Sleep(1000);
 
-                        //client.RunCommand(@"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'");
-                        //client.RunCommand(@"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'");
-                        //client.RunCommand(@"sysctl -p");
                         sshShellCommand = @"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -5101,18 +4924,7 @@ namespace ProxySU
 
                     }
                     client.Disconnect();//断开服务器ssh连接
-                    //var result = client.RunCommand("uname -r");
-                    //string[] linuxKernelVerStr = result.Result.Split('-');
-
-                    //bool detectResult = DetectKernelVersionBBR(linuxKernelVerStr[0]);
-                    //string resultCmdTestBBR = client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
-                    ////如果内核满足大于等于4.9，且还未启用BBR，则启用BBR
-                    //if (detectResult == true && resultCmdTestBBR.Contains("bbr") == false)
-                    //{
-                    //    client.RunCommand(@"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'");
-                    //    client.RunCommand(@"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'");
-                    //    client.RunCommand(@"sysctl -p");
-                    //}
+                  
 
                     //生成客户端配置
                     currentStatus = "生成客户端配置......";
@@ -5141,8 +4953,6 @@ namespace ProxySU
                         }
                     }
 
-                    //client.Disconnect();
-
                     currentStatus = "Trojan安装成功,祝你玩的愉快！！";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -5152,8 +4962,7 @@ namespace ProxySU
 
                     //显示服务端连接参数
                     proxyType = "Trojan";
-                    //TrojanResultClientInfoWindow resultClientInformation = new TrojanResultClientInfoWindow();
-                    //resultClientInformation.ShowDialog();
+
                     ResultClientInformation resultClientInformation = new ResultClientInformation();
                     resultClientInformation.ShowDialog();
                     return;
@@ -5162,7 +4971,7 @@ namespace ProxySU
             catch (Exception ex1)//例外处理   
             #region 例外处理
             {
-                //MessageBox.Show(ex1.Message);
+
                 if (ex1.Message.Contains("连接尝试失败") == true)
                 {
                     MessageBox.Show($"{ex1.Message}\n请检查主机地址及端口是否正确，如果通过代理，请检查代理是否正常工作");
@@ -5605,7 +5414,9 @@ namespace ProxySU
                         Thread.Sleep(1000);
                     }
                     //检测是否运行在root权限下
-                    currentShellCommandResult = "检测是否运行在root权限下...";
+                    currentStatus = "检测是否运行在root权限下...";
+                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                    currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"id -u";
@@ -5622,7 +5433,9 @@ namespace ProxySU
                     }
                     else
                     {
-                        currentShellCommandResult = "检测结果：OK！";
+                        currentStatus = "检测结果：OK！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
@@ -5666,21 +5479,14 @@ namespace ProxySU
                     }
                     else
                     {
-                        currentShellCommandResult = "检测结果：未安装Caddy！";
+                        currentStatus = "检测结果：未安装Caddy！";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        currentShellCommandResult = currentStatus;
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
 
-                    //MessageBoxResult messageBoxResult1 = MessageBox.Show("远程主机已安装Caddy,但不确定是否支持forward proxy，是否强制重新安装？", "", MessageBoxButton.YesNo, MessageBoxImage.Question);
-                    //if (messageBoxResult1 == MessageBoxResult.No)
-                    //{
-                    //    currentStatus = "安装取消，退出";
-                    //    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    //    Thread.Sleep(1000);
-                    //    client.Disconnect();
-                    //    return;
-                    //}
-
+                   
                     //检测远程主机系统环境是否符合要求
                     currentStatus = "检测系统是否符合安装要求......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
@@ -5771,29 +5577,22 @@ namespace ProxySU
                     //为假则表示系统有相应的组件。
                     if (getApt == false)
                     {
-                        //client.RunCommand("apt -qq update");
-                        //client.RunCommand("apt -y -qq install curl");
                         sshCmdUpdate = @"apt -qq update";
                         sshCmdInstall = @"apt -y -qq install ";
                     }
                     else if (getDnf == false)
                     {
-                        //client.RunCommand("dnf -q makecache");
-                        //client.RunCommand("dnf -y -q install curl");
                         sshCmdUpdate = @"dnf -q makecache";
                         sshCmdInstall = @"dnf -y -q install ";
                     }
                     else if (getYum == false)
                     {
-                        //client.RunCommand("yum -q makecache");
-                        //client.RunCommand("yum -y -q install curl");
                         sshCmdUpdate = @"yum -q makecache";
                         sshCmdInstall = @"yum -y -q install ";
                     }
                     else if (getZypper == false)
                     {
-                        //client.RunCommand("zypper ref");
-                        //client.RunCommand("zypper -y install curl");
+
                         sshCmdUpdate = @"zypper ref";
                         sshCmdInstall = @"zypper -y install ";
                     }
@@ -5814,8 +5613,6 @@ namespace ProxySU
                             currentShellCommandResult = currentStatus;
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                            //client.RunCommand("setenforce  0");//不重启改为Permissive模式
-                            //client.RunCommand("sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config");//重启也工作在Permissive模式下
                             sshShellCommand = @"setenforce  0";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -5849,66 +5646,7 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //if (getApt == false)
-                    //{
-                    //    //client.RunCommand("apt -qq update");
-                    //    //client.RunCommand("apt -y -qq install curl libnss3 xz-utils lsof unzip");
-                    //    sshShellCommand = @"apt -qq update";
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
-                    //    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                    //    sshShellCommand = @"apt -y -qq install curl libnss3 xz-utils lsof unzip";
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
-                    //    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                    //}
-                    //else if (getDnf == false)
-                    //{
-                    //    //client.RunCommand("dnf -q makecache");
-                    //    //client.RunCommand("dnf -y -q install curl nss xz lsof unzip");
-                    //    sshShellCommand = @"dnf -q makecache";
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
-                    //    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                    //    sshShellCommand = @"dnf -y -q install curl nss xz lsof unzip";
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
-                    //    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                    //}
-                    //else if (getYum == false)
-                    //{
-                    //    //client.RunCommand("yum -q makecache");
-                    //    //client.RunCommand("yum -y -q install curl nss xz lsof unzip");
-                    //    sshShellCommand = @"yum -q makecache";
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
-                    //    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                    //    sshShellCommand = @"yum -y -q install curl nss xz lsof unzip";
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
-                    //    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                    //}
-                    //else if (getZypper == false)
-                    //{
-                    //    //client.RunCommand("zypper ref");
-                    //    //client.RunCommand("zypper -y install curl nss xz lsof unzip");
-                    //    sshShellCommand = @"zypper ref";
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
-                    //    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                    //    sshShellCommand = @"zypper -y install curl nss xz lsof unzip";
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
-                    //    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
-                    //    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
-
-                    //}
+                   
                     currentStatus = "安装完毕！OK！";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
@@ -5999,9 +5737,7 @@ namespace ProxySU
                         if (String.IsNullOrEmpty(testPort443) == false)
                         {
                             string[] cmdResultArry443 = testPort443.Split(' ');
-                            //client.RunCommand($"systemctl stop {cmdResultArry443[0]}");
-                            //client.RunCommand($"systemctl disable {cmdResultArry443[0]}");
-                            //client.RunCommand($"kill -9 {cmdResultArry443[3]}");
+
                             sshShellCommand = $"systemctl stop {cmdResultArry443[0]}";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6022,9 +5758,7 @@ namespace ProxySU
                         if (String.IsNullOrEmpty(testPort80) == false)
                         {
                             string[] cmdResultArry80 = testPort80.Split(' ');
-                            //client.RunCommand($"systemctl stop {cmdResultArry80[0]}");
-                            //client.RunCommand($"systemctl disable {cmdResultArry80[0]}");
-                            //client.RunCommand($"kill -9 {cmdResultArry80[3]}");
+
                             sshShellCommand = $"systemctl stop {cmdResultArry80[0]}";
                             TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                             currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6072,10 +5806,6 @@ namespace ProxySU
 
                     if (String.IsNullOrEmpty(client.RunCommand("command -v firewall-cmd").Result) == false)
                     {
-
-                        //client.RunCommand("firewall-cmd --zone=public --add-port=80/tcp --permanent");
-                        //client.RunCommand("firewall-cmd --zone=public --add-port=443/tcp --permanent");
-                        //client.RunCommand("firewall-cmd --reload");
                         sshShellCommand = @"firewall-cmd --zone=public --add-port=80/tcp --permanent";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6094,9 +5824,6 @@ namespace ProxySU
                     }
                     if (String.IsNullOrEmpty(client.RunCommand("command -v ufw").Result) == false)
                     {
-                        //client.RunCommand("ufw allow 80");
-                        //client.RunCommand("ufw allow 443");
-                        //client.RunCommand("yes | ufw reload");
 
                         sshShellCommand = @"ufw allow 80";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
@@ -6126,10 +5853,7 @@ namespace ProxySU
                     //为假则表示系统有相应的组件。
                     if (getApt == false)
                     {
-                        //client.RunCommand(@"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list");
-                        //client.RunCommand("apt install -y apt-transport-https");
-                        //client.RunCommand("apt -qq update");
-                        //client.RunCommand("apt -y -qq install caddy");
+
                         sshShellCommand = @"echo ""deb [trusted=yes] https://apt.fury.io/caddy/ /"" | tee -a /etc/apt/sources.list.d/caddy-fury.list";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6153,10 +5877,7 @@ namespace ProxySU
                     }
                     else if (getDnf == false)
                     {
-                        //client.RunCommand(@"dnf install 'dnf-command(copr)' -y");
-                        //client.RunCommand(@"dnf copr enable @caddy/caddy -y");
-                        ////client.RunCommand("dnf -q makecache");
-                        //client.RunCommand("dnf -y -q install caddy");
+
                         sshShellCommand = @"dnf install 'dnf-command(copr)' -y";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6180,10 +5901,7 @@ namespace ProxySU
                     }
                     else if (getYum == false)
                     {
-                        //client.RunCommand(@"yum install yum-plugin-copr -y");
-                        //client.RunCommand(@"yum copr enable @caddy/caddy -y");
-                        ////client.RunCommand("yum -q makecache");
-                        //client.RunCommand("yum -y -q install caddy");
+
                         sshShellCommand = @"yum install yum-plugin-copr -y";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6237,7 +5955,7 @@ namespace ProxySU
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                         Thread.Sleep(1000);
-                        //client.RunCommand("systemctl enable caddy");
+
                         sshShellCommand = @"systemctl enable caddy";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6253,11 +5971,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //client.RunCommand(@"curl -o /tmp/caddy.zip https://raw.githubusercontent.com/proxysu/Resources/master/Caddy2/caddy20200816.zip");
-                    //client.RunCommand(@"unzip /tmp/caddy.zip"); //解压到当前目录 ~/
-                    //client.RunCommand(@"chmod +x caddy");
-                    //client.RunCommand(@"systemctl stop caddy;rm -f /usr/bin/caddy");
-                    //client.RunCommand(@"cp ./caddy /usr/bin/");
                     sshShellCommand = @"curl -o /tmp/caddy.zip https://raw.githubusercontent.com/proxysu/Resources/master/Caddy2/caddy20200816.zip";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6298,7 +6011,6 @@ namespace ProxySU
 
                     //生成服务端配置
 
-                    //string email = $"user@{ReceiveConfigurationParameters[4]}";//生成Caddyfile文件中的tls 邮箱
                     string caddyConfig = "TemplateConfg\\Naiveproxy_server_config.json";
                     using (StreamReader reader = File.OpenText(caddyConfig))
                     {
@@ -6335,9 +6047,6 @@ namespace ProxySU
                     currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    //client.RunCommand(@"sed -i 's/Caddyfile/config.json/' /lib/systemd/system/caddy.service");
-                    //client.RunCommand("systemctl daemon-reload");
-                    //client.RunCommand("systemctl restart caddy"); //启动Caddy服务
                     sshShellCommand = @"sed -i 's/Caddyfile/config.json/' /lib/systemd/system/caddy.service";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6348,7 +6057,7 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    currentStatus = "设置完毕，正在重启Caddy......";
+                    currentStatus = "设置完毕，正在启动Caddy......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                     currentShellCommandResult = currentStatus;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -6359,11 +6068,69 @@ namespace ProxySU
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    currentStatus = "重启Caddy完毕，OK!";
-                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    currentShellCommandResult = currentStatus;
+                    Thread.Sleep(3000);
+
+                    sshShellCommand = @"ps aux | grep caddy";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
+                    if (currentShellCommandResult.Contains("/usr/bin/caddy") == true)
+                    {
+                        //运行成功
+                        currentStatus = "Caddy启动成功！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(1000);
+                    }
+                    else
+                    {
+                        //运行失败
+                        currentStatus = "Caddy启动失败！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(1000);
+                        currentStatus = "正在启动Caddy（第二次尝试）！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        Thread.Sleep(1000);
+                        sshShellCommand = @"systemctl restart caddy";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        Thread.Sleep(3000);
+
+                        sshShellCommand = @"ps aux | grep caddy";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                        if (currentShellCommandResult.Contains("/usr/bin/caddy") == true)
+                        {
+                            currentStatus = "Caddy启动成功！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                            Thread.Sleep(1000);
+                        }
+                        else
+                        {
+                            currentStatus = "Caddy启动失败(第二次)！退出安装！";
+                            textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                            currentShellCommandResult = currentStatus;
+                            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                            Thread.Sleep(1000);
+                            MessageBox.Show("Caddy启动失败，原因未知！请向开发者问询！");
+                            return;
+                        }
+                    }
+
+                   
                     ////设置伪装网站
                     //if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false)
                     //{
@@ -6382,115 +6149,96 @@ namespace ProxySU
 
                     //优化网络参数
                     sshShellCommand = @"bash -c 'echo ""fs.file-max = 51200"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.core.rmem_max = 67108864"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.core.wmem_max = 67108864"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.core.rmem_default = 65536"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.core.wmem_default = 65536"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.core.netdev_max_backlog = 4096"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.core.somaxconn = 4096"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_syncookies = 1"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_tw_reuse = 1"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_tw_recycle = 0"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_fin_timeout = 30"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_keepalive_time = 1200"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.ip_local_port_range = 10000 65000"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_max_syn_backlog = 4096"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_max_tw_buckets = 5000"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_rmem = 4096 87380 67108864"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_wmem = 4096 65536 67108864"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_mtu_probing = 1"" >> /etc/sysctl.conf'";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     sshShellCommand = @"sysctl -p";
-                    //client.RunCommand(sshShellCommand);
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
@@ -6511,7 +6259,6 @@ namespace ProxySU
 
                     Thread.Sleep(1000);
 
-                    //var result = client.RunCommand("uname -r");
                     sshShellCommand = @"uname -r";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6520,7 +6267,6 @@ namespace ProxySU
                     string[] linuxKernelVerStr = currentShellCommandResult.Split('-');
 
                     bool detectResult = DetectKernelVersionBBR(linuxKernelVerStr[0]);
-                    //client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
                     sshShellCommand = @"sysctl net.ipv4.tcp_congestion_control | grep bbr";
                     TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                     currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6536,9 +6282,6 @@ namespace ProxySU
 
                         Thread.Sleep(1000);
 
-                        //client.RunCommand(@"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'");
-                        //client.RunCommand(@"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'");
-                        //client.RunCommand(@"sysctl -p");
                         sshShellCommand = @"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'";
                         TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
                         currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
@@ -6605,8 +6348,6 @@ namespace ProxySU
 
                     //显示服务端连接参数
                     proxyType = "NaiveProxy";
-                    //NaiveProxyResultInfoWindow resultClientInformation = new NaiveProxyResultInfoWindow();
-                    //resultClientInformation.ShowDialog();
                     ResultClientInformation resultClientInformation = new ResultClientInformation();
                     resultClientInformation.ShowDialog();
                     return;
@@ -6862,12 +6603,11 @@ namespace ProxySU
                     string cmdResult;
                     cmdTestPort = @"lsof -n -P -i :443 | grep LISTEN";
                     cmdResult = client.RunCommand(cmdTestPort).Result;
-                    //MessageBox.Show(cmdTestPort);
+
                     if (String.IsNullOrEmpty(cmdResult) == false)
                     {
-                        //MessageBox.Show(cmdResult);
+
                         string[] cmdResultArry443 = cmdResult.Split(' ');
-                        //MessageBox.Show(cmdResultArry443[3]);
                         client.RunCommand($"systemctl stop {cmdResultArry443[0]}");
                         client.RunCommand($"systemctl disable {cmdResultArry443[0]}");
                         client.RunCommand($"kill -9 {cmdResultArry443[3]}");
@@ -6910,8 +6650,9 @@ namespace ProxySU
         private void StartTestAndEnableBBR(ConnectionInfo connectionInfo, TextBlock textBlockName, ProgressBar progressBar)
         {
             string currentStatus = "正在登录远程主机......";
-            Action<TextBlock, ProgressBar, string> updateAction = new Action<TextBlock, ProgressBar, string>(UpdateTextBlock);
             textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+            currentShellCommandResult = currentStatus;
+            TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
             try
             {
@@ -6950,84 +6691,102 @@ namespace ProxySU
                     {
                         currentStatus = "主机登录成功";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果在监视窗口
                         Thread.Sleep(1000);
                     }
                     //检测是否运行在root权限下
-                    string testRootAuthority = client.RunCommand(@"id -u").Result;
+                    currentStatus = "检测是否运行在root权限下...";
+                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                    currentShellCommandResult = currentStatus;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                    sshShellCommand = @"id -u";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                    string testRootAuthority = currentShellCommandResult;
                     if (testRootAuthority.Equals("0\n") == false)
                     {
                         MessageBox.Show("请使用具有root权限的账户登录主机！！");
                         client.Disconnect();
                         return;
                     }
+                    else
+                    {
+                        currentStatus = "检测结果：OK！";
+                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                    }
                     //检测远程主机系统环境是否符合要求
                     currentStatus = "检测系统内核版本是否符合要求......";
                     textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                    currentShellCommandResult = currentStatus;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
                     Thread.Sleep(1000);
 
-                    var result = client.RunCommand("uname -r");
-                    //var result = client.RunCommand("cat /root/test.ver");
-                    string[] linuxKernelVerStr = result.Result.Split('-');
+                    sshShellCommand = @"uname -r";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    bool detectResult = DetectKernelVersionBBR(linuxKernelVerStr[0]);
-                    if (detectResult == false)
+                    string[] linuxKernelVerStrBBR = currentShellCommandResult.Split('-');
+
+                    bool detectResultBBR = DetectKernelVersionBBR(linuxKernelVerStrBBR[0]);
+
+                    sshShellCommand = @"sysctl net.ipv4.tcp_congestion_control | grep bbr";
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                    currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                    TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+                    string resultCmdTestBBR = currentShellCommandResult;
+                    //如果内核满足大于等于4.9，且还未启用BBR，则启用BBR
+                    if (detectResultBBR == true && resultCmdTestBBR.Contains("bbr") == false)
                     {
-                        MessageBox.Show($"当前系统内核版本为{linuxKernelVerStr[0]}，启用BBR要求内核为4.9及以上。请升级内核再安装！或更换系统为CentOS8/Debian9/10/Ubuntu18.04及以上");
-                        currentStatus = "系统内核版本不符合要求，安装失败！！";
+                        currentStatus = "正在启用BBR......";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
                         Thread.Sleep(1000);
-                        client.Disconnect();
-                        return;
+
+                        sshShellCommand = @"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        sshShellCommand = @"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
+                        sshShellCommand = @"sysctl -p";
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令
+                        currentShellCommandResult = client.RunCommand(sshShellCommand).Result;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
+
                     }
-                    //检测是否安装有NaiveProxy
-                    currentStatus = "检测系统是否已经启用BBR......";
-                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    Thread.Sleep(1000);
-
-                    string resultCmdTestBBR = client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
-
-                    if (resultCmdTestBBR.Contains("bbr") == true)
+                    else if (resultCmdTestBBR.Contains("bbr") == true)
                     {
-                        MessageBoxResult messageBoxResult = MessageBox.Show("远程主机已启用BBR!");
-
-                        currentStatus = "远程主机已启用BBR！退出！";
+                        currentStatus = "BBR已经启用了！";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        Thread.Sleep(1000);
-                        client.Disconnect();
-                        return;
-                    }
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
-                    currentStatus = "内核符合要求,启用中......";
-                    textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    Thread.Sleep(1000);
-
-                    //启用BBR
-
-                    client.RunCommand(@"bash -c 'echo ""net.core.default_qdisc=fq"" >> /etc/sysctl.conf'");
-                    client.RunCommand(@"bash -c 'echo ""net.ipv4.tcp_congestion_control=bbr"" >> /etc/sysctl.conf'");
-                    client.RunCommand(@"sysctl -p");
-
-                    resultCmdTestBBR = client.RunCommand(@"sysctl net.ipv4.tcp_congestion_control | grep bbr").Result;
-                    //resultCmdTestBBR = client.RunCommand(@"sysctl -n net.ipv4.tcp_congestion_control").Result;
-                    if (resultCmdTestBBR.Contains("bbr") == true)
-                    {
-                        MessageBoxResult messageBoxResult = MessageBox.Show("远程主机已成功启用BBR!");
-
-                        currentStatus = "远程主机已启用BBR！成功！";
-                        textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        Thread.Sleep(1000);
                     }
                     else
                     {
-                        MessageBoxResult messageBoxResult = MessageBox.Show("BBR启用失败!原因未知，请重试或更换系统为CentOS8/Debian9/10/Ubuntu18.04及以上");
-
-                        currentStatus = "BBR启用失败！";
+                        currentStatus = "系统不满足启用BBR的条件，启用失败！";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                        Thread.Sleep(1000);
+                        currentShellCommandResult = currentStatus;
+                        TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
                     }
+                    client.Disconnect();//断开服务器ssh连接
 
-                    client.Disconnect();
                     return;
                 }
             }
@@ -7063,6 +6822,8 @@ namespace ProxySU
                 }
                 currentStatus = "主机登录失败";
                 textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
+                currentShellCommandResult = currentStatus;
+                TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
 
             }
             #endregion
@@ -8117,9 +7878,13 @@ namespace ProxySU
 
         }
 
+
         #endregion
 
-  
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            MessageBox.Show(System.Globalization.CultureInfo.InstalledUICulture.Name);
+        }
     }
 
 }
diff --git a/ProxySU/ProofreadTimeWindow.xaml.cs b/ProxySU/ProofreadTimeWindow.xaml.cs
index 44eb5d3..cabbba4 100644
--- a/ProxySU/ProofreadTimeWindow.xaml.cs
+++ b/ProxySU/ProofreadTimeWindow.xaml.cs
@@ -52,7 +52,7 @@ namespace ProxySU
                 client.RunCommand("ln -s /usr/share/zoneinfo/UTC /etc/localtime");
                 //获取远程主机的时间戳
                 long timeStampVPS = Convert.ToInt64(client.RunCommand("date +%s").Result.ToString());
-                //MessageBox.Show(timesStampVPS.ToString());
+
                 //获取本地时间戳
                 TimeSpan ts = DateTime.Now.ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0, 0);
                 long timeStampLocal = Convert.ToInt64(ts.TotalSeconds);
@@ -61,9 +61,7 @@ namespace ProxySU
                 {
 
                     MessageBox.Show("本地时间与远程主机时间相差超过限制(90秒)，V2ray无法建立连接");
-                    //currentStatus = "时间较对失败......";
-                    //textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
-                    //Thread.Sleep(1000);
+
                     return;
                 }
                 else
@@ -107,11 +105,9 @@ namespace ProxySU
                     //获取本地时间戳
                     TimeSpan ts = DateTime.Now.ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0, 0);
                     long timeStampLocal = Convert.ToInt64(ts.TotalSeconds);
-                    //string stampTime = timeStampLocal.ToString();
+
                     string sshCmd = $"date --set=\"$(date \"+%Y-%m-%d %H:%M:%S\" -d @{timeStampLocal.ToString()})\"";
-                    //MessageBox.Show(sshCmd);
-                    //string sshCmd = $"date --set=\"$(date \"+%Y-%m-%d %H:%M:%S\" -d @1489739011)\"";
-                    //MessageBox.Show(sshCmd);
+
                     client.RunCommand(sshCmd);
                     MessageBox.Show("同步本地时间校时完毕");
 
@@ -124,17 +120,12 @@ namespace ProxySU
                     long timeStampVPS = Convert.ToInt64(utcTS.TotalSeconds);
                     if (timeStampVPS!=0)
                     {
-                        //MessageBox.Show(timeStampVPS.ToString());
+
                         string sshCmd = $"date --set=\"$(date \"+%Y-%m-%d %H:%M:%S\" -d @{timeStampVPS.ToString()})\"";
-                        //MessageBox.Show(sshCmd);
+
                         client.RunCommand(sshCmd);
                         MessageBox.Show("同步网络时间校时完毕");
                     }
-                    //else
-                    //{
-                    //    MessageBox.Show(timeStampVPS.ToString());
-                    //    MessageBox.Show("同步网络时间失败");
-                    //}
                 
                 }
                 client.Disconnect();
diff --git a/ProxySU/ProxySU.csproj b/ProxySU/ProxySU.csproj
index ec40860..fb08767 100644
--- a/ProxySU/ProxySU.csproj
+++ b/ProxySU/ProxySU.csproj
@@ -113,6 +113,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Translations\ProxySU.zh-CN.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Translations\ProxySU.en-US.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="V2RayTemplateWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -155,6 +163,7 @@
   <ItemGroup>
     <Resource Include="ProxySU.ico" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>del "$(TargetDir)*.xml"
diff --git a/ProxySU/ResultClientInformation.xaml b/ProxySU/ResultClientInformation.xaml
index 7c21433..cfaabf0 100644
--- a/ProxySU/ResultClientInformation.xaml
+++ b/ProxySU/ResultClientInformation.xaml
@@ -197,7 +197,7 @@
                     <ColumnDefinition></ColumnDefinition>
                     <ColumnDefinition Width="0.6*"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
-                <TextBlock x:Name="TextBlockQrURLexplain" Text="二维码和URL链接可用于&#x0a;v2rayN(windows)&#x0a;Trojan-QT5(windows)&#x0a;Qv2ray(windows)&#x0a;Shadowrocket(ios)&#x0a;v2rayNG(Android)&#x0a;导入v2ray节点&#x0a;注意:Vless协议需要手动输入配置参数，二维码和URL无效" TextWrapping="Wrap" Grid.Column="0"></TextBlock>
+                <TextBlock x:Name="TextBlockQrURLexplain" Text="二维码和URL链接可用于&#x0a;v2rayN(windows)&#x0a;Trojan-QT5(windows)&#x0a;Qv2ray(windows)&#x0a;Shadowrocket(ios)&#x0a;v2rayNG(Android)&#x0a;导入v2ray节点&#x0a;&#x0a;注意:Vless协议需要手动输入配置参数，二维码和URL无效" TextWrapping="Wrap" Grid.Column="0"></TextBlock>
                 <Image x:Name="ImageShareQRcode" Grid.Column="1"></Image>
                 <TextBox x:Name="TextBoxURL" TextWrapping="Wrap" Grid.Column="2"></TextBox>
             </Grid>
diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs
index ceaa0ae..c7a32f2 100644
--- a/ProxySU/ResultClientInformation.xaml.cs
+++ b/ProxySU/ResultClientInformation.xaml.cs
@@ -109,6 +109,8 @@ namespace ProxySU
                     HideAlterId();
                     HidePath();
                     HideQuicKey();
+                    ImageShareQRcode.Visibility = Visibility.Collapsed;
+                    TextBoxURL.Visibility = Visibility.Collapsed;
                 }
                 else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "webSocket"))
                 {
@@ -444,15 +446,21 @@ namespace ProxySU
                 num++;
             }
             CheckDir(@"v2ray_config\" + saveFileFolder);
-            //MessageBox.Show(v2rayNjsonObject.ToString());
+            //生成二维码与URL，跳过VlessTcpTlsWeb暂时未有URL标准
             string vmessUrl = "vmess://" + ToBase64Encode(v2rayNjsonObject.ToString());
             TextBoxURL.Text = vmessUrl;
             using (StreamWriter sw = new StreamWriter($"v2ray_config\\{saveFileFolder}\\url.txt"))
             {
-                  sw.WriteLine(vmessUrl);
-
+                if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "VlessTcpTlsWeb") == false)
+                {
+                    sw.WriteLine(vmessUrl);
+                }
             }
-            CreateQRCode(vmessUrl,"v2ray_config");
+            if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "VlessTcpTlsWeb") == false)
+            {
+                CreateQRCode(vmessUrl, "v2ray_config");
+            }
+            
 
             if (File.Exists(@"v2ray_config\config.json"))
             {
diff --git a/ProxySU/Translations/ProxySU.en-US.xaml b/ProxySU/Translations/ProxySU.en-US.xaml
new file mode 100644
index 0000000..b145274
--- /dev/null
+++ b/ProxySU/Translations/ProxySU.en-US.xaml
@@ -0,0 +1,136 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:ProxySU.Translations"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+    <sys:String x:Key="TabItemHeaderAppDeployment">Deployment</sys:String>
+    <sys:String x:Key="TabItemHeaderResourceTools">Resource Tools</sys:String>
+    <sys:String x:Key="TextBlockHostName">Host:</sys:String>
+    <sys:String x:Key="TextBoxHostNamePrompt">IP or Domain (Not empty)</sys:String>
+    <sys:String x:Key="TextBlockHostPart">Port:</sys:String>
+    <sys:String x:Key="TextBlockHostUser">User:</sys:String>
+    <sys:String x:Key="TextBlockHostPassword">Password:</sys:String>
+    <sys:String x:Key="TextBlockSetUpProcessing">Waiting for Deployment</sys:String>
+    <sys:String x:Key="TabItemHeaderSysTools">Tools</sys:String>
+    <sys:String x:Key="ButtonV2RayTemplateConfiguration">V2Ray Templates</sys:String>
+    <sys:String x:Key="ButtonV2RayOneKeyInstall">Install V2ray</sys:String>
+    <sys:String x:Key="ButtonUpdateV2ray">Upgrade V2Ray</sys:String>
+    <sys:String x:Key="Button_canel">Canel</sys:String>
+    <sys:String x:Key="ButtonTrojanGoTemplate">Trojan-Go Templates</sys:String>
+    <sys:String x:Key="ButtonTrojanGoSetUp">Install Trojan-Go</sys:String>
+    <sys:String x:Key="ButtonUpdateTrojanGo">Upgrade Trojan-Go</sys:String>
+    <sys:String x:Key="ButtonTrojanGoCancel">Canel</sys:String>
+    <sys:String x:Key="GroupBoxHeaderParameterTrojan">Parameter</sys:String>
+    <sys:String x:Key="TextBlockTrojanTemplateExplanation">Plan: Trojan+TLS+Caddy</sys:String>
+    <sys:String x:Key="TextBlockTrojanServerDomain">Server Domain:</sys:String>
+    <sys:String x:Key="TextBlockTrojanPort">Port: 443</sys:String>
+    <sys:String x:Key="TextBoxDomainPrompt">Domain name cannot be empty</sys:String>
+    <sys:String x:Key="TextBlockTrojanHostPassword">Password:</sys:String>
+    <sys:String x:Key="ButtonTrojanChangePassword">Change</sys:String>
+    <sys:String x:Key="ButtonTrojanSetUp">Install Trojan</sys:String>
+    <sys:String x:Key="ButtonUpdateTrojan">Upgrade Trojan</sys:String>
+    <sys:String x:Key="ButtonTrojanCancel">Cancel</sys:String>
+    <sys:String x:Key="TextBlockNaiveProxyTemplateExplanation">Plan: NaiveProxy+TLS+Caddy</sys:String>
+    <sys:String x:Key="ButtonNaiveProxyChangeUser">Change</sys:String>
+    <sys:String x:Key="ButtonNavieSetUp">Install NaiveProxy</sys:String>
+    <sys:String x:Key="ButtonNaiveCancel">Cancel</sys:String>
+    <sys:String x:Key="ButtonProofreadTime">Proofread Time</sys:String>
+    <sys:String x:Key="ButtonClearOccupiedPorts">Release Port 80/443</sys:String>
+    <sys:String x:Key="ButtonTestAndEnableBBR">Turn on BBR</sys:String>
+    <sys:String x:Key="ButtonWebBrowserHomePage">Home</sys:String>
+    <sys:String x:Key="ButtonWebBrowserForward">Forward</sys:String>
+    <sys:String x:Key="ButtonWebBrowserBack">Back</sys:String>
+    <sys:String x:Key="TextBlockWebExplain">Due to well-known reasons, loading is slow at certain times, please be patient</sys:String>
+    <sys:String x:Key="GroupBoxHeaderTrojanGoTemplates">Trojan-go Templates</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoTLSwebPlan">HTTP/2 transmission, Caddy2 camouflage website, anti-identification, does not support CloudFlare CDN temporarily</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoWebSocketTLSwebPlan">Use WebSocket transmission, Caddy2 camouflage website, anti-identification, support CloudFlare CDN</sys:String>
+    <sys:String x:Key="GroupBoxHeaderParameterTrojanGo">Parameter</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoDomain">Domain:</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoPort">Port: 443</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoPassword">Password: </sys:String>
+    <sys:String x:Key="TextBlockTrojanGoPasswordExplain">Use the existing password and paste it directly into the box</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoWebSocketPath">WebSocket Path: </sys:String>
+    <sys:String x:Key="ButtonTrojanGoTemplateOK">OK</sys:String>
+    <sys:String x:Key="ButtonTrojanGoTemplateCancel">Cancel</sys:String>
+    <sys:String x:Key="GroupBoxHeaderV2RayTemplates">V2Ray Templates</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayHotPlan">Hot Plan</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayTcpProtocol">TCP</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayWebSocketProtocol">WebSocket</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayHttp2Protocol">Http/2</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayMkcpProtocol">mKCP</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayQuicProtocol">QUIC</sys:String>
+    <sys:String x:Key="GroupBoxHeaderParameterV2Ray">Parameter</sys:String>
+    <sys:String x:Key="TextBlockV2RayServerPort">Port: </sys:String>
+    <sys:String x:Key="ButtonV2RayServerPortChange">Change</sys:String>
+    <sys:String x:Key="TextBlockV2RayServerPortExplain">TLS encryption, keep port 443</sys:String>
+    <sys:String x:Key="TextBlockV2RayUUIDExplain">Use the existing UUID and paste it directly into the box</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicUUID">mKCP/QUIC Key</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpExplain">Enable mKCP key to enhance anti-recognition, Blank to disabled, 4.24.2+ required, V2rayN not support</sys:String>
+    <sys:String x:Key="TextBlockV2RayPath">Path: </sys:String>
+    <sys:String x:Key="TextBlockV2RayDomain">Domain: </sys:String>
+    <sys:String x:Key="TextBlockV2RayMaskSites">Shield Websites: </sys:String>
+    <sys:String x:Key="TextBoxV2RayMaskSitesTag">Increase the concealment of the agent (can be empty)</sys:String>
+    <sys:String x:Key="TextBlockV2RayWebSocketTlsWebExplain">Strong stability, Caddy2 is front-facing, hidden proxy features, it is recognized as https traffic visiting the website, the strongest anti-blocking recognition, domain name is required, CDN support</sys:String>
+    <sys:String x:Key="TextBlockV2RayHttp2TlsWebExplain">Based on HTTP/2 transmission. Completely implemented in accordance with the HTTP/2 standard, with Caddy2 as the front end, hidden proxy features, H2C protocol forwarding to V2Ray, domain name is required, and CloudFlare CDN is not supported temporarily</sys:String>
+    <sys:String x:Key="TextBlockV2RayTcpExplain">Encrypted data transmission will be recognized as unknown tcp traffic</sys:String>
+    <sys:String x:Key="RadioButtonV2RayTcpHttp">TCP+Http(Disguise)</sys:String>
+    <sys:String x:Key="TextBlockV2RayTcpHttpExplain">Encrypted transmission of data and http disguise will be recognized as http traffic, but not real http access</sys:String>
+    <sys:String x:Key="TextBlockV2RayTcpTlsExplain">Encrypted data transmission, the transmission protocol uses TLS, it will be recognized as TLS traffic, not equivalent to https traffic characteristics (domain name required)</sys:String>
+    <sys:String x:Key="RadioButtonV2RayTcpTlsSelfSigned">TCP+TLS(Self-signed)</sys:String>
+    <sys:String x:Key="TextBlockV2RayTcpTlsSelfSignedExplain">Encrypted data transmission, the transmission protocol uses TLS, it will be recognized as TLS traffic, not equivalent to https traffic characteristics (no domain name required)</sys:String>
+    <sys:String x:Key="TextBlockV2RaySelfSignedShadowrocketExplain">Shadowrocket (ios) needs to manually turn on the "Allow Insecure" option</sys:String>
+    <sys:String x:Key="TextBlockV2RayVlessTcpTlsWebExplain">Lightweight protocol VLESS, occupies less host resources, data TLS encrypted transmission, and Caddy2 is used as a disguised website on the node. Suitable for low-configuration VPS, or multiple people sharing nodes, the server client version requires 4.27+ (domain name required)</sys:String>
+    <sys:String x:Key="TextBlockV2RayWebSocketExplain">Data is encrypted for transmission. The transmission protocol uses WebSocket. If TLS is not enabled, it will be recognized as WebSocket traffic.</sys:String>
+    <sys:String x:Key="TextBlockV2RayWebSocketTlsExplain">Data is encrypted for transmission, the transmission protocol uses WebSocket, and TLS is enabled, it will be recognized as TLS traffic. (Domain name required)</sys:String>
+    <sys:String x:Key="RadioButtonV2RayWebSocketTlsSelfSigned">WebSocket+TLS (Self-signed)</sys:String>
+    <sys:String x:Key="TextBlockV2RayWebSocketTlsSelfSignedExplain">Data is encrypted for transmission, the transmission protocol uses WebSocket, and TLS is enabled, it will be recognized as TLS traffic. (No domain name required)</sys:String>
+    <sys:String x:Key="TextBlockV2RayHttp2Explain">Transmission method based on HTTP/2. It is fully implemented in accordance with the HTTP/2 standard and requires a domain name</sys:String>
+    <sys:String x:Key="RadioButtonV2RayHttp2SelfSigned">HTTP2 (Self-signed)</sys:String>
+    <sys:String x:Key="TextBlockV2RayHttp2SelfSignedExplain">Transmission method based on HTTP/2. It is fully implemented in accordance with the HTTP/2 standard, uses a self-signed certificate, and does not require a domain name</sys:String>
+    <sys:String x:Key="RadioButtonV2RayMkcpNone">mKCP(No disguise)</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpNoneExplain">Data encrypted transmission to increase bandwidth usage and reduce delay, udp protocol, no camouflage, will be recognized as udp traffic</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpSRTPExplain">Same as mKCP (no camouflage), adding a packet disguised as SRTP will be recognized as video call data (such as FaceTime)</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpuTPExplain">Same as mKCP (without camouflage), add disguised as uTP data packet, it will be recognized as BT download data</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpWeChatExplain">Same as mKCP (no camouflage), adding data packets disguised as WeChat video calls</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpDTLSExplain">Same as mKCP (no masquerading), adding masquerading as DTLS 1.2 packets</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpWireGuardExplain">Same as mKCP (without camouflage), adding a pretend to be a WireGuard packet. (Not a real WireGuard protocol)</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicShadowrocketExplain">Reminder: Shadowrocket currently does not support QUIC transmission mode.</sys:String>
+    <sys:String x:Key="RadioButtonV2RayQuicNone">QUIC(No disguise)</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicNoneExplain">Encrypted data transmission, no pretense will be recognized as udp traffic, produced by Google, advantages: reduced delay, multiplexing, connection migration</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicSRTPExplain">Same as QUIC (no camouflage), adding a packet disguised as SRTP will be recognized as video call data (such as FaceTime)</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicuTPExplain">Same as QUIC (no camouflage), adding a packet disguised as uTP, it will be recognized as BT download data</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicWeChatExplain">Same as QUIC (no camouflage), adding data packets disguised as WeChat video calls</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicDTLSExplain">Same as QUIC (no masquerading), adding masquerading as DTLS 1.2 packets</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicWireGuardExplain">Same as QUIC (without camouflage), adding a packet disguised as WireGuard. (Not a real WireGuard protocol)</sys:String>
+    <!--以下为程序内的-->
+    <sys:String x:Key="MessageBoxShow_ErrorHostConnection">The remote host connection information is wrong, please check</sys:String>
+    <sys:String x:Key="MessageBoxShow_ChooseTemplate">Please select a configuration template first!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_Login">Logging in to the remote host......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_LoginSuccessful">Host login is successful!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_DetectionRootPermission">Check whether it is running under root privileges...</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorRootPermission">Please log in to the host with an account with root privileges!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_DetectionRoot_OK">Test result: OK!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_TestExistV2Ray">Check whether the system has installed V2ray....</sys:String>
+    <sys:String x:Key="MessageBoxShow_ExistedV2Ray">V2ray has been installed on the remote host, do you force it to reinstall?</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_InstallationCanceledExit">Installation canceled, exit</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ForceInstallV2Ray">You have chosen to install V2Ray forcefully!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_NoInstalledV2Ray">Test result: V2Ray is not installed!</sys:String>
+
+
+    <!--<sys:String x:Key="BtnOK">OK</sys:String>
+    <sys:String x:Key="HdNo">No.</sys:String>
+    <sys:String x:Key="HdName">Name</sys:String>
+    <sys:String x:Key="HdGender">Gender</sys:String>
+    <sys:String x:Key="HdDept">Dept</sys:String>
+    <sys:String x:Key="HdEmail">Email</sys:String>
+    <sys:String x:Key="HdTel">Tel</sys:String>
+    <sys:String x:Key="MsgShowTime">Now</sys:String>
+    <sys:String x:Key="BtnOK1">OK</sys:String>
+    <sys:String x:Key="HdNo1">No.</sys:String>
+    <sys:String x:Key="HdName1">Name</sys:String>
+    <sys:String x:Key="HdGender1">Gender</sys:String>
+    <sys:String x:Key="HdDept1">Dept</sys:String>
+    <sys:String x:Key="HdEmail1">Email</sys:String>
+    <sys:String x:Key="HdTel1">Tel</sys:String>
+    <sys:String x:Key="MsgShowTime1">Now</sys:String>-->
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/ProxySU/Translations/ProxySU.zh-CN.xaml b/ProxySU/Translations/ProxySU.zh-CN.xaml
new file mode 100644
index 0000000..4d53401
--- /dev/null
+++ b/ProxySU/Translations/ProxySU.zh-CN.xaml
@@ -0,0 +1,141 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:ProxySU.Translations"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+    <sys:String x:Key="TabItemHeaderAppDeployment">应用布署</sys:String>
+    <sys:String x:Key="TabItemHeaderResourceTools">资源工具</sys:String>
+    <sys:String x:Key="TextBlockHostName">主机:</sys:String>
+    <sys:String x:Key="TextBoxHostNamePrompt">IP或域名(不可为空)</sys:String>
+    <sys:String x:Key="TextBlockHostPart">端口:</sys:String>
+    <sys:String x:Key="TextBlockHostUser">用户名:</sys:String>
+    <sys:String x:Key="TextBlockHostPassword">密码:</sys:String>
+    <sys:String x:Key="TextBlockSetUpProcessing">等待安装布署</sys:String>
+    <sys:String x:Key="TabItemHeaderSysTools">系统工具</sys:String>
+    <sys:String x:Key="ButtonV2RayTemplateConfiguration">V2Ray模板库</sys:String>
+    <sys:String x:Key="ButtonV2RayOneKeyInstall">V2ray一键安装</sys:String>
+    <sys:String x:Key="ButtonUpdateV2ray">升级V2Ray</sys:String>
+    <sys:String x:Key="Button_canel">取消</sys:String>
+    <sys:String x:Key="ButtonTrojanGoTemplate">Trojan-Go参数设置</sys:String>
+    <sys:String x:Key="ButtonTrojanGoSetUp">Trojan-Go一键安装</sys:String>
+    <sys:String x:Key="ButtonUpdateTrojanGo">升级Trojan-Go</sys:String>
+    <sys:String x:Key="ButtonTrojanGoCancel">取消</sys:String>
+    <sys:String x:Key="GroupBoxHeaderParameterTrojan">参数设置</sys:String>
+    <sys:String x:Key="TextBlockTrojanTemplateExplanation">模式：Trojan+TLS+Caddy</sys:String>
+    <sys:String x:Key="TextBlockTrojanServerDomain">服务器地址(域名)：</sys:String>
+    <sys:String x:Key="TextBlockTrojanPort">端口：443</sys:String>
+    <sys:String x:Key="TextBoxDomainPrompt">域名不可为空</sys:String>
+    <sys:String x:Key="TextBlockTrojanHostPassword">密码:</sys:String>
+    <sys:String x:Key="ButtonTrojanChangePassword">更新</sys:String>
+    <sys:String x:Key="ButtonTrojanSetUp">Trojan一键安装</sys:String>
+    <sys:String x:Key="ButtonUpdateTrojan">升级Trojan</sys:String>
+    <sys:String x:Key="ButtonTrojanCancel">取消</sys:String>
+    <sys:String x:Key="TextBlockNaiveProxyTemplateExplanation">模式：NaiveProxy+TLS+Caddy</sys:String>
+    <sys:String x:Key="ButtonNaiveProxyChangeUser">随机</sys:String>
+    <sys:String x:Key="ButtonNavieSetUp">NaiveProxy一键安装</sys:String>
+    <sys:String x:Key="ButtonNaiveCancel">取消</sys:String>
+    <sys:String x:Key="ButtonProofreadTime">校对时间</sys:String>
+    <sys:String x:Key="ButtonClearOccupiedPorts">释放80/443端口</sys:String>
+    <sys:String x:Key="ButtonTestAndEnableBBR">启用BBR</sys:String>
+    <sys:String x:Key="ButtonWebBrowserHomePage">主页</sys:String>
+    <sys:String x:Key="ButtonWebBrowserForward">前进</sys:String>
+    <sys:String x:Key="ButtonWebBrowserBack">后退</sys:String>
+    <sys:String x:Key="TextBlockWebExplain">由于众所周知的原因，在某些时候，加载缓慢，请耐心等待一下</sys:String>
+    <sys:String x:Key="GroupBoxHeaderTrojanGoTemplates">Trojan-go 模板库</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoTLSwebPlan">http/2传输，Caddy2伪装网站，抗识别，暂不支持CloudFlare的CDN</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoWebSocketTLSwebPlan">使用WebSocket传输，Caddy2伪装网站，抗识别，支持CloudFlare的CDN</sys:String>
+    <sys:String x:Key="GroupBoxHeaderParameterTrojanGo">参数设置</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoDomain">域名：</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoPort">端口：443</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoPassword">密码：</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoPasswordExplain">使用已有密码，直接粘贴到框中</sys:String>
+    <sys:String x:Key="TextBlockTrojanGoWebSocketPath">WebSocket路径：</sys:String>
+    <sys:String x:Key="ButtonTrojanGoTemplateOK">确定</sys:String>
+    <sys:String x:Key="ButtonTrojanGoTemplateCancel">取消</sys:String>
+    <sys:String x:Key="GroupBoxHeaderV2RayTemplates">V2Ray 模板库</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayHotPlan">热门方案</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayTcpProtocol">TCP传输协议</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayWebSocketProtocol">WebSocket传输协议</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayHttp2Protocol">Http/2传输协议</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayMkcpProtocol">mKCP传输协议</sys:String>
+    <sys:String x:Key="TabItemHeaderV2RayQuicProtocol">QUIC传输协议</sys:String>
+    <sys:String x:Key="GroupBoxHeaderParameterV2Ray">参数设置</sys:String>
+    <sys:String x:Key="TextBlockV2RayServerPort">服务器端口：</sys:String>
+    <sys:String x:Key="ButtonV2RayServerPortChange">随机选择</sys:String>
+    <sys:String x:Key="TextBlockV2RayServerPortExplain">若使用TLS加密，请保持默认的443端口</sys:String>
+    <sys:String x:Key="TextBlockV2RayUUIDExplain">使用已有UUID，直接粘贴到框中</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicUUID">mKCP/QUIC密钥</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpExplain">启用mKCP密钥，可增强抗识别，留空则禁用,要求版本4.24.2以上,V2rayN暂不支持</sys:String>
+    <sys:String x:Key="TextBlockV2RayPath">路径：</sys:String>
+    <sys:String x:Key="TextBlockV2RayDomain">域名：</sys:String>
+    <sys:String x:Key="TextBlockV2RayMaskSites">伪装网站：</sys:String>
+    <sys:String x:Key="TextBoxV2RayMaskSitesTag">设置此项可增加代理的隐蔽(可为空)</sys:String>
+    <sys:String x:Key="TextBlockV2RayWebSocketTlsWebExplain">稳定性强，Caddy2做前置，隐藏代理特征，被识别为访问网站的https流量，抗封锁识别最强,需要域名,支持CDN</sys:String>
+    <sys:String x:Key="TextBlockV2RayHttp2TlsWebExplain">基于 HTTP/2 传输。完整按 HTTP/2 标准实现，Caddy2做前置，隐藏代理特征，H2C协议转发到V2Ray，需要域名，暂不支持CloudFlare的CDN</sys:String>
+    <sys:String x:Key="TextBlockV2RayTcpExplain">数据加密传输，会被识别为未知的tcp流量</sys:String>
+    <sys:String x:Key="RadioButtonV2RayTcpHttp">TCP+Http伪装</sys:String>
+    <sys:String x:Key="TextBlockV2RayTcpHttpExplain">数据加密传输，并做http伪装，会被识别为http流量，但并不是真正的http访问</sys:String>
+    <sys:String x:Key="TextBlockV2RayTcpTlsExplain">数据加密传输，传输协议使用TLS，会被识别为TLS流量，不等同于https流量特征 (需域名)</sys:String>
+    <sys:String x:Key="RadioButtonV2RayTcpTlsSelfSigned">TCP+TLS(自签证书)</sys:String>
+    <sys:String x:Key="TextBlockV2RayTcpTlsSelfSignedExplain">数据加密传输，传输协议使用TLS，会被识别为TLS流量，不等同于https流量特征 (无需域名)</sys:String>
+    <sys:String x:Key="TextBlockV2RaySelfSignedShadowrocketExplain">Shadowrocket (ios)需要手动打开“允许不安全”选项</sys:String>
+    <sys:String x:Key="TextBlockV2RayVlessTcpTlsWebExplain">轻量协议VLESS,占用更少主机资源，数据TLS加密传输，用Caddy2在节点上做伪装网站。适合配置低的VPS,或多人共用节点，服务端客户端版本要求4.27+ (需域名)</sys:String>
+    <sys:String x:Key="TextBlockV2RayWebSocketExplain">数据加密传输，传输协议使用WebSocket，未启用TLS,将被识别为WebSocket流量。</sys:String>
+    <sys:String x:Key="TextBlockV2RayWebSocketTlsExplain">数据加密传输，传输协议使用WebSocket，启用TLS,将被识别为TLS流量。(需要域名)</sys:String>
+    <sys:String x:Key="RadioButtonV2RayWebSocketTlsSelfSigned">WebSocket+TLS(自签证书)</sys:String>
+    <sys:String x:Key="TextBlockV2RayWebSocketTlsSelfSignedExplain">数据加密传输，传输协议使用WebSocket，启用TLS,将被识别为TLS流量。(无需域名)</sys:String>
+    <sys:String x:Key="TextBlockV2RayHttp2Explain">基于 HTTP/2 的传输方式。它完整按照 HTTP/2 标准实现，需要域名</sys:String>
+    <sys:String x:Key="RadioButtonV2RayHttp2SelfSigned">HTTP2(自签证书)</sys:String>
+    <sys:String x:Key="TextBlockV2RayHttp2SelfSignedExplain">基于 HTTP/2 的传输方式。它完整按照 HTTP/2 标准实现，使用自签名证书，不需要域名</sys:String>
+    <sys:String x:Key="RadioButtonV2RayMkcpNone">mKCP(无伪装)</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpNoneExplain">数据加密传输，以增加带宽占用，减少延迟，udp协议,无伪装，会被识别为udp流量</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpSRTPExplain">同mKCP(无伪装)，增加伪装成 SRTP 数据包，会被识别为视频通话数据（如 FaceTime）</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpuTPExplain">同mKCP(无伪装)，增加伪装成 uTP 数据包，会被识别为 BT 下载数据</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpWeChatExplain">同mKCP(无伪装)，增加伪装成微信视频通话的数据包</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpDTLSExplain">同mKCP(无伪装)，增加伪装成 DTLS 1.2 数据包</sys:String>
+    <sys:String x:Key="TextBlockV2RayMkcpWireGuardExplain">同mKCP(无伪装)，增加伪装成 WireGuard 数据包。(并不是真正的 WireGuard 协议)</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicShadowrocketExplain">提醒：Shadowrocket目前暂不支持QUIC的传输模式。</sys:String>
+    <sys:String x:Key="RadioButtonV2RayQuicNone">QUIC(无伪装)</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicNoneExplain">数据加密传输，无伪装会被识别为udp流量，谷歌出品，优点:减少延迟、多路复用、连接迁移</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicSRTPExplain">同QUIC(无伪装)，增加伪装成 SRTP 数据包，会被识别为视频通话数据（如 FaceTime）</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicuTPExplain">同QUIC(无伪装)，增加伪装成 uTP 数据包，会被识别为 BT 下载数据</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicWeChatExplain">同QUIC(无伪装)，增加伪装成微信视频通话的数据包</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicDTLSExplain">同QUIC(无伪装)，增加伪装成 DTLS 1.2 数据包</sys:String>
+    <sys:String x:Key="TextBlockV2RayQuicWireGuardExplain">同QUIC(无伪装)，增加伪装成 WireGuard 数据包。(并不是真正的 WireGuard 协议)</sys:String>
+<!--以下为程序内的-->
+    <sys:String x:Key="MessageBoxShow_ErrorHostPortUserNotEmpty">主机地址、主机端口、用户名为必填项，不能为空!!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorHostPasswordNotEmpty">登录密码为必填项，不能为空!!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorHostKeyNotEmpty">密钥文件为必填项，不能为空!!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorProxyAddressPortNotEmpty">如果选择了代理，则代理地址与端口不能为空!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorProxyUserPasswordNotEmpty">如果代理需要登录，则代理登录的用户名与密码不能为空!</sys:String>
+
+    <sys:String x:Key="MessageBoxShow_ErrorHostConnection">远程主机连接信息有误，请检查!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ChooseTemplate">请先选择配置模板！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_Login">正在登录远程主机......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_LoginSuccessful">主机登录成功!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_DetectionRootPermission">检测是否运行在root权限下...</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorRootPermission">请使用具有root权限的账户登录主机！！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_DetectionRoot_OK">检测结果：OK！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_TestExistV2Ray">检测系统是否已经安装V2ray......</sys:String>
+    <sys:String x:Key="MessageBoxShow_ExistedV2Ray">远程主机已安装V2ray,是否强制重新安装？</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_InstallationCanceledExit">安装取消，退出</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ForceInstallV2Ray">已选择强制安装V2Ray！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_NoInstalledV2Ray">检测结果：未安装V2Ray！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_CheckSystemRequirements">检测系统是否符合安装要求......</sys:String>
+    <sys:String x:Key="MessageBoxShow_CurrentKernelVersion">当前系统内核版本为</sys:String>
+    <sys:String x:Key="MessageBoxShow_RequiredKernelVersionExplain">，V2ray要求内核为2.6.23及以上。请升级内核再安装！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_KernelVersionNotMatch">系统内核版本不符合要求，安装失败！！</sys:String>
+    <sys:String x:Key="MessageBoxShow_MissingSystemComponents">系统缺乏必要的安装组件如:apt||dnf||yum||zypper||Syetemd，主机系统推荐使用：CentOS 7/8,Debian 8/9/10,Ubuntu 16.04及以上版本</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_MissingSystemComponents">系统环境不满足要求，安装失败！！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_SystemRequirementsOK">检测结果：OK!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_EnableSELinux">检测到系统启用SELinux，且工作在严格模式下，需改为宽松模式！修改中......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_SELinuxModifyOK">修改完毕！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ProofreadingTime">校对时间......</sys:String>
+    <sys:String x:Key="MessageBoxShow_TimeError">本地时间与远程主机时间相差超过限制(90秒)，请先用 '系统工具-->时间校对' 校对时间后再设置</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_TimeError">时间较对失败......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_TimeOK">时间差符合要求，OK!</sys:String>
+
+
+
+  <sys:String x:Key="HdTel1">Tel</sys:String>
+    <sys:String x:Key="MsgShowTime1">Now</sys:String>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/ProxySU/TrojanGoTemplateWindow.xaml b/ProxySU/TrojanGoTemplateWindow.xaml
index ed95f43..406c757 100644
--- a/ProxySU/TrojanGoTemplateWindow.xaml
+++ b/ProxySU/TrojanGoTemplateWindow.xaml
@@ -39,7 +39,7 @@
                 <RowDefinition></RowDefinition>
 
             </Grid.RowDefinitions>
-            <GroupBox Header="模板库" Grid.Row="0">
+            <GroupBox Header="{DynamicResource GroupBoxHeaderTrojanGoTemplates}" Grid.Row="0">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.6*"></ColumnDefinition>
@@ -54,18 +54,18 @@
                         <RowDefinition></RowDefinition>
                     </Grid.RowDefinitions>
                     <RadioButton x:Name="RadioButtonTrojanGoTLS2Web" Content="Trojan-Go+TLS+Web" Grid.Column="0" Grid.Row="1" Checked="RadioButtonTrojanTLS2Web_Checked"></RadioButton>
-                    <TextBlock Text="http/2传输，Caddy2伪装网站，抗识别，暂不支持CloudFlare的CDN" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1"></TextBlock>
+                    <TextBlock Text="{DynamicResource TextBlockTrojanGoTLSwebPlan}" TextWrapping="Wrap" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1"></TextBlock>
                     <RadioButton x:Name="RadioButtonTrojanGoWebSocketTLS2Web" Content="Trojan-Go+WebSocket+TLS+Web" Grid.Column="0" Grid.Row="2" Checked="RadioButtonTrojanGoWebSocketTLS2Web_Checked"></RadioButton>
-                    <TextBlock Text="使用WebSocket传输，Caddy2伪装网站，抗识别，支持CloudFlare的CDN" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2"></TextBlock>
+                    <TextBlock Text="{DynamicResource TextBlockTrojanGoWebSocketTLSwebPlan}" TextWrapping="Wrap" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2"></TextBlock>
                 </Grid>
             </GroupBox>
-            <GroupBox Header="其他设置" Grid.Row="1">
+            <GroupBox Header="{DynamicResource GroupBoxHeaderParameterTrojanGo}" Grid.Row="1">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.3*"></ColumnDefinition>
                         <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition Width="0.4*"></ColumnDefinition>
-                        <ColumnDefinition Width="0.4*"></ColumnDefinition>
+                        <ColumnDefinition Width="0.3*"></ColumnDefinition>
+                        <ColumnDefinition Width="0.5*"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition></RowDefinition>
@@ -76,22 +76,22 @@
                         <RowDefinition></RowDefinition>
                         
                     </Grid.RowDefinitions>
-                    <TextBlock x:Name="TextBlockDomain" Text="域名：" Grid.Column="0" Grid.Row="0" Margin="5"></TextBlock>
-                    <TextBox x:Name="TextBoxDomain" Style="{StaticResource TitleText}" Tag="不可为空" Grid.Column="1" Grid.Row="0" Margin="5"></TextBox>
-                    <TextBlock Text="端口：443" Grid.Column="2" Grid.Row="0" Margin="5"></TextBlock>
+                    <TextBlock x:Name="TextBlockDomain" Text="{DynamicResource TextBlockTrojanGoDomain}" Grid.Column="0" Grid.Row="0" Margin="5" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
+                    <TextBox x:Name="TextBoxDomain" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxDomainPrompt}" Grid.Column="1" Grid.Row="0" Margin="5"></TextBox>
+                    <TextBlock Text="{DynamicResource TextBlockTrojanGoPort}" Grid.Column="2" Grid.Row="0" Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
                  
                     <!--<Button x:Name="ButtonDomain" Content="检测" Visibility="Collapsed" Grid.Column="2" Grid.Row="0" Margin="2" Click="ButtonDomain_Click"></Button>-->
                     <!--<TextBlock x:Name="TextBlockServerListenPort" Text="服务端口：" Grid.Column="0" Grid.Row="1"></TextBlock>
                     <TextBox x:Name="TextBoxServerListenPort" Grid.Column="1" Grid.Row="1" Margin="3"></TextBox>
                     <Button x:Name="ButtonServerListenPort" Content="随机选择" Grid.Column="2" Grid.Row="1" Margin="2" Click="ButtonServerListenPort_Click"></Button>-->
 
-                    <TextBlock x:Name="TextBlockNewUUID" Text="密码：" Grid.Column="0" Grid.Row="1" ></TextBlock>
+                    <TextBlock x:Name="TextBlockNewUUID" Text="{DynamicResource TextBlockTrojanGoPassword}" Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" ></TextBlock>
                     <TextBox x:Name="TextBoxNewUUID" Grid.Column="1" Grid.Row="1" Margin="5"></TextBox>
-                    <Button x:Name="ButtonNewUUID" Content="更新" Grid.Column="2" Grid.Row="1" Margin="3" Click="ButtonNewUUID_Click"></Button>
-                    <TextBlock Text="使用已有密码，直接粘贴到框中" TextWrapping="Wrap" Grid.Column="3" Grid.Row="1"></TextBlock>
-                    <TextBlock x:Name="TextBlockPath" Text="WebSocket路径：" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2"></TextBlock>
+                    <Button x:Name="ButtonNewUUID" Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="2" Grid.Row="1" Margin="3" Click="ButtonNewUUID_Click"></Button>
+                    <TextBlock Text="{DynamicResource TextBlockTrojanGoPasswordExplain}" TextWrapping="Wrap" Grid.Column="3" Grid.Row="1"></TextBlock>
+                    <TextBlock x:Name="TextBlockPath" Text="{DynamicResource TextBlockTrojanGoWebSocketPath}" Grid.Column="0" Grid.Row="2"  HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
                     <TextBox x:Name="TextBoxPath" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="1" Margin="5"></TextBox>
-                    <Button x:Name="ButtonPath" Content="随机" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonPath_Click"></Button>
+                    <Button x:Name="ButtonPath" Content="{DynamicResource ButtonNaiveProxyChangeUser}" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonPath_Click"></Button>
 
                     <TextBlock x:Name="TextBlockMaskSites" Text="伪装网站：" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Visibility="Hidden"></TextBlock>
                     <TextBox x:Name="TextBoxMaskSites" Style="{StaticResource TitleText}" Tag="设置此项可增加代理的隐蔽(可为空)" Grid.Column="1" Grid.Row="3" Margin="5" Visibility="Hidden"></TextBox>
@@ -103,8 +103,8 @@
                             <ColumnDefinition></ColumnDefinition>
                             <ColumnDefinition></ColumnDefinition>
                         </Grid.ColumnDefinitions>
-                        <Button x:Name="ButtondDecide" Content="确定" Grid.Column="1" Grid.Row="6" Margin="3" Click="ButtondDecide_Click"></Button>
-                        <Button x:Name="ButtondCancel" Content="取消" Grid.Column="3" Grid.Row="6" Margin="3" Click="ButtondCancel_Click"></Button>
+                        <Button x:Name="ButtondDecide" Content="{DynamicResource ButtonTrojanGoTemplateOK}" Grid.Column="1" Grid.Row="6" Margin="3" Click="ButtondDecide_Click"></Button>
+                        <Button x:Name="ButtondCancel" Content="{DynamicResource ButtonTrojanGoTemplateCancel}" Grid.Column="3" Grid.Row="6" Margin="3" Click="ButtondCancel_Click"></Button>
 
                     </Grid>
                 </Grid>
diff --git a/ProxySU/V2RayTemplateWindow.xaml b/ProxySU/V2RayTemplateWindow.xaml
index d31e552..4085009 100644
--- a/ProxySU/V2RayTemplateWindow.xaml
+++ b/ProxySU/V2RayTemplateWindow.xaml
@@ -39,35 +39,35 @@
             <RowDefinition></RowDefinition>
         </Grid.RowDefinitions>
 
-        <GroupBox Header="模板库" Grid.Row="0" Grid.RowSpan="3">
+        <GroupBox Header="{DynamicResource GroupBoxHeaderV2RayTemplates}" Grid.Row="0" Grid.RowSpan="3">
             <Grid>
                 <TabControl x:Name="TabControlTemplate">
-                    <TabItem Header="热门方案" Width="110" Height="30">
+                    <TabItem Header="{DynamicResource TabItemHeaderV2RayHotPlan}" Width="110" Height="30">
                         <Grid>
                             <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="0.8*"></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
-                                <ColumnDefinition></ColumnDefinition>
-                                <ColumnDefinition></ColumnDefinition>
+                                <ColumnDefinition Width="0.3*"></ColumnDefinition>
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition></RowDefinition>
-                                <RowDefinition></RowDefinition>
-                                <RowDefinition></RowDefinition>
+                                <RowDefinition Height="1.2*"></RowDefinition>
+                                <RowDefinition Height="1.2*"></RowDefinition>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                             </Grid.RowDefinitions>
-                            <RadioButton x:Name="RadioButtonWebSocketTLS2WebHot" Content="WebSocket+TLS+Web"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
-                            <TextBlock Text="稳定性强，Caddy2做前置，隐藏代理特征，被识别为访问网站的https流量，抗封锁识别最强,需要域名,支持CDN" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonHTTP2WebHot" Content="HTTP2+TLS+Web"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
-                            <TextBlock Text="基于 HTTP/2 传输。完整按 HTTP/2 标准实现，Caddy2做前置，隐藏代理特征，H2C协议转发到V2Ray，需要域名，暂不支持CloudFlare的CDN" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
+                            <RadioButton x:Name="RadioButtonWebSocketTLS2WebHot" Content="WebSocket+TLS+Web"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonWebSocketTLS2Web_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayWebSocketTlsWebExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
+                            <RadioButton x:Name="RadioButtonHTTP2WebHot" Content="HTTP2+TLS+Web"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonWebSocketTLS2Web_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayHttp2TlsWebExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
 
                         </Grid>
                     </TabItem>
-                    <TabItem Header="TCP传输协议" Width="110" Height="30">
+                    <TabItem Header="{DynamicResource TabItemHeaderV2RayTcpProtocol}" Width="110" Height="30">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition></ColumnDefinition>
@@ -81,28 +81,28 @@
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
-                                <RowDefinition></RowDefinition>
-                                <RowDefinition></RowDefinition>
+                                <RowDefinition Height="1.3*"></RowDefinition>
+                                <RowDefinition Height="1.7*"></RowDefinition>
                                 <RowDefinition></RowDefinition>
                             </Grid.RowDefinitions>
-                            <RadioButton x:Name="RadioButtonTCP" Content="TCP"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonTCP_Checked"></RadioButton>
-                            <TextBlock Text="数据加密传输，会被识别为未知的tcp流量" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonTCPhttp" Content="TCP+Http伪装" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonTCPhttp_Checked" ></RadioButton>
-                            <TextBlock Text="数据加密传输，并做http伪装，会被识别为http流量，但并不是真正的http访问" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonTCP2TLS" Content="TCP+TLS"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="3" Checked="RadioButtonTCP2TLS_Checked" />
-                            <TextBlock Text="数据加密传输，传输协议使用TLS，会被识别为TLS流量，不等同于https流量特征 (需域名)" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonTcpTLS2SelfSigned" Content="TCP+TLS((自签证书)"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="4" Checked="RadioButtonTCP2TLSnoDomain_Checked" />
-                            <TextBlock Text="数据加密传输，传输协议使用TLS，会被识别为TLS流量，不等同于https流量特征 (无需域名)" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3"></TextBlock>
-                            <TextBlock Text="Shadowrocket (ios)需要手动打开“允许不安全”选项" TextWrapping="Wrap" Grid.Column="4" Grid.Row="4" ></TextBlock>
-                            <RadioButton x:Name="RadioButtonVlessTcpTlsWeb" Content="VLESS+TCP+TLS+Web" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="5" Checked="RadioButtonTCP2TLS_Checked" ></RadioButton>
-                            <TextBlock Text="轻量协议VLESS,占用更少主机资源，数据TLS加密传输，用Caddy2在节点上做伪装网站。适合配置低的VPS,或多人共用节点，服务端客户端版本要求4.27+ (需域名)," TextWrapping="Wrap" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="3"></TextBlock>
+                            <RadioButton x:Name="RadioButtonTCP" Content="TCP"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonTCP_Checked" VerticalAlignment="Center" HorizontalAlignment="Left"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayTcpExplain}" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonTCPhttp" Content="{DynamicResource RadioButtonV2RayTcpHttp}" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonTCPhttp_Checked" VerticalAlignment="Center" HorizontalAlignment="Left" ></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayTcpHttpExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
+                            <RadioButton x:Name="RadioButtonTCP2TLS" Content="TCP+TLS"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="3" Checked="RadioButtonTCP2TLS_Checked" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                            <TextBlock Text="{DynamicResource TextBlockV2RayTcpTlsExplain}"  TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
+                            <RadioButton x:Name="RadioButtonTcpTLS2SelfSigned" Content="{DynamicResource RadioButtonV2RayTcpTlsSelfSigned}"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="4" Checked="RadioButtonTCP2TLSnoDomain_Checked" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                            <TextBlock Text="{DynamicResource TextBlockV2RayTcpTlsSelfSignedExplain}"  TextWrapping="Wrap" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
+                            <TextBlock Text="{DynamicResource TextBlockV2RaySelfSignedShadowrocketExplain}" TextWrapping="Wrap" Grid.Column="4" Grid.Row="4" HorizontalAlignment="Left" VerticalAlignment="Center" ></TextBlock>
+                            <RadioButton x:Name="RadioButtonVlessTcpTlsWeb" Content="VLESS+TCP+TLS+Web" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="5" Checked="RadioButtonTCP2TLS_Checked" VerticalAlignment="Center" HorizontalAlignment="Left" ></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayVlessTcpTlsWebExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
 
                         </Grid>
                     </TabItem>
-                    <TabItem Header="WebSocket传输协议" Width="150" Height="30">
+                    <TabItem Header="{DynamicResource TabItemHeaderV2RayWebSocketProtocol}" Width="150" Height="30">
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="1.2*"></ColumnDefinition>
+                                <ColumnDefinition Width="1.5*"></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
@@ -112,27 +112,27 @@
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
-                                <RowDefinition></RowDefinition>
-                                <RowDefinition></RowDefinition>
+                                <RowDefinition Height="1.3*"></RowDefinition>
+                                <RowDefinition Height="1.3*"></RowDefinition>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                             </Grid.RowDefinitions>
-                            <RadioButton x:Name="RadioButtonWebSocket" Content="WebSocket"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonTCP_Checked"/>
-                            <TextBlock Text="数据加密传输，传输协议使用WebSocket，未启用TLS,将被识别为WebSocket流量。" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonWebSocketTLS" Content="WebSocket+TLS"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="2" Checked="RadioButtonHTTP2_Checked"/>
-                            <TextBlock Text="数据加密传输，传输协议使用WebSocket，启用TLS,将被识别为TLS流量。(需要域名)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonWebSocketTLS2Web" Content="WebSocket+TLS+Web"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="3" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
-                            <TextBlock Text="稳定性强，Caddy2做前置，隐藏代理特征，被识别为访问网站的https流量，抗封锁识别最强,需要域名,支持CDN" TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonWebSocketTLSselfSigned" Content="WebSocket+TLS(自签证书)"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="4" Checked="RadioButtonWebSocketTLSselfSigned_Checked"></RadioButton>
-                            <TextBlock Text="数据加密传输，传输协议使用WebSocket，启用TLS,将被识别为TLS流量。(无需域名)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3"></TextBlock>
-                            <TextBlock Text="Shadowrocket (ios)需要手动打开“允许不安全”选项" TextWrapping="Wrap" Grid.Column="4" Grid.Row="4" ></TextBlock>
+                            <RadioButton x:Name="RadioButtonWebSocket" Content="WebSocket"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonTCP_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayWebSocketExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonWebSocketTLS" Content="WebSocket+TLS"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="2" Checked="RadioButtonHTTP2_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayWebSocketTlsExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonWebSocketTLS2Web" Content="WebSocket+TLS+Web"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="3" Checked="RadioButtonWebSocketTLS2Web_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayWebSocketTlsWebExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonWebSocketTLSselfSigned" Content="{DynamicResource RadioButtonV2RayWebSocketTlsSelfSigned}"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="4" Checked="RadioButtonWebSocketTLSselfSigned_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayWebSocketTlsSelfSignedExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <TextBlock Text="{DynamicResource TextBlockV2RaySelfSignedShadowrocketExplain}" TextWrapping="Wrap" Grid.Column="4" Grid.Row="4" HorizontalAlignment="Left" VerticalAlignment="Center" ></TextBlock>
 
                         </Grid>
                     </TabItem>
-                    <TabItem Header="Http/2传输协议" Width="110" Height="30">
+                    <TabItem Header="{DynamicResource TabItemHeaderV2RayHttp2Protocol}" Width="110" Height="30">
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition></ColumnDefinition>
+                                <ColumnDefinition Width="1*"></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
                                 <ColumnDefinition></ColumnDefinition>
@@ -141,24 +141,24 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
-                                <RowDefinition></RowDefinition>
-                                <RowDefinition></RowDefinition>
+                                <RowDefinition Height="1.8*"></RowDefinition>
+                                <RowDefinition Height="1.5*"></RowDefinition>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                             </Grid.RowDefinitions>
-                            <RadioButton x:Name="RadioButtonHTTP2" Content="HTTP2"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="1" Checked="RadioButtonHTTP2_Checked"></RadioButton>
-                            <TextBlock Text="基于 HTTP/2 的传输方式。它完整按照 HTTP/2 标准实现，需要域名"  Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonHTTP2Web" Content="HTTP2+TLS+Web"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
-                            <TextBlock Text="基于 HTTP/2 传输。完整按 HTTP/2 标准实现，Caddy2做前置，隐藏代理特征，H2C协议转发到V2Ray，需要域名，暂不支持CloudFlare的CDN" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonHTTP2selfSigned" Content="HTTP2(自签证书)"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="3" Checked="RadioButtonWebSocketTLSselfSigned_Checked"></RadioButton>
-                            <TextBlock Text="基于 HTTP/2 的传输方式。它完整按照 HTTP/2 标准实现，使用自签名证书，不需要域名"  Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3"></TextBlock>
-                            <TextBlock Text="Shadowrocket (ios)需要手动打开“允许不安全”选项" TextWrapping="Wrap" Grid.Column="4" Grid.Row="3" ></TextBlock>
+                            <RadioButton x:Name="RadioButtonHTTP2" Content="HTTP2"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="1" Checked="RadioButtonHTTP2_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayHttp2Explain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonHTTP2Web" Content="HTTP2+TLS+Web"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonWebSocketTLS2Web_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayHttp2TlsWebExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonHTTP2selfSigned" Content="{DynamicResource RadioButtonV2RayHttp2SelfSigned}"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="3" Checked="RadioButtonWebSocketTLSselfSigned_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayHttp2SelfSignedExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <TextBlock Text="{DynamicResource TextBlockV2RaySelfSignedShadowrocketExplain}" TextWrapping="Wrap" Grid.Column="4" Grid.Row="3" ></TextBlock>
 
                         </Grid>
                     </TabItem>
-                   
-                    <TabItem Header="mKCP传输协议" Width="110" Height="30">
+
+                    <TabItem Header="{DynamicResource TabItemHeaderV2RayMkcpProtocol}" Width="110" Height="30">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition></ColumnDefinition>
@@ -177,22 +177,22 @@
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                             </Grid.RowDefinitions>
-                            <RadioButton x:Name="RadioButtonMkcpNone" Content="mKCP(无伪装)" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="1" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="数据加密传输，以增加带宽占用，减少延迟，udp协议,无伪装，会被识别为udp流量" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButton2mKCP2SRTP" Content="mKCP+SRTP" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同mKCP(无伪装)，增加伪装成 SRTP 数据包，会被识别为视频通话数据（如 FaceTime）" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButton2mKCPuTP" Content="mKCP+uTP" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="3" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同mKCP(无伪装)，增加伪装成 uTP 数据包，会被识别为 BT 下载数据" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButton2mKCP2WechatVideo" Content="mKCP+WechatVideo" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="4" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同mKCP(无伪装)，增加伪装成微信视频通话的数据包" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButton2mKCP2DTLS" Content="mKCP+DTLS 1.2" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="5" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同mKCP(无伪装)，增加伪装成 DTLS 1.2 数据包" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButton2mKCP2WireGuard" Content="mKCP+WireGuard" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="6" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同mKCP(无伪装)，增加伪装成 WireGuard 数据包。(并不是真正的 WireGuard 协议)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="6" Grid.ColumnSpan="3"></TextBlock>
+                            <RadioButton x:Name="RadioButtonMkcpNone" Content="{DynamicResource RadioButtonV2RayMkcpNone}" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="1" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayMkcpNoneExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButton2mKCP2SRTP" Content="mKCP+SRTP" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayMkcpSRTPExplain}" TextWrapping="Wrap"  Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButton2mKCPuTP" Content="mKCP+uTP" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="3" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayMkcpuTPExplain}" TextWrapping="Wrap"  Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButton2mKCP2WechatVideo" Content="mKCP+WechatVideo" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="4" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayMkcpWeChatExplain}" TextWrapping="Wrap"  Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButton2mKCP2DTLS" Content="mKCP+DTLS 1.2" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="5" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayMkcpDTLSExplain}" TextWrapping="Wrap"  Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButton2mKCP2WireGuard" Content="mKCP+WireGuard" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="6" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayMkcpWireGuardExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="6" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
 
                         </Grid>
                     </TabItem>
-                    <TabItem Header="QUIC传输协议" Width="110" Height="30">
+                    <TabItem Header="{DynamicResource TabItemHeaderV2RayQuicProtocol}" Width="110" Height="30">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition></ColumnDefinition>
@@ -211,26 +211,26 @@
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                             </Grid.RowDefinitions>
-                            <TextBlock Text="提醒：Shadowrocket目前暂不支持QUIC的传输模式。" Foreground="Red" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="5"></TextBlock>
-                            <RadioButton x:Name="RadioButtonQuicNone"  Content="QUIC(无伪装)"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="1" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="数据加密传输，无伪装会被识别为udp流量，谷歌出品，优点:减少延迟、多路复用、连接迁移"  Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonQuicSRTP"  Content="QUIC+SRTP" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同QUIC(无伪装)，增加伪装成 SRTP 数据包，会被识别为视频通话数据（如 FaceTime）"  Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonQuic2uTP"  Content="QUIC+uTP" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="3" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同QUIC(无伪装)，增加伪装成 uTP 数据包，会被识别为 BT 下载数据"  Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonQuicWechatVideo"  Content="QUIC+WechatVideo" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="4" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同QUIC(无伪装)，增加伪装成微信视频通话的数据包"  Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonQuicDTLS" Content="QUIC+DTLS 1.2"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="5" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同QUIC(无伪装)，增加伪装成 DTLS 1.2 数据包" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonQuicWireGuard" Content="QUIC+WireGuard" GroupName="TemplateGroup" Grid.Column="0" Grid.Row="6" Checked="RadioButtonQuicNone_Checked"></RadioButton>
-                            <TextBlock Text="同QUIC(无伪装)，增加伪装成 WireGuard 数据包。(并不是真正的 WireGuard 协议)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="6" Grid.ColumnSpan="3"></TextBlock>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayQuicShadowrocketExplain}" Foreground="Red" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="5" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonQuicNone"  Content="{DynamicResource RadioButtonV2RayQuicNone}"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="1" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayQuicNoneExplain}" TextWrapping="Wrap"  Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonQuicSRTP"  Content="QUIC+SRTP" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayQuicSRTPExplain}"  TextWrapping="Wrap"  Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonQuic2uTP"  Content="QUIC+uTP" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="3" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayQuicuTPExplain}"  TextWrapping="Wrap"  Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonQuicWechatVideo"  Content="QUIC+WechatVideo" GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="4" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayQuicWeChatExplain}"  TextWrapping="Wrap"  Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonQuicDTLS" Content="QUIC+DTLS 1.2"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="5" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayQuicDTLSExplain}" TextWrapping="Wrap"  Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                            <RadioButton x:Name="RadioButtonQuicWireGuard" Content="QUIC+WireGuard" GroupName="TemplateGroup" Grid.Column="0" Grid.Row="6" Checked="RadioButtonQuicNone_Checked" HorizontalAlignment="Left" VerticalAlignment="Center"></RadioButton>
+                            <TextBlock Text="{DynamicResource TextBlockV2RayQuicWireGuardExplain}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="6" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
 
                         </Grid>
                     </TabItem>
                 </TabControl>
             </Grid>
         </GroupBox>
-        <GroupBox Header="其他设置" Grid.Row="3" Grid.RowSpan="2">
+        <GroupBox Header="{DynamicResource GroupBoxHeaderParameterV2Ray}" Grid.Row="3" Grid.RowSpan="2">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition></ColumnDefinition>
@@ -251,31 +251,31 @@
                     <RowDefinition></RowDefinition>
                     <RowDefinition></RowDefinition>
                 </Grid.RowDefinitions>
-                <TextBlock x:Name="TextBlockServerListenPort" Text="服务端口：" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="1"></TextBlock>
+                <TextBlock x:Name="TextBlockServerListenPort" Text="{DynamicResource TextBlockV2RayServerPort}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
                 <TextBox x:Name="TextBoxServerListenPort" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Margin="3"></TextBox>
-                <Button x:Name="ButtonServerListenPort" Content="随机选择" Grid.Column="4"  Grid.Row="0" Margin="2" Click="ButtonServerListenPort_Click"></Button>
-                <TextBlock Text="若使用TLS加密，请保持默认的443端口" Grid.Column="5" Grid.ColumnSpan="2" Grid.Row="0" Margin="3"></TextBlock>
-                <TextBlock x:Name="TextBlockNewUUID" Text="UUID：" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="1"></TextBlock>
+                <Button x:Name="ButtonServerListenPort" Content="{DynamicResource ButtonV2RayServerPortChange}" Grid.Column="4"  Grid.Row="0" Margin="2" Click="ButtonServerListenPort_Click"></Button>
+                <TextBlock Text="{DynamicResource TextBlockV2RayServerPortExplain}" Grid.Column="5" Grid.ColumnSpan="2" Grid.Row="0" Margin="3"></TextBlock>
+                <TextBlock x:Name="TextBlockNewUUID" Text="UUID:" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
                 <TextBox x:Name="TextBoxNewUUID" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" Margin="3"></TextBox>
-                <Button x:Name="ButtonNewUUID" Content="更新" Grid.Column="4" Grid.Row="1" Margin="2" Click="ButtonNewUUID_Click"></Button>
-                <TextBlock Text="使用已有UUID，直接粘贴到框中" TextWrapping="Wrap" Grid.Column="5" Grid.Row="1" Grid.ColumnSpan="2" Margin="0"></TextBlock>
-                <TextBlock x:Name="TextBlockQuicUUID" Text="mKCP/QUIC密钥"  Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="1"></TextBlock>
+                <Button x:Name="ButtonNewUUID" Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="4" Grid.Row="1" Margin="2" Click="ButtonNewUUID_Click"></Button>
+                <TextBlock Text="{DynamicResource TextBlockV2RayUUIDExplain}" TextWrapping="Wrap" Grid.Column="5" Grid.Row="1" Grid.ColumnSpan="2" Margin="0"></TextBlock>
+                <TextBlock x:Name="TextBlockQuicUUID" Text="{DynamicResource TextBlockV2RayQuicUUID}"  Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
                 <TextBox x:Name="TextBoxQuicUUID"  Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" Margin="3"></TextBox>
-                <Button x:Name="ButtonQuicUUID"  Content="更新" Grid.Column="4" Grid.Row="2" Margin="2" Click="ButtonQuicUUID_Click"></Button>
-                <TextBlock x:Name="TextBlockMkcpUUID"  Text="启用mKCP密钥，可增强抗识别，留空则禁用,要求版本4.24.2以上,V2rayN暂不支持" TextWrapping="Wrap" Grid.Column="5" Grid.Row="2" Grid.ColumnSpan="2"></TextBlock>
+                <Button x:Name="ButtonQuicUUID"  Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="4" Grid.Row="2" Margin="2" Click="ButtonQuicUUID_Click"></Button>
+                <TextBlock x:Name="TextBlockMkcpUUID"  Text="{DynamicResource TextBlockV2RayMkcpExplain}" TextWrapping="Wrap" Grid.Column="5" Grid.Row="2" Grid.ColumnSpan="2"></TextBlock>
 
-                <TextBlock x:Name="TextBlockPath" Text="路径：" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="1"></TextBlock>
+                <TextBlock x:Name="TextBlockPath" Text="{DynamicResource TextBlockV2RayPath}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
                 <TextBox x:Name="TextBoxPath" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" Margin="3"></TextBox>
-                <Button x:Name="ButtonPath" Content="随机" Grid.Column="4" Grid.Row="3" Margin="2" Click="ButtonPath_Click"></Button>
-                <TextBlock x:Name="TextBlockDomain" Text="域名：" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="1"></TextBlock>
-                <TextBox x:Name="TextBoxDomain" Style="{StaticResource TitleText}" Tag="不可为空" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3" Margin="3"></TextBox>
+                <Button x:Name="ButtonPath" Content="{DynamicResource ButtonNaiveProxyChangeUser}" Grid.Column="4" Grid.Row="3" Margin="2" Click="ButtonPath_Click"></Button>
+                <TextBlock x:Name="TextBlockDomain" Text="{DynamicResource TextBlockV2RayDomain}" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
+                <TextBox x:Name="TextBoxDomain" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxDomainPrompt}" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3" Margin="3"></TextBox>
                 <Button x:Name="ButtonDomain" Content="检测" Visibility="Collapsed" Grid.Column="4" Grid.Row="4" Margin="2" Click="ButtonDomain_Click"></Button>
-                <TextBlock x:Name="TextBlockMaskSites" Text="伪装网站：" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="1" Visibility="Hidden"></TextBlock>
-                <TextBox x:Name="TextBoxMaskSites" Style="{StaticResource TitleText}" Tag="设置此项可增加代理的隐蔽(可为空)" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="3" Margin="3" Visibility="Hidden"></TextBox>
+                <TextBlock x:Name="TextBlockMaskSites" Text="{DynamicResource TextBlockV2RayMaskSites}" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="1" Visibility="Hidden"></TextBlock>
+                <TextBox x:Name="TextBoxMaskSites" Style="{StaticResource TitleText}" Tag="{DynamicResource TextBoxV2RayMaskSitesTag}" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="3" Margin="3" Visibility="Hidden"></TextBox>
 
 
-                <Button x:Name="ButtondDecide" Content="确定" Grid.Column="1" Grid.Row="6" Margin="0" Click="ButtondDecide_Click"></Button>
-                <Button x:Name="ButtondCancel" Content="取消" Grid.Column="3" Grid.Row="6" Margin="0" Click="ButtondCancel_Click"></Button>
+                <Button x:Name="ButtondDecide" Content="{DynamicResource ButtonTrojanGoTemplateOK}" Grid.Column="1" Grid.Row="6" Margin="0" Click="ButtondDecide_Click"></Button>
+                <Button x:Name="ButtondCancel" Content="{DynamicResource ButtonTrojanGoTemplateCancel}" Grid.Column="3" Grid.Row="6" Margin="0" Click="ButtondCancel_Click"></Button>
                 <!--<Button x:Name="ButtonTestChecked" Content="测试选中状态" Grid.Column="5" Grid.Row="6" Click="ButtonTestChecked_Click"></Button>-->
             </Grid>
         </GroupBox>
diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip
index 167ef8d..2e0365f 100644
Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ