mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2025-04-04 06:13:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9 from proxysu/master

Browse source 
update
This commit is contained in:
xnxy2012 2021-12-22 17:18:00 +08:00 • committed by GitHub
commit 1e8f6fcb63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 84 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ProxySuper.Core/Models/Record.cs
View file

@ -42,7 +42,7 @@ namespace ProxySuper.Core.Models
[JsonProperty("trojanGoSettings")]
public TrojanGoSettings TrojanGoSettings { get; set; }
[JsonProperty("naiveProtoSettings")]
[JsonProperty("naiveProxySettings")]
public NaiveProxySettings NaiveProxySettings { get; set; }
[JsonProperty("brook")]

22
ProxySuper.Core/Services/ServiceBase.cs
View file

@ -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()
{
@ -799,6 +818,7 @@ namespace ProxySuper.Core.Services
return new ConnectionInfo(
host: _host.Address,
username: _host.UserName,
port: _host.Port,
authenticationMethods: authMethods.ToArray());
}

3
ProxySuper.Core/Services/XrayService.cs
View file

@ -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服务";

18
ProxySuper.WPF/ProxySuper.WPF.csproj
View file

@ -144,14 +144,14 @@
<Compile Include="Views\MTProxyGo\MTProxyGoInstallView.xaml.cs">
<DependentUpon>MTProxyGoInstallView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\NaiveProto\NaiveProtoConfigView.xaml.cs">
<DependentUpon>NaiveProtoConfigView.xaml</DependentUpon>
<Compile Include="Views\NaiveProxy\NaiveProxyConfigView.xaml.cs">
<DependentUpon>NaiveProxyConfigView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\NaiveProto\NaiveProtoEditorView.xaml.cs">
<DependentUpon>NaiveProtoEditorView.xaml</DependentUpon>
<Compile Include="Views\NaiveProxy\NaiveProxyEditorView.xaml.cs">
<DependentUpon>NaiveProxyEditorView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\NaiveProto\NaiveProtoInstallView.xaml.cs">
<DependentUpon>NaiveProtoInstallView.xaml</DependentUpon>
<Compile Include="Views\NaiveProxy\NaiveProxyInstallView.xaml.cs">
<DependentUpon>NaiveProxyInstallView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ShareLinkView.xaml.cs">
<DependentUpon>ShareLinkView.xaml</DependentUpon>
@ -299,15 +299,15 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\NaiveProto\NaiveProtoConfigView.xaml">
<Page Include="Views\NaiveProxy\NaiveProxyConfigView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\NaiveProto\NaiveProtoEditorView.xaml">
<Page Include="Views\NaiveProxy\NaiveProxyEditorView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\NaiveProto\NaiveProtoInstallView.xaml">
<Page Include="Views\NaiveProxy\NaiveProxyInstallView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>

1
ProxySuper.WPF/Templates/trojan-go/trojan-go.json
View file

@ -1,4 +1,5 @@
{
"log_level": 5,
"run_type": "server",
"local_addr": "0.0.0.0",
"local_port": 443,

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml
View file

@ -1,4 +1,4 @@
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProtoConfigView"
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxyConfigView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -8,7 +8,7 @@
mc:Ignorable="d"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
Title="NaiveProxyConfigView" Height="450" Width="800">
Title="NaiveProxy配置" Height="450" Width="800">
<Grid Margin="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="140" />

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs
View file

@ -5,9 +5,9 @@ namespace ProxySuper.WPF.Views
/// <summary>
/// NaiveProxyConfigView.xaml 的交互逻辑
/// </summary>
public partial class NaiveProtoConfigView : MvxWindow
public partial class NaiveProxyConfigView : MvxWindow
{
public NaiveProtoConfigView()
public NaiveProxyConfigView()
{
InitializeComponent();
}

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
View file

@ -1,4 +1,4 @@
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProtoEditorView"
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxyEditorView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -11,7 +11,7 @@
BorderBrush="#eee"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
Title="NaiveProxy" Height="600" Width="1000">
Title="NaiveProxy编辑配置" Height="600" Width="1000">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="310" />

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs
View file

@ -5,9 +5,9 @@ namespace ProxySuper.WPF.Views
/// <summary>
/// NaiveProxyEditorView.xaml 的交互逻辑
/// </summary>
public partial class NaiveProtoEditorView : MvxWindow
public partial class NaiveProxyEditorView : MvxWindow
{
public NaiveProtoEditorView()
public NaiveProxyEditorView()
{
InitializeComponent();
}

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml
View file

@ -1,4 +1,4 @@
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxy.NaiveProtoInstallView"
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxy.NaiveProxyInstallView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -8,7 +8,7 @@
xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
Title="TrojanGoInstallView" Height="600" Width="1000">
Title="TrojanGo安装" Height="600" Width="1000">
<StackPanel>
<ctrl:ProgressControl />

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs
View file

@ -18,9 +18,9 @@ namespace ProxySuper.WPF.Views.NaiveProxy
/// <summary>
/// NaiveProxyInstallViewModel.xaml 的交互逻辑
/// </summary>
public partial class NaiveProtoInstallView : MvxWindow
public partial class NaiveProxyInstallView : MvxWindow
{
public NaiveProtoInstallView()
public NaiveProxyInstallView()
{
InitializeComponent();
}

1
ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml
View file

@ -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}"

16
ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml.cs
View file

@ -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

1
ProxySuper.WPF/Views/Xray/XrayConfigView.xaml
View file

@ -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"

19
ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs
View file

@ -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;

4
README.md
View file

@ -110,3 +110,7 @@ Microsoft [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-fram
* 在线提问 https://github.com/proxysu/windows/issues
在使用遇到问题时，请先看一下[常见问题集锦](https://github.com/proxysu/windows/wiki/CommonError)，如果还不能解决，可以到以上平台询问，个人精力有限，尽力解答。