mirror of
https://github.com/proxysu/ProxySU.git
synced 2025-04-19 17:10:56 +00:00
Compare commits
6 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
30d81716ac | ||
|
7be972fe93 | ||
|
fad6f1a485 | ||
|
ed6c4e9f99 | ||
|
|
2ffbd9f096 | ||
|
|
c81e3ae52b |
9 changed files with 49 additions and 26 deletions
|
|
@ -5,7 +5,7 @@
|
|||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:ProxySU"
|
||||
mc:Ignorable="d"
|
||||
Title="ProxySU - v2.5.3 Beta1" Height="675" Width="660">
|
||||
Title="ProxySU - v2.5.5" Height="720" Width="660">
|
||||
<!--以下样式参考自：https://yq.aliyun.com/articles/331878
|
||||
https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
|
||||
<Window.Resources>
|
||||
|
|
@ -57,6 +57,7 @@
|
|||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition></RowDefinition>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
<RowDefinition Height="1.3*"></RowDefinition>
|
||||
<RowDefinition Height="1.8*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
|
|
@ -147,23 +148,29 @@
|
|||
<TextBlock x:Name="TextBlockProxyPassword" IsEnabled="False" Text="{DynamicResource TextBlockHostPassword}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5" Grid.Column="2" Grid.Row="1" ></TextBlock>
|
||||
<TextBox x:Name="TextBoxProxyUserName" IsEnabled="False" Text="" Margin="3" Grid.Column="1" Grid.Row="1" />
|
||||
<PasswordBox x:Name="PasswordBoxProxyPassword" IsEnabled="False" Password="" Margin="3" Grid.Column="3" Grid.Row="1"></PasswordBox>
|
||||
<Button x:Name="ButtonSaveInstalledLog" Content="{DynamicResource ButtonSaveInstalledLog}" Grid.Column="4" Grid.Row="1" Grid.ColumnSpan="2" Margin="10,3,10,3" Click="ButtonSaveInstalledLog_Click"></Button>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid Grid.Row="1">
|
||||
<StackPanel Margin="10,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
|
||||
<TextBlock Foreground="Red" x:Name="AcmeEmailLabel" Text="Email:" VerticalAlignment="Center" />
|
||||
<TextBox Margin="10,0,0,0" Height="20" Width="200" x:Name="AcmeEmailTextBox" />
|
||||
<TextBlock Margin="10,0,0,0" Text="{DynamicResource AcmeEmailDesc}" Foreground="Red" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<Grid Grid.Row="2">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="20"></RowDefinition>
|
||||
<RowDefinition Height="20"></RowDefinition>
|
||||
<RowDefinition></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Button x:Name="ButtonSaveInstalledLog" Content="{DynamicResource ButtonSaveInstalledLog}" Margin="0,0,10,0" Width="140" HorizontalAlignment="Right" Click="ButtonSaveInstalledLog_Click"></Button>
|
||||
<TextBlock x:Name="TextBlockSetUpProcessing" Text="{DynamicResource TextBlockSetUpProcessing}" Foreground="Blue" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="0"></TextBlock>
|
||||
<ProgressBar x:Name="ProgressBarSetUpProcessing" Minimum="0" Maximum="100" Value="{Binding InsertBindingHere}" Margin="10,0,10,3" Grid.Row="1"></ProgressBar>
|
||||
<TextBlock Text="{Binding ElementName=ProgressBarSetUpProcessing, Path=Value, StringFormat={}{0:0}%}" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1"/>
|
||||
<TextBox x:Name="TextBoxMonitorCommandResults" IsReadOnly="True" TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Grid.Row="2" Margin="10,0,10,3"></TextBox>
|
||||
|
||||
</Grid>
|
||||
<Grid Grid.Row="2">
|
||||
<Grid Grid.Row="3">
|
||||
<TabControl Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="3">
|
||||
<TabItem Header="Xray" Width="60" Height="30">
|
||||
<Grid>
|
||||
|
|
|
|||
|
|
@ -9941,7 +9941,9 @@ namespace ProxySU
|
|||
{
|
||||
string nativeIp = ipv4;
|
||||
|
||||
sshShellCommand = "ping " + ReceiveConfigurationParameters[4] + " -c1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
|
||||
//string cmdFilter = "";
|
||||
string cmdFilter = @"| grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1";
|
||||
sshShellCommand = $"dig @resolver1.opendns.com A {ReceiveConfigurationParameters[4]} +short -4 {cmdFilter}";
|
||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||
|
||||
string resultTestDomainCmd = currentShellCommandResult.TrimEnd('\r', '\n');
|
||||
|
|
@ -9958,11 +9960,11 @@ namespace ProxySU
|
|||
}
|
||||
else
|
||||
{
|
||||
|
||||
string nativeIp = ipv6;
|
||||
|
||||
//sshShellCommand = "ping6 " + ReceiveConfigurationParameters[4] + " -c1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
|
||||
sshShellCommand = $"dig @resolver1.opendns.com AAAA {ReceiveConfigurationParameters[4]} +short -6";
|
||||
//string cmdFilter = "";
|
||||
string cmdFilter = @"| grep -oE '(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))' | head -n 1";
|
||||
sshShellCommand = $"dig @resolver1.opendns.com AAAA {ReceiveConfigurationParameters[4]} +short -6 {cmdFilter}";
|
||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||
|
||||
string resultTestDomainCmd = currentShellCommandResult.TrimEnd('\r', '\n');
|
||||
|
|
@ -10100,7 +10102,8 @@ namespace ProxySU
|
|||
sshShellCommand = $"{sshCmdInstall}automake autoconf libtool";
|
||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||
|
||||
sshShellCommand = $"curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh | INSTALLONLINE=1 sh";
|
||||
//sshShellCommand = $"curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh | INSTALLONLINE=1 sh";
|
||||
sshShellCommand = $"curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh | sh -s -- --install-online -m {AcmeEmailTextBox.Text}";
|
||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||
|
||||
if (currentShellCommandResult.Contains("Install success") == true)
|
||||
|
|
|
|||
|
|
@ -51,5 +51,5 @@ using System.Windows;
|
|||
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
|
||||
// 方法是按如下所示使用“*”: :
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("2.5.3.0")]
|
||||
[assembly: AssemblyFileVersion("2.5.3.0")]
|
||||
[assembly: AssemblyVersion("2.5.5.0")]
|
||||
[assembly: AssemblyFileVersion("2.5.5.0")]
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Deterministic>true</Deterministic>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
|
|
@ -23,10 +24,10 @@
|
|||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationRevision>1</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<PublishWizardCompleted>true</PublishWizardCompleted>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
|
|
@ -51,6 +52,18 @@
|
|||
<PropertyGroup>
|
||||
<ApplicationIcon>ProxySU.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ManifestCertificateThumbprint>01AFC64B121E781F77B42A6E9F1B587DDBAD475A</ManifestCertificateThumbprint>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ManifestKeyFile>ProxySU_TemporaryKey.pfx</ManifestKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<GenerateManifests>true</GenerateManifests>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignManifests>true</SignManifests>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Newtonsoft.Json">
|
||||
<HintPath>..\json.net\net40\Newtonsoft.Json.dll</HintPath>
|
||||
|
|
@ -186,17 +199,11 @@
|
|||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>del "$(TargetDir)*.xml"
|
||||
del "$(TargetDir)*.pdb"
|
||||
del "$(TargetDir)*.zip"
|
||||
mkdir "$(TargetDir)TemplateConfg"
|
||||
xcopy /Y /E /R "$(TargetDir)..\..\..\TemplateConfg\*.*" "$(TargetDir)TemplateConfg\"
|
||||
"$(TargetDir)..\..\..\7z\7z.exe" a $(TargetDir)Release.zip $(TargetDir) -xr!*config
|
||||
rmdir /S /Q "$(TargetDir)..\Beta"
|
||||
mkdir "$(TargetDir)..\Beta"
|
||||
copy /Y "$(TargetDir)Release.zip" "$(TargetDir)..\Beta\Beta.zip"</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>rmdir /S /Q "$(TargetDir)</PreBuildEvent>
|
||||
<PreBuildEvent>
|
||||
</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -27,6 +27,8 @@
|
|||
<sys:String x:Key="RadioButtonProxyNoLogin">Not Login</sys:String>
|
||||
<sys:String x:Key="RadiobuttonProxyYesLogin">Requires Login</sys:String>
|
||||
<sys:String x:Key="TextBlockProxyHost">Proxy Addr:</sys:String>
|
||||
<sys:String x:Key="AcmeEmail">Email</sys:String>
|
||||
<sys:String x:Key="AcmeEmailDesc">Acme.sh SSL must an available email address.</sys:String>
|
||||
<sys:String x:Key="ButtonSaveInstalledLog">Save Installation Log...</sys:String>
|
||||
<sys:String x:Key="TextBlockSetUpProcessing">Waiting for installation and deployment</sys:String>
|
||||
<sys:String x:Key="TabItemHeaderSysTools">System Tools</sys:String>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
<sys:String x:Key="RadioButtonProxyNoLogin">不需登录</sys:String>
|
||||
<sys:String x:Key="RadiobuttonProxyYesLogin">需要登录</sys:String>
|
||||
<sys:String x:Key="TextBlockProxyHost">代理地址:</sys:String>
|
||||
<sys:String x:Key="AcmeEmail">Email</sys:String>
|
||||
<sys:String x:Key="AcmeEmailDesc">申请SSL证书需要一个可用的Email地址</sys:String>
|
||||
<sys:String x:Key="ButtonSaveInstalledLog">安装日志另存为...</sys:String>
|
||||
<sys:String x:Key="TextBlockSetUpProcessing">等待安装布署</sys:String>
|
||||
<sys:String x:Key="TabItemHeaderSysTools">系统工具</sys:String>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
<sys:String x:Key="RadioButtonProxyNoLogin">不需登錄</sys:String>
|
||||
<sys:String x:Key="RadiobuttonProxyYesLogin">需要登錄</sys:String>
|
||||
<sys:String x:Key="TextBlockProxyHost">代理地址:</sys:String>
|
||||
<sys:String x:Key="AcmeEmail">Email</sys:String>
|
||||
<sys:String x:Key="AcmeEmailDesc">申請SSL證書需要一個可用的Email地址</sys:String>
|
||||
<sys:String x:Key="ButtonSaveInstalledLog">安裝日誌另存為...</sys:String>
|
||||
<sys:String x:Key="TextBlockSetUpProcessing">等待安裝佈署</sys:String>
|
||||
<sys:String x:Key="TabItemHeaderSysTools">系統工具</sys:String>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -267,7 +267,7 @@ Microsoft [.NET Framework 4.0](https://dotnet.microsoft.com/download/dotnet-fram
|
|||
|
||||
在使用遇到问题时，请先看一下[常见问题集锦](https://github.com/proxysu/windows/wiki/CommonError)，如果还不能解决，可以到以上平台询问，个人精力有限，尽力解答。
|
||||
## v1.0.0发布小记
|
||||
足足用了近两个月的业余时间，终于做成一个功能还算完善的版本。虽是一个简单的小工具，没想到对于我这个初学C#的人，还是有点小吃力，如果不是因为武汉肺炎疫情，被禁足在家，还真没时间。学习C#，为啥编写这样一个小工具软件来练手？现在一键安装脚本多的是，这样的工具还有必要吗？咋说呢？我也不知道有多少人会喜欢这个小工具，只是觉得自己用着方便，也想方便一下别人吧，喜欢用就用，不喜欢，也随意。
|
||||
足足用了近两个月的业余时间，终于做成一个功能还算完善的版本。虽是一个简单的小工具，没想到对于我这个初学C#的人，还是有点小吃力，如果不是因为新冠肺炎疫情，被禁足在家，还真没时间。学习C#，为啥编写这样一个小工具软件来练手？现在一键安装脚本多的是，这样的工具还有必要吗？咋说呢？我也不知道有多少人会喜欢这个小工具，只是觉得自己用着方便，也想方便一下别人吧，喜欢用就用，不喜欢，也随意。
|
||||
生意又忙起来了，对于我这个业余的编程爱好者，可能没有多少业余时间继续折腾了，尽力吧。
|
||||
（记于2020.4.18）
|
||||
## V2.0.0发布小记
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue