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

除去caddy.service中的线程限制

Browse Source
This commit is contained in:
ProxySU 2020-11-19 11:02:07 +08:00
parent 90adece940
commit f445395fda
4 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProxySU/MainWindow.xaml
View File

@ -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.23" Height="675" Width="650">
Title="ProxySU - v2.4.24 Beta2" Height="675" Width="650">
<!--以下样式参考自：https://yq.aliyun.com/articles/331878
https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
<Window.Resources>

44
ProxySU/MainWindow.xaml.cs
View File

@ -5690,6 +5690,13 @@ namespace ProxySU
functionResult = RootAuthorityDetect(client);
if (functionResult == false) { FunctionResultErr(); client.Disconnect(); return; }
functionResult = FileCheckExists(client, @"/etc/resolv.conf.proxysu");
if (functionResult == true)
{
sshShellCommand = @"mv /etc/resolv.conf.proxysu /etc/resolv.conf ";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
}
sshShellCommand = @"command -v apt-get";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
getApt = !String.IsNullOrEmpty(currentShellCommandResult);
@ -5721,11 +5728,19 @@ namespace ProxySU
//检测主机是否为纯ipv6的主机
onlyIpv6 = OnlyIpv6HostDetect(client);
//如果未检测到有效的ip，连接就会被断开
if (client.IsConnected == false)
{
return ;
}
if (onlyIpv6 == true)
{
SetUpNat64(client, true);
sshShellCommand = $"{sshCmdUpdate}";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
functionResult = SetUpNat64(client, true);
if (functionResult == false) { FunctionResultErr(); client.Disconnect(); return ; }
//SetUpNat64(client, true);
//sshShellCommand = $"{sshCmdUpdate}";
//currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
}
@ -6434,8 +6449,8 @@ namespace ProxySU
if (onlyIpv6 == true)
{
SetUpNat64(client, false);
sshShellCommand = $"{sshCmdUpdate}";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
//sshShellCommand = $"{sshCmdUpdate}";
//currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
}
@ -8524,8 +8539,6 @@ namespace ProxySU
sshShellCommand = @"yum -y install caddy";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
}
string caddyService = @"/lib/systemd/system/caddy.service";
@ -8540,15 +8553,16 @@ namespace ProxySU
sshShellCommand = $"sed -i 's/=caddy/=root/g' {caddyService}";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
sshShellCommand = $"sed -i 's/LimitNPROC/#LimitNPROC/g' {caddyService}";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
sshShellCommand = $"sed -i 's/LimitNOFILE/#LimitNOFILE/g' {caddyService}";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
sshShellCommand = @"systemctl daemon-reload";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
//sshShellCommand = @"find / -name caddy";
//sshShellCommand = @"if [[ -f /usr/bin/caddy ]];then echo '1';else echo '0'; fi";
//currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
//if (!currentShellCommandResult.Contains("/usr/bin/caddy"))
//if (currentShellCommandResult.Trim().Equals("0") == true)
functionResult = FileCheckExists(client, @"/usr/bin/caddy");
if (functionResult == true)
{
@ -8623,8 +8637,8 @@ namespace ProxySU
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
//设置伪装网站/纯ipv6主机暂不设置
if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false && onlyIpv6 == false)
{
//if (String.IsNullOrEmpty(ReceiveConfigurationParameters[7]) == false && onlyIpv6 == false)
//{
sshShellCommand = $"sed -i 's/##reverse_Proxy1##/reverse_proxy http:\\/\\/{ReceiveConfigurationParameters[7]} {{/ ' {upLoadPath}";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
@ -8634,7 +8648,7 @@ namespace ProxySU
sshShellCommand = $"sed -i 's/##reverse_Proxy3##/}}/' {upLoadPath}";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
}
//}
return true;
}

4
ProxySU/Properties/AssemblyInfo.cs
View File

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

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

Binary file not shown.