1.1.4 -> 1.1.5 第2次更新

This commit is contained in:
Space Time 2024-12-23 22:06:35 +08:00
parent 345c291305
commit 87d97c2f04

View File

@ -329,8 +329,6 @@ public partial class MainWin : Window
{ {
await NginxCleaner.Clean(); await NginxCleaner.Clean();
NginxHttpPort = 80;
NginxHttpsPort = 443;
NginxConfWatcher_Changed(null!, null!); NginxConfWatcher_Changed(null!, null!);
}; };
@ -394,11 +392,7 @@ public partial class MainWin : Window
else else
foreach (Process mihomoProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(MainConst.MihomoPath))) foreach (Process mihomoProcess in Process.GetProcessesByName(Path.GetFileNameWithoutExtension(MainConst.MihomoPath)))
{ {
mihomoProcess.Exited += (_, _) => mihomoProcess.Exited += (_, _) => MihomoConfWatcher_Changed(null!, null!);
{
MihomoMixedPort = 7880;
MihomoConfWatcher_Changed(null!, null!);
};
mihomoProcess.Kill(); mihomoProcess.Kill();
} }
@ -653,6 +647,9 @@ public partial class MainWin : Window
if (!Directory.Exists(MainConst.NginxTempPath)) if (!Directory.Exists(MainConst.NginxTempPath))
Directory.CreateDirectory(MainConst.NginxTempPath); Directory.CreateDirectory(MainConst.NginxTempPath);
NginxHttpPort = 80;
NginxHttpsPort = 443;
foreach (IPEndPoint activeTcpListener in IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners()) foreach (IPEndPoint activeTcpListener in IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners())
if (activeTcpListener.Port == NginxHttpPort) if (activeTcpListener.Port == NginxHttpPort)
NginxHttpPort++; NginxHttpPort++;
@ -725,6 +722,8 @@ public partial class MainWin : Window
if (!File.Exists(MainConst.MihomoConfPath)) if (!File.Exists(MainConst.MihomoConfPath))
await File.Create(MainConst.MihomoConfPath).DisposeAsync(); await File.Create(MainConst.MihomoConfPath).DisposeAsync();
MihomoMixedPort = 7880;
foreach (IPEndPoint activeTcpListener in IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners()) foreach (IPEndPoint activeTcpListener in IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners())
if (activeTcpListener.Port == MihomoMixedPort) if (activeTcpListener.Port == MihomoMixedPort)
MihomoMixedPort++; MihomoMixedPort++;