From 63c7f8b7a7092c6092242669628427b3f66dad57 Mon Sep 17 00:00:00 2001 From: autumn Date: Fri, 18 Jun 2021 20:53:46 +0800 Subject: [PATCH] 4.0.3 --- ProxySuper.Core/Services/NaiveProxyProject.cs | 2 +- ProxySuper.Core/Services/ProjectBase.cs | 6 +++--- ProxySuper.Core/Services/TrojanGoProject.cs | 2 +- ProxySuper.Core/Services/XrayProject.cs | 2 +- ProxySuper.WPF/Properties/AssemblyInfo.cs | 4 ++-- .../Views/NaiveProxyInstallerView.xaml.cs | 13 +++++++++++++ .../Views/TrojanGoInstallerView.xaml.cs | 13 +++++++++++++ ProxySuper.WPF/Views/XrayInstallerView.xaml.cs | 18 ++++++++++++++++++ 8 files changed, 52 insertions(+), 8 deletions(-) diff --git a/ProxySuper.Core/Services/NaiveProxyProject.cs b/ProxySuper.Core/Services/NaiveProxyProject.cs index 0c11622..6d9ae64 100644 --- a/ProxySuper.Core/Services/NaiveProxyProject.cs +++ b/ProxySuper.Core/Services/NaiveProxyProject.cs @@ -93,7 +93,7 @@ namespace ProxySuper.Core.Services { var errorLog = "安装终止，" + ex.Message; WriteOutput(errorLog); - MessageBox.Show(errorLog); + MessageBox.Show("安装失败，请联系开发者或上传日志文件(Logs文件夹下)到github提问。"); } } diff --git a/ProxySuper.Core/Services/ProjectBase.cs b/ProxySuper.Core/Services/ProjectBase.cs index 4cee6b8..7ce26c9 100644 --- a/ProxySuper.Core/Services/ProjectBase.cs +++ b/ProxySuper.Core/Services/ProjectBase.cs @@ -662,7 +662,7 @@ namespace ProxySuper.Core.Services // 安装Acme - var result = RunCmd($"curl https://get.acme.sh yes | sh -s email={Parameters.Email}"); + var result = RunCmd($"curl https://get.acme.sh yes | sh"); if (result.Contains("Install success")) { WriteOutput("安装 acme.sh 成功"); @@ -679,12 +679,12 @@ namespace ProxySuper.Core.Services // 申请证书 if (OnlyIpv6) { - var cmd = $"/root/.acme.sh/acme.sh --force --debug --issue --standalone -d {Parameters.Domain} --listen-v6 --pre-hook \"systemctl stop caddy\" --post-hook \"systemctl start caddy\""; + var cmd = $"/root/.acme.sh/acme.sh --force --debug --issue --standalone -d {Parameters.Domain} --listen-v6 --pre-hook \"systemctl stop caddy\" --post-hook \"systemctl start caddy\" --server letsencrypt"; result = RunCmd(cmd); } else { - var cmd = $"/root/.acme.sh/acme.sh --force --debug --issue --standalone -d {Parameters.Domain} --pre-hook \"systemctl stop caddy\" --post-hook \"systemctl start caddy\""; + var cmd = $"/root/.acme.sh/acme.sh --force --debug --issue --standalone -d {Parameters.Domain} --pre-hook \"systemctl stop caddy\" --post-hook \"systemctl start caddy\" --server letsencrypt"; result = RunCmd(cmd); } diff --git a/ProxySuper.Core/Services/TrojanGoProject.cs b/ProxySuper.Core/Services/TrojanGoProject.cs index 554eb60..98783dd 100644 --- a/ProxySuper.Core/Services/TrojanGoProject.cs +++ b/ProxySuper.Core/Services/TrojanGoProject.cs @@ -129,7 +129,7 @@ namespace ProxySuper.Core.Services { var errorLog = "安装终止，" + ex.Message; WriteOutput(errorLog); - MessageBox.Show(errorLog); + MessageBox.Show("安装失败，请联系开发者或上传日志文件(Logs文件夹下)到github提问。"); } } diff --git a/ProxySuper.Core/Services/XrayProject.cs b/ProxySuper.Core/Services/XrayProject.cs index d57e30c..a079ca6 100644 --- a/ProxySuper.Core/Services/XrayProject.cs +++ b/ProxySuper.Core/Services/XrayProject.cs @@ -98,7 +98,7 @@ namespace ProxySuper.Core.Services { var errorLog = "安装终止，" + ex.Message; WriteOutput(errorLog); - MessageBox.Show(errorLog); + MessageBox.Show("安装失败，请联系开发者或上传日志文件(Logs文件夹下)到github提问。"); } } diff --git a/ProxySuper.WPF/Properties/AssemblyInfo.cs b/ProxySuper.WPF/Properties/AssemblyInfo.cs index 48b954e..89c1abd 100644 --- a/ProxySuper.WPF/Properties/AssemblyInfo.cs +++ b/ProxySuper.WPF/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0.2.0")] -[assembly: AssemblyFileVersion("4.0.2.0")] +[assembly: AssemblyVersion("4.0.3.0")] +[assembly: AssemblyFileVersion("4.0.3.0")] diff --git a/ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml.cs b/ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml.cs index af015dc..a88fcd4 100644 --- a/ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml.cs +++ b/ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -71,6 +72,7 @@ namespace ProxySuper.WPF.Views { outShell += "\n"; } + ViewModel.CommandText += outShell; Dispatcher.Invoke(() => { @@ -119,8 +121,19 @@ namespace ProxySuper.WPF.Views { Task.Factory.StartNew(OpenConnect); }; + base.Closed += SaveInstallLog; } + private void SaveInstallLog(object sender, EventArgs e) + { + if (!Directory.Exists("Logs")) + { + Directory.CreateDirectory("Logs"); + } + + var fileName = System.IO.Path.Combine("Logs", DateTime.Now.ToString("yyyy-MM-dd hh-mm") + ".naiveproxy.txt"); + File.WriteAllText(fileName, ViewModel.CommandText); + } private void OpenLink(object sender, RoutedEventArgs e) { diff --git a/ProxySuper.WPF/Views/TrojanGoInstallerView.xaml.cs b/ProxySuper.WPF/Views/TrojanGoInstallerView.xaml.cs index 4368c0b..e8ad031 100644 --- a/ProxySuper.WPF/Views/TrojanGoInstallerView.xaml.cs +++ b/ProxySuper.WPF/Views/TrojanGoInstallerView.xaml.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -73,6 +74,7 @@ namespace ProxySuper.WPF.Views { outShell += "\n"; } + ViewModel.CommandText += outShell; Dispatcher.Invoke(() => { @@ -121,8 +123,19 @@ namespace ProxySuper.WPF.Views { Task.Factory.StartNew(OpenConnect); }; + base.Closed += SaveInstallLog; } + private void SaveInstallLog(object sender, EventArgs e) + { + if (!Directory.Exists("Logs")) + { + Directory.CreateDirectory("Logs"); + } + + var fileName = System.IO.Path.Combine("Logs", DateTime.Now.ToString("yyyy-MM-dd hh-mm") + ".trojan-go.txt"); + File.WriteAllText(fileName, ViewModel.CommandText); + } private void OpenLink(object sender, RoutedEventArgs e) { diff --git a/ProxySuper.WPF/Views/XrayInstallerView.xaml.cs b/ProxySuper.WPF/Views/XrayInstallerView.xaml.cs index 525dff7..b582987 100644 --- a/ProxySuper.WPF/Views/XrayInstallerView.xaml.cs +++ b/ProxySuper.WPF/Views/XrayInstallerView.xaml.cs @@ -8,6 +8,7 @@ using Renci.SshNet; using System; using System.ComponentModel; using System.Diagnostics; +using System.IO; using System.Threading.Tasks; using System.Windows; using System.Windows.Automation.Peers; @@ -45,6 +46,19 @@ namespace ProxySuper.WPF.Views { Task.Factory.StartNew(OpenConnect); }; + + base.Closed += SaveInstallLog; + } + + private void SaveInstallLog(object sender, EventArgs e) + { + if (!Directory.Exists("Logs")) + { + Directory.CreateDirectory("Logs"); + } + + var fileName = Path.Combine("Logs", DateTime.Now.ToString("yyyy-MM-dd hh-mm") + ".xary.txt"); + File.WriteAllText(fileName, ViewModel.CommandText); } private SshClient _sshClient; @@ -75,6 +89,7 @@ namespace ProxySuper.WPF.Views { outShell += "\n"; } + ViewModel.CommandText += outShell; Dispatcher.Invoke(() => { @@ -116,6 +131,8 @@ namespace ProxySuper.WPF.Views } + #region 功能 + private void OpenLink(object sender, RoutedEventArgs e) { Hyperlink link = sender as Hyperlink; @@ -186,6 +203,7 @@ namespace ProxySuper.WPF.Views } }); } + #endregion } }