Fixed the problem of traffic statistics api url

This commit is contained in:
2dust
2024-11-30 10:58:53 +08:00
parent f685682214
commit e4d3a98aa8
5 changed files with 21 additions and 15 deletions
+8 -1
View File
@@ -27,7 +27,7 @@
get
{
_statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
return _statePort2.Value;
return _statePort2.Value + (_config.TunModeItem.EnableTun ? 1 : 0);
}
}
@@ -79,6 +79,13 @@
return true;
}
public bool Reset()
{
_statePort = null;
_statePort2 = null;
return true;
}
#endregion Init
#region Config
+7 -6
View File
@@ -97,12 +97,12 @@ namespace ServiceLib.Handler
{
if (_process != null)
{
await KillProcess(_process);
_process = await KillProcess(_process);
}
if (_processPre != null)
{
await KillProcess(_processPre);
_processPre = await KillProcess(_processPre);
}
if (_linuxSudoPid > 0)
@@ -321,17 +321,18 @@ namespace ServiceLib.Handler
}
}
private async Task KillProcess(Process? proc)
private async Task<Process?> KillProcess(Process? proc)
{
if (proc is null)
{
return;
return null;
}
try { proc?.Kill(true); } catch { }
try { proc?.Close(); } catch { }
try { proc?.Dispose(); } catch { }
proc = null;
await Task.Delay(100);
return null;
}
#endregion Process
@@ -394,7 +395,7 @@ namespace ServiceLib.Handler
private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
{
//Shell scripts
var shFilePath = Utils.GetBinPath(fileName);
var shFilePath = Utils.GetBinPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
File.Delete(shFilePath);
var sb = new StringBuilder();
sb.AppendLine("#!/bin/sh");