diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index 7729f54..6f3ca17 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 - v2.4.12" Height="675" Width="650"> + Title="ProxySU - v2.4.13" Height="675" Width="650"> diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index bfce48e..b5c12a9 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -6844,50 +6844,57 @@ namespace ProxySU #region 测试用代码 private void Button_Click(object sender, RoutedEventArgs e) { - string pwdir = AppDomain.CurrentDomain.BaseDirectory; - MessageBox.Show(pwdir); - //ConnectionInfo connectionInfo = GenerateConnectionInfo(); - //if (connectionInfo == null) - //{ - // //****** "远程主机连接信息有误,请检查!" ****** - // MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorHostConnection").ToString()); - // return; - //} - //using (var client = new SshClient(connectionInfo)) - //{ - // client.Connect(); - // if (client.IsConnected == true) - // { - // //******"主机登录成功"****** - // SetUpProgressBarProcessing(3); - // currentStatus = Application.Current.FindResource("DisplayInstallInfo_LoginSuccessful").ToString(); - // MainWindowsShowInfo(currentStatus); + //string pwdir = AppDomain.CurrentDomain.BaseDirectory; + //MessageBox.Show(pwdir); + ConnectionInfo connectionInfo = GenerateConnectionInfo(); + if (connectionInfo == null) + { + //****** "远程主机连接信息有误,请检查!" ****** + MessageBox.Show(Application.Current.FindResource("MessageBoxShow_ErrorHostConnection").ToString()); + return; + } + using (var client = new SshClient(connectionInfo)) + { + client.Connect(); + if (client.IsConnected == true) + { + //******"主机登录成功"****** + SetUpProgressBarProcessing(3); + currentStatus = Application.Current.FindResource("DisplayInstallInfo_LoginSuccessful").ToString(); + MainWindowsShowInfo(currentStatus); - // } - // //string cmdErr = client.RunCommand(@"aaa ee").Error; - // //MessageBox.Show(cmdErr); - // SshCommand cmdResult = client.RunCommand(@"pwd"); - // string result = cmdResult.Result; - // MessageBox.Show("result:"+result); - // string error = cmdResult.Error; - // MessageBox.Show("err:"+error); + } + //string cmdErr = client.RunCommand(@"aaa ee").Error; + //MessageBox.Show(cmdErr); + SshCommand cmdResult = client.RunCommand(@"pwd"); + string result = cmdResult.Result; + MessageBox.Show("result:" + result); + string error = cmdResult.Error; + MessageBox.Show("err:" + error); - // SshCommand cmdResultCat = client.RunCommand(@"cat tt.t"); - // string resultCat = cmdResultCat.Result; - // MessageBox.Show("resultCat:" + resultCat); - // string errorCat = cmdResultCat.Error; - // MessageBox.Show("errCat:" + errorCat); - //SoftInstalledSuccessOrFail(client, "v2ray", @"/usr/local/bin/v2ray"); - //CaddyInstall(client); - //if (client.IsConnected == true) - //{ - // MessageBox.Show("Connected"); - //} - //if (client.IsConnected == false) - //{ - // MessageBox.Show("disConnected"); - //} - //} + int cmdExitStatus = cmdResult.ExitStatus; + MessageBox.Show("cmdExitStatus:" + cmdExitStatus.ToString()); + + SshCommand cmdResultCat = client.RunCommand(@"cat tt.t"); + string resultCat = cmdResultCat.Result; + MessageBox.Show("resultCat:" + resultCat); + string errorCat = cmdResultCat.Error; + MessageBox.Show("errCat:" + errorCat); + + cmdExitStatus = cmdResultCat.ExitStatus; + MessageBox.Show("cmdExitStatus:" + cmdExitStatus.ToString()); + + //SoftInstalledSuccessOrFail(client, "v2ray", @"/usr/local/bin/v2ray"); + //CaddyInstall(client); + //if (client.IsConnected == true) + //{ + // MessageBox.Show("Connected"); + //} + //if (client.IsConnected == false) + //{ + // MessageBox.Show("disConnected"); + //} + } } private string CaddyInstallTest(SshClient client) @@ -7014,9 +7021,15 @@ namespace ProxySU { TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令 SshCommand cmdResult = client.RunCommand(sshShellCommand); - string currentShellCommandResult = cmdResult.Result; - string currentShellCommandError = cmdResult.Error; - if (String.IsNullOrEmpty(currentShellCommandResult) == true) { currentShellCommandResult = currentShellCommandError; } + string currentShellCommandResult = cmdResult.Result; //命令执行成功的结果 + string currentShellCommandError = cmdResult.Error; //命令执行出错的提示 + int cmdExitStatus = cmdResult.ExitStatus; + //if (String.IsNullOrEmpty(currentShellCommandResult) == true) + if(cmdExitStatus == 1) + { + //currentShellCommandResult = currentShellCommandError; + TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandError);//显示命令执行错误的提示 + } TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果 return currentShellCommandResult; diff --git a/ProxySU/Properties/AssemblyInfo.cs b/ProxySU/Properties/AssemblyInfo.cs index ff2c8c5..452962e 100644 --- a/ProxySU/Properties/AssemblyInfo.cs +++ b/ProxySU/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.12.0")] -[assembly: AssemblyFileVersion("2.4.12.0")] +[assembly: AssemblyVersion("2.4.13.0")] +[assembly: AssemblyFileVersion("2.4.13.0")] diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index 362c784..97491a3 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ