mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-26 07:06:08 +03:00
Code Issues Projects Releases Wiki Activity

修复一些小Bug(#4 #6)

Browse Source
This commit is contained in:
ProxySU 2020-08-17 17:35:29 +08:00
parent d91e6fb667
commit 5ec0e54a48
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ProxySU/MainWindow.xaml.cs
View File

@ -740,11 +740,18 @@ namespace ProxySU
client.Disconnect(); client.Disconnect();
return; return;
} }
client.RunCommand("systemctl enable v2ray; systemctl start v2ray"); else
//client.RunCommand("mv /etc/v2ray/config.json /etc/v2ray/config.json.1"); {
currentStatus = "V2ray成功！";
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
Thread.Sleep(1000);
client.RunCommand("systemctl enable v2ray; systemctl start v2ray");
}
client.RunCommand("mv /etc/v2ray/config.json /etc/v2ray/config.json.1");
//上传配置文件 //上传配置文件
currentStatus = "V2ray程序安装完毕，配置文件上传中......"; currentStatus = "V2ray配置文件上传中......";
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
Thread.Sleep(1000); Thread.Sleep(1000);
@ -1924,6 +1931,13 @@ namespace ProxySU
client.Disconnect(); client.Disconnect();
return; return;
} }
else
{
currentStatus = "Trojan安装成功！";
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
Thread.Sleep(1000);
client.RunCommand("systemctl enable trojan");
}
client.RunCommand("mv /usr/local/etc/trojan/config.json /usr/local/etc/trojan/config.json.1"); client.RunCommand("mv /usr/local/etc/trojan/config.json /usr/local/etc/trojan/config.json.1");
//上传配置文件 //上传配置文件
@ -2695,13 +2709,20 @@ namespace ProxySU
if (!installResult.Contains("/usr/local/bin/trojan-go")) if (!installResult.Contains("/usr/local/bin/trojan-go"))
{ {
MessageBox.Show("安装Trojan失败(安装脚本运行出错！"); MessageBox.Show("安装Trojan-Go失败(安装脚本运行出错！");
currentStatus = "安装Trojan失败(安装脚本运行出错！"; currentStatus = "安装Trojan-Go失败(安装脚本运行出错！";
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
client.Disconnect(); client.Disconnect();
return; return;
} }
else
{
currentStatus = "Trojan-Go安装成功！";
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
Thread.Sleep(1000);
client.RunCommand("systemctl enable trojan-go");
}
client.RunCommand("mv /etc/trojan-go/config.json /etc/trojan-go/config.json.1"); client.RunCommand("mv /etc/trojan-go/config.json /etc/trojan-go/config.json.1");
//上传配置文件 //上传配置文件

BIN
ProxySU/bin/Beta/Beta.zip
View File

Binary file not shown.