From eaca464f9cab7596f4bf2c74c286e2fb84f12144 Mon Sep 17 00:00:00 2001 From: proxysu Date: Sat, 27 Nov 2021 11:47:31 +0800 Subject: [PATCH 1/4] update... --- ProxySuper.Core/Services/XrayService.cs | 3 +-- .../Views/V2ray/V2rayConfigView.xaml | 1 + .../Views/V2ray/V2rayConfigView.xaml.cs | 16 ++++++++++++++++ ProxySuper.WPF/Views/Xray/XrayConfigView.xaml | 1 + .../Views/Xray/XrayConfigView.xaml.cs | 19 +++++++++++++++++-- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/ProxySuper.Core/Services/XrayService.cs b/ProxySuper.Core/Services/XrayService.cs index dce2df3..4c62dc9 100644 --- a/ProxySuper.Core/Services/XrayService.cs +++ b/ProxySuper.Core/Services/XrayService.cs @@ -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服务"; diff --git a/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml b/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml index 1bd3a07..728e2ab 100644 --- a/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml +++ b/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml @@ -22,6 +22,7 @@ BorderThickness="1,0,1,0" BorderBrush="#DDD" TabStripPlacement="Left" + x:Name="TabCtrl" SelectionChanged="BuildQrCode"> Date: Sat, 27 Nov 2021 11:50:58 +0800 Subject: [PATCH 2/4] update --- ProxySuper.Core/Services/ServiceBase.cs | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ProxySuper.Core/Services/ServiceBase.cs b/ProxySuper.Core/Services/ServiceBase.cs index 75f677a..d3dbd80 100644 --- a/ProxySuper.Core/Services/ServiceBase.cs +++ b/ProxySuper.Core/Services/ServiceBase.cs @@ -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() { From ef5bb6d977d09073a2ac9aa79a089f70b32cf6bc Mon Sep 17 00:00:00 2001 From: next-autumn <73510229+next-autumn@users.noreply.github.com> Date: Mon, 29 Nov 2021 10:28:25 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 5360c57..f36385d 100644 --- a/README.md +++ b/README.md @@ -128,9 +128,6 @@ CloudPower：gia线路，ping 稳定在170 ms，已使用半年多。 | 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) | - From d815152d2d79ca86faf8936bf3a6f3e1956f868e Mon Sep 17 00:00:00 2001 From: next-autumn <73510229+next-autumn@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:10:06 +0800 Subject: [PATCH 4/4] Update README.md --- README.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/README.md b/README.md index f36385d..a58fea9 100644 --- a/README.md +++ b/README.md @@ -112,22 +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) | -