1
0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-22 21:26:09 +03:00

增加更多的错误提示信息

This commit is contained in:
ProxySU 2020-10-14 08:48:03 +08:00
parent 2e9a49db5c
commit 36972317d0
4 changed files with 34 additions and 7 deletions

View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ProxySU" xmlns:local="clr-namespace:ProxySU"
mc:Ignorable="d" mc:Ignorable="d"
Title="ProxySU - v2.4.4" Height="675" Width="650"> Title="ProxySU - v2.4.5" Height="675" Width="650">
<!--以下样式参考自https://yq.aliyun.com/articles/331878 <!--以下样式参考自https://yq.aliyun.com/articles/331878
https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview--> https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
<Window.Resources> <Window.Resources>

View File

@ -11634,7 +11634,28 @@ namespace ProxySU
using (var client = new SshClient(connectionInfo)) using (var client = new SshClient(connectionInfo))
{ {
client.Connect(); 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); //CaddyInstall(client);
//if (client.IsConnected == true) //if (client.IsConnected == true)
//{ //{
@ -11686,7 +11707,10 @@ namespace ProxySU
private string MainWindowsShowCmd(SshClient client,string sshShellCommand) private string MainWindowsShowCmd(SshClient client,string sshShellCommand)
{ {
TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, 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);//显示命令执行的结果 TextBoxMonitorCommandResults.Dispatcher.BeginInvoke(updateMonitorAction, TextBoxMonitorCommandResults, currentShellCommandResult);//显示命令执行的结果
return currentShellCommandResult; return currentShellCommandResult;
@ -11792,7 +11816,7 @@ namespace ProxySU
} }
//检测关闭Selinux及系统组件是否齐全apt/yum/dnf/systemctl11--30 //检测关闭Selinux及系统组件是否齐全apt/yum/dnf/systemctl11--30
//安装依赖软件,检测端口,防火墙开启端口,升级systemctl //安装依赖软件,检测端口,防火墙开启端口
//functionResult = ShutDownSelinuxAndSysComponentsDetect(client); //functionResult = ShutDownSelinuxAndSysComponentsDetect(client);
//if (functionResult == false) { FunctionResultErr(); client.Disconnect(); return; } //if (functionResult == false) { FunctionResultErr(); client.Disconnect(); return; }
private bool ShutDownSelinuxAndSysComponentsDetect(SshClient client) private bool ShutDownSelinuxAndSysComponentsDetect(SshClient client)
@ -12221,7 +12245,10 @@ namespace ProxySU
//安装代理程序 37--40 //安装代理程序 37--40
private bool SoftInstall()
{
return true;
}
//程序是否安装成功检测并设置开机启动 41--43 //程序是否安装成功检测并设置开机启动 41--43
//soft--要检测的程序 //soft--要检测的程序

View File

@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.4.4.0")] [assembly: AssemblyVersion("2.4.5.0")]
[assembly: AssemblyFileVersion("2.4.4.0")] [assembly: AssemblyFileVersion("2.4.5.0")]

Binary file not shown.