diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index 17ea639..b8d4bc0 100644 --- a/ProxySU/MainWindow.xaml +++ b/ProxySU/MainWindow.xaml @@ -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.4" Height="675" Width="660"> + Title="ProxySU - v2.5.5" Height="720" Width="660"> @@ -57,6 +57,7 @@ + @@ -147,23 +148,29 @@ - - + + + + + + + + - - + + - + diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index b60b10e..e615084 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -10102,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) diff --git a/ProxySU/Properties/AssemblyInfo.cs b/ProxySU/Properties/AssemblyInfo.cs index a15b0a0..a8fc770 100644 --- a/ProxySU/Properties/AssemblyInfo.cs +++ b/ProxySU/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.5.4.0")] -[assembly: AssemblyFileVersion("2.5.4.0")] +[assembly: AssemblyVersion("2.5.5.0")] +[assembly: AssemblyFileVersion("2.5.5.0")] diff --git a/ProxySU/ProxySU.csproj b/ProxySU/ProxySU.csproj index 1dac41d..05b8fd7 100644 --- a/ProxySU/ProxySU.csproj +++ b/ProxySU/ProxySU.csproj @@ -13,6 +13,7 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + false publish\ true Disk @@ -23,10 +24,10 @@ false false true - 0 + 1 1.0.0.%2a - false false + true true @@ -51,6 +52,18 @@ ProxySU.ico + + 01AFC64B121E781F77B42A6E9F1B587DDBAD475A + + + ProxySU_TemporaryKey.pfx + + + true + + + true + ..\json.net\net40\Newtonsoft.Json.dll @@ -186,17 +199,11 @@ - 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" + + - rmdir /S /Q "$(TargetDir) + + \ No newline at end of file diff --git a/ProxySU/Translations/ProxySU.en-US.xaml b/ProxySU/Translations/ProxySU.en-US.xaml index 4007373..a7ff3f0 100644 --- a/ProxySU/Translations/ProxySU.en-US.xaml +++ b/ProxySU/Translations/ProxySU.en-US.xaml @@ -27,6 +27,8 @@ Not Login Requires Login Proxy Addr: + Email + Acme.sh SSL must an available email address. Save Installation Log... Waiting for installation and deployment System Tools diff --git a/ProxySU/Translations/ProxySU.zh-CN.xaml b/ProxySU/Translations/ProxySU.zh-CN.xaml index 825341a..1db4354 100644 --- a/ProxySU/Translations/ProxySU.zh-CN.xaml +++ b/ProxySU/Translations/ProxySU.zh-CN.xaml @@ -27,6 +27,8 @@ 不需登录 需要登录 代理地址: + Email + 申请SSL证书需要一个可用的Email地址 安装日志另存为... 等待安装布署 系统工具 diff --git a/ProxySU/Translations/ProxySU.zh-TW.xaml b/ProxySU/Translations/ProxySU.zh-TW.xaml index d6c233e..3b98e2e 100644 --- a/ProxySU/Translations/ProxySU.zh-TW.xaml +++ b/ProxySU/Translations/ProxySU.zh-TW.xaml @@ -27,6 +27,8 @@ 不需登錄 需要登錄 代理地址: + Email + 申請SSL證書需要一個可用的Email地址 安裝日誌另存為... 等待安裝佈署 系統工具 diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip deleted file mode 100644 index b439863..0000000 Binary files a/ProxySU/bin/Beta/Beta.zip and /dev/null differ