diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index d367409..9c1c4c0 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.4" Height="675" Width="650"> + Title="ProxySU - v2.4.5" Height="675" Width="650"> diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index e8a6167..99dc0f9 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -11634,7 +11634,28 @@ namespace ProxySU using (var client = new SshClient(connectionInfo)) { client.Connect(); - SoftInstalledSuccessOrFail(client, "v2ray", @"/usr/local/bin/v2ray"); + 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); + + 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) //{ @@ -11686,7 +11707,10 @@ namespace ProxySU private string MainWindowsShowCmd(SshClient client,string sshShellCommand) { TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, sshShellCommand);//显示执行的命令 - string currentShellCommandResult = client.RunCommand(sshShellCommand).Result; + SshCommand cmdResult = client.RunCommand(sshShellCommand); + string currentShellCommandResult = cmdResult.Result; + string currentShellCommandError = cmdResult.Error; + if (String.IsNullOrEmpty(currentShellCommandResult) == true) { currentShellCommandResult = currentShellCommandError; } TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果 return currentShellCommandResult; @@ -11792,7 +11816,7 @@ namespace ProxySU } //检测关闭Selinux及系统组件是否齐全(apt/yum/dnf/systemctl)11--30 - //安装依赖软件,检测端口,防火墙开启端口,升级systemctl + //安装依赖软件,检测端口,防火墙开启端口 //functionResult = ShutDownSelinuxAndSysComponentsDetect(client); //if (functionResult == false) { FunctionResultErr(); client.Disconnect(); return; } private bool ShutDownSelinuxAndSysComponentsDetect(SshClient client) @@ -12221,7 +12245,10 @@ namespace ProxySU //安装代理程序 37--40 - + private bool SoftInstall() + { + return true; + } //程序是否安装成功检测并设置开机启动 41--43 //soft--要检测的程序 diff --git a/ProxySU/Properties/AssemblyInfo.cs b/ProxySU/Properties/AssemblyInfo.cs index 2723df7..a066fd9 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.4.0")] -[assembly: AssemblyFileVersion("2.4.4.0")] +[assembly: AssemblyVersion("2.4.5.0")] +[assembly: AssemblyFileVersion("2.4.5.0")] diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index f152e83..7d191ba 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ