From 139e115f5a1f1cae1cdf80fb02d3ad86524f939a Mon Sep 17 00:00:00 2001 From: root <295172551@qq.com> Date: Sat, 2 Aug 2025 20:33:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=BD=91=E7=BB=9C=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20=E4=B8=BB=E6=AC=A1=E6=8D=A2=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Network/NetworkInterfaceManager.cs | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/CoreAgent.Infrastructure/Services/Network/NetworkInterfaceManager.cs b/CoreAgent.Infrastructure/Services/Network/NetworkInterfaceManager.cs index 2b343fa..14d77a0 100644 --- a/CoreAgent.Infrastructure/Services/Network/NetworkInterfaceManager.cs +++ b/CoreAgent.Infrastructure/Services/Network/NetworkInterfaceManager.cs @@ -273,16 +273,32 @@ public class NetworkInterfaceManager : INetworkInterfaceManager private async Task ExecuteMultiConfigStartCommandsAsync(CommandTemplateConfig startCommand, NetworkConfiguration networkConfig) { + // 执行主配置命令 + var primaryConfig = networkConfig.CoreOrImsConfigs.FirstOrDefault(s => s.Index == 1); + if (primaryConfig != null) + { + var primaryCommand = string.Format(startCommand.Template, 1); + var fullCommand = $"{primaryCommand} {networkConfig.RagConfig} {primaryConfig.CoreNetworkConfig} {primaryConfig.ImsConfig}"; + + _logger.LogInformation("执行主配置启动命令: {Command}", fullCommand); + //_context.TokenSource + var result = await _commandExecutor.ExecuteCommandAsync(fullCommand, new CancellationTokenSource()); + if (!result.IsSuccess) + { + return NetworkInterfaceOperationResult.Failure($"主配置命令执行失败: {result.Error}", NetworkConfigType.BothRagAndCore); + } + } + // 添加次要配置命令 var secondaryConfigs = networkConfig.CoreOrImsConfigs.Where(s => s.Index != 1).ToArray(); var secondaryTasks = new List>(); - + for (int i = 0; i < secondaryConfigs.Length; i++) { var config = secondaryConfigs[i]; var command = string.Format(startCommand.Template, i + 2); var fullCommand = $"{command} NULL {config.CoreNetworkConfig} {config.ImsConfig}"; - + _logger.LogInformation("并发执行次要配置启动命令: {Command}", fullCommand); //_context.TokenSource secondaryTasks.Add(_commandExecutor.ExecuteCommandAsync(fullCommand, new CancellationTokenSource())); @@ -295,22 +311,6 @@ public class NetworkInterfaceManager : INetworkInterfaceManager return NetworkInterfaceOperationResult.Failure("部分次要配置命令执行失败", NetworkConfigType.BothRagAndCore); } - // 执行主配置命令 - var primaryConfig = networkConfig.CoreOrImsConfigs.FirstOrDefault(s => s.Index == 1); - if (primaryConfig != null) - { - var primaryCommand = string.Format(startCommand.Template, 1); - var fullCommand = $"{primaryCommand} {networkConfig.RagConfig} {primaryConfig.CoreNetworkConfig} {primaryConfig.ImsConfig}"; - - _logger.LogInformation("执行主配置启动命令: {Command}", fullCommand); - //_context.TokenSource - var result = await _commandExecutor.ExecuteCommandAsync(fullCommand, new CancellationTokenSource()); - if (!result.IsSuccess) - { - return NetworkInterfaceOperationResult.Failure($"主配置命令执行失败: {result.Error}", NetworkConfigType.BothRagAndCore); - } - } - return NetworkInterfaceOperationResult.Success(NetworkConfigType.BothRagAndCore); } } \ No newline at end of file