From 9f653c650b52d825352b122f36c299f6932352b7 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 19 Sep 2025 16:14:27 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/lite/install/sys_menu.sql | 4 ++-- build/database/lite/upgrade/upg_sys_menu.sql | 4 ++-- build/database/std/install/sys_menu.sql | 4 ++-- build/database/std/upgrade/upg_sys_menu.sql | 4 ++-- src/modules/network_element/service/ne_config_backup.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/database/lite/install/sys_menu.sql b/build/database/lite/install/sys_menu.sql index 511e2a1a..53d6c284 100644 --- a/build/database/lite/install/sys_menu.sql +++ b/build/database/lite/install/sys_menu.sql @@ -136,8 +136,8 @@ INSERT INTO "sys_menu" VALUES (1079, 'menu.common.stop', 2086, 3, '', '', '1', ' INSERT INTO "sys_menu" VALUES (1080, 'menu.common.reload', 2086, 4, '', '', '1', '1', 'B', '1', '1', 'traceManage:pcap:textlog', '#', '0', 'supervisor', 1757576647815, 'supervisor', 1757576647815, ''); INSERT INTO "sys_menu" VALUES (1081, 'menu.common.download', 2086, 5, '', '', '1', '1', 'B', '1', '1', 'traceManage:pcap:download', '#', '0', 'supervisor', 1757576647815, 'supervisor', 1757576647815, ''); INSERT INTO "sys_menu" VALUES (1082, 'menu.common.query', 2163, 0, '', '', '1', '1', 'B', '1', '1', 'traceManage:tshark:search', '#', '0', 'supervisor', 1757667388112, 'supervisor', 1757667388112, ''); -INSERT INTO "sys_menu" VALUES (1083, 'menu.system.setting.backup', 2114, 7, '', '', '1', '1', 'B', '1', '1', 'system:setting:backup', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); -INSERT INTO "sys_menu" VALUES (1084, 'menu.system.setting.reset', 2114, 7, '', '', '1', '1', 'B', '1', '1', 'system:setting:reset', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +INSERT INTO "sys_menu" VALUES (1083, 'menu.system.setting.backup', 2114, 8, '', '', '1', '1', 'B', '1', '1', 'system:setting:backup', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +INSERT INTO "sys_menu" VALUES (1084, 'menu.system.setting.reset', 2114, 9, '', '', '1', '1', 'B', '1', '1', 'system:setting:reset', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); INSERT INTO "sys_menu" VALUES (1085, 'menu.common.query', 2164, 0, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:search', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); INSERT INTO "sys_menu" VALUES (1086, 'menu.common.start', 2164, 1, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:start', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); INSERT INTO "sys_menu" VALUES (1087, 'menu.common.stop', 2164, 3, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:stop', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); diff --git a/build/database/lite/upgrade/upg_sys_menu.sql b/build/database/lite/upgrade/upg_sys_menu.sql index 1759ff82..37ccb716 100644 --- a/build/database/lite/upgrade/upg_sys_menu.sql +++ b/build/database/lite/upgrade/upg_sys_menu.sql @@ -135,8 +135,8 @@ REPLACE INTO "sys_menu" VALUES (1079, 'menu.common.stop', 2086, 3, '', '', '1', REPLACE INTO "sys_menu" VALUES (1080, 'menu.common.reload', 2086, 4, '', '', '1', '1', 'B', '1', '1', 'traceManage:pcap:textlog', '#', '0', 'supervisor', 1757576647815, 'supervisor', 1757576647815, ''); REPLACE INTO "sys_menu" VALUES (1081, 'menu.common.download', 2086, 5, '', '', '1', '1', 'B', '1', '1', 'traceManage:pcap:download', '#', '0', 'supervisor', 1757576647815, 'supervisor', 1757576647815, ''); REPLACE INTO "sys_menu" VALUES (1082, 'menu.common.query', 2163, 0, '', '', '1', '1', 'B', '1', '1', 'traceManage:tshark:search', '#', '0', 'supervisor', 1757667388112, 'supervisor', 1757667388112, ''); -REPLACE INTO "sys_menu" VALUES (1083, 'menu.system.setting.backup', 2114, 7, '', '', '1', '1', 'B', '1', '1', 'system:setting:backup', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); -REPLACE INTO "sys_menu" VALUES (1084, 'menu.system.setting.reset', 2114, 7, '', '', '1', '1', 'B', '1', '1', 'system:setting:reset', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +REPLACE INTO "sys_menu" VALUES (1083, 'menu.system.setting.backup', 2114, 8, '', '', '1', '1', 'B', '1', '1', 'system:setting:backup', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +REPLACE INTO "sys_menu" VALUES (1084, 'menu.system.setting.reset', 2114, 9, '', '', '1', '1', 'B', '1', '1', 'system:setting:reset', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); REPLACE INTO "sys_menu" VALUES (1085, 'menu.common.query', 2164, 0, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:search', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); REPLACE INTO "sys_menu" VALUES (1086, 'menu.common.start', 2164, 1, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:start', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); REPLACE INTO "sys_menu" VALUES (1087, 'menu.common.stop', 2164, 3, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:stop', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); diff --git a/build/database/std/install/sys_menu.sql b/build/database/std/install/sys_menu.sql index b665f1fd..6e04b786 100644 --- a/build/database/std/install/sys_menu.sql +++ b/build/database/std/install/sys_menu.sql @@ -139,8 +139,8 @@ INSERT INTO `sys_menu` VALUES (1079, 'menu.common.stop', 2086, 3, '', '', '1', ' INSERT INTO `sys_menu` VALUES (1080, 'menu.common.reload', 2086, 4, '', '', '1', '1', 'B', '1', '1', 'traceManage:pcap:textlog', '#', '0', 'supervisor', 1757576647815, 'supervisor', 1757576647815, ''); INSERT INTO `sys_menu` VALUES (1081, 'menu.common.download', 2086, 5, '', '', '1', '1', 'B', '1', '1', 'traceManage:pcap:download', '#', '0', 'supervisor', 1757576647815, 'supervisor', 1757576647815, ''); INSERT INTO `sys_menu` VALUES (1082, 'menu.common.query', 2163, 0, '', '', '1', '1', 'B', '1', '1', 'traceManage:tshark:search', '#', '0', 'supervisor', 1757667388112, 'supervisor', 1757667388112, ''); -INSERT INTO `sys_menu` VALUES (1083, 'menu.system.setting.backup', 2114, 7, '', '', '1', '1', 'B', '1', '1', 'system:setting:backup', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); -INSERT INTO `sys_menu` VALUES (1084, 'menu.system.setting.reset', 2114, 7, '', '', '1', '1', 'B', '1', '1', 'system:setting:reset', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +INSERT INTO `sys_menu` VALUES (1083, 'menu.system.setting.backup', 2114, 8, '', '', '1', '1', 'B', '1', '1', 'system:setting:backup', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +INSERT INTO `sys_menu` VALUES (1084, 'menu.system.setting.reset', 2114, 9, '', '', '1', '1', 'B', '1', '1', 'system:setting:reset', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); INSERT INTO `sys_menu` VALUES (1085, 'menu.common.query', 2164, 0, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:search', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); INSERT INTO `sys_menu` VALUES (1086, 'menu.common.start', 2164, 1, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:start', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); INSERT INTO `sys_menu` VALUES (1087, 'menu.common.stop', 2164, 3, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:stop', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); diff --git a/build/database/std/upgrade/upg_sys_menu.sql b/build/database/std/upgrade/upg_sys_menu.sql index 366bfb73..73d249bd 100644 --- a/build/database/std/upgrade/upg_sys_menu.sql +++ b/build/database/std/upgrade/upg_sys_menu.sql @@ -161,8 +161,8 @@ REPLACE INTO `sys_menu` VALUES (1079, 'menu.common.stop', 2086, 3, '', '', '1', REPLACE INTO `sys_menu` VALUES (1080, 'menu.common.reload', 2086, 4, '', '', '1', '1', 'B', '1', '1', 'traceManage:pcap:textlog', '#', '0', 'supervisor', 1757576647815, 'supervisor', 1757576647815, ''); REPLACE INTO `sys_menu` VALUES (1081, 'menu.common.download', 2086, 5, '', '', '1', '1', 'B', '1', '1', 'traceManage:pcap:download', '#', '0', 'supervisor', 1757576647815, 'supervisor', 1757576647815, ''); REPLACE INTO `sys_menu` VALUES (1082, 'menu.common.query', 2163, 0, '', '', '1', '1', 'B', '1', '1', 'traceManage:tshark:search', '#', '0', 'supervisor', 1757667388112, 'supervisor', 1757667388112, ''); -REPLACE INTO `sys_menu` VALUES (1083, 'menu.system.setting.backup', 2114, 7, '', '', '1', '1', 'B', '1', '1', 'system:setting:backup', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); -REPLACE INTO `sys_menu` VALUES (1084, 'menu.system.setting.reset', 2114, 7, '', '', '1', '1', 'B', '1', '1', 'system:setting:reset', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +REPLACE INTO `sys_menu` VALUES (1083, 'menu.system.setting.backup', 2114, 8, '', '', '1', '1', 'B', '1', '1', 'system:setting:backup', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +REPLACE INTO `sys_menu` VALUES (1084, 'menu.system.setting.reset', 2114, 9, '', '', '1', '1', 'B', '1', '1', 'system:setting:reset', '#', '0', 'system', 1728641403588, 'system', 1728641403588, ''); REPLACE INTO `sys_menu` VALUES (1085, 'menu.common.query', 2164, 0, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:search', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); REPLACE INTO `sys_menu` VALUES (1086, 'menu.common.start', 2164, 1, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:start', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); REPLACE INTO `sys_menu` VALUES (1087, 'menu.common.stop', 2164, 3, '', '', '1', '1', 'B', '1', '1', 'traceManage:wireshark:stop', '#', '0', 'supervisor', 1757667601966, 'supervisor', 1757667601966, ''); diff --git a/src/modules/network_element/service/ne_config_backup.go b/src/modules/network_element/service/ne_config_backup.go index c57a2c89..1f60fe4a 100644 --- a/src/modules/network_element/service/ne_config_backup.go +++ b/src/modules/network_element/service/ne_config_backup.go @@ -169,8 +169,8 @@ func (s NeConfigBackup) FileNeToLocalPath(neInfo model.NeInfo, localDirPath stri } // 网元端复制到本地 - if err := file.CopyDir(neDirTemp, localDirPath); err != nil { - return fmt.Errorf("copy config err") + if err = sftpClient.CopyDirRemoteToLocal(neDirTemp, localDirPath); err != nil { + return fmt.Errorf("copy config from ne err") } sshClient.RunCMD(fmt.Sprintf("sudo rm -rf %s", neDirTemp)) // 删除临时目录 return nil