Fix portal routing after settings changes
This commit is contained in:
+30
-5
@@ -132,7 +132,7 @@ public sealed class MainForm : Form
|
||||
_btnRefreshStatus = CreateButton("刷新状态", 96);
|
||||
_btnRefreshStatus.Click += (s, e) => RefreshStatus();
|
||||
_btnSavePortal = CreateButton("保存入口设置", 96);
|
||||
_btnSavePortal.Click += (s, e) => SavePortalSettings();
|
||||
_btnSavePortal.Click += async (s, e) => await SavePortalSettingsAsync();
|
||||
|
||||
panel.Controls.Add(CreateLabel("配置文件"), 0, 0);
|
||||
panel.Controls.Add(_txtConfigPath, 1, 0);
|
||||
@@ -413,10 +413,13 @@ public sealed class MainForm : Form
|
||||
_grid.DataSource = _binding;
|
||||
}
|
||||
|
||||
private void SavePortalSettings()
|
||||
private async Task SavePortalSettingsAsync()
|
||||
{
|
||||
var settingsSaved = false;
|
||||
try
|
||||
{
|
||||
_btnSavePortal.Enabled = false;
|
||||
SetNginxActionsEnabled(false);
|
||||
var domain = _txtPortalDomain.Text.Trim();
|
||||
if (!string.IsNullOrWhiteSpace(domain) &&
|
||||
(domain.Contains("://", StringComparison.Ordinal) || domain.Contains('/') ||
|
||||
@@ -427,18 +430,40 @@ public sealed class MainForm : Form
|
||||
|
||||
_manager.UpdatePortalSettings(domain, (int)_numPortalPort.Value);
|
||||
_manager.RenderConfig();
|
||||
settingsSaved = true;
|
||||
var wasRunning = _manager.IsRunning;
|
||||
if (wasRunning)
|
||||
{
|
||||
_lblStatus.Text = "● 正在应用入口设置...";
|
||||
_lblStatus.ForeColor = Color.FromArgb(131, 88, 0);
|
||||
_lblStatus.BackColor = Color.FromArgb(255, 246, 214);
|
||||
await Task.Run(_manager.Reload);
|
||||
await WaitForNginxStateAsync(expectedRunning: true);
|
||||
}
|
||||
|
||||
RefreshBasicInfo();
|
||||
var applyMessage = wasRunning
|
||||
? "运行中的 Nginx 已自动重新加载。"
|
||||
: "请点击“启动代理”使设置生效。";
|
||||
MessageBox.Show(
|
||||
string.IsNullOrWhiteSpace(domain)
|
||||
? "入口站点已关闭,Nginx 配置已更新。"
|
||||
: "入口页域名和监听端口已保存,Nginx 配置已更新。",
|
||||
? $"入口站点已关闭,Nginx 配置已更新。\n{applyMessage}"
|
||||
: $"入口页域名和监听端口已保存,Nginx 配置已更新。\n{applyMessage}",
|
||||
"NginxMan",
|
||||
MessageBoxButtons.OK,
|
||||
MessageBoxIcon.Information);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(ex.Message, "NginxMan", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
var prefix = settingsSaved
|
||||
? "入口设置已保存,但运行中的 Nginx 自动重新加载失败。\n"
|
||||
: string.Empty;
|
||||
MessageBox.Show(prefix + ex.Message, "NginxMan", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_btnSavePortal.Enabled = true;
|
||||
RefreshStatus();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user