diff --git a/backend/utils/mikrotikInterfaceGenerator.js b/backend/utils/mikrotikInterfaceGenerator.js index 575e9da..16ab05a 100644 --- a/backend/utils/mikrotikInterfaceGenerator.js +++ b/backend/utils/mikrotikInterfaceGenerator.js @@ -281,14 +281,14 @@ async function buildMikrotikRecursiveRoutes(config, servers, options = {}) { if (server?.provider) code += `# Провайдер: ${server.provider}\n`; if (server?.country) code += `# Страна: ${server.country}\n`; code += '\n'; - code += '# Удаление существующих рекурсивных маршрутов (опционально)\n'; - code += '/ip route remove [find comment~"Recursive"]\n\n'; + code += '# Удаление старых рекурсивных маршрутов (comment начинается с "Recursive: ")\n'; + code += '/ip route remove [find comment~"^Recursive: "] \n\n'; } else { operations.push({ path: '/ip/route', action: 'remove', params: {}, - meta: { findComment: 'Recursive' }, + meta: { findComment: '^Recursive: ' }, }); } diff --git a/frontend/src/NetworkConfigManager.jsx b/frontend/src/NetworkConfigManager.jsx index c7e193f..d7e4045 100644 --- a/frontend/src/NetworkConfigManager.jsx +++ b/frontend/src/NetworkConfigManager.jsx @@ -5439,7 +5439,9 @@ function NetworkConfigManager() { Запросы к MikroTik API ({applyResult.mikrotikRequests.length})
                               {applyResult.mikrotikRequests.map((req, i) => (
-                                
{req.path} {Array.isArray(req.args) ? req.args.join(' ') : ''}
+
+ {req.block || req.path} — {req.serverName || ''} ({req.operationCount ?? (Array.isArray(req.args) ? req.args.length : 0)} операций) +
))}
@@ -5453,7 +5455,9 @@ function NetworkConfigManager() { Запросы к MikroTik API до ошибки ({applyResult.mikrotikRequests.length})
                               {applyResult.mikrotikRequests.map((req, i) => (
-                                
{req.path} {Array.isArray(req.args) ? req.args.join(' ') : ''}
+
+ {req.block || req.path} — {req.serverName || ''} ({req.operationCount ?? (Array.isArray(req.args) ? req.args.length : 0)} операций) +
))}