mirror of
https://github.com/proxysu/ProxySU.git
synced 2025-04-04 06:13:37 +03:00
Merge branch 'proxysu:master' into master
This commit is contained in:
Stklv
GitHub
commit
d864ddc337
7 changed files with 56 additions and 25 deletions
|
|
@ -327,7 +327,7 @@ namespace ProxySuper.Core.Services
|
|||
var result = RunCmd("id -u");
|
||||
if (!result.Equals("0\n"))
|
||||
{
|
||||
throw new Exception("ProxySU需要使用Root用户进行安装！");
|
||||
throw new Exception("请使用Root权限账户登录！");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -365,6 +365,9 @@ namespace ProxySuper.Core.Services
|
|||
|
||||
public void InstallSystemTools()
|
||||
{
|
||||
Progress.Desc = ("更新安装包");
|
||||
RunUpdateCmd();
|
||||
|
||||
Progress.Desc = ("安装sudo工具");
|
||||
InstallSoftware("sudo");
|
||||
|
||||
|
|
@ -768,6 +771,22 @@ namespace ProxySuper.Core.Services
|
|||
}
|
||||
}
|
||||
|
||||
private void RunUpdateCmd()
|
||||
{
|
||||
if (CmdType == CmdType.Apt)
|
||||
{
|
||||
RunCmd($"apt update -y");
|
||||
}
|
||||
else if (CmdType == CmdType.Yum)
|
||||
{
|
||||
RunCmd($"yum update -y");
|
||||
}
|
||||
else
|
||||
{
|
||||
RunCmd($"dnf update -y");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private ConnectionInfo CreateConnectionInfo()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ namespace ProxySuper.Core.Services
|
|||
}
|
||||
|
||||
|
||||
#region 似有方法
|
||||
#region 私有方法
|
||||
|
||||
private void DoUploadCert(object sender, CancelEventArgs e)
|
||||
{
|
||||
|
|
@ -424,7 +424,6 @@ namespace ProxySuper.Core.Services
|
|||
WriteToFile(configJson, "/etc/caddy/Caddyfile");
|
||||
}
|
||||
|
||||
|
||||
private void UninstallXray()
|
||||
{
|
||||
Progress.Desc = "关闭Xray服务";
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
BorderThickness="1,0,1,0"
|
||||
BorderBrush="#DDD"
|
||||
TabStripPlacement="Left"
|
||||
x:Name="TabCtrl"
|
||||
SelectionChanged="BuildQrCode">
|
||||
<TabItem Width="200" Height="40"
|
||||
Tag="{x:Static models:RayType.VLESS_TCP}"
|
||||
|
|
|
|||
|
|
@ -31,6 +31,22 @@ namespace ProxySuper.WPF.Views.V2ray
|
|||
InitializeComponent();
|
||||
}
|
||||
|
||||
protected override void OnRender(DrawingContext drawingContext)
|
||||
{
|
||||
base.OnRender(drawingContext);
|
||||
|
||||
for (int i = 0; i < TabCtrl.Items.Count; i++)
|
||||
{
|
||||
var tabItem = TabCtrl.Items[i] as TabItem;
|
||||
|
||||
if (Settings.Types.Contains((RayType)tabItem.Tag))
|
||||
{
|
||||
TabCtrl.SelectedIndex = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public V2raySettings Settings
|
||||
{
|
||||
get
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
Padding="10"
|
||||
BorderThickness="1,0,1,0"
|
||||
BorderBrush="#DDD"
|
||||
x:Name="TabCtrl"
|
||||
TabStripPlacement="Left"
|
||||
SelectionChanged="BuildQrCode">
|
||||
<TabItem Width="200" Height="40"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ using System.Drawing;
|
|||
using System.IO;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
|
||||
namespace ProxySuper.WPF.Views
|
||||
|
|
@ -21,6 +22,22 @@ namespace ProxySuper.WPF.Views
|
|||
InitializeComponent();
|
||||
}
|
||||
|
||||
protected override void OnRender(DrawingContext drawingContext)
|
||||
{
|
||||
base.OnRender(drawingContext);
|
||||
|
||||
for (int i = 0; i < TabCtrl.Items.Count; i++)
|
||||
{
|
||||
var tabItem = TabCtrl.Items[i] as TabItem;
|
||||
|
||||
if (Settings.Types.Contains((RayType)tabItem.Tag))
|
||||
{
|
||||
TabCtrl.SelectedIndex = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public XraySettings Settings
|
||||
{
|
||||
get
|
||||
|
|
@ -29,8 +46,6 @@ namespace ProxySuper.WPF.Views
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void BuildQrCode(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
var tabControl = e.Source as TabControl;
|
||||
|
|
|
|||
20
README.md
20
README.md
|
|
@ -112,25 +112,5 @@ Microsoft [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-fram
|
|||
在使用遇到问题时，请先看一下[常见问题集锦](https://github.com/proxysu/windows/wiki/CommonError)，如果还不能解决，可以到以上平台询问，个人精力有限，尽力解答。
|
||||
|
||||
|
||||
## 云主机
|
||||
|
||||
下面连接购买，作者可获得推广佣金，谢谢支持！
|
||||
以下是国内优化线路、比较实惠的vps。
|
||||
|
||||
延迟参考：中国华北地区，联通。
|
||||
CloudPower：gia线路，ping 稳定在170 ms，已使用半年多。
|
||||
水墨云：买过香港GIA三网直连，ping 稳定在 65ms，已使用半年多。
|
||||
**水墨云支付宝支付是国内企业注册，需要注意安全.**
|
||||
|
||||
| 商家 | 线路 | 配置 | 流量 | 价格 | 连接 |
|
||||
| ---------- | ------------- | --------- | ------ | --------- | -------------------------------------------------------------- |
|
||||
| CloudPower | CN2 GIA | 1 核 1G | 500GB | 36.99/年 | [链接](https://cloudpowerall.com/aff.php?aff=3225&pid=150) |
|
||||
| CloudPower | AS9929 | 1 核 1G | 500GB | 29.99/年 | [链接](https://cloudpowerall.com/aff.php?aff=3225&pid=149) |
|
||||
| cloudcone | CN2 GIA | 1 核 512M | 500GB | $40/年 | [链接](https://app.cloudcone.com/compute/1024/create?ref=7021) |
|
||||
| 搬瓦工 | CN2 GT | 1 核 1G | 1000GB | $49.99/年 | [链接](https://bandwagonhost.com/aff.php?aff=66053&pid=57) |
|
||||
| 水墨云活动 | 香港 移动电信直连 | 1 核 512 | 1000GB | 199人民币/年 | [链接](https://www.inkisp.com/aff.php?aff=468&pid=852) |
|
||||
| 水墨云活动 | 香港 三网直连 | 1 核 512 | 500GB | 199人民币/年 | [链接](https://www.inkisp.com/aff.php?aff=468&pid=851) |
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue